diff --git a/.github/locales.py b/.github/locales.py
index dd23ebbe225..a74d7258834 100644
--- a/.github/locales.py
+++ b/.github/locales.py
@@ -1,6 +1,7 @@
 import re
 import glob
 import requests
+import os
 import lxml.etree as ET  # builtin library doesn't preserve comments
 
 
@@ -61,5 +62,8 @@
         with open(file, 'wb') as fp:
             fp.write(b'<?xml version="1.0" encoding="utf-8"?>\n')
             tree.write(fp, encoding="utf-8", method="xml", pretty_print=True, xml_declaration=False)
+            # Remove trailing new line to be consistent with weblate
+            fp.seek(-1, os.SEEK_END)
+            fp.truncate()
     except ET.ParseError as ex:
         print(f"[{file}] {ex}")
diff --git a/.github/workflows/build_to_archive.yml b/.github/workflows/build_to_archive.yml
index e84bb08b0df..f62f1ba055c 100644
--- a/.github/workflows/build_to_archive.yml
+++ b/.github/workflows/build_to_archive.yml
@@ -1,78 +1,78 @@
-name: Archive build
-
-on:
-  push:
-    branches: [ master ]
-    paths-ignore:
-      - '*.md'
-      - '*.json'
-      - '**/wcokey.txt'
-  workflow_dispatch:
-
-concurrency: 
-  group: "Archive-build"
-  cancel-in-progress: true
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Generate access token
-      id: generate_token
-      uses: tibdex/github-app-token@v2
-      with:
-        app_id: ${{ secrets.GH_APP_ID }}
-        private_key: ${{ secrets.GH_APP_KEY }}
-        repository: "recloudstream/secrets"
-    - name: Generate access token (archive)
-      id: generate_archive_token
-      uses: tibdex/github-app-token@v2
-      with:
-        app_id: ${{ secrets.GH_APP_ID }}
-        private_key: ${{ secrets.GH_APP_KEY }}
-        repository: "recloudstream/cloudstream-archive"
-    - uses: actions/checkout@v4
-    - name: Set up JDK 17
-      uses: actions/setup-java@v4
-      with:
-        java-version: '17'
-        distribution: 'adopt'
-    - name: Grant execute permission for gradlew
-      run: chmod +x gradlew
-    - name: Fetch keystore
-      id: fetch_keystore
-      run: |
-        TMP_KEYSTORE_FILE_PATH="${RUNNER_TEMP}"/keystore
-        mkdir -p "${TMP_KEYSTORE_FILE_PATH}"
-        curl -H "Authorization: token ${{ steps.generate_token.outputs.token }}" -o "${TMP_KEYSTORE_FILE_PATH}/prerelease_keystore.keystore" "https://raw.githubusercontent.com/recloudstream/secrets/master/keystore.jks"
-        curl -H "Authorization: token ${{ steps.generate_token.outputs.token }}" -o "keystore_password.txt" "https://raw.githubusercontent.com/recloudstream/secrets/master/keystore_password.txt"
-        KEY_PWD="$(cat keystore_password.txt)"
-        echo "::add-mask::${KEY_PWD}"
-        echo "key_pwd=$KEY_PWD" >> $GITHUB_OUTPUT
-    - name: Run Gradle
-      run: |
-        ./gradlew assemblePrerelease
-      env:
-        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@v4
-      with:
-        repository: "recloudstream/cloudstream-archive"
-        token: ${{ steps.generate_archive_token.outputs.token }}
-        path: "archive"
-
-    - name: Move build
-      run: |
-        cp app/build/outputs/apk/prerelease/release/*.apk "archive/$(git rev-parse --short HEAD).apk"
-    
-    - name: Push archive
-      run: |
-        cd $GITHUB_WORKSPACE/archive
-        git config --local user.email "actions@github.com"
-        git config --local user.name "GitHub Actions"
-        git add .
-        git commit --amend -m "Build $GITHUB_SHA" || exit 0   # do not error if nothing to commit
+name: Archive build
+
+on:
+  push:
+    branches: [ master ]
+    paths-ignore:
+      - '*.md'
+      - '*.json'
+      - '**/wcokey.txt'
+  workflow_dispatch:
+
+concurrency: 
+  group: "Archive-build"
+  cancel-in-progress: true
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Generate access token
+      id: generate_token
+      uses: tibdex/github-app-token@v2
+      with:
+        app_id: ${{ secrets.GH_APP_ID }}
+        private_key: ${{ secrets.GH_APP_KEY }}
+        repository: "recloudstream/secrets"
+    - name: Generate access token (archive)
+      id: generate_archive_token
+      uses: tibdex/github-app-token@v2
+      with:
+        app_id: ${{ secrets.GH_APP_ID }}
+        private_key: ${{ secrets.GH_APP_KEY }}
+        repository: "recloudstream/cloudstream-archive"
+    - uses: actions/checkout@v4
+    - name: Set up JDK 17
+      uses: actions/setup-java@v4
+      with:
+        java-version: '17'
+        distribution: 'adopt'
+    - name: Grant execute permission for gradlew
+      run: chmod +x gradlew
+    - name: Fetch keystore
+      id: fetch_keystore
+      run: |
+        TMP_KEYSTORE_FILE_PATH="${RUNNER_TEMP}"/keystore
+        mkdir -p "${TMP_KEYSTORE_FILE_PATH}"
+        curl -H "Authorization: token ${{ steps.generate_token.outputs.token }}" -o "${TMP_KEYSTORE_FILE_PATH}/prerelease_keystore.keystore" "https://raw.githubusercontent.com/recloudstream/secrets/master/keystore.jks"
+        curl -H "Authorization: token ${{ steps.generate_token.outputs.token }}" -o "keystore_password.txt" "https://raw.githubusercontent.com/recloudstream/secrets/master/keystore_password.txt"
+        KEY_PWD="$(cat keystore_password.txt)"
+        echo "::add-mask::${KEY_PWD}"
+        echo "key_pwd=$KEY_PWD" >> $GITHUB_OUTPUT
+    - name: Run Gradle
+      run: |
+        ./gradlew assemblePrerelease
+      env:
+        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@v4
+      with:
+        repository: "recloudstream/cloudstream-archive"
+        token: ${{ steps.generate_archive_token.outputs.token }}
+        path: "archive"
+
+    - name: Move build
+      run: |
+        cp app/build/outputs/apk/prerelease/release/*.apk "archive/$(git rev-parse --short HEAD).apk"
+    
+    - name: Push archive
+      run: |
+        cd $GITHUB_WORKSPACE/archive
+        git config --local user.email "actions@github.com"
+        git config --local user.name "GitHub Actions"
+        git add .
+        git commit --amend -m "Build $GITHUB_SHA" || exit 0   # do not error if nothing to commit
         git push --force
\ No newline at end of file
diff --git a/.github/workflows/generate_dokka.yml b/.github/workflows/generate_dokka.yml
index 96e61644799..666e2ba1078 100644
--- a/.github/workflows/generate_dokka.yml
+++ b/.github/workflows/generate_dokka.yml
@@ -40,7 +40,8 @@ jobs:
       - name: Clean old builds
         run: |
           cd $GITHUB_WORKSPACE/dokka/
-          rm -rf "./-cloudstream"
+          rm -rf "./app"
+          rm -rf "./library"
 
       - name: Setup JDK 17
         uses: actions/setup-java@v4
@@ -55,11 +56,11 @@ jobs:
         run: |
           cd $GITHUB_WORKSPACE/src/
           chmod +x gradlew
-          ./gradlew app:dokkaHtml
+          ./gradlew docs:dokkaGeneratePublicationHtml
 
       - name: Copy Dokka
         run: |
-          cp -r $GITHUB_WORKSPACE/src/app/build/dokka/html/* $GITHUB_WORKSPACE/dokka/
+          cp -r $GITHUB_WORKSPACE/src/docs/build/dokka/html/* $GITHUB_WORKSPACE/dokka/
 
       - name: Push builds
         run: |
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d7c08c9c2db..d06216153db 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,12 +4,14 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <option name="testRunner" value="CHOOSE_PER_TEST" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
+            <option value="$PROJECT_DIR$/docs" />
             <option value="$PROJECT_DIR$/library" />
           </set>
         </option>
diff --git a/.idea/studiobot.xml b/.idea/studiobot.xml
new file mode 100644
index 00000000000..9298202cbef
--- /dev/null
+++ b/.idea/studiobot.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="StudioBotProjectSettings">
+    <option name="shareContext" value="OptedOut" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
deleted file mode 100644
index 7f7fd14c120..00000000000
--- a/app/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-# 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 956909a948b..f48414be3b5 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,31 +1,41 @@
 import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties
-import org.jetbrains.dokka.gradle.DokkaTask
-import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.util.archivesName
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-import java.io.ByteArrayOutputStream
-import java.net.URL
+import org.jetbrains.dokka.gradle.engine.parameters.KotlinPlatform
+import org.jetbrains.dokka.gradle.engine.parameters.VisibilityModifier
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
 
 plugins {
     id("com.android.application")
-    id("com.google.devtools.ksp")
     id("kotlin-android")
     id("org.jetbrains.dokka")
 }
 
+val javaTarget = JvmTarget.fromTarget(libs.versions.jvmTarget.get())
 val tmpFilePath = System.getProperty("user.home") + "/work/_temp/keystore/"
 val prereleaseStoreFile: File? = File(tmpFilePath).listFiles()?.first()
 
-fun String.execute() = ByteArrayOutputStream().use { baot ->
-    if (project.exec {
-            workingDir = projectDir
-            commandLine = this@execute.split(Regex("\\s"))
-            standardOutput = baot
-        }.exitValue == 0)
-        String(baot.toByteArray()).trim()
-    else null
+fun getGitCommitHash(): String {
+    return try {
+        val headFile = file("${project.rootDir}/.git/HEAD")
+
+        // Read the commit hash from .git/HEAD
+        if (headFile.exists()) {
+            val headContent = headFile.readText().trim()
+            if (headContent.startsWith("ref:")) {
+                val refPath = headContent.substring(5) // e.g., refs/heads/main
+                val commitFile = file("${project.rootDir}/.git/$refPath")
+                if (commitFile.exists()) commitFile.readText().trim() else ""
+            } else headContent // If it's a detached HEAD (commit hash directly)
+        } else {
+            "" // If .git/HEAD doesn't exist
+        }.take(7) // Return the short commit hash
+    } catch (_: Throwable) {
+        "" // Just return an empty string if any exception occurs
+    }
 }
 
 android {
+    @Suppress("UnstableApiUsage")
     testOptions {
         unitTests.isReturnDefaultValues = true
     }
@@ -34,16 +44,9 @@ android {
         enable = true
     }
 
-    /* disable this for now
-    externalNativeBuild {
-        cmake {
-            path("CMakeLists.txt")
-        }
-    }*/
-
     signingConfigs {
-        create("prerelease") {
-            if (prereleaseStoreFile != null) {
+        if (prereleaseStoreFile != null) {
+            create("prerelease") {
                 storeFile = file(prereleaseStoreFile)
                 storePassword = System.getenv("SIGNING_STORE_PASSWORD")
                 keyAlias = System.getenv("SIGNING_KEY_ALIAS")
@@ -52,23 +55,21 @@ android {
         }
     }
 
-    compileSdk = 34
-    buildToolsVersion = "34.0.0"
+    compileSdk = libs.versions.compileSdk.get().toInt()
 
     defaultConfig {
         applicationId = "com.lagradost.cloudstream3"
-        minSdk = 21
-        targetSdk = 33 /* Android 14 is Fu*ked
-        ^ https://developer.android.com/about/versions/14/behavior-changes-14#safer-dynamic-code-loading*/
-        versionCode = 63
-        versionName = "4.3.333"
+        minSdk = libs.versions.minSdk.get().toInt()
+        targetSdk = libs.versions.targetSdk.get().toInt()
+        versionCode = 65
+        versionName = "4.5.1"
 
         resValue("string", "app_version", "${defaultConfig.versionName}${versionNameSuffix ?: ""}")
-        resValue("string", "commit_hash", "git rev-parse --short HEAD".execute() ?: "")
+        resValue("string", "commit_hash", getGitCommitHash())
         resValue("bool", "is_prerelease", "false")
 
         // Reads local.properties
-        val localProperties = gradleLocalProperties(rootDir)
+        val localProperties = gradleLocalProperties(rootDir, project.providers)
 
         buildConfigField(
             "long",
@@ -86,11 +87,6 @@ android {
             "\"" + (System.getenv("SIMKL_CLIENT_SECRET") ?: localProperties["simkl.secret"]) + "\""
         )
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-
-        ksp {
-            arg("room.schemaLocation", "$projectDir/schemas")
-            arg("exportSchema", "true")
-        }
     }
 
     buildTypes {
@@ -124,7 +120,11 @@ android {
             resValue("bool", "is_prerelease", "true")
             buildConfigField("boolean", "BETA", "true")
             applicationIdSuffix = ".prerelease"
-            signingConfig = signingConfigs.getByName("prerelease")
+            if (signingConfigs.names.contains("prerelease")) {
+                signingConfig = signingConfigs.getByName("prerelease")
+            } else {
+                logger.warn("No prerelease signing config!")
+            }
             versionNameSuffix = "-PRE"
             versionCode = (System.currentTimeMillis() / 60000).toInt()
         }
@@ -132,15 +132,15 @@ android {
 
     compileOptions {
         isCoreLibraryDesugaringEnabled = true
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.toVersion(javaTarget.target)
+        targetCompatibility = JavaVersion.toVersion(javaTarget.target)
     }
 
     lint {
         abortOnError = false
         checkReleaseBuilds = false
     }
-    
+
     buildFeatures {
         buildConfig = true
     }
@@ -148,90 +148,84 @@ android {
     namespace = "com.lagradost.cloudstream3"
 }
 
-repositories {
-    maven("https://jitpack.io")
-}
-
 dependencies {
     // Testing
-    testImplementation("junit:junit:4.13.2")
-    testImplementation("org.json:json:20240303")
-    androidTestImplementation("androidx.test:core")
-    implementation("androidx.test.ext:junit-ktx:1.2.1")
-    androidTestImplementation("androidx.test.ext:junit:1.2.1")
-    androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")
+    testImplementation(libs.junit)
+    testImplementation(libs.json)
+    androidTestImplementation(libs.core)
+    implementation(libs.junit.ktx)
+    androidTestImplementation(libs.ext.junit)
+    androidTestImplementation(libs.espresso.core)
 
     // Android Core & Lifecycle
-    implementation("androidx.core:core-ktx:1.13.1")
-    implementation("androidx.appcompat:appcompat:1.7.0")
-    implementation("androidx.navigation:navigation-ui-ktx:2.7.7")
-    implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.8.3")
-    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.3")
-    implementation("androidx.navigation:navigation-fragment-ktx:2.7.7")
+    implementation(libs.core.ktx)
+    implementation(libs.appcompat)
+    implementation(libs.navigation.ui.ktx)
+    implementation(libs.lifecycle.livedata.ktx)
+    implementation(libs.lifecycle.viewmodel.ktx)
+    implementation(libs.navigation.fragment.ktx)
 
     // Design & UI
-    implementation("jp.wasabeef:glide-transformations:4.3.0")
-    implementation("androidx.preference:preference-ktx:1.2.1")
-    implementation("com.google.android.material:material:1.12.0")
-    implementation("androidx.constraintlayout:constraintlayout:2.1.4")
-    implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
-
-    // Glide Module
-    ksp("com.github.bumptech.glide:ksp:4.16.0")
-    implementation("com.github.bumptech.glide:glide:4.16.0")
-    implementation("com.github.bumptech.glide:okhttp3-integration:4.16.0")
-
-    // For KSP -> Official Annotation Processors are Not Yet Supported for KSP
-    ksp("dev.zacsweers.autoservice:auto-service-ksp:1.2.0")
-    implementation("com.google.guava:guava:33.2.1-android")
-    implementation("dev.zacsweers.autoservice:auto-service-ksp:1.2.0")
+    implementation(libs.preference.ktx)
+    implementation(libs.material)
+    implementation(libs.constraintlayout)
+    implementation(libs.swiperefreshlayout)
+
+    // Coil Image Loading
+    implementation(libs.coil)
+    implementation(libs.coil.network.okhttp)
 
     // Media 3 (ExoPlayer)
-    implementation("androidx.media3:media3-ui:1.1.1")
-    implementation("androidx.media3:media3-cast:1.1.1")
-    implementation("androidx.media3:media3-common:1.1.1")
-    implementation("androidx.media3:media3-session:1.1.1")
-    implementation("androidx.media3:media3-exoplayer:1.1.1")
-    implementation("com.google.android.mediahome:video:1.0.0")
-    implementation("androidx.media3:media3-exoplayer-hls:1.1.1")
-    implementation("androidx.media3:media3-exoplayer-dash:1.1.1")
-    implementation("androidx.media3:media3-datasource-okhttp:1.1.1")
+    implementation(libs.bundles.media3)
+    implementation(libs.video)
 
     // PlayBack
-    implementation("com.jaredrummler:colorpicker:1.1.0") // Subtitle Color Picker
-    implementation("com.github.recloudstream:media-ffmpeg:1.1.0") // Custom FF-MPEG Lib for Audio Codecs
-    implementation("com.github.teamnewpipe:NewPipeExtractor:592f159") /* For Trailers
-    ^ Update to Latest Commits if Trailers Misbehave, github.com/TeamNewPipe/NewPipeExtractor/commits/dev */
-    implementation("com.github.albfernandez:juniversalchardet:2.5.0") // Subtitle Decoding
+    implementation(libs.colorpicker) // Subtitle Color Picker
+    implementation(libs.newpipeextractor) // For Trailers
+    implementation(libs.juniversalchardet) // Subtitle Decoding
+
+    // FFmpeg Decoding
+    implementation(libs.bundles.nextlibMedia3)
 
     // Crash Reports (AcraApplication.kt)
-    implementation("ch.acra:acra-core:5.11.3")
-    implementation("ch.acra:acra-toast:5.11.3")
+    implementation(libs.acra.core)
+    implementation(libs.acra.toast)
 
     // UI Stuff
-    implementation("com.facebook.shimmer:shimmer:0.5.0") // Shimmering Effect (Loading Skeleton)
-    implementation("androidx.palette:palette-ktx:1.0.0") // Palette For Images -> Colors
-    implementation("androidx.tvprovider:tvprovider:1.0.0")
-    implementation("com.github.discord:OverlappingPanels:0.1.5") // Gestures
-    implementation ("androidx.biometric:biometric:1.2.0-alpha05") // Fingerprint Authentication
-    implementation("com.github.rubensousa:previewseekbar-media3:1.1.1.0") // SeekBar Preview
-    implementation("io.github.g0dkar:qrcode-kotlin:4.2.0") // QR code for PIN Auth on TV
+    implementation(libs.shimmer) // Shimmering Effect (Loading Skeleton)
+    implementation(libs.palette.ktx) // Palette for Images -> Colors
+    implementation(libs.tvprovider)
+    implementation(libs.overlappingpanels) // Gestures
+    implementation(libs.biometric) // Fingerprint Authentication
+    implementation(libs.previewseekbar.media3) // SeekBar Preview
+    implementation(libs.qrcode.kotlin) // QR Code for PIN Auth on TV
 
     // Extensions & Other Libs
-    implementation("org.mozilla:rhino:1.7.15") // run JavaScript
-    implementation("me.xdrop:fuzzywuzzy:1.4.0") // Library/Ext Searching with Levenshtein Distance
-    implementation("com.github.LagradOst:SafeFile:0.0.6") // To Prevent the URI File Fu*kery
-    implementation("org.conscrypt:conscrypt-android:2.5.2") // To Fix SSL Fu*kery on Android 9
-    implementation("com.uwetrottmann.tmdb2:tmdb-java:2.11.0") // TMDB API v3 Wrapper Made with RetroFit
-    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.4")
-    implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.13.1") /* JSON Parser
-    ^ Don't Bump Jackson above 2.13.1 , Crashes on Android TV's and FireSticks that have Min API
-    Level 25 or Less. */
+    implementation(libs.rhino) // Run JavaScript
+    implementation(libs.quickjs)
+    implementation(libs.fuzzywuzzy) // Library/Ext Searching with Levenshtein Distance
+    implementation(libs.safefile) // To Prevent the URI File Fu*kery
+    coreLibraryDesugaring(libs.desugar.jdk.libs.nio) // NIO Flavor Needed for NewPipeExtractor
+    implementation(libs.conscrypt.android) {
+        version {
+            strictly("2.5.2")
+        }
+        because("2.5.3 crashes everything for everyone.")
+    } // To Fix SSL Fu*kery on Android 9
+    implementation(libs.jackson.module.kotlin) {
+        version {
+            strictly("2.13.1")
+        }
+        because("Don't Bump Jackson above 2.13.1, Crashes on Android TV's and FireSticks that have Min API Level 25 or Less.")
+    } // JSON Parser
+
+    // Torrent Support
+    implementation(libs.torrentserver)
 
     // Downloading & Networking
-    implementation("androidx.work:work-runtime:2.9.0")
-    implementation("androidx.work:work-runtime-ktx:2.9.0")
-    implementation("com.github.Blatzar:NiceHttp:0.4.11") // HTTP Lib
+    implementation(libs.work.runtime)
+    implementation(libs.work.runtime.ktx)
+    implementation(libs.nicehttp) // HTTP Lib
 
     implementation(project(":library") {
         // There does not seem to be a good way of getting the android flavor.
@@ -252,7 +246,7 @@ tasks.register<Jar>("androidSourcesJar") {
 
 tasks.register<Copy>("copyJar") {
     from(
-        "build/intermediates/compile_app_classes_jar/prereleaseDebug",
+        "build/intermediates/compile_app_classes_jar/prereleaseDebug/bundlePrereleaseDebugClassesToCompileJar",
         "../library/build/libs"
     )
     into("build/app-classes")
@@ -271,30 +265,31 @@ tasks.register<Jar>("makeJar") {
         zipTree("build/app-classes/library-jvm.jar")
     )
     destinationDirectory.set(layout.buildDirectory)
-    archivesName = "classes"
+    archiveBaseName = "classes"
 }
 
-tasks.withType<KotlinCompile> {
-    kotlinOptions {
-        jvmTarget = "1.8"
-        freeCompilerArgs = listOf("-Xjvm-default=all-compatibility")
+tasks.withType<KotlinJvmCompile> {
+    compilerOptions {
+        jvmTarget.set(javaTarget)
+        freeCompilerArgs.add("-Xjvm-default=all-compatibility")
     }
 }
 
-tasks.withType<DokkaTask>().configureEach {
-    moduleName.set("Cloudstream")
+dokka {
+    moduleName = "App"
     dokkaSourceSets {
-        named("main") {
-            sourceLink {
-                // Unix based directory relative path to the root of the project (where you execute gradle respectively).
-                localDirectory.set(file("src/main/java"))
-
-                // URL showing where the source code can be accessed through the web browser
-                remoteUrl.set(URL("https://github.com/3a4oT/cloudstream/tree/master/app/src/main/java"))
+        main {
+            analysisPlatform = KotlinPlatform.JVM
+            documentedVisibilities(
+                VisibilityModifier.Public,
+                VisibilityModifier.Protected
+            )
 
-                // Suffix which is used to append the line number to the URL. Use #L for GitHub
-                remoteLineSuffix.set("#L")
+            sourceLink {
+                localDirectory = file("..")
+                remoteUrl("https://github.com/3a4ot/cloudstream/tree/master")
+                remoteLineSuffix = "#L"
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/androidTest/java/com/lagradost/cloudstream3/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/lagradost/cloudstream3/ExampleInstrumentedTest.kt
index faacdf50141..c7f02baff8a 100644
--- a/app/src/androidTest/java/com/lagradost/cloudstream3/ExampleInstrumentedTest.kt
+++ b/app/src/androidTest/java/com/lagradost/cloudstream3/ExampleInstrumentedTest.kt
@@ -154,7 +154,7 @@ class ExampleInstrumentedTest {
     fun providerCorrectHomepage() {
         runBlocking {
             getAllProviders().toList().amap { api ->
-                TestingUtils.testHomepage(api, ::println)
+                TestingUtils.testHomepage(api, TestingUtils.Logger())
             }
         }
         println("Done providerCorrectHomepage")
@@ -166,7 +166,6 @@ class ExampleInstrumentedTest {
             TestingUtils.getDeferredProviderTests(
                 this,
                 getAllProviders(),
-                ::println
             ) { _, _ -> }
         }
     }
diff --git a/app/src/debug/res/drawable-v24/ic_banner_background.xml b/app/src/debug/res/drawable-v24/ic_banner_background.xml
index 7b05b711181..caed023d55f 100644
--- a/app/src/debug/res/drawable-v24/ic_banner_background.xml
+++ b/app/src/debug/res/drawable-v24/ic_banner_background.xml
@@ -25,9 +25,8 @@
                   android:endY="245.72"
                   android:endX="292.58"
                   android:type="linear">
-            <item android:offset="0" android:color="#FF5D49EA"/>
-            <item android:offset="0.45" android:color="#FF452FE4"/>
-            <item android:offset="1" android:color="#FF2309DB"/>
+            <item android:offset="0" android:color="#3FAA11"/>
+            <item android:offset="1" android:color="#39A11D"/>
           </gradient>
         </aapt:attr>
       </path>
@@ -40,9 +39,8 @@
                   android:endY="245.72"
                   android:endX="248.76"
                   android:type="linear">
-            <item android:offset="0" android:color="#FF4F6DFB"/>
-            <item android:offset="0.6" android:color="#FF3559E7"/>
-            <item android:offset="1" android:color="#FF2149D8"/>
+            <item android:offset="0" android:color="#37DB25"/>
+            <item android:offset="1" android:color="#11DD6D"/>
           </gradient>
         </aapt:attr>
       </path>
@@ -55,46 +53,45 @@
                   android:endY="245.69"
                   android:endX="210.03"
                   android:type="linear">
-            <item android:offset="0" android:color="#FF56B6FE"/>
-            <item android:offset="0.61" android:color="#FF599CFA"/>
-            <item android:offset="1" android:color="#FF5C89F7"/>
+            <item android:offset="0" android:color="#40F15D"/>
+            <item android:offset="1" android:color="#42C54F"/>
           </gradient>
         </aapt:attr>
       </path>
 
       <path
               android:pathData="M358.81,285q-13.53,0 -22.64,-9.1t-9,-22.72q0,-13.62 9,-22.64 9,-9.18 22.64,-9.19 13.79,0 22.38,10l-5.62,5.44a20.82,20.82 0,0 0,-16.76 -7.91,23 23,0 0,0 -16.94,6.81q-6.72,6.72 -6.72,17.53t6.72,17.53a23,23 0,0 0,16.94 6.81q10.63,0 18.46,-8.94l5.7,5.53a29.57,29.57 0,0 1,-10.63 8A32.44,32.44 0,0 1,358.81 285Z"
-              android:fillColor="#2e24ff"/>
+              android:fillColor="#39A11D"/>
       <path
               android:pathData="M397.78,222.69v60.93H390V222.69Z"
-              android:fillColor="#2e24ff"/>
+              android:fillColor="#39A11D"/>
       <path
               android:pathData="M404.5,262.77q0,-9.61 6,-15.91a20.6,20.6 0,0 1,15.41 -6.3,20.31 20.31,0 0,1 15.31,6.3 21.87,21.87 0,0 1,6.13 15.91q0,9.71 -6.13,15.92A20.3,20.3 0,0 1,426 285a20.6,20.6 0,0 1,-15.41 -6.29Q404.5,272.39 404.5,262.77ZM412.33,262.77a15.31,15.31 0,0 0,3.91 10.9,13.38 13.38,0 0,0 19.41,0 17,17 0,0 0,0 -21.7,13.18 13.18,0 0,0 -19.41,0A15.18,15.18 0,0 0,412.33 262.77Z"
-              android:fillColor="#2e24ff"/>
+              android:fillColor="#39A11D"/>
       <path
               android:pathData="M490.7,283.62h-7.48v-5.78h-0.35a13.86,13.86 0,0 1,-5.48 5.1,15.77 15.77,0 0,1 -7.7,2q-7.67,0 -11.79,-4.38t-4.13,-12.47v-26.2h7.83v25.69q0.25,10.22 10.3,10.22a9.81,9.81 0,0 0,7.83 -3.79,13.7 13.7,0 0,0 3.14,-9.06V241.93h7.83Z"
-              android:fillColor="#2e24ff"/>
+              android:fillColor="#39A11D"/>
       <path
               android:pathData="M517.25,285a18.34,18.34 0,0 1,-14 -6.46,24.34 24.34,0 0,1 0,-31.49 18.35,18.35 0,0 1,14 -6.47,18.07 18.07,0 0,1 8.39,2 14.84,14.84 0,0 1,5.83 5.19h0.34l-0.34,-5.78L531.47,222.69h7.82v60.93h-7.48v-5.78h-0.34a14.84,14.84 0,0 1,-5.83 5.19A18.07,18.07 0,0 1,517.25 285ZM518.53,277.86a12,12 0,0 0,9.45 -4.17q3.82,-4.17 3.83,-10.9A15.54,15.54 0,0 0,528 252a12.05,12.05 0,0 0,-9.45 -4.26,12.19 12.19,0 0,0 -9.44,4.26 15.5,15.5 0,0 0,-3.83 10.8,15.32 15.32,0 0,0 3.83,10.81A12.19,12.19 0,0 0,518.53 277.84Z"
-              android:fillColor="#2e24ff"/>
+              android:fillColor="#39A11D"/>
       <path
               android:pathData="M587.8,267.33a15.91,15.91 0,0 1,-5.87 12.88A22.43,22.43 0,0 1,567.46 285a21.39,21.39 0,0 1,-13.36 -4.42,22.65 22.65,0 0,1 -8,-12.08l7.49,-3.07a19.3,19.3 0,0 0,2.13 4.94,15.72 15.72,0 0,0 3.19,3.78 14.25,14.25 0,0 0,4 2.47,12.26 12.26,0 0,0 4.68,0.9 13.47,13.47 0,0 0,8.76 -2.77,9 9,0 0,0 3.41,-7.36 8.8,8.8 0,0 0,-2.81 -6.55q-2.64,-2.64 -9.87,-5.11 -7.32,-2.64 -9.11,-3.57 -9.69,-4.94 -9.7,-14.55a14.84,14.84 0,0 1,5.37 -11.49A19.53,19.53 0,0 1,567 221.33a20.5,20.5 0,0 1,12.09 3.58,16.67 16.67,0 0,1 6.8,8.76l-7.31,3.06a10.84,10.84 0,0 0,-4 -5.65,13.1 13.1,0 0,0 -15.11,0.28 7.41,7.41 0,0 0,-3.15 6.19,7.14 7.14,0 0,0 2.47,5.42q2.73,2.29 11.83,5.42 9.27,3.17 13.23,7.72A16.53,16.53 0,0 1,587.8 267.33Z"
-              android:fillColor="#5252ff"/>
+              android:fillColor="#68C671"/>
       <path
               android:pathData="M610.26,284.3a11.88,11.88 0,0 1,-8.46 -3.15c-2.25,-2.09 -3.4,-5 -3.45,-8.76V249.07H591v-7.14h7.32V229.16h7.83v12.77h10.21v7.14H606.18v20.77c0,2.78 0.54,4.66 1.61,5.66a5.27,5.27 0,0 0,3.66 1.48,7.9 7.9,0 0,0 1.83,-0.21 9,9 0,0 0,1.66 -0.55l2.47,7A21.23,21.23 0,0 1,610.26 284.3Z"
-              android:fillColor="#5252ff"/>
+              android:fillColor="#68C671"/>
       <path
               android:pathData="M631.71,283.62h-7.83V241.93h7.48v6.8h0.35a11.31,11.31 0,0 1,4.89 -5.66,13.66 13.66,0 0,1 7.27,-2.34 14.7,14.7 0,0 1,5.79 1l-2.38,7.57a12.93,12.93 0,0 0,-4.6 -0.6,10.11 10.11,0 0,0 -7.7,3.58 12,12 0,0 0,-3.27 8.34Z"
-              android:fillColor="#5252ff"/>
+              android:fillColor="#68C671"/>
       <path
               android:pathData="M670.93,285a19.93,19.93 0,0 1,-15.14 -6.29q-6,-6.3 -6,-15.92a22.65,22.65 0,0 1,5.79 -15.87,19.15 19.15,0 0,1 14.8,-6.34q9.29,0 14.77,6t5.49,16.81l-0.09,0.85L657.83,264.24a13.56,13.56 0,0 0,4.08 9.87,13.06 13.06,0 0,0 9.36,3.75q7.49,0 11.75,-7.49l7,3.4a20.69,20.69 0,0 1,-7.78 8.25A21.51,21.51 0,0 1,670.93 285ZM658.42,257.77h23.92a10.43,10.43 0,0 0,-3.53 -7.19,12.38 12.38,0 0,0 -8.56,-2.85 11.34,11.34 0,0 0,-7.61 2.72A13.09,13.09 0,0 0,658.42 257.75Z"
-              android:fillColor="#5252ff"/>
+              android:fillColor="#68C671"/>
       <path
               android:pathData="M714.08,240.56q8.67,0 13.7,4.64c3.34,3.1 5,7.33 5,12.72v25.7h-7.49v-5.78H725Q720.11,285 712,285a16.83,16.83 0,0 1,-11.53 -4.08,13 13,0 0,1 -4.63,-10.21 12.38,12.38 0,0 1,4.89 -10.3q4.89,-3.83 13.06,-3.83a23.16,23.16 0,0 1,11.49 2.55v-1.78a8.9,8.9 0,0 0,-3.24 -6.94,11.08 11.08,0 0,0 -7.57,-2.85 12,12 0,0 0,-10.38 5.53l-6.89,-4.34Q702.93,240.57 714.08,240.56ZM704,270.86a6.24,6.24 0,0 0,2.59 5.1,9.57 9.57,0 0,0 6.09,2.05 12.5,12.5 0,0 0,8.81 -3.66,11.47 11.47,0 0,0 3.87,-8.6q-3.66,-2.88 -10.21,-2.89a13.22,13.22 0,0 0,-8 2.3A6.81,6.81 0,0 0,704 270.86Z"
-              android:fillColor="#5252ff"/>
+              android:fillColor="#68C671"/>
       <path
               android:pathData="M749.47,283.62h-7.82V241.93h7.48v5.78h0.34a14,14 0,0 1,5.49 -5.1,15.06 15.06,0 0,1 7.36,-2.05 15.22,15.22 0,0 1,8.09 2.13,12.56 12.56,0 0,1 5.1,5.87q5.19,-8 14.39,-8 7.23,0 11.14,4.43T805,257.58v26h-7.83V258.77q0,-5.86 -2.13,-8.46t-7.15,-2.6a9.35,9.35 0,0 0,-7.57 3.83,14 14,0 0,0 -3.06,9v23.06h-7.83V258.77q0,-5.86 -2.13,-8.46t-7.15,-2.6a9.35,9.35 0,0 0,-7.57 3.83,14 14,0 0,0 -3.07,9Z"
-              android:fillColor="#5252ff"/>
+              android:fillColor="#68C671"/>
       <path
           android:pathData="M-13.76,555.76c10.3,-20.89 58.91,-113.94 157.31,-139.7C261.3,385.24 405.9,462.43 469.89,613.28">
         <aapt:attr name="android:fillColor">
@@ -104,9 +101,9 @@
                   android:endY="252.3"
                   android:endX="373.57"
                   android:type="linear">
-            <item android:offset="0" android:color="#FF5D49EA"/>
-            <item android:offset="0.45" android:color="#FF452FE4"/>
-            <item android:offset="1" android:color="#FF2309DB"/>
+            <item android:offset="0" android:color="#68C671"/>
+            <item android:offset="0.45" android:color="#11DD6D"/>
+            <item android:offset="1" android:color="#39A11D"/>
           </gradient>
         </aapt:attr>
       </path>
@@ -117,9 +114,9 @@
                   android:startX="400.11"
                   android:endX="900"
                   android:type="linear">
-            <item android:offset="0" android:color="#FF5D49EA"/>
-            <item android:offset="0.45" android:color="#FF452FE4"/>
-            <item android:offset="1" android:color="#FF2309DB"/>
+            <item android:offset="0" android:color="#68C671"/>
+            <item android:offset="0.45" android:color="#11DD6D"/>
+            <item android:offset="1" android:color="#39A11D"/>
           </gradient>
         </aapt:attr>
       </path>
@@ -132,9 +129,9 @@
                   android:endY="252.3"
                   android:endX="373.57"
                   android:type="linear">
-            <item android:offset="0" android:color="#FF5D49EA"/>
-            <item android:offset="0.45" android:color="#FF452FE4"/>
-            <item android:offset="1" android:color="#FF2309DB"/>
+            <item android:offset="0" android:color="#68C671"/>
+            <item android:offset="0.45" android:color="#11DD6D"/>
+            <item android:offset="1" android:color="#39A11D"/>
           </gradient>
         </aapt:attr>
       </path>
@@ -145,9 +142,9 @@
                   android:startX="700.11"
                   android:endX="900.57"
                   android:type="linear">
-            <item android:offset="0" android:color="#FF5D49EA"/>
-            <item android:offset="0.45" android:color="#FF452FE4"/>
-            <item android:offset="1" android:color="#FF2309DB"/>
+            <item android:offset="0" android:color="#68C671"/>
+            <item android:offset="0.45" android:color="#11DD6D"/>
+            <item android:offset="1" android:color="#39A11D"/>
           </gradient>
         </aapt:attr>
       </path>
@@ -158,9 +155,9 @@
                   android:startX="400.11"
                   android:endX="800.57"
                   android:type="linear">
-            <item android:offset="0" android:color="#FF5D49EA"/>
-            <item android:offset="0.45" android:color="#FF452FE4"/>
-            <item android:offset="1" android:color="#FF2309DB"/>
+            <item android:offset="0" android:color="#68C671"/>
+            <item android:offset="0.45" android:color="#11DD6D"/>
+            <item android:offset="1" android:color="#39A11D"/>
           </gradient>
         </aapt:attr>
       </path>
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a23ef72588f..d960d910c6a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,22 +2,24 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
+    <uses-sdk tools:overrideLibrary="go.torrServer.gojni" /> <!-- torrServer has a different api level -->
+
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <!-- I dont remember, probs has to do with downloads -->
     <uses-permission android:name="android.permission.INTERNET" /> <!-- unless you only use cs3 as a player for downloaded stuff, you need this -->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> <!-- Downloads -->
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <!-- Downloads on low api devices -->
     <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" tools:ignore="ScopedStorage" /> <!-- Plugin API -->
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> <!-- some dependency needs this -->
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" /> <!-- Used for player vertical slide -->
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" /> <!-- Used for app update -->
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" /> <!-- Used for app notifications on Android 13+ -->
     <uses-permission android:name="com.android.providers.tv.permission.WRITE_EPG_DATA" /> <!-- Used for Android TV watch next -->
     <uses-permission android:name="android.permission.UPDATE_PACKAGES_WITHOUT_USER_ACTION" /> <!-- Used for updates without prompt -->
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" /> <!-- Used for update service -->
-    <uses-permission android:name="android.permission.USE_BIOMETRIC" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
+    <uses-permission android:name="android.permission.USE_BIOMETRIC" />
+    <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" /> <!-- We can use this directly as CS3 is not on Play Store -->
 
-    <!-- Required for getting arbitrary Aniyomi packages  -->
+    <!-- Required for OpenInAppAction and getting arbitrary Aniyomi packages  -->
     <uses-permission
         android:name="android.permission.QUERY_ALL_PACKAGES"
         tools:ignore="QueryAllPackagesPermission" />
@@ -30,12 +32,6 @@
         android:name="android.software.leanback"
         android:required="false" />
 
-    <queries>
-        <package android:name="org.videolan.vlc" />
-        <package android:name="com.instantbits.cast.webvideo" />
-        <package android:name="is.xyz.mpv" />
-    </queries>
-
     <!-- Without the large heap Exoplayer buffering gets reset due to OOM. -->
     <!--TODO https://stackoverflow.com/questions/41799732/chromecast-button-not-visible-in-android-->
     <application
@@ -53,7 +49,7 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         android:usesCleartextTraffic="true"
-        tools:targetApi="tiramisu">
+        tools:targetApi="35">
 
         <meta-data
             android:name="com.google.android.gms.cast.framework.OPTIONS_PROVIDER_CLASS_NAME"
@@ -71,7 +67,8 @@
             android:screenOrientation="userLandscape"
             android:supportsPictureInPicture="true"
             android:taskAffinity="com.lagradost.cloudstream3.downloadedplayer"
-            android:launchMode="singleTask">
+            android:launchMode="singleTask"
+            tools:ignore="DiscouragedApi">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -89,6 +86,25 @@
 
                 <data android:mimeType="*/*" />
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <action android:name="android.intent.action.SEND" />
+                <action android:name="android.intent.action.OPEN_DOCUMENT" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="magnet" />
+            </intent-filter>
+            <!--<intent-filter tools:ignore="AppLinkUrlError">
+                <action android:name="android.intent.action.VIEW" />
+                <action android:name="android.intent.action.SEND" />
+                <action android:name="android.intent.action.OPEN_DOCUMENT" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+
+                <data android:mimeType="application/x-bittorrent" />
+            </intent-filter>-->
         </activity>
         <!--
         android:launchMode="singleTask"
@@ -97,7 +113,7 @@
         -->
         <activity
             android:name=".MainActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|keyboard|keyboardHidden|navigation"
+            android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|keyboard|keyboardHidden|navigation|uiMode"
             android:exported="true"
             android:launchMode="singleTask"
             android:resizeableActivity="true"
@@ -180,10 +196,6 @@
             </intent-filter>
         </activity>
 
-        <activity
-            android:name=".ui.EasterEggMonke"
-            android:exported="true" />
-
         <receiver
             android:name=".receivers.VideoDownloadRestartReceiver"
             android:enabled="false"
@@ -194,18 +206,24 @@
         </receiver>
 
         <service
-            android:foregroundServiceType="dataSync"
             android:name=".services.VideoDownloadService"
             android:enabled="true"
+            android:foregroundServiceType="dataSync"
             android:exported="false" />
 
+        <!-- Necessary for WorkManager services: https://stackoverflow.com/a/77186316 -->
+        <service
+            android:name="androidx.work.impl.foreground.SystemForegroundService"
+            android:foregroundServiceType="dataSync"
+            tools:node="merge" />
+
         <activity
             android:name=".ui.ControllerActivity"
             android:exported="false" />
 
         <service
+            android:name=".services.PackageInstallerService"
             android:foregroundServiceType="dataSync"
-            android:name=".utils.PackageInstallerService"
             android:exported="false" />
 
         <provider
@@ -219,5 +237,5 @@
                 android:resource="@xml/provider_paths" />
         </provider>
     </application>
-
-</manifest>
\ No newline at end of file
+    
+</manifest>
diff --git a/app/src/main/java/com/lagradost/cloudstream3/AcraApplication.kt b/app/src/main/java/com/lagradost/cloudstream3/AcraApplication.kt
index 598ff540af3..003d79a77b4 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/AcraApplication.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/AcraApplication.kt
@@ -8,6 +8,8 @@ import android.content.Intent
 import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
+import coil3.PlatformContext
+import coil3.SingletonImageLoader
 import com.lagradost.api.setContext
 import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
 import com.lagradost.cloudstream3.mvvm.suspendSafeApiCall
@@ -22,6 +24,7 @@ import com.lagradost.cloudstream3.utils.DataStore.getKeys
 import com.lagradost.cloudstream3.utils.DataStore.removeKey
 import com.lagradost.cloudstream3.utils.DataStore.removeKeys
 import com.lagradost.cloudstream3.utils.DataStore.setKey
+import com.lagradost.cloudstream3.utils.ImageLoader
 import kotlinx.coroutines.runBlocking
 import org.acra.ACRA
 import org.acra.ReportField
@@ -35,17 +38,18 @@ import java.io.File
 import java.io.FileNotFoundException
 import java.io.PrintStream
 import java.lang.ref.WeakReference
+import java.util.Locale
 import kotlin.concurrent.thread
 import kotlin.system.exitProcess
 
 class CustomReportSender : ReportSender {
     // Sends all your crashes to google forms
     override fun send(context: Context, errorContent: CrashReportData) {
-        println("Sending report")
+        /*println("Sending report")
         val url =
-            "https://docs.google.com/forms/d/e/1FAIpQLSfO4r353BJ79TTY_-t5KWSIJT2xfqcQWY81xjAA1-1N0U2eSg/formResponse"
+            "https://docs.google.com/forms/d/e/$id/formResponse"
         val data = mapOf(
-            "entry.1993829403" to errorContent.toJSON()
+            "entry.$entry" to errorContent.toJSON()
         )
 
         thread { // to not run it on main thread
@@ -61,7 +65,7 @@ class CustomReportSender : ReportSender {
             normalSafeApiCall {
                 Toast.makeText(context, R.string.acra_report_toast, Toast.LENGTH_SHORT).show()
             }
-        }
+        }*/
     }
 }
 
@@ -81,14 +85,8 @@ class ExceptionHandler(val errorFile: File, val onError: (() -> Unit)) :
         ACRA.errorReporter.handleException(error)
         try {
             PrintStream(errorFile).use { ps ->
-                ps.println(String.format("Currently loading extension: ${PluginManager.currentlyLoading ?: "none"}"))
-                ps.println(
-                    String.format(
-                        "Fatal exception on thread %s (%d)",
-                        thread.name,
-                        thread.id
-                    )
-                )
+                ps.println("Currently loading extension: ${PluginManager.currentlyLoading ?: "none"}")
+                ps.println("Fatal exception on thread ${thread.name} (${thread.id})")
                 error.printStackTrace(ps)
             }
         } catch (ignored: FileNotFoundException) {
@@ -102,11 +100,14 @@ class ExceptionHandler(val errorFile: File, val onError: (() -> Unit)) :
 
 }
 
-class AcraApplication : Application() {
+class AcraApplication : Application(), SingletonImageLoader.Factory {
 
     override fun onCreate() {
         super.onCreate()
-        //NativeCrashHandler.initCrashHandler()
+        // if we want to initialise coil at earliest
+        // (maybe when loading an image or gif using in splash screen activity)
+        //ImageLoader.buildImageLoader(applicationContext)
+
         ExceptionHandler(filesDir.resolve("last_error")) {
             val intent = context!!.packageManager.getLaunchIntentForPackage(context!!.packageName)
             startActivity(Intent.makeRestartActivityTask(intent!!.component))
@@ -140,12 +141,22 @@ class AcraApplication : Application() {
         }
     }
 
+    override fun newImageLoader(context: PlatformContext): coil3.ImageLoader {
+        // Coil Module will be initialized & setSafe globally when first loadImage() is invoked
+        return ImageLoader.buildImageLoader(applicationContext)
+    }
+
     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()
+        tailrec fun Context.getActivity(): Activity? {
+            return when (this) {
+                is Activity -> this
+                is ContextWrapper -> baseContext.getActivity()
+                else -> null
+            }
+        }
 
         private var _context: WeakReference<Context>? = null
         var context
@@ -219,4 +230,4 @@ class AcraApplication : Application() {
             )
         }
     }
-}
+}
\ 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 ba303feff7e..02ace92d5b6 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt
@@ -5,6 +5,7 @@ import android.app.Activity
 import android.app.PictureInPictureParams
 import android.content.Context
 import android.content.pm.PackageManager
+import android.content.res.Configuration
 import android.content.res.Resources
 import android.os.Build
 import android.util.DisplayMetrics
@@ -29,15 +30,16 @@ 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.MainActivity.Companion.resumeApps
+import com.lagradost.cloudstream3.actions.OpenInAppAction
+import com.lagradost.cloudstream3.actions.VideoClickActionHolder
 import com.lagradost.cloudstream3.databinding.ToastBinding
 import com.lagradost.cloudstream3.mvvm.logError
 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.player.Torrent
+import com.lagradost.cloudstream3.utils.UiText
 import com.lagradost.cloudstream3.ui.settings.Globals.updateTv
 import com.lagradost.cloudstream3.utils.AppContextUtils.isRtl
-import com.lagradost.cloudstream3.utils.DataStoreHelper
+import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import com.lagradost.cloudstream3.utils.Event
 import com.lagradost.cloudstream3.utils.UIHelper
 import com.lagradost.cloudstream3.utils.UIHelper.hasPIPPermission
@@ -164,7 +166,8 @@ object CommonActivity {
             val toast = Toast(act)
             toast.duration = duration ?: Toast.LENGTH_SHORT
             toast.setGravity(Gravity.CENTER_HORIZONTAL or Gravity.BOTTOM, 0, 5.toPx)
-            toast.view = binding.root
+            @Suppress("DEPRECATION")
+            toast.view = binding.root // FIXME Find an alternative using default Toasts since custom toasts are deprecated and won't appear with api30 set as minSDK version.
             currentToast = toast
             toast.show()
 
@@ -192,7 +195,8 @@ object CommonActivity {
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
             context.createConfigurationContext(config)
-        resources.updateConfiguration(config, resources.displayMetrics)
+        @Suppress("DEPRECATION")
+        resources.updateConfiguration(config, resources.displayMetrics) // FIXME this should be replaced
     }
 
     fun Context.updateLocale() {
@@ -203,6 +207,7 @@ object CommonActivity {
 
     fun init(act: Activity) {
         setActivityInstance(act)
+        ioSafe { Torrent.deleteAllFiles() }
 
         val componentActivity = activity as? ComponentActivity ?: return
 
@@ -217,20 +222,15 @@ object CommonActivity {
         componentActivity.updateTv()
         NewPipe.init(DownloaderTestImpl.getInstance())
 
-        for (resumeApp in resumeApps) {
-            resumeApp.launcher =
-                componentActivity.registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
-                    val resultCode = result.resultCode
-                    val data = result.data
-                    if (resultCode == AppCompatActivity.RESULT_OK && data != null && resumeApp.position != null && resumeApp.duration != null) {
-                        val pos = resumeApp.getPosition(data)
-                        val dur = resumeApp.getDuration(data)
-                        if (dur > 0L && pos > 0L)
-                            DataStoreHelper.setViewPos(getKey(resumeApp.lastId), pos, dur)
-                        removeKey(resumeApp.lastId)
-                        ResultFragment.updateUI()
-                    }
-                }
+        MainActivity.activityResultLauncher = componentActivity.registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+            if (result.resultCode == AppCompatActivity.RESULT_OK) {
+                val actionUid = getKey<String>("last_click_action") ?: return@registerForActivityResult
+                Log.d(TAG, "Loading action $actionUid result handler")
+                val action = VideoClickActionHolder.getByUniqueId(actionUid) as? OpenInAppAction ?: return@registerForActivityResult
+                action.onResultSafe(act, result.data)
+                removeKey("last_click_action")
+                removeKey("last_opened_id")
+            }
         }
 
         // Ask for notification permissions on Android 13
@@ -258,10 +258,13 @@ object CommonActivity {
                 try {
                     enterPictureInPictureMode(PictureInPictureParams.Builder().build())
                 } catch (e: Exception) {
+                    // Use fallback just in case
+                    @Suppress("DEPRECATION")
                     enterPictureInPictureMode()
                 }
             } else {
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                    @Suppress("DEPRECATION")
                     enterPictureInPictureMode()
                 }
             }
@@ -276,12 +279,35 @@ object CommonActivity {
         }
     }
 
+    fun updateTheme(act: Activity) {
+        val settingsManager = PreferenceManager.getDefaultSharedPreferences(act)
+        if (settingsManager
+            .getString(act.getString(R.string.app_theme_key), "AmoledLight") == "System"
+            && Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            loadThemes(act)
+        }
+    }
+
+    private fun mapSystemTheme(act: Activity): Int {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            val currentNightMode =
+                act.resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK
+            return when (currentNightMode) {
+                Configuration.UI_MODE_NIGHT_NO -> R.style.LightMode // Night mode is not active, we're using the light theme
+                else -> R.style.AppTheme // Night mode is active, we're using dark theme
+            }
+        } else {
+            return R.style.AppTheme
+        }
+    }
+
     fun loadThemes(act: Activity?) {
         if (act == null) return
         val settingsManager = PreferenceManager.getDefaultSharedPreferences(act)
 
         val currentTheme =
             when (settingsManager.getString(act.getString(R.string.app_theme_key), "AmoledLight")) {
+                "System" -> mapSystemTheme(act)
                 "Black" -> R.style.AppTheme
                 "Light" -> R.style.LightMode
                 "Amoled" -> R.style.AmoledMode
@@ -352,8 +378,8 @@ object CommonActivity {
         currentLook = currentLook.parent as? View ?: break
     }*/
 
-    private fun View.hasContent() : Boolean {
-        return isShown && when(this) {
+    private fun View.hasContent(): Boolean {
+        return isShown && when (this) {
             //is RecyclerView -> this.childCount > 0
             is ViewGroup -> this.childCount > 0
             else -> true
@@ -464,20 +490,6 @@ object CommonActivity {
 
 
     fun onKeyDown(act: Activity?, keyCode: Int, event: KeyEvent?) {
-        //println("Keycode: $keyCode")
-        //showToast(
-        //    this,
-        //    "Got Keycode $keyCode | ${KeyEvent.keyCodeToString(keyCode)} \n ${event?.action}",
-        //    Toast.LENGTH_LONG
-        //)
-
-        // Tested keycodes on remote:
-        // KeyEvent.KEYCODE_MEDIA_FAST_FORWARD
-        // KeyEvent.KEYCODE_MEDIA_REWIND
-        // KeyEvent.KEYCODE_MENU
-        // KeyEvent.KEYCODE_MEDIA_NEXT
-        // KeyEvent.KEYCODE_MEDIA_PREVIOUS
-        // KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE
 
         // 149 keycode_numpad 5
         when (keyCode) {
@@ -489,11 +501,11 @@ object CommonActivity {
                 PlayerEventType.SeekBack
             }
 
-            KeyEvent.KEYCODE_MEDIA_NEXT, KeyEvent.KEYCODE_BUTTON_R1, KeyEvent.KEYCODE_N -> {
+            KeyEvent.KEYCODE_MEDIA_NEXT, KeyEvent.KEYCODE_BUTTON_R1, KeyEvent.KEYCODE_N, KeyEvent.KEYCODE_NUMPAD_2, KeyEvent.KEYCODE_CHANNEL_UP -> {
                 PlayerEventType.NextEpisode
             }
 
-            KeyEvent.KEYCODE_MEDIA_PREVIOUS, KeyEvent.KEYCODE_BUTTON_L1, KeyEvent.KEYCODE_B -> {
+            KeyEvent.KEYCODE_MEDIA_PREVIOUS, KeyEvent.KEYCODE_BUTTON_L1, KeyEvent.KEYCODE_B, KeyEvent.KEYCODE_NUMPAD_1, KeyEvent.KEYCODE_CHANNEL_DOWN -> {
                 PlayerEventType.PrevEpisode
             }
 
@@ -620,4 +632,4 @@ object CommonActivity {
         }
         return null
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/DownloaderTestImpl.kt b/app/src/main/java/com/lagradost/cloudstream3/DownloaderTestImpl.kt
index 934dd58a351..8da7ca384b5 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/DownloaderTestImpl.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/DownloaderTestImpl.kt
@@ -11,7 +11,7 @@ import java.util.concurrent.TimeUnit
 
 
 class DownloaderTestImpl private constructor(builder: OkHttpClient.Builder) : Downloader() {
-    private val client: OkHttpClient
+    private val client: OkHttpClient = builder.readTimeout(30, TimeUnit.SECONDS).build()
     override fun execute(request: Request): Response {
         val httpMethod: String = request.httpMethod()
         val url: String = request.url()
@@ -74,8 +74,4 @@ class DownloaderTestImpl private constructor(builder: OkHttpClient.Builder) : Do
             return instance
         }
     }
-
-    init {
-        client = builder.readTimeout(30, TimeUnit.SECONDS).build()
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
index 59f499c5f2e..47aa8b6eebe 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
@@ -1,14 +1,14 @@
 package com.lagradost.cloudstream3
 
 import android.animation.ValueAnimator
-import android.content.ComponentName
+import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
+import android.content.SharedPreferences
 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
@@ -18,6 +18,9 @@ import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
 import android.view.WindowManager
+import android.widget.CheckBox
+import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.Toast
 import androidx.activity.OnBackPressedCallback
 import androidx.activity.result.ActivityResultLauncher
@@ -25,6 +28,7 @@ import androidx.annotation.IdRes
 import androidx.annotation.MainThread
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
+import androidx.cardview.widget.CardView
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.view.children
 import androidx.core.view.isGone
@@ -68,6 +72,8 @@ import com.lagradost.cloudstream3.CommonActivity.screenHeight
 import com.lagradost.cloudstream3.CommonActivity.setActivityInstance
 import com.lagradost.cloudstream3.CommonActivity.showToast
 import com.lagradost.cloudstream3.CommonActivity.updateLocale
+import com.lagradost.cloudstream3.CommonActivity.updateTheme
+import com.lagradost.cloudstream3.actions.temp.fcast.FcastManager
 import com.lagradost.cloudstream3.databinding.ActivityMainBinding
 import com.lagradost.cloudstream3.databinding.ActivityMainTvBinding
 import com.lagradost.cloudstream3.databinding.BottomResultviewPreviewBinding
@@ -82,19 +88,20 @@ import com.lagradost.cloudstream3.plugins.PluginManager.loadAllOnlinePlugins
 import com.lagradost.cloudstream3.plugins.PluginManager.loadSinglePlugin
 import com.lagradost.cloudstream3.receivers.VideoDownloadRestartReceiver
 import com.lagradost.cloudstream3.services.SubscriptionWorkManager
+import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.APP_STRING
+import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.APP_STRING_PLAYER
+import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.APP_STRING_REPO
+import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.APP_STRING_RESUME_WATCHING
+import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.APP_STRING_SEARCH
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.OAuth2Apis
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.accountManagers
-import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.appString
-import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.appStringPlayer
-import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.appStringRepo
-import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.appStringResumeWatching
-import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.appStringSearch
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.inAppAuths
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.localListApi
 import com.lagradost.cloudstream3.syncproviders.SyncAPI
 import com.lagradost.cloudstream3.ui.APIRepository
 import com.lagradost.cloudstream3.ui.SyncWatchType
 import com.lagradost.cloudstream3.ui.WatchType
+import com.lagradost.cloudstream3.ui.account.AccountHelper.showAccountSelectLinear
 import com.lagradost.cloudstream3.ui.download.DOWNLOAD_NAVIGATE_TO
 import com.lagradost.cloudstream3.ui.home.HomeViewModel
 import com.lagradost.cloudstream3.ui.library.LibraryViewModel
@@ -105,9 +112,6 @@ 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.SyncViewModel
-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.Globals.EMULATOR
@@ -131,6 +135,8 @@ import com.lagradost.cloudstream3.utils.AppContextUtils.loadResult
 import com.lagradost.cloudstream3.utils.AppContextUtils.loadSearchResult
 import com.lagradost.cloudstream3.utils.AppContextUtils.setDefaultFocus
 import com.lagradost.cloudstream3.utils.AppContextUtils.updateHasTrailers
+import com.lagradost.cloudstream3.utils.BackPressedCallbackHelper.attachBackPressedCallback
+import com.lagradost.cloudstream3.utils.BackPressedCallbackHelper.detachBackPressedCallback
 import com.lagradost.cloudstream3.utils.BackupUtils.backup
 import com.lagradost.cloudstream3.utils.BackupUtils.setUpBackup
 import com.lagradost.cloudstream3.utils.BiometricAuthenticator.BiometricCallback
@@ -147,8 +153,10 @@ import com.lagradost.cloudstream3.utils.DataStoreHelper
 import com.lagradost.cloudstream3.utils.DataStoreHelper.accounts
 import com.lagradost.cloudstream3.utils.DataStoreHelper.migrateResumeWatching
 import com.lagradost.cloudstream3.utils.Event
+import com.lagradost.cloudstream3.utils.ImageLoader.loadImage
 import com.lagradost.cloudstream3.utils.InAppUpdater.Companion.runAutoUpdate
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialog
+import com.lagradost.cloudstream3.utils.SnackbarHelper.showSnackbar
 import com.lagradost.cloudstream3.utils.UIHelper.changeStatusBarState
 import com.lagradost.cloudstream3.utils.UIHelper.checkWrite
 import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute
@@ -160,7 +168,9 @@ 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.cloudstream3.utils.fcast.FcastManager
+import com.lagradost.cloudstream3.utils.setText
+import com.lagradost.cloudstream3.utils.setTextHtml
+import com.lagradost.cloudstream3.utils.txt
 import com.lagradost.safefile.SafeFile
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
@@ -173,107 +183,16 @@ import kotlin.math.abs
 import kotlin.math.absoluteValue
 import kotlin.system.exitProcess
 
-//https://github.com/videolan/vlc-android/blob/3706c4be2da6800b3d26344fc04fab03ffa4b860/application/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.kt#L1898
-//https://wiki.videolan.org/Android_Player_Intents/
-
-//https://github.com/mpv-android/mpv-android/blob/0eb3cdc6f1632636b9c30d52ec50e4b017661980/app/src/main/java/is/xyz/mpv/MPVActivity.kt#L904
-//https://mpv-android.github.io/mpv-android/intent.html
-
-// https://www.webvideocaster.com/integrations
-
-//https://github.com/jellyfin/jellyfin-android/blob/6cbf0edf84a3da82347c8d59b5d5590749da81a9/app/src/main/java/org/jellyfin/mobile/bridge/ExternalPlayer.kt#L225
-
 class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCallback {
     companion object {
-        const val VLC_PACKAGE = "org.videolan.vlc"
-        const val MPV_PACKAGE = "is.xyz.mpv"
-        const val WEB_VIDEO_CAST_PACKAGE = "com.instantbits.cast.webvideo"
-
-        val VLC_COMPONENT = ComponentName(VLC_PACKAGE, "$VLC_PACKAGE.gui.video.VideoPlayerActivity")
-        val MPV_COMPONENT = ComponentName(MPV_PACKAGE, "$MPV_PACKAGE.MPVActivity")
-
-        //TODO REFACTOR AF
-        open class ResultResume(
-            val packageString: String,
-            val action: String = Intent.ACTION_VIEW,
-            val position: String? = null,
-            val duration: String? = null,
-            var launcher: ActivityResultLauncher<Intent>? = null,
-        ) {
-            val defaultTime = -1L
-
-            val lastId get() = "${packageString}_last_open_id"
-            suspend fun launch(id: Int?, callback: suspend Intent.() -> Unit) {
-                val intent = Intent(action)
-
-                if (id != null)
-                    setKey(lastId, id)
-                else
-                    removeKey(lastId)
-
-                intent.setPackage(packageString)
-                callback.invoke(intent)
-                launcher?.launch(intent)
-            }
-
-            open fun getPosition(intent: Intent?): Long {
-                return defaultTime
-            }
-
-            open fun getDuration(intent: Intent?): Long {
-                return defaultTime
-            }
-        }
-
-        val VLC = object : ResultResume(
-            VLC_PACKAGE,
-            // Android 13 intent restrictions fucks up specifically launching the VLC player
-            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
-                "org.videolan.vlc.player.result"
-            } else {
-                Intent.ACTION_VIEW
-            },
-            "extra_position",
-            "extra_duration",
-        ) {
-            override fun getPosition(intent: Intent?): Long {
-                return intent?.getLongExtra(this.position, defaultTime) ?: defaultTime
-            }
-
-            override fun getDuration(intent: Intent?): Long {
-                return intent?.getLongExtra(this.duration, defaultTime) ?: defaultTime
-            }
-        }
-
-        val MPV = object : ResultResume(
-            MPV_PACKAGE,
-            //"is.xyz.mpv.MPVActivity.result", // resume not working :pensive:
-            position = "position",
-            duration = "duration",
-        ) {
-            override fun getPosition(intent: Intent?): Long {
-                return intent?.getIntExtra(this.position, defaultTime.toInt())?.toLong()
-                    ?: defaultTime
-            }
-
-            override fun getDuration(intent: Intent?): Long {
-                return intent?.getIntExtra(this.duration, defaultTime.toInt())?.toLong()
-                    ?: defaultTime
-            }
-        }
-
-        val WEB_VIDEO = ResultResume(WEB_VIDEO_CAST_PACKAGE)
-
-        val resumeApps = arrayOf(
-            VLC, MPV, WEB_VIDEO
-        )
-
+        var activityResultLauncher: ActivityResultLauncher<Intent>? = null
 
         const val TAG = "MAINACT"
         const val ANIMATED_OUTLINE: Boolean = false
         var lastError: String? = null
 
         private const val FILE_DELETE_KEY = "FILES_TO_DELETE_KEY"
+        const val API_NAME_EXTRA_KEY = "API_NAME_EXTRA_KEY"
 
         /**
          * Transient files to delete on application exit.
@@ -324,6 +243,10 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
          */
         val reloadLibraryEvent = Event<Boolean>()
 
+        /**
+         * Used by DataStoreHelper to fully reload Navigation Rail header picture
+         */
+        val reloadAccountEvent = Event<Boolean>()
 
         /**
          * @return true if the str has launched an app task (be it successful or not)
@@ -332,7 +255,8 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
         fun handleAppIntentUrl(
             activity: FragmentActivity?,
             str: String?,
-            isWebview: Boolean
+            isWebview: Boolean,
+            extraArgs: Bundle? = null
         ): Boolean =
             with(activity) {
                 // TODO MUCH BETTER HANDLING
@@ -346,7 +270,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
                         println("Repository url: $realUrl")
                         loadRepository(realUrl)
                         return true
-                    } else if (str.contains(appString)) {
+                    } else if (str.contains(APP_STRING)) {
                         for (api in OAuth2Apis) {
                             if (str.contains("/${api.redirectUrl}")) {
                                 ioSafe {
@@ -376,15 +300,15 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
                         }
                         // This specific intent is used for the gradle deployWithAdb
                         // https://github.com/recloudstream/gradle/blob/master/src/main/kotlin/com/lagradost/cloudstream3/gradle/tasks/DeployWithAdbTask.kt#L46
-                        if (str == "$appString:") {
+                        if (str == "$APP_STRING:") {
                             PluginManager.hotReloadAllLocalPlugins(activity)
                         }
-                    } else if (safeURI(str)?.scheme == appStringRepo) {
-                        val url = str.replaceFirst(appStringRepo, "https")
+                    } else if (safeURI(str)?.scheme == APP_STRING_REPO) {
+                        val url = str.replaceFirst(APP_STRING_REPO, "https")
                         loadRepository(url)
                         return true
-                    } else if (safeURI(str)?.scheme == appStringSearch) {
-                        val query = str.substringAfter("$appStringSearch://")
+                    } else if (safeURI(str)?.scheme == APP_STRING_SEARCH) {
+                        val query = str.substringAfter("$APP_STRING_SEARCH://")
                         nextSearchQuery =
                             try {
                                 URLDecoder.decode(query, "UTF-8")
@@ -398,7 +322,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
                             R.id.navigation_search
                         activity?.findViewById<NavigationRailView>(R.id.nav_rail_view)?.selectedItemId =
                             R.id.navigation_search
-                    } else if (safeURI(str)?.scheme == appStringPlayer) {
+                    } else if (safeURI(str)?.scheme == APP_STRING_PLAYER) {
                         val uri = Uri.parse(str)
                         val name = uri.getQueryParameter("name")
                         val url = URLDecoder.decode(uri.authority, "UTF-8")
@@ -412,9 +336,9 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
                                 )
                             )
                         )
-                    } else if (safeURI(str)?.scheme == appStringResumeWatching) {
+                    } else if (safeURI(str)?.scheme == APP_STRING_RESUME_WATCHING) {
                         val id =
-                            str.substringAfter("$appStringResumeWatching://").toIntOrNull()
+                            str.substringAfter("$APP_STRING_RESUME_WATCHING://").toIntOrNull()
                                 ?: return false
                         ioSafe {
                             val resumeWatchingCard =
@@ -430,10 +354,20 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
                             this.navigate(R.id.navigation_downloads)
                             return true
                         } else {
+                            val apiName = extraArgs?.getString(API_NAME_EXTRA_KEY)
+                                ?.takeIf { it.isNotBlank() }
+                            // if provided, try to match the api name instead of the api url
+                            // this is in order to also support providers that use JSON dataUrls
+                            // for example
+                            if (apiName != null) {
+                                loadResult(str, apiName, "")
+                                return true
+                            }
+
                             synchronized(apis) {
                                 for (api in apis) {
                                     if (str.startsWith(api.mainUrl)) {
-                                        loadResult(str, api.name)
+                                        loadResult(str, api.name, "")
                                         return true
                                     }
                                 }
@@ -468,7 +402,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
                 ) DubStatus.Dubbed else DubStatus.Subbed, null
             )
         } else {
-            viewModel.loadSmall(this, result)
+            viewModel.loadSmall(result)
         }
     }
 
@@ -483,6 +417,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
     override fun onConfigurationChanged(newConfig: Configuration) {
         super.onConfigurationChanged(newConfig)
         updateLocale() // android fucks me by chaining lang when rotating the phone
+        updateTheme(this) // Update if system theme
 
         val navHostFragment =
             supportFragmentManager.findFragmentById(R.id.nav_host_fragment) as NavHostFragment
@@ -571,11 +506,40 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
         binding?.apply {
             navRailView.isVisible = isNavVisible && landscape
             navView.isVisible = isNavVisible && !landscape
+
+            /**
+             * We need to make sure if we return to a sub-fragment,
+             * the correct navigation item is selected so that it does not
+             * highlight the wrong one in UI.
+             */
+            when (destination.id) {
+                in listOf(R.id.navigation_downloads, R.id.navigation_download_child) -> {
+                    navRailView.menu.findItem(R.id.navigation_downloads).isChecked = true
+                    navView.menu.findItem(R.id.navigation_downloads).isChecked = true
+                }
+                in listOf(
+                    R.id.navigation_settings,
+                    R.id.navigation_subtitles,
+                    R.id.navigation_chrome_subtitles,
+                    R.id.navigation_settings_player,
+                    R.id.navigation_settings_updates,
+                    R.id.navigation_settings_ui,
+                    R.id.navigation_settings_account,
+                    R.id.navigation_settings_providers,
+                    R.id.navigation_settings_general,
+                    R.id.navigation_settings_extensions,
+                    R.id.navigation_settings_plugins,
+                    R.id.navigation_test_providers
+                ) -> {
+                    navRailView.menu.findItem(R.id.navigation_settings).isChecked = true
+                    navView.menu.findItem(R.id.navigation_settings).isChecked = true
+                }
+            }
         }
     }
 
     //private var mCastSession: CastSession? = null
-    lateinit var mSessionManager: SessionManager
+    var mSessionManager: SessionManager? = null
     private val mSessionManagerListener: SessionManagerListener<Session> by lazy { SessionManagerListenerImpl() }
 
     private inner class SessionManagerListenerImpl : SessionManagerListener<Session> {
@@ -615,8 +579,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
         setActivityInstance(this)
         try {
             if (isCastApiAvailable()) {
-                //mCastSession = mSessionManager.currentCastSession
-                mSessionManager.addSessionManagerListener(mSessionManagerListener)
+                mSessionManager?.addSessionManagerListener(mSessionManagerListener)
             }
         } catch (e: Exception) {
             logError(e)
@@ -632,7 +595,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
         }
         try {
             if (isCastApiAvailable()) {
-                mSessionManager.removeSessionManagerListener(mSessionManagerListener)
+                mSessionManager?.removeSessionManagerListener(mSessionManagerListener)
                 //mCastSession = null
             }
         } catch (e: Exception) {
@@ -659,14 +622,32 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
         onUserLeaveHint(this)
     }
 
-    private fun showConfirmExitDialog() {
-        val builder: AlertDialog.Builder = AlertDialog.Builder(this)
-        builder.setTitle(R.string.confirm_exit_dialog)
-        builder.apply {
-            // Forceful exit since back button can actually go back to setup
-            setPositiveButton(R.string.yes) { _, _ -> exitProcess(0) }
-            setNegativeButton(R.string.no) { _, _ -> }
+    @SuppressLint("ApplySharedPref") // commit since the op needs to be synchronous
+    private fun showConfirmExitDialog(settingsManager: SharedPreferences) {
+        val confirmBeforeExit = settingsManager.getInt(getString(R.string.confirm_exit_key), -1)
+
+        if (confirmBeforeExit == 1 || (confirmBeforeExit == -1 && isLayout(PHONE))) {
+            // finish() causes a bug on some TVs where player
+            // may keep playing after closing the app.
+            if (isLayout(TV)) exitProcess(0) else finish()
+            return
         }
+
+        val dialogView = layoutInflater.inflate(R.layout.confirm_exit_dialog, null)
+        val dontShowAgainCheck: CheckBox = dialogView.findViewById(R.id.checkboxDontShowAgain)
+        val builder: AlertDialog.Builder = AlertDialog.Builder(this)
+        builder.setView(dialogView)
+            .setTitle(R.string.confirm_exit_dialog)
+            .setNegativeButton(R.string.no) { _, _ -> /*NO-OP*/ }
+            .setPositiveButton(R.string.yes) { _, _ ->
+                if (dontShowAgainCheck.isChecked) {
+                    settingsManager.edit().putInt(getString(R.string.confirm_exit_key), 1).commit()
+                }
+                // finish() causes a bug on some TVs where player
+                // may keep playing after closing the app.
+                if (isLayout(TV)) exitProcess(0) else finish()
+            }
+
         builder.show().setDefaultFocus()
     }
 
@@ -697,13 +678,24 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
         if (intent == null) return
         val str = intent.dataString
         loadCache()
-        handleAppIntentUrl(this, str, false)
+        handleAppIntentUrl(this, str, false, intent.extras)
     }
 
     private fun NavDestination.matchDestination(@IdRes destId: Int): Boolean =
         hierarchy.any { it.id == destId }
 
+    private var lastNavTime = 0L
     private fun onNavDestinationSelected(item: MenuItem, navController: NavController): Boolean {
+        val currentTime = System.currentTimeMillis()
+        // safeDebounce: Check if a previous tap happened within the last 400ms
+        if (currentTime - lastNavTime < 400) return false
+        lastNavTime = currentTime
+
+        val destinationId = item.itemId
+
+        // Check if we are already at the selected destination
+        if(navController.currentDestination?.id == destinationId) return false
+
         val builder = NavOptions.Builder().setLaunchSingleTop(true).setRestoreState(true)
             .setEnterAnim(R.anim.enter_anim)
             .setExitAnim(R.anim.exit_anim)
@@ -716,11 +708,11 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
                 saveState = true
             )
         }
-        val options = builder.build()
         return try {
-            navController.navigate(item.itemId, null, options)
-            navController.currentDestination?.matchDestination(item.itemId) == true
+            navController.navigate(destinationId, null, builder.build())
+            navController.currentDestination?.matchDestination(destinationId) == true
         } catch (e: IllegalArgumentException) {
+            Log.e("NavigationError", "Failed to navigate: ${e.message}")
             false
         }
     }
@@ -736,7 +728,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
                             list.forEach { custom ->
                                 allProviders.firstOrNull { it.javaClass.simpleName == custom.parentJavaClass }
                                     ?.let {
-                                        allProviders.add(it.javaClass.newInstance().apply {
+                                        allProviders.add(it.javaClass.getDeclaredConstructor().newInstance().apply {
                                             name = custom.name
                                             lang = custom.lang
                                             mainUrl = custom.url.trimEnd('/')
@@ -1117,7 +1109,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
         super.onCreate(savedInstanceState)
         try {
             if (isCastApiAvailable()) {
-                mSessionManager = CastContext.getSharedInstance(this).sessionManager
+                CastContext.getSharedInstance(this) {it.run()}.addOnSuccessListener { mSessionManager = it.sessionManager }
             }
         } catch (t: Throwable) {
             logError(t)
@@ -1223,17 +1215,12 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
                     this.setKey(getString(R.string.jsdelivr_proxy_key), false)
                 } else {
                     this.setKey(getString(R.string.jsdelivr_proxy_key), true)
-                    val parentView: View = findViewById(android.R.id.content)
-                    Snackbar.make(parentView, R.string.jsdelivr_enabled, Snackbar.LENGTH_LONG)
-                        .let { snackbar ->
-                            snackbar.setAction(R.string.revert) {
-                                setKey(getString(R.string.jsdelivr_proxy_key), false)
-                            }
-                            snackbar.setBackgroundTint(colorFromAttribute(R.attr.primaryGrayBackground))
-                            snackbar.setTextColor(colorFromAttribute(R.attr.textColor))
-                            snackbar.setActionTextColor(colorFromAttribute(R.attr.colorPrimary))
-                            snackbar.show()
-                        }
+                    showSnackbar(
+                        this@MainActivity,
+                        R.string.jsdelivr_enabled,
+                        Snackbar.LENGTH_LONG,
+                        R.string.revert
+                    ) { setKey(getString(R.string.jsdelivr_proxy_key), false) }
                 }
             }
         }
@@ -1404,8 +1391,8 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
                         resultviewPreviewMetaDuration.setText(d.durationText)
                         resultviewPreviewMetaRating.setText(d.ratingText)
 
-                        resultviewPreviewDescription.setText(d.plotText)
-                        resultviewPreviewPoster.setImage(
+                        resultviewPreviewDescription.setTextHtml(d.plotText)
+                        resultviewPreviewPoster.loadImage(
                             d.posterImage ?: d.posterBackgroundImage
                         )
 
@@ -1419,13 +1406,13 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
                                 val value = viewModel.watchStatus.value ?: WatchType.NONE
 
                                 this@MainActivity.showBottomDialog(
-                                    WatchType.values().map { getString(it.stringRes) }.toList(),
+                                    WatchType.entries.map { getString(it.stringRes) }.toList(),
                                     value.ordinal,
                                     this@MainActivity.getString(R.string.action_add_to_bookmarks),
                                     showApply = false,
                                     {}) {
                                     viewModel.updateWatchStatus(
-                                        WatchType.values()[it],
+                                        WatchType.entries[it],
                                         this@MainActivity
                                     )
                                 }
@@ -1435,12 +1422,12 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
                                         ?: SyncWatchType.NONE
 
                                 this@MainActivity.showBottomDialog(
-                                    SyncWatchType.values().map { getString(it.stringRes) }.toList(),
+                                    SyncWatchType.entries.map { getString(it.stringRes) }.toList(),
                                     value.ordinal,
                                     this@MainActivity.getString(R.string.action_add_to_bookmarks),
                                     showApply = false,
                                     {}) {
-                                    syncViewModel.setStatus(SyncWatchType.values()[it].internalId)
+                                    syncViewModel.setStatus(SyncWatchType.entries[it].internalId)
                                     syncViewModel.publishUserData()
                                 }
                             }
@@ -1521,18 +1508,19 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
                     logError(e)
                 }
             }
-            
+
             // we need to run this after we init all apis, otherwise currentSyncApi will fuck itself
             this@MainActivity.runOnUiThread {
                 // Change library icon with logo of current api in sync
-                libraryViewModel = ViewModelProvider(this@MainActivity)[LibraryViewModel::class.java]
+                libraryViewModel =
+                    ViewModelProvider(this@MainActivity)[LibraryViewModel::class.java]
                 libraryViewModel?.currentApiName?.observe(this@MainActivity) {
-                    val syncAPI =  libraryViewModel?.currentSyncApi
+                    val syncAPI = libraryViewModel?.currentSyncApi
                     Log.i("SYNC_API", "${syncAPI?.name}, ${syncAPI?.idPrefix}")
-                    val icon = if (syncAPI?.idPrefix ==  localListApi.idPrefix) {
-                        R.drawable.library_icon
+                    val icon = if (syncAPI?.idPrefix == localListApi.idPrefix) {
+                        R.drawable.library_icon_selector
                     } else {
-                        syncAPI?.icon ?: R.drawable.library_icon
+                        syncAPI?.icon ?: R.drawable.library_icon_selector
                     }
 
                     binding?.apply {
@@ -1570,11 +1558,15 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
                 }
             }
 
-            if (isLayout(TV or EMULATOR)) {
-                if (navDestination.matchDestination(R.id.navigation_home)) {
-                    attachBackPressedCallback()
-                } else detachBackPressedCallback()
-            }
+            if (navDestination.matchDestination(R.id.navigation_home)) {
+                attachBackPressedCallback("MainActivity") {
+                    showConfirmExitDialog(settingsManager)
+                    @Suppress("DEPRECATION")
+                    window?.navigationBarColor =
+                        colorFromAttribute(R.attr.primaryGrayBackground)
+                    updateLocale()
+                }
+            } else detachBackPressedCallback("MainActivity")
         }
 
         //val navController = findNavController(R.id.nav_host_fragment)
@@ -1627,7 +1619,34 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
                     }
                 }
             }
-            noFocus(this)
+            //noFocus(this)
+
+            val navProfileRoot = findViewById<LinearLayout>(R.id.nav_footer_root)
+
+            if (isLayout(TV or EMULATOR)) {
+                val navProfilePic = findViewById<ImageView>(R.id.nav_footer_profile_pic)
+                val navProfileCard = findViewById<CardView>(R.id.nav_footer_profile_card)
+
+                navProfileCard?.setOnClickListener {
+                    showAccountSelectLinear()
+                }
+
+                val homeViewModel =
+                    ViewModelProvider(this@MainActivity)[HomeViewModel::class.java]
+
+                observe(homeViewModel.currentAccount) { currentAccount ->
+                    if (currentAccount != null) {
+                        navProfilePic?.loadImage(
+                            currentAccount.image
+                        )
+                        navProfileRoot.isVisible = true
+                    } else {
+                        navProfileRoot.isGone = true
+                    }
+                }
+            } else {
+                navProfileRoot.isGone = true
+            }
         }
 
         loadCache()
@@ -1793,6 +1812,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
             this,
             object : OnBackPressedCallback(true) {
                 override fun handleOnBackPressed() {
+                    @Suppress("DEPRECATION")
                     window?.navigationBarColor = colorFromAttribute(R.attr.primaryGrayBackground)
                     updateLocale()
 
@@ -1817,28 +1837,6 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
         finish()
     }
 
-    private var backPressedCallback: OnBackPressedCallback? = null
-
-    private fun attachBackPressedCallback() {
-        if (backPressedCallback == null) {
-            backPressedCallback = object : OnBackPressedCallback(true) {
-                override fun handleOnBackPressed() {
-                    showConfirmExitDialog()
-                    window?.navigationBarColor =
-                        colorFromAttribute(R.attr.primaryGrayBackground)
-                    updateLocale()
-                }
-            }
-        }
-
-        backPressedCallback?.isEnabled = true
-        onBackPressedDispatcher.addCallback(this, backPressedCallback ?: return)
-    }
-
-    private fun detachBackPressedCallback() {
-        backPressedCallback?.isEnabled = false
-    }
-
     suspend fun checkGithubConnectivity(): Boolean {
         return try {
             app.get(
@@ -1849,4 +1847,4 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
             false
         }
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/NativeCrashHandler.kt b/app/src/main/java/com/lagradost/cloudstream3/NativeCrashHandler.kt
deleted file mode 100644
index 7be904405a9..00000000000
--- a/app/src/main/java/com/lagradost/cloudstream3/NativeCrashHandler.kt
+++ /dev/null
@@ -1,53 +0,0 @@
-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/actions/OpenInAppAction.kt b/app/src/main/java/com/lagradost/cloudstream3/actions/OpenInAppAction.kt
new file mode 100644
index 00000000000..cc64a6d394d
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/actions/OpenInAppAction.kt
@@ -0,0 +1,134 @@
+package com.lagradost.cloudstream3.actions
+
+import android.app.Activity
+import android.content.ComponentName
+import android.content.Context
+import android.content.Intent
+import androidx.core.content.FileProvider
+import androidx.core.net.toUri
+import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
+import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.mvvm.logError
+import com.lagradost.cloudstream3.ui.result.LinkLoadingResult
+import com.lagradost.cloudstream3.ui.result.ResultEpisode
+import com.lagradost.cloudstream3.ui.result.ResultFragment
+import com.lagradost.cloudstream3.utils.UiText
+import com.lagradost.cloudstream3.utils.txt
+import com.lagradost.cloudstream3.utils.AppContextUtils.isAppInstalled
+import com.lagradost.cloudstream3.utils.DataStoreHelper
+import java.io.File
+
+fun updateDurationAndPosition(position: Long, duration: Long) {
+    if (position <= 0 || duration <= 0) return
+    DataStoreHelper.setViewPos(getKey("last_opened_id"), position, duration)
+    ResultFragment.updateUI()
+}
+
+/**
+ * Util method that may be helpful for creating intents for apps that support m3u8 files.
+ * All sources are written to a temporary m3u8 file, which is then sent to the app.
+ */
+fun makeTempM3U8Intent(
+    context: Context,
+    intent: Intent,
+    result: LinkLoadingResult
+) {
+    if (result.links.size == 1) {
+        intent.setDataAndType(result.links.first().url.toUri(), "video/*")
+        return
+    }
+
+    intent.apply {
+        addFlags(Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION)
+        addFlags(Intent.FLAG_GRANT_PREFIX_URI_PERMISSION)
+        addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+        addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
+    }
+
+    val outputFile = File.createTempFile("mirrorlist", ".m3u8", context.cacheDir)
+    var text = "#EXTM3U\n#EXT-X-VERSION:3"
+
+    result.links.forEach { link ->
+        text += "\n#EXTINF:0,${link.name}\n${link.url}"
+    }
+
+    //With subtitles it doesn't work for no reason :(
+    /*for (sub in result.subs) {
+        val normalizedName = sub.name.replace("[^a-zA-Z0-9 ]".toRegex(), "")
+        text += "\n#EXT-X-MEDIA:TYPE=SUBTITLES,GROUP-ID=\"subs\",NAME=\"${normalizedName}\",DEFAULT=NO,AUTOSELECT=NO,FORCED=NO,LANGUAGE=\"${sub.languageCode}\",URI=\"${sub.url}\""
+    }*/
+
+    text += "\n#EXT-X-ENDLIST"
+    outputFile.writeText(text)
+
+    intent.setDataAndType(
+        FileProvider.getUriForFile(
+            context,
+            context.applicationContext.packageName + ".provider",
+            outputFile
+        ), "application/x-mpegURL"
+    )
+}
+
+abstract class OpenInAppAction(
+    open val appName: UiText,
+    open val packageName: String,
+    private val intentClass: String? = null,
+    private val action: String = Intent.ACTION_VIEW
+) : VideoClickAction() {
+    override val name: UiText
+        get() = txt(R.string.episode_action_play_in_format, appName)
+
+    override val isPlayer = true
+
+    override fun shouldShow(context: Context?, video: ResultEpisode?) =
+        context?.isAppInstalled(packageName) != false
+
+    override suspend fun runAction(
+        context: Context?,
+        video: ResultEpisode,
+        result: LinkLoadingResult,
+        index: Int?
+    ) {
+        if (context == null) return
+        val intent = Intent(action)
+        intent.setPackage(packageName)
+        if (intentClass != null) {
+            intent.component = ComponentName(packageName, intentClass)
+        }
+        putExtra(context, intent, video, result, index)
+        setKey("last_opened_id", video.id)
+        launchResult(intent)
+    }
+
+    /**
+     * Before intent is sent, this function is called to put extra data into the intent.
+     * @see VideoClickAction.runAction
+     * */
+    @Throws
+    abstract suspend fun putExtra(
+        context: Context,
+        intent: Intent,
+        video: ResultEpisode,
+        result: LinkLoadingResult,
+        index: Int?
+    )
+
+    /**
+     * This function is called when the app is opened again after the intent was sent.
+     * You can use it to for example update duration and position.
+     * @see updateDurationAndPosition
+     */
+    @Throws
+    abstract fun onResult(activity: Activity, intent: Intent?)
+
+    /** Safe version of onResult, we don't trust extension devs to not crash the app */
+    fun onResultSafe(activity: Activity, intent: Intent?) {
+        try {
+            onResult(activity, intent)
+        } catch (t: Throwable) {
+            logError(t)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/actions/VideoClickAction.kt b/app/src/main/java/com/lagradost/cloudstream3/actions/VideoClickAction.kt
new file mode 100644
index 00000000000..7e8b1c97bb1
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/actions/VideoClickAction.kt
@@ -0,0 +1,185 @@
+package com.lagradost.cloudstream3.actions
+
+import android.app.Activity
+import android.content.ActivityNotFoundException
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import android.widget.Toast
+import androidx.core.app.ActivityOptionsCompat
+import com.lagradost.api.Log
+import com.lagradost.cloudstream3.CommonActivity
+import com.lagradost.cloudstream3.ErrorLoadingException
+import com.lagradost.cloudstream3.MainActivity
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.actions.temp.CopyClipboardAction
+import com.lagradost.cloudstream3.actions.temp.MpvKtPackage
+import com.lagradost.cloudstream3.actions.temp.MpvKtPreviewPackage
+import com.lagradost.cloudstream3.actions.temp.MpvPackage
+import com.lagradost.cloudstream3.actions.temp.MpvYTDLPackage
+import com.lagradost.cloudstream3.actions.temp.PlayInBrowserAction
+import com.lagradost.cloudstream3.actions.temp.ViewM3U8Action
+import com.lagradost.cloudstream3.actions.temp.VlcPackage
+import com.lagradost.cloudstream3.actions.temp.WebVideoCastPackage
+import com.lagradost.cloudstream3.actions.temp.fcast.FcastAction
+import com.lagradost.cloudstream3.mvvm.logError
+import com.lagradost.cloudstream3.ui.result.LinkLoadingResult
+import com.lagradost.cloudstream3.ui.result.ResultEpisode
+import com.lagradost.cloudstream3.utils.UiText
+import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
+import com.lagradost.cloudstream3.utils.Coroutines.threadSafeListOf
+import com.lagradost.cloudstream3.utils.ExtractorLinkType
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import java.util.concurrent.Callable
+import java.util.concurrent.FutureTask
+import kotlin.reflect.jvm.jvmName
+
+object VideoClickActionHolder {
+    val allVideoClickActions = threadSafeListOf(
+        // Default
+        PlayInBrowserAction(),
+        CopyClipboardAction(),
+        ViewM3U8Action(),
+        // main support external apps
+        VlcPackage(),
+        MpvPackage(),
+        FcastAction(),
+        // forks/backup apps
+        WebVideoCastPackage(),
+        MpvYTDLPackage(),
+        MpvKtPackage(),
+        MpvKtPreviewPackage(),
+        // added by plugins
+        // ...
+    )
+
+    init {
+        Log.d("VideoClickActionHolder", "allVideoClickActions: ${allVideoClickActions.map { it.uniqueId() }}")
+    }
+
+    private const val ACTION_ID_OFFSET = 1000
+
+    fun makeOptionMap(activity: Activity?, video: ResultEpisode) = allVideoClickActions
+        // We need to have index before filtering
+        .mapIndexed { id, it -> it to id + ACTION_ID_OFFSET }
+        .filter { it.first.shouldShowSafe(activity, video) }
+        .map { it.first.name to it.second }
+
+
+    fun getActionById(id: Int): VideoClickAction? = allVideoClickActions.getOrNull(id - ACTION_ID_OFFSET)
+
+    fun getByUniqueId(uniqueId: String): VideoClickAction? = allVideoClickActions.firstOrNull { it.uniqueId() == uniqueId }
+
+    fun uniqueIdToId(uniqueId: String?): Int? {
+        if (uniqueId == null) return null
+        return allVideoClickActions
+            .mapIndexed { id, it -> it to id + ACTION_ID_OFFSET }
+            .firstOrNull { it.first.uniqueId() == uniqueId }
+            ?.second
+    }
+
+    fun getPlayers(activity: Activity? = null) = allVideoClickActions.filter { it.isPlayer && it.shouldShowSafe(activity, null) }
+}
+
+abstract class VideoClickAction {
+    abstract val name: UiText
+
+    /** if true, the app will show dialog to select source - result.links[index] */
+    open val oneSource : Boolean = false
+
+    /** if true, this action could be selected as default player (one press action) in settings */
+    open val isPlayer: Boolean = false
+
+    /** Which type of sources this action can handle. */
+    open val sourceTypes: Set<ExtractorLinkType> = ExtractorLinkType.entries.toSet()
+
+    /** Determines which plugin a given provider is from. This is the full path to the plugin. */
+    var sourcePlugin: String? = null
+
+    /** Even if VideoClickAction should not run any UI code, startActivity requires it,
+     * this is a wrapper for runOnUiThread in a suspended safe context that bubble up exceptions  */
+    @Throws
+    suspend fun <T> uiThread(callable : Callable<T>) : T? {
+        val future = FutureTask{
+            try {
+                Result.success(callable.call())
+            } catch (t : Throwable) {
+                Result.failure(t)
+            }
+        }
+        CommonActivity.activity?.runOnUiThread(future) ?: throw ErrorLoadingException("No UI Activity, this should never happened")
+        val result = withContext(Dispatchers.IO) {
+            return@withContext future.get()
+        }
+        return result.getOrThrow()
+    }
+
+    /** Internally uses activityResultLauncher,
+     * use this when the activity has a result like watched position */
+    @Throws
+    suspend fun launchResult(intent : Intent?, options : ActivityOptionsCompat? = null) {
+        if (intent == null) {
+            return
+        }
+
+        uiThread {
+            MainActivity.activityResultLauncher?.launch(intent,options)
+        }
+    }
+
+    /** Internally uses startActivity, use this when you don't
+     * have any result that needs to be stored when exiting the activity  */
+    @Throws
+    suspend fun launch(intent : Intent?, bundle : Bundle? = null) {
+        if (intent == null) {
+            return
+        }
+
+        uiThread {
+            CommonActivity.activity?.startActivity(intent, bundle)
+        }
+    }
+
+    fun uniqueId() = "$sourcePlugin:${this::class.jvmName}"
+
+    @Throws
+    abstract fun shouldShow(context: Context?, video: ResultEpisode?): Boolean
+
+    /** Safe version of shouldShow, as we don't trust extension devs to handle exceptions,
+     * however no dev *should* throw in shouldShow */
+    fun shouldShowSafe(context: Context?, video: ResultEpisode?): Boolean {
+        return try {
+            shouldShow(context,video)
+        } catch (t : Throwable) {
+            logError(t)
+            false
+        }
+    }
+
+    /**
+     *  This function is called when the action is clicked.
+     *  @param context The current activity
+     *  @param video The episode/movie that was clicked
+     *  @param result The result of the link loading, contains video & subtitle links
+     *  @param index if oneSource is true, this is the index of the selected source
+     */
+    @Throws
+    abstract suspend fun runAction(context: Context?, video: ResultEpisode, result: LinkLoadingResult, index: Int?)
+
+    /** Safe version of runAction, as we don't trust extension devs to handle exceptions */
+    fun runActionSafe(context: Context?, video: ResultEpisode, result: LinkLoadingResult, index: Int?) = ioSafe {
+        try {
+            runAction(context, video, result, index)
+        }  catch (_ : NotImplementedError) {
+            CommonActivity.showToast("runAction has not been implemented for ${name.asStringNull(context)}, please contact the extension developer of $sourcePlugin", Toast.LENGTH_LONG)
+        } catch (error : ErrorLoadingException) {
+            CommonActivity.showToast(error.message, Toast.LENGTH_LONG)
+        } catch (_: ActivityNotFoundException) {
+            CommonActivity.showToast(R.string.app_not_found_error, Toast.LENGTH_LONG)
+        } catch (t : Throwable) {
+            logError(t)
+            CommonActivity.showToast(t.toString(), Toast.LENGTH_LONG)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/actions/temp/CopyClipboardAction.kt b/app/src/main/java/com/lagradost/cloudstream3/actions/temp/CopyClipboardAction.kt
new file mode 100644
index 00000000000..7e89d7c8c44
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/actions/temp/CopyClipboardAction.kt
@@ -0,0 +1,27 @@
+package com.lagradost.cloudstream3.actions.temp
+
+import android.content.Context
+import com.lagradost.cloudstream3.actions.VideoClickAction
+import com.lagradost.cloudstream3.ui.result.LinkLoadingResult
+import com.lagradost.cloudstream3.ui.result.ResultEpisode
+import com.lagradost.cloudstream3.utils.txt
+import com.lagradost.cloudstream3.utils.UIHelper.clipboardHelper
+
+class CopyClipboardAction: VideoClickAction() {
+    override val name = txt("Copy to clipboard")
+
+    override val oneSource = true
+
+    override fun shouldShow(context: Context?, video: ResultEpisode?) = true
+
+    override suspend fun runAction(
+        context: Context?,
+        video: ResultEpisode,
+        result: LinkLoadingResult,
+        index: Int?
+    ) {
+        if (index == null) return
+        val link = result.links.getOrNull(index) ?: return
+        clipboardHelper(txt(link.name), link.url)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/actions/temp/MpvKtPackage.kt b/app/src/main/java/com/lagradost/cloudstream3/actions/temp/MpvKtPackage.kt
new file mode 100644
index 00000000000..102f0ac8bb3
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/actions/temp/MpvKtPackage.kt
@@ -0,0 +1,69 @@
+package com.lagradost.cloudstream3.actions.temp
+
+import android.app.Activity
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import androidx.core.net.toUri
+import com.lagradost.cloudstream3.actions.OpenInAppAction
+import com.lagradost.cloudstream3.actions.updateDurationAndPosition
+import com.lagradost.cloudstream3.ui.result.LinkLoadingResult
+import com.lagradost.cloudstream3.ui.result.ResultEpisode
+import com.lagradost.cloudstream3.utils.txt
+import com.lagradost.cloudstream3.utils.DataStoreHelper.getViewPos
+import com.lagradost.cloudstream3.utils.ExtractorLinkType
+
+class MpvKtPreviewPackage: MpvKtPackage(
+    appName = "mpvKt Preview",
+    packageName = "live.mehiz.mpvkt.preview",
+)
+
+open class MpvKtPackage(
+    appName: String = "mpvKt",
+    packageName: String = "live.mehiz.mpvkt",
+): OpenInAppAction(
+    appName = txt(appName),
+    packageName = packageName,
+    intentClass = "live.mehiz.mpvkt.ui.player.PlayerActivity"
+) {
+    override val oneSource = true
+
+    override val sourceTypes = setOf(
+        ExtractorLinkType.VIDEO,
+        ExtractorLinkType.DASH,
+        ExtractorLinkType.M3U8
+    )
+
+    override suspend fun putExtra(
+        context: Context,
+        intent: Intent,
+        video: ResultEpisode,
+        result: LinkLoadingResult,
+        index: Int?
+    ) {
+        val link = result.links.getOrNull(index ?: 0) ?: return
+
+        intent.apply {
+            putExtra("subs", result.subs.map { it.url.toUri() }.toTypedArray())
+            setDataAndType(Uri.parse(link.url), "video/*")
+
+            // m3u8 plays, but changing sources feature is not available
+            // makeTempM3U8Intent(activity, this, result)
+
+            //putExtra("headers", link.headers.flatMap { listOf(it.key, it.value) }.toTypedArray())
+
+            val position = getViewPos(video.id)?.position
+            if (position != null)
+                putExtra("position", position.toInt())
+
+            putExtra("secure_uri", true)
+        }
+    }
+
+    override fun onResult(activity: Activity, intent: Intent?) {
+        val position = intent?.getIntExtra("position", -1)?.toLong() ?: -1
+        val duration = intent?.getIntExtra("duration", -1)?.toLong() ?: -1
+        updateDurationAndPosition(position, duration)
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/actions/temp/MpvPackage.kt b/app/src/main/java/com/lagradost/cloudstream3/actions/temp/MpvPackage.kt
new file mode 100644
index 00000000000..68e619c92c8
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/actions/temp/MpvPackage.kt
@@ -0,0 +1,66 @@
+package com.lagradost.cloudstream3.actions.temp
+
+import android.app.Activity
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import androidx.core.net.toUri
+import com.lagradost.api.Log
+import com.lagradost.cloudstream3.actions.OpenInAppAction
+import com.lagradost.cloudstream3.actions.makeTempM3U8Intent
+import com.lagradost.cloudstream3.actions.updateDurationAndPosition
+import com.lagradost.cloudstream3.ui.result.LinkLoadingResult
+import com.lagradost.cloudstream3.ui.result.ResultEpisode
+import com.lagradost.cloudstream3.utils.txt
+import com.lagradost.cloudstream3.utils.DataStoreHelper.getViewPos
+import com.lagradost.cloudstream3.utils.ExtractorLinkType
+
+// https://github.com/mpv-android/mpv-android/blob/0eb3cdc6f1632636b9c30d52ec50e4b017661980/app/src/main/java/is/xyz/mpv/MPVActivity.kt#L904
+// https://mpv-android.github.io/mpv-android/intent.html
+
+class MpvYTDLPackage : MpvPackage("MPV YTDL", "is.xyz.mpv.ytdl") {
+    override val sourceTypes = setOf(
+        ExtractorLinkType.VIDEO,
+        ExtractorLinkType.DASH,
+        ExtractorLinkType.M3U8
+    )
+}
+
+open class MpvPackage(appName: String = "MPV", packageName: String = "is.xyz.mpv"): OpenInAppAction(
+    txt(appName),
+    packageName,
+    "is.xyz.mpv.MPVActivity"
+) {
+    override val oneSource = true // mpv has poor playlist support on TV
+    override suspend fun putExtra(
+        context: Context,
+        intent: Intent,
+        video: ResultEpisode,
+        result: LinkLoadingResult,
+        index: Int?
+    ) {
+        intent.apply {
+            putExtra("subs", result.subs.map { it.url.toUri() }.toTypedArray())
+            putExtra("title", video.name)
+
+            if (index != null) {
+                setDataAndType(Uri.parse(result.links.getOrNull(index)?.url ?: return), "video/*")
+            } else {
+                makeTempM3U8Intent(context, this, result)
+            }
+
+            val position = getViewPos(video.id)?.position
+            if (position != null)
+                putExtra("position", position.toInt())
+
+            putExtra("secure_uri", true)
+        }
+    }
+
+    override fun onResult(activity: Activity, intent: Intent?) {
+        val position = intent?.getIntExtra("position", -1) ?: -1
+        val duration = intent?.getIntExtra("duration", -1) ?: -1
+        Log.d("MPV", "Position: $position, Duration: $duration")
+        updateDurationAndPosition(position.toLong(), duration.toLong())
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/actions/temp/PlayInBrowserAction.kt b/app/src/main/java/com/lagradost/cloudstream3/actions/temp/PlayInBrowserAction.kt
new file mode 100644
index 00000000000..7c1b68c054e
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/actions/temp/PlayInBrowserAction.kt
@@ -0,0 +1,39 @@
+package com.lagradost.cloudstream3.actions.temp
+
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.actions.VideoClickAction
+import com.lagradost.cloudstream3.ui.result.LinkLoadingResult
+import com.lagradost.cloudstream3.ui.result.ResultEpisode
+import com.lagradost.cloudstream3.utils.txt
+import com.lagradost.cloudstream3.utils.ExtractorLinkType
+
+class PlayInBrowserAction: VideoClickAction() {
+    override val name = txt(R.string.episode_action_play_in_format, "Browser")
+
+    override val oneSource = true
+
+    override val isPlayer = true
+
+    override val sourceTypes: Set<ExtractorLinkType> = setOf(
+        ExtractorLinkType.VIDEO,
+        ExtractorLinkType.DASH,
+        ExtractorLinkType.M3U8
+    )
+
+    override fun shouldShow(context: Context?, video: ResultEpisode?) = true
+
+    override suspend fun runAction(
+        context: Context?,
+        video: ResultEpisode,
+        result: LinkLoadingResult,
+        index: Int?
+    ) {
+        val link = result.links.getOrNull(index ?: 0) ?: return
+        val i = Intent(Intent.ACTION_VIEW)
+        i.data = Uri.parse(link.url)
+        launch(i)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/actions/temp/ViewM3U8Action.kt b/app/src/main/java/com/lagradost/cloudstream3/actions/temp/ViewM3U8Action.kt
new file mode 100644
index 00000000000..791566862e0
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/actions/temp/ViewM3U8Action.kt
@@ -0,0 +1,30 @@
+package com.lagradost.cloudstream3.actions.temp
+
+import android.content.Context
+import android.content.Intent
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.actions.VideoClickAction
+import com.lagradost.cloudstream3.actions.makeTempM3U8Intent
+import com.lagradost.cloudstream3.ui.result.LinkLoadingResult
+import com.lagradost.cloudstream3.ui.result.ResultEpisode
+import com.lagradost.cloudstream3.utils.txt
+
+class ViewM3U8Action: VideoClickAction() {
+    override val name = txt(R.string.episode_action_play_in_format, "m3u8 player")
+
+    override val isPlayer = true
+
+    override fun shouldShow(context: Context?, video: ResultEpisode?) = true
+
+    override suspend fun runAction(
+        context: Context?,
+        video: ResultEpisode,
+        result: LinkLoadingResult,
+        index: Int?
+    ) {
+        if (context == null) return
+        val i = Intent(Intent.ACTION_VIEW)
+        makeTempM3U8Intent(context, i, result)
+        launch(i)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/actions/temp/VlcPackage.kt b/app/src/main/java/com/lagradost/cloudstream3/actions/temp/VlcPackage.kt
new file mode 100644
index 00000000000..df4fcca8125
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/actions/temp/VlcPackage.kt
@@ -0,0 +1,72 @@
+package com.lagradost.cloudstream3.actions.temp
+
+import android.app.Activity
+import android.content.Context
+import android.content.Intent
+import android.os.Build
+import androidx.core.net.toUri
+import com.lagradost.api.Log
+import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
+import com.lagradost.cloudstream3.actions.OpenInAppAction
+import com.lagradost.cloudstream3.actions.makeTempM3U8Intent
+import com.lagradost.cloudstream3.actions.updateDurationAndPosition
+import com.lagradost.cloudstream3.ui.result.LinkLoadingResult
+import com.lagradost.cloudstream3.ui.result.ResultEpisode
+import com.lagradost.cloudstream3.utils.txt
+import com.lagradost.cloudstream3.ui.subtitles.SUBTITLE_AUTO_SELECT_KEY
+import com.lagradost.cloudstream3.utils.DataStoreHelper.getViewPos
+
+// https://github.com/videolan/vlc-android/blob/3706c4be2da6800b3d26344fc04fab03ffa4b860/application/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.kt#L1898
+// https://wiki.videolan.org/Android_Player_Intents/
+
+class VlcPackage: OpenInAppAction(
+    appName = txt("VLC"),
+    packageName = "org.videolan.vlc",
+    intentClass = if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
+        "org.videolan.vlc.gui.video.VideoPlayerActivity"
+    } else {
+        null
+    },
+    action = if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
+        "org.videolan.vlc.player.result"
+    } else {
+        Intent.ACTION_VIEW
+    }
+) {
+    // while VLC supports multi links, it has poor support, so we disable it for now
+    override val oneSource = true
+
+    override suspend fun putExtra(
+        context: Context,
+        intent: Intent,
+        video: ResultEpisode,
+        result: LinkLoadingResult,
+        index: Int?
+    ) {
+        if (index != null) {
+            intent.setDataAndType(result.links[index].url.toUri(), "video/*")
+        } else {
+            makeTempM3U8Intent(context, intent, result)
+        }
+        val position = getViewPos(video.id)?.position ?: 0L
+
+        intent.putExtra("from_start", false)
+        intent.putExtra("position", position)
+        intent.putExtra("secure_uri", true)
+        intent.putExtra("title", video.name)
+
+        val subsLang = getKey(SUBTITLE_AUTO_SELECT_KEY) ?: "en"
+        result.subs.firstOrNull {
+            subsLang == it.languageCode
+        }?.let {
+            intent.putExtra("subtitles_location", it.url)
+        }
+    }
+
+    override fun onResult(activity: Activity, intent: Intent?) {
+        val position = intent?.getLongExtra("extra_position", -1) ?: -1
+        val duration = intent?.getLongExtra("extra_duration", -1) ?: -1
+        Log.d("VLC", "Position: $position, Duration: $duration")
+        updateDurationAndPosition(position, duration)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/actions/temp/WebVideoCastPackage.kt b/app/src/main/java/com/lagradost/cloudstream3/actions/temp/WebVideoCastPackage.kt
new file mode 100644
index 00000000000..9f7eee7b820
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/actions/temp/WebVideoCastPackage.kt
@@ -0,0 +1,62 @@
+package com.lagradost.cloudstream3.actions.temp
+
+import android.app.Activity
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.os.Bundle
+import androidx.core.net.toUri
+import com.lagradost.cloudstream3.USER_AGENT
+import com.lagradost.cloudstream3.actions.OpenInAppAction
+import com.lagradost.cloudstream3.ui.result.LinkLoadingResult
+import com.lagradost.cloudstream3.ui.result.ResultEpisode
+import com.lagradost.cloudstream3.utils.txt
+import com.lagradost.cloudstream3.utils.ExtractorLinkType
+
+// https://www.webvideocaster.com/integrations
+
+class WebVideoCastPackage: OpenInAppAction(
+    txt("Web Video Cast"),
+    "com.instantbits.cast.webvideo"
+) {
+
+    override val oneSource = true
+
+    override val sourceTypes = setOf(
+        ExtractorLinkType.VIDEO,
+        ExtractorLinkType.DASH,
+        ExtractorLinkType.M3U8
+    )
+
+    override suspend fun putExtra(
+        context: Context,
+        intent: Intent,
+        video: ResultEpisode,
+        result: LinkLoadingResult,
+        index: Int?
+    ) {
+        val link = result.links[index ?: 0]
+
+        intent.apply {
+            setDataAndType(Uri.parse(link.url), "video/*")
+
+            val title = video.name ?: video.headerName
+
+            putExtra("subs", result.subs.map { it.url.toUri() }.toTypedArray())
+            putExtra("title", title)
+            video.poster?.let { putExtra("poster", it) }
+            val headers = Bundle().apply {
+                if (link.referer.isNotBlank())
+                    putString("Referer", link.referer)
+                putString("User-Agent", USER_AGENT)
+                for ((key, value) in link.headers) {
+                    putString(key, value)
+                }
+            }
+            putExtra("android.media.intent.extra.HTTP_HEADERS", headers)
+            putExtra("secure_uri", true)
+        }
+    }
+
+    override fun onResult(activity: Activity, intent: Intent?) = Unit
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/actions/temp/fcast/FcastAction.kt b/app/src/main/java/com/lagradost/cloudstream3/actions/temp/fcast/FcastAction.kt
new file mode 100644
index 00000000000..e3916df01c6
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/actions/temp/fcast/FcastAction.kt
@@ -0,0 +1,69 @@
+package com.lagradost.cloudstream3.actions.temp.fcast
+
+import android.content.Context
+import com.lagradost.cloudstream3.AcraApplication.Companion.getActivity
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.USER_AGENT
+import com.lagradost.cloudstream3.actions.VideoClickAction
+import com.lagradost.cloudstream3.ui.result.LinkLoadingResult
+import com.lagradost.cloudstream3.ui.result.ResultEpisode
+import com.lagradost.cloudstream3.utils.txt
+import com.lagradost.cloudstream3.utils.DataStoreHelper.getViewPos
+import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.ExtractorLinkType
+import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialog
+
+class FcastAction: VideoClickAction() {
+    override val name = txt("Fcast to device")
+
+    override val oneSource = true
+
+    override val sourceTypes = setOf(
+        ExtractorLinkType.VIDEO,
+        ExtractorLinkType.DASH,
+        ExtractorLinkType.M3U8
+    )
+
+    override fun shouldShow(context: Context?, video: ResultEpisode?) = FcastManager.currentDevices.isNotEmpty()
+
+    override suspend fun runAction(
+        context: Context?,
+        video: ResultEpisode,
+        result: LinkLoadingResult,
+        index: Int?
+    ) {
+        val link = result.links.getOrNull(index ?: 0) ?: return
+        val devices = FcastManager.currentDevices.toList()
+        uiThread {
+            context?.getActivity()?.showBottomDialog(
+                devices.map { it.name },
+                -1,
+                txt(R.string.player_settings_select_cast_device).asString(context),
+                false,
+                {}) {
+                val position = getViewPos(video.id)?.position
+                castTo(devices.getOrNull(it), link, position)
+            }
+        }
+    }
+
+
+    private fun castTo(device: PublicDeviceInfo?, link: ExtractorLink, position: Long?) {
+        val host = device?.host ?: return
+
+        FcastSession(host).use { session ->
+            session.sendMessage(
+                Opcode.Play,
+                PlayMessage(
+                    link.type.getMimeType(),
+                    link.url,
+                    time = position?.let { it / 1000.0 },
+                    headers = mapOf(
+                        "referer" to link.referer,
+                        "user-agent" to USER_AGENT
+                    ) + link.headers
+                )
+            )
+        }
+    }
+}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/fcast/FcastManager.kt b/app/src/main/java/com/lagradost/cloudstream3/actions/temp/fcast/FcastManager.kt
similarity index 55%
rename from app/src/main/java/com/lagradost/cloudstream3/utils/fcast/FcastManager.kt
rename to app/src/main/java/com/lagradost/cloudstream3/actions/temp/fcast/FcastManager.kt
index 9ff5cc0896f..282ef834eb2 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/fcast/FcastManager.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/actions/temp/fcast/FcastManager.kt
@@ -1,10 +1,11 @@
-package com.lagradost.cloudstream3.utils.fcast
+package com.lagradost.cloudstream3.actions.temp.fcast
 
 import android.content.Context
 import android.net.nsd.NsdManager
 import android.net.nsd.NsdManager.ResolveListener
 import android.net.nsd.NsdServiceInfo
 import android.os.Build
+import android.os.ext.SdkExtensions
 import android.util.Log
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 
@@ -72,29 +73,62 @@ class FcastManager {
 
         override fun onServiceFound(serviceInfo: NsdServiceInfo?) {
             if (serviceInfo == null) return
-            nsdManager?.resolveService(serviceInfo, object : ResolveListener {
-                override fun onResolveFailed(serviceInfo: NsdServiceInfo?, errorCode: Int) {
-                }
-
-                override fun onServiceResolved(serviceInfo: NsdServiceInfo?) {
-                    if (serviceInfo == null) return
 
-                    currentDevices.add(PublicDeviceInfo(serviceInfo))
-
-                    Log.d(
-                        tag,
-                        "Service found: ${serviceInfo.serviceName}, Net: ${serviceInfo.host.hostAddress}"
-                    )
-                }
-            })
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R && SdkExtensions.getExtensionVersion(
+                    Build.VERSION_CODES.TIRAMISU) >= 7) {
+                nsdManager?.registerServiceInfoCallback(serviceInfo,
+                    Runnable::run,
+                    object : NsdManager.ServiceInfoCallback {
+                        override fun onServiceInfoCallbackRegistrationFailed(errorCode: Int) {
+                            Log.e(tag, "Service registration failed: $errorCode")
+                        }
+                        override fun onServiceUpdated(serviceInfo: NsdServiceInfo) {
+                            Log.d(tag,
+                                "Service updated: ${serviceInfo.serviceName}," +
+                                        "Net: ${serviceInfo.hostAddresses.firstOrNull()?.hostAddress}"
+                            )
+                            synchronized(_currentDevices) {
+                                _currentDevices.removeIf { it.rawName == serviceInfo.serviceName }
+                                _currentDevices.add(PublicDeviceInfo(serviceInfo))
+                            }
+                        }
+                        override fun onServiceLost() {
+                            Log.d(tag, "Service lost: ${serviceInfo.serviceName},")
+                            synchronized(_currentDevices) {
+                                _currentDevices.removeIf { it.rawName == serviceInfo.serviceName }
+                            }
+                        }
+                        override fun onServiceInfoCallbackUnregistered() {}
+                    })
+            } else {
+                @Suppress("DEPRECATION")
+                nsdManager?.resolveService(serviceInfo, object : ResolveListener {
+                    override fun onResolveFailed(serviceInfo: NsdServiceInfo?, errorCode: Int) {}
+
+                    override fun onServiceResolved(serviceInfo: NsdServiceInfo?) {
+                        if (serviceInfo == null) return
+
+                        synchronized(_currentDevices) {
+                            _currentDevices.add(PublicDeviceInfo(serviceInfo))
+                        }
+
+                        Log.d(
+                            tag,
+                            "Service found: ${serviceInfo.serviceName}, Net: ${serviceInfo.host.hostAddress}"
+                        )
+                    }
+                })
+            }
         }
 
         override fun onServiceLost(serviceInfo: NsdServiceInfo?) {
             if (serviceInfo == null) return
 
             // May remove duplicates, but net and port is null here, preventing device specific identification
-            currentDevices.removeAll {
-                it.rawName == serviceInfo.serviceName
+            synchronized(_currentDevices) {
+                _currentDevices.removeAll {
+                    it.rawName == serviceInfo.serviceName
+                }
             }
 
             Log.d(tag, "Service lost: ${serviceInfo.serviceName}")
@@ -103,7 +137,8 @@ class FcastManager {
 
     companion object {
         const val APP_PREFIX = "CloudStream"
-        val currentDevices: MutableList<PublicDeviceInfo> = mutableListOf()
+        private val _currentDevices: MutableList<PublicDeviceInfo> = mutableListOf()
+        val currentDevices: List<PublicDeviceInfo> = _currentDevices
 
         class DefaultRegistrationListener : NsdManager.RegistrationListener {
             val tag = "DiscoveryService"
@@ -130,6 +165,15 @@ class FcastManager {
 
 class PublicDeviceInfo(serviceInfo: NsdServiceInfo) {
     val rawName: String = serviceInfo.serviceName
-    val host: String? = serviceInfo.host.hostAddress
+    val host: String? = if (
+        Build.VERSION.SDK_INT >= Build.VERSION_CODES.R &&
+        SdkExtensions.getExtensionVersion(
+            Build.VERSION_CODES.TIRAMISU) >= 7
+        ) {
+        serviceInfo.hostAddresses.firstOrNull()?.hostAddress
+    } else {
+        @Suppress("DEPRECATION")
+        serviceInfo.host.hostAddress
+    }
     val name = rawName.replace("-", " ") + host?.let { " $it" }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/fcast/FcastSession.kt b/app/src/main/java/com/lagradost/cloudstream3/actions/temp/fcast/FcastSession.kt
similarity index 96%
rename from app/src/main/java/com/lagradost/cloudstream3/utils/fcast/FcastSession.kt
rename to app/src/main/java/com/lagradost/cloudstream3/actions/temp/fcast/FcastSession.kt
index 1f33bca43f0..326d111919b 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/fcast/FcastSession.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/actions/temp/fcast/FcastSession.kt
@@ -1,4 +1,4 @@
-package com.lagradost.cloudstream3.utils.fcast
+package com.lagradost.cloudstream3.actions.temp.fcast
 
 import android.util.Log
 import androidx.annotation.WorkerThread
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/fcast/Packets.kt b/app/src/main/java/com/lagradost/cloudstream3/actions/temp/fcast/Packets.kt
similarity index 95%
rename from app/src/main/java/com/lagradost/cloudstream3/utils/fcast/Packets.kt
rename to app/src/main/java/com/lagradost/cloudstream3/actions/temp/fcast/Packets.kt
index 61c00d6edb8..26f5cec5364 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/fcast/Packets.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/actions/temp/fcast/Packets.kt
@@ -1,4 +1,4 @@
-package com.lagradost.cloudstream3.utils.fcast
+package com.lagradost.cloudstream3.actions.temp.fcast
 
 // See https://gitlab.com/futo-org/fcast/-/wikis/Protocol-version-1
 enum class Opcode(val value: Byte) {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/network/CloudflareKiller.kt b/app/src/main/java/com/lagradost/cloudstream3/network/CloudflareKiller.kt
index ce2fb3a216d..85a9db5db73 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/network/CloudflareKiller.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/network/CloudflareKiller.kt
@@ -1,6 +1,5 @@
 package com.lagradost.cloudstream3.network
 
-import android.util.Base64
 import android.util.Log
 import android.webkit.CookieManager
 import androidx.annotation.AnyThread
@@ -10,7 +9,10 @@ import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
 import com.lagradost.nicehttp.Requests.Companion.await
 import com.lagradost.nicehttp.cookies
 import kotlinx.coroutines.runBlocking
-import okhttp3.*
+import okhttp3.Headers
+import okhttp3.Interceptor
+import okhttp3.Request
+import okhttp3.Response
 import java.net.URI
 
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/network/DohProviders.kt b/app/src/main/java/com/lagradost/cloudstream3/network/DohProviders.kt
index 55e092513aa..4127799e8f4 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/network/DohProviders.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/network/DohProviders.kt
@@ -84,4 +84,24 @@ fun OkHttpClient.Builder.addQuad9Dns() = (
             "9.9.9.9",
             "149.112.112.112",
         )
-    ))
\ No newline at end of file
+    ))
+
+fun OkHttpClient.Builder.addDnsSbDns() = (
+        addGenericDns(
+            "https://doh.dns.sb/dns-query",
+            //https://dns.sb/guide/
+            listOf(
+                "185.222.222.222",
+                "45.11.45.11",
+            )
+        ))
+
+fun OkHttpClient.Builder.addCanadianShieldDns() = (
+        addGenericDns(
+            "https://private.canadianshield.cira.ca/dns-query",
+            //https://www.cira.ca/en/canadian-shield/configure/summary-cira-canadian-shield-dns-resolver-addresses/
+            listOf(
+                "149.112.121.10",
+                "149.112.122.10",
+            )
+        ))
diff --git a/app/src/main/java/com/lagradost/cloudstream3/network/RequestsHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/network/RequestsHelper.kt
index a1d84f6cdac..1565d92cf9b 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/network/RequestsHelper.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/network/RequestsHelper.kt
@@ -15,11 +15,16 @@ import org.conscrypt.Conscrypt
 import java.io.File
 import java.security.Security
 
-fun Requests.initClient(context: Context): OkHttpClient {
+fun Requests.initClient(context: Context) {
+    this.baseClient = buildDefaultClient(context)
+}
+
+fun buildDefaultClient(context: Context): OkHttpClient {
     normalSafeApiCall { Security.insertProviderAt(Conscrypt.newProvider(), 1) }
+    
     val settingsManager = PreferenceManager.getDefaultSharedPreferences(context)
     val dns = settingsManager.getInt(context.getString(R.string.dns_pref), 0)
-    baseClient = OkHttpClient.Builder()
+    val baseClient = OkHttpClient.Builder()
         .followRedirects(true)
         .followSslRedirects(true)
         .ignoreAllSSLErrors()
@@ -38,6 +43,8 @@ fun Requests.initClient(context: Context): OkHttpClient {
                 4 -> addAdGuardDns()
                 5 -> addDNSWatchDns()
                 6 -> addQuad9Dns()
+                7 -> addDnsSbDns()
+                8 -> addCanadianShieldDns()
             }
         }
         // Needs to be build as otherwise the other builders will change this object
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 7f08af924ad..efa028d1427 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/plugins/Plugin.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/plugins/Plugin.kt
@@ -2,73 +2,39 @@ package com.lagradost.cloudstream3.plugins
 
 import android.content.Context
 import android.content.res.Resources
-import kotlin.Throws
-import com.lagradost.cloudstream3.MainAPI
-import com.lagradost.cloudstream3.APIHolder
-import com.lagradost.cloudstream3.utils.ExtractorApi
-import com.lagradost.cloudstream3.utils.extractorApis
 import android.util.Log
-import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.cloudstream3.actions.VideoClickAction
+import com.lagradost.cloudstream3.actions.VideoClickActionHolder
+import kotlin.Throws
 
-const val PLUGIN_TAG = "PluginInstance"
 
-abstract class Plugin {
+abstract class Plugin : BasePlugin() {
     /**
      * Called when your Plugin is loaded
      * @param context Context
      */
     @Throws(Throwable::class)
     open fun load(context: Context) {
+        // If not overridden by an extension then try the cross-platform load()
+        load()
     }
 
     /**
-     * Called when your Plugin is being unloaded
-     */
-    @Throws(Throwable::class)
-    open fun beforeUnload() {
-    }
-
-    /**
-     * Used to register providers instances of MainAPI
-     * @param element MainAPI provider you want to register
+     * Used to register VideoClickAction instances
+     * @param element VideoClickAction you want to register
      */
-    fun registerMainAPI(element: MainAPI) {
-        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
-        synchronized(APIHolder.allProviders) {
-            APIHolder.allProviders.add(element)
+    fun registerVideoClickAction(element: VideoClickAction) {
+        Log.i(PLUGIN_TAG, "Adding ${element.name} VideoClickAction")
+        element.sourcePlugin = this.filename
+        synchronized(VideoClickActionHolder.allVideoClickActions) {
+            VideoClickActionHolder.allVideoClickActions.add(element)
         }
-        APIHolder.addPluginMapping(element)
-    }
-
-    /**
-     * Used to register extractor instances of ExtractorApi
-     * @param element ExtractorApi provider you want to register
-     */
-    fun registerExtractorAPI(element: ExtractorApi) {
-        Log.i(PLUGIN_TAG, "Adding ${element.name} (${element.mainUrl}) ExtractorApi")
-        element.sourcePlugin = this.__filename
-        extractorApis.add(element)
-    }
-
-    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
     }
 
     /**
      * This will contain your resources if you specified requiresResources in gradle
      */
     var resources: Resources? = null
-    /** Full file path to the plugin. */
-    var __filename: String? = null
 
     /**
      * This will add a button in the settings allowing you to add custom settings
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 6b2b75f25a2..9a00a1f4cc8 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt
@@ -1,26 +1,42 @@
 package com.lagradost.cloudstream3.plugins
 
-import android.app.*
+import android.Manifest
+import android.app.Activity
+import android.app.Notification
+import android.app.NotificationChannel
+import android.app.NotificationManager
 import android.content.Context
+import android.content.pm.PackageManager
 import android.content.res.AssetManager
 import android.content.res.Resources
 import android.os.Build
 import android.os.Environment
 import android.util.Log
 import android.widget.Toast
+import androidx.core.app.ActivityCompat
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.fragment.app.FragmentActivity
 import com.fasterxml.jackson.annotation.JsonProperty
-import com.google.gson.Gson
-import com.lagradost.cloudstream3.*
+import com.lagradost.cloudstream3.APIHolder
 import com.lagradost.cloudstream3.APIHolder.removePluginMapping
 import com.lagradost.cloudstream3.AcraApplication.Companion.getActivity
 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.AllLanguagesName
+import com.lagradost.cloudstream3.AutoDownloadMode
 import com.lagradost.cloudstream3.CommonActivity.showToast
+import com.lagradost.cloudstream3.MainAPI
 import com.lagradost.cloudstream3.MainAPI.Companion.settingsForProvider
 import com.lagradost.cloudstream3.MainActivity.Companion.afterPluginsLoadedEvent
+import com.lagradost.cloudstream3.PROVIDER_STATUS_DOWN
+import com.lagradost.cloudstream3.PROVIDER_STATUS_OK
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.TvType
+import com.lagradost.cloudstream3.actions.VideoClickAction
+import com.lagradost.cloudstream3.actions.VideoClickActionHolder
+import com.lagradost.cloudstream3.apmap
 import com.lagradost.cloudstream3.mvvm.debugPrint
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
@@ -28,22 +44,22 @@ import com.lagradost.cloudstream3.plugins.RepositoryManager.ONLINE_PLUGINS_FOLDE
 import com.lagradost.cloudstream3.plugins.RepositoryManager.PREBUILT_REPOSITORIES
 import com.lagradost.cloudstream3.plugins.RepositoryManager.downloadPluginToFile
 import com.lagradost.cloudstream3.plugins.RepositoryManager.getRepoPlugins
-import com.lagradost.cloudstream3.ui.result.UiText
-import com.lagradost.cloudstream3.ui.result.txt
 import com.lagradost.cloudstream3.ui.settings.extensions.REPOSITORIES_KEY
 import com.lagradost.cloudstream3.ui.settings.extensions.RepositoryData
 import com.lagradost.cloudstream3.utils.AppContextUtils.getApiProviderLangSettings
+import com.lagradost.cloudstream3.utils.AppUtils.parseJson
 import com.lagradost.cloudstream3.utils.Coroutines.main
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute
+import com.lagradost.cloudstream3.utils.UiText
 import com.lagradost.cloudstream3.utils.VideoDownloadManager.sanitizeFilename
 import com.lagradost.cloudstream3.utils.extractorApis
+import com.lagradost.cloudstream3.utils.txt
 import dalvik.system.PathClassLoader
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import java.io.File
 import java.io.InputStreamReader
-import java.util.*
 
 // Different keys for local and not since local can be removed at any time without app knowing, hence the local are getting rebuilt on every app start
 const val PLUGINS_KEY = "PLUGINS_KEY"
@@ -163,25 +179,24 @@ object PluginManager {
 
     private val LOCAL_PLUGINS_PATH = CLOUD_STREAM_FOLDER + "plugins"
 
-    public var currentlyLoading: String? = null
+    var currentlyLoading: String? = null
 
     // Maps filepath to plugin
-    val plugins: MutableMap<String, Plugin> =
-        LinkedHashMap<String, Plugin>()
+    val plugins: MutableMap<String, BasePlugin> =
+        LinkedHashMap<String, BasePlugin>()
 
     // Maps urls to plugin
-    val urlPlugins: MutableMap<String, Plugin> =
-        LinkedHashMap<String, Plugin>()
+    val urlPlugins: MutableMap<String, BasePlugin> =
+        LinkedHashMap<String, BasePlugin>()
 
-    private val classLoaders: MutableMap<PathClassLoader, Plugin> =
-        HashMap<PathClassLoader, Plugin>()
+    private val classLoaders: MutableMap<PathClassLoader, BasePlugin> =
+        HashMap<PathClassLoader, BasePlugin>()
 
     var loadedLocalPlugins = false
         private set
 
     var loadedOnlinePlugins = false
         private set
-    private val gson = Gson()
 
     private suspend fun maybeLoadPlugin(context: Context, file: File) {
         val name = file.name
@@ -291,6 +306,9 @@ object PluginManager {
         main {
             val uitext = txt(R.string.plugins_updated, updatedPlugins.size)
             createNotification(activity, uitext, updatedPlugins)
+            /*val navBadge = (activity as MainActivity).binding?.navRailView?.getOrCreateBadge(R.id.navigation_settings)
+            navBadge?.isVisible = true
+            navBadge?.number = 5*/
         }
 
         // ioSafe {
@@ -339,7 +357,7 @@ object PluginManager {
 
             //Omit non-NSFW if mode is set to NSFW only
             if (mode == AutoDownloadMode.NsfwOnly) {
-                if (tvtypes.contains(TvType.NSFW.name) == false) {
+                if (!tvtypes.contains(TvType.NSFW.name)) {
                     return@mapNotNull null
                 }
             }
@@ -440,10 +458,44 @@ object PluginManager {
         val sortedPlugins = dir.listFiles()
         // Always sort plugins alphabetically for reproducible results
 
-        Log.d(TAG, "Files in '${LOCAL_PLUGINS_PATH}' folder: $sortedPlugins")
+        Log.d(TAG, "Files in '${LOCAL_PLUGINS_PATH}' folder: ${sortedPlugins?.size}")
+
+        // Use app-specific external files directory and copy the file there.
+        // We have to do this because on Android 14+, it otherwise gives SecurityException
+        // due to dex files and setReadOnly seems to have no effect unless it it here.
+        val pluginDirectory = File(context.getExternalFilesDir(null), "plugins")
+        if (!pluginDirectory.exists()) {
+            pluginDirectory.mkdirs() // Ensure the plugins directory exists
+        }
+
+        // Make sure all local plugins are fully refreshed.
+        removeKey(PLUGINS_KEY_LOCAL)
 
         sortedPlugins?.sortedBy { it.name }?.apmap { file ->
-            maybeLoadPlugin(context, file)
+            try {
+                val destinationFile = File(pluginDirectory, file.name)
+
+                // Only copy the file if the destination file doesn't exist or if it
+                // has been modified (check file length and modification time).
+                if (!destinationFile.exists() ||
+                    destinationFile.length() != file.length() ||
+                    destinationFile.lastModified() != file.lastModified()) {
+
+                    // Copy the file to the app-specific plugin directory
+                    file.copyTo(destinationFile, overwrite = true)
+
+                    // After copying, set the destination file's modification time
+                    // to match the source file. We do this for performance so that we
+                    // can check the modification time and not make redundant writes.
+                    destinationFile.setLastModified(file.lastModified())
+                }
+
+                // Load the plugin after it has been copied
+                maybeLoadPlugin(context, destinationFile)
+            } catch (t: Throwable) {
+                Log.e(TAG, "Failed to copy the file")
+                logError(t)
+            }
         }
 
         loadedLocalPlugins = true
@@ -475,26 +527,26 @@ object PluginManager {
         Log.i(TAG, "Loading plugin: $data")
 
         return try {
-            // in case of android 14 then
+            // In case of Android 14+ then
             try {
-                File(filePath).setReadOnly()
+                // Set the file as read-only and log if it fails
+                if (!file.setReadOnly()) {
+                    Log.e(TAG, "Failed to set read-only on plugin file: ${file.name}")
+                }
             } catch (t: Throwable) {
-                Log.e(TAG, "Failed to set dex as readonly")
+                Log.e(TAG, "Failed to set dex as read-only")
                 logError(t)
             }
 
             val loader = PathClassLoader(filePath, context.classLoader)
-            var manifest: Plugin.Manifest
+            var manifest: BasePlugin.Manifest
             loader.getResourceAsStream("manifest.json").use { stream ->
                 if (stream == null) {
                     Log.e(TAG, "Failed to load plugin  $fileName: No manifest found")
                     return false
                 }
                 InputStreamReader(stream).use { reader ->
-                    manifest = gson.fromJson(
-                        reader,
-                        Plugin.Manifest::class.java
-                    )
+                    manifest = parseJson(reader, BasePlugin.Manifest::class.java)
                 }
             }
 
@@ -504,10 +556,12 @@ object PluginManager {
             val version: Int = manifest.version ?: PLUGIN_VERSION_NOT_SET.also {
                 Log.d(TAG, "No manifest version for ${data.internalName}")
             }
+
+            @Suppress("UNCHECKED_CAST")
             val pluginClass: Class<*> =
-                loader.loadClass(manifest.pluginClassName) as Class<out Plugin?>
-            val pluginInstance: Plugin =
-                pluginClass.newInstance() as Plugin
+                loader.loadClass(manifest.pluginClassName) as Class<out BasePlugin?>
+            val pluginInstance: BasePlugin =
+                pluginClass.getDeclaredConstructor().newInstance() as BasePlugin
 
             // Sets with the proper version
             setPluginData(data.copy(version = version))
@@ -517,15 +571,17 @@ object PluginManager {
                 return true
             }
 
-            pluginInstance.__filename = file.absolutePath
+            pluginInstance.filename = file.absolutePath
             if (manifest.requiresResources) {
                 Log.d(TAG, "Loading resources for ${data.internalName}")
                 // based on https://stackoverflow.com/questions/7483568/dynamic-resource-loading-from-other-apk
-                val assets = AssetManager::class.java.newInstance()
+                val assets = AssetManager::class.java.getDeclaredConstructor().newInstance()
                 val addAssetPath =
                     AssetManager::class.java.getMethod("addAssetPath", String::class.java)
                 addAssetPath.invoke(assets, file.absolutePath)
-                pluginInstance.resources = Resources(
+
+                @Suppress("DEPRECATION")
+                (pluginInstance as? Plugin)?.resources = Resources(
                     assets,
                     context.resources.displayMetrics,
                     context.resources.configuration
@@ -534,14 +590,18 @@ object PluginManager {
             plugins[filePath] = pluginInstance
             classLoaders[loader] = pluginInstance
             urlPlugins[data.url ?: filePath] = pluginInstance
-            pluginInstance.load(context)
+            if (pluginInstance is Plugin) {
+                pluginInstance.load(context)
+            } else {
+                pluginInstance.load()
+            }
             Log.i(TAG, "Loaded plugin ${data.internalName} successfully")
             currentlyLoading = null
             true
         } catch (e: Throwable) {
             Log.e(TAG, "Failed to load $file: ${Log.getStackTraceString(e)}")
             showToast(
-                context.getActivity(),
+                // context.getActivity(), // we are not always on the main thread
                 context.getString(R.string.plugin_load_fail).format(fileName),
                 Toast.LENGTH_LONG
             )
@@ -566,14 +626,19 @@ object PluginManager {
 
         // remove all registered apis
         synchronized(APIHolder.apis) {
-            APIHolder.apis.filter { api -> api.sourcePlugin == plugin.__filename }.forEach {
+            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 }
+
+        synchronized(VideoClickActionHolder.allVideoClickActions) {
+            VideoClickActionHolder.allVideoClickActions.removeIf { action: VideoClickAction -> action.sourcePlugin == plugin.filename }
         }
-        extractorApis.removeIf { provider: ExtractorApi -> provider.sourcePlugin == plugin.__filename }
 
         classLoaders.values.removeIf { v -> v == plugin }
 
@@ -669,6 +734,60 @@ object PluginManager {
         }
     }
 
+    fun manuallyReloadAndUpdatePlugins(activity: Activity) {
+        showToast(activity.getString(R.string.starting_plugin_update_manually), Toast.LENGTH_LONG)
+
+        loadAllOnlinePlugins(activity)
+        afterPluginsLoadedEvent.invoke(false)
+
+        val urls = (getKey<Array<RepositoryData>>(REPOSITORIES_KEY) ?: emptyArray()) + PREBUILT_REPOSITORIES
+        val onlinePlugins = urls.toList().apmap {
+            getRepoPlugins(it.url)?.toList() ?: emptyList()
+        }.flatten().distinctBy { it.second.url }
+
+        val allPlugins = getPluginsOnline().flatMap { savedData ->
+            onlinePlugins
+                .filter { it.second.internalName == savedData.internalName }
+                .mapNotNull { onlineData ->
+                    OnlinePluginData(savedData, onlineData).takeIf { it.validOnlineData(activity) }
+                }
+        }.distinctBy { it.onlineData.second.url }
+
+        val updatedPlugins = mutableListOf<String>()
+
+        allPlugins.apmap { pluginData ->
+            if (pluginData.isDisabled) {
+                Log.e("PluginManager", "Unloading disabled plugin: ${pluginData.onlineData.second.name}")
+                unloadPlugin(pluginData.savedData.filePath)
+            } else {
+                val existingFile = File(pluginData.savedData.filePath)
+                if (existingFile.exists()) existingFile.delete()
+
+                if (downloadPlugin(activity, pluginData.onlineData.second.url, pluginData.savedData.internalName, existingFile, true)) {
+                    updatedPlugins.add(pluginData.onlineData.second.name)
+                }
+            }
+        }.also {
+            main {
+                val message = if (updatedPlugins.isNotEmpty()) {
+                    activity.getString(R.string.plugins_updated_manually, updatedPlugins.size)
+                } else {
+                    activity.getString(R.string.no_plugins_updated_manually)
+                }
+                showToast(message, Toast.LENGTH_LONG)
+
+                val notificationText = UiText.StringResource(R.string.plugins_updated_manually, listOf(updatedPlugins.size))
+                createNotification(activity, notificationText, updatedPlugins)
+
+            }
+        }
+
+        loadedOnlinePlugins = true
+        afterPluginsLoadedEvent.invoke(false)
+
+        Log.i("PluginManager", "Plugin update done!")
+    }
+
     private fun Context.createNotificationChannel() {
         hasCreatedNotChanel = true
         // Create the NotificationChannel, but only on API 26+ because
@@ -720,9 +839,14 @@ object PluginManager {
             }
 
             val notification = builder.build()
-            with(NotificationManagerCompat.from(context)) {
-                // notificationId is a unique int for each notification that you must define
-                notify((System.currentTimeMillis() / 1000).toInt(), notification)
+            // notificationId is a unique int for each notification that you must define
+            if (ActivityCompat.checkSelfPermission(
+                    context,
+                    Manifest.permission.POST_NOTIFICATIONS
+                ) == PackageManager.PERMISSION_GRANTED
+            ) {
+                NotificationManagerCompat.from(context)
+                    .notify((System.currentTimeMillis() / 1000).toInt(), notification)
             }
             return notification
         } catch (e: Exception) {
@@ -730,4 +854,4 @@ object PluginManager {
             return null
         }
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/plugins/RepositoryManager.kt b/app/src/main/java/com/lagradost/cloudstream3/plugins/RepositoryManager.kt
index d499c84321c..fd3712ba56a 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/plugins/RepositoryManager.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/plugins/RepositoryManager.kt
@@ -79,7 +79,7 @@ object RepositoryManager {
             )
         )
     }
-    val GH_REGEX = Regex("^https://raw.githubusercontent.com/([A-Za-z0-9-]+)/([A-Za-z0-9_.-]+)/(.*)$")
+    private val GH_REGEX = Regex("^https://raw.githubusercontent.com/([A-Za-z0-9-]+)/([A-Za-z0-9_.-]+)/(.*)$")
 
     /* Convert raw.githubusercontent.com urls to cdn.jsdelivr.net if enabled in settings */
     fun convertRawGitUrl(url: String): String {
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 a45ab5f0239..d1b702f4ce3 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/plugins/VotingApi.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/plugins/VotingApi.kt
@@ -15,7 +15,7 @@ import kotlinx.coroutines.sync.withLock
 object VotingApi { // please do not cheat the votes lol
     private const val LOGKEY = "VotingApi"
 
-    private const val apiDomain = "https://counterapi.com/api"
+    private const val API_DOMAIN = "https://counterapi.com/api"
 
     private fun transformUrl(url: String): String = // dont touch or all votes get reset
         MessageDigest
@@ -49,13 +49,13 @@ object VotingApi { // please do not cheat the votes lol
         .joinToString("-")
 
     private suspend fun readVote(pluginUrl: String): Int {
-        var url = "${apiDomain}/cs-${getRepository(pluginUrl)}/vote/${transformUrl(pluginUrl)}?readOnly=true"
+        val url = "${API_DOMAIN}/cs-${getRepository(pluginUrl)}/vote/${transformUrl(pluginUrl)}?readOnly=true"
         Log.d(LOGKEY, "Requesting: $url")
         return app.get(url).parsedSafe<Result>()?.value ?: 0
     }
 
     private suspend fun writeVote(pluginUrl: String): Boolean {
-        var url = "${apiDomain}/cs-${getRepository(pluginUrl)}/vote/${transformUrl(pluginUrl)}"
+        val url = "${API_DOMAIN}/cs-${getRepository(pluginUrl)}/vote/${transformUrl(pluginUrl)}"
         Log.d(LOGKEY, "Requesting: $url")
         return app.get(url).parsedSafe<Result>()?.value != null
     }
@@ -69,8 +69,7 @@ object VotingApi { // please do not cheat the votes lol
         getKey("cs3-votes/${transformUrl(pluginUrl)}") ?: false
 
     fun canVote(pluginUrl: String): Boolean {
-        if (!PluginManager.urlPlugins.contains(pluginUrl)) return false
-        return true
+        return PluginManager.urlPlugins.contains(pluginUrl)
     }
 
     private val voteLock = Mutex()
diff --git a/app/src/main/java/com/lagradost/cloudstream3/services/BackupWorkManager.kt b/app/src/main/java/com/lagradost/cloudstream3/services/BackupWorkManager.kt
index 4ef841f5881..f130831c6ed 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/services/BackupWorkManager.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/services/BackupWorkManager.kt
@@ -1,6 +1,8 @@
 package com.lagradost.cloudstream3.services
 
 import android.content.Context
+import android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC
+import android.os.Build.VERSION.SDK_INT
 import androidx.core.app.NotificationCompat
 import androidx.work.Constraints
 import androidx.work.CoroutineWorker
@@ -82,12 +84,11 @@ class BackupWorkManager(val context: Context, workerParams: WorkerParameters) :
             BACKUP_CHANNEL_DESCRIPTION
         )
 
-        setForeground(
+        val foregroundInfo = if (SDK_INT >= 29)
             ForegroundInfo(
-                BACKUP_NOTIFICATION_ID,
-                backupNotificationBuilder.build()
-            )
-        )
+                BACKUP_NOTIFICATION_ID, backupNotificationBuilder.build(), FOREGROUND_SERVICE_TYPE_DATA_SYNC
+            ) else  ForegroundInfo(BACKUP_NOTIFICATION_ID, backupNotificationBuilder.build())
+        setForeground(foregroundInfo)
 
         BackupUtils.backup(context)
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/PackageInstallerService.kt b/app/src/main/java/com/lagradost/cloudstream3/services/PackageInstallerService.kt
similarity index 83%
rename from app/src/main/java/com/lagradost/cloudstream3/utils/PackageInstallerService.kt
rename to app/src/main/java/com/lagradost/cloudstream3/services/PackageInstallerService.kt
index 57b98dc2378..fa7754718b5 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/PackageInstallerService.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/services/PackageInstallerService.kt
@@ -1,20 +1,21 @@
-package com.lagradost.cloudstream3.utils
+package com.lagradost.cloudstream3.services
 
 import android.app.NotificationManager
-import android.app.PendingIntent
 import android.app.Service
-import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC
-import android.os.Build
+import android.os.Build.VERSION.SDK_INT
 import android.os.IBinder
 import android.util.Log
 import androidx.core.app.NotificationCompat
+import androidx.core.app.PendingIntentCompat
 import com.lagradost.cloudstream3.MainActivity
 import com.lagradost.cloudstream3.MainActivity.Companion.deleteFileOnExit
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.mvvm.logError
+import com.lagradost.cloudstream3.utils.ApkInstaller
 import com.lagradost.cloudstream3.utils.AppContextUtils.createNotificationChannel
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute
@@ -23,18 +24,13 @@ import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import kotlin.math.roundToInt
 
-
 class PackageInstallerService : Service() {
-    val receivers = mutableListOf<BroadcastReceiver>()
+    private var installer: ApkInstaller? = null
 
     private val baseNotification by lazy {
-        val flag = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-            PendingIntent.FLAG_MUTABLE
-        } else 0
-
         val intent = Intent(this, MainActivity::class.java)
         val pendingIntent =
-            PendingIntent.getActivity(this, 0, intent, flag)
+            PendingIntentCompat.getActivity(this, 0, intent, 0, false)
 
         NotificationCompat.Builder(this, UPDATE_CHANNEL_ID)
             .setAutoCancel(false)
@@ -55,18 +51,16 @@ class PackageInstallerService : Service() {
             UPDATE_CHANNEL_NAME,
             UPDATE_CHANNEL_DESCRIPTION
         )
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            startForeground(UPDATE_NOTIFICATION_ID, baseNotification.build(), FOREGROUND_SERVICE_TYPE_DATA_SYNC)
-        } else{
-            startForeground(UPDATE_NOTIFICATION_ID, baseNotification.build())
-        }
+        if (SDK_INT >= 29)
+        startForeground(UPDATE_NOTIFICATION_ID, baseNotification.build(), FOREGROUND_SERVICE_TYPE_DATA_SYNC)
+        else startForeground(UPDATE_NOTIFICATION_ID, baseNotification.build())
     }
 
     private val updateLock = Mutex()
 
     private suspend fun downloadUpdate(url: String): Boolean {
         try {
-            Log.d(LOG_TAG, "Downloading update: $url")
+            Log.d("PackageInstallerService", "Downloading update: $url")
 
             // Delete all old updates
             ioSafe {
@@ -88,11 +82,11 @@ class PackageInstallerService : Service() {
 
                 val body = app.get(url).body
                 val inputStream = body.byteStream()
-                val installer = ApkInstaller(this)
+                installer = ApkInstaller(this)
                 val totalSize = body.contentLength()
                 var currentSize = 0
 
-                installer.installApk(this, inputStream, totalSize, {
+                installer?.installApk(this, inputStream, totalSize, {
                     currentSize += it
                     // Prevent div 0
                     if (totalSize == 0L) return@installApk
@@ -108,6 +102,7 @@ class PackageInstallerService : Service() {
             }
             return true
         } catch (e: Exception) {
+            logError(e)
             updateNotificationProgress(0f, ApkInstaller.InstallProgressStatus.Failed)
             return false
         }
@@ -140,7 +135,7 @@ class PackageInstallerService : Service() {
             .build()
 
         val notificationManager =
-            getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+            getSystemService(NOTIFICATION_SERVICE) as NotificationManager
 
         // Persistent notification on failure
         val id =
@@ -162,21 +157,21 @@ class PackageInstallerService : Service() {
     }
 
     override fun onDestroy() {
-        receivers.forEach {
-            try {
-                this.unregisterReceiver(it)
-            } catch (_: IllegalArgumentException) {
-                // Receiver not registered
-            }
-        }
+        installer?.unregisterInstallActionReceiver()
+        installer = null
+        this.stopSelf()
         super.onDestroy()
     }
 
     override fun onBind(i: Intent?): IBinder? = null
 
+    override fun onTimeout(reason: Int) {
+        stopSelf()
+        Log.e("PackageInstallerService", "Service stopped due to timeout: $reason")
+    }
+
     companion object {
         private const val EXTRA_URL = "EXTRA_URL"
-        private const val LOG_TAG = "PackageInstallerService"
 
         const val UPDATE_CHANNEL_ID = "cloudstream3.updates"
         const val UPDATE_CHANNEL_NAME = "App Updates"
@@ -191,4 +186,4 @@ class PackageInstallerService : Service() {
                 .putExtra(EXTRA_URL, url)
         }
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/services/SubscriptionWorkManager.kt b/app/src/main/java/com/lagradost/cloudstream3/services/SubscriptionWorkManager.kt
index 00c74dfff73..56ab43dbf4e 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/services/SubscriptionWorkManager.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/services/SubscriptionWorkManager.kt
@@ -1,12 +1,12 @@
 package com.lagradost.cloudstream3.services
 
-import android.annotation.SuppressLint
 import android.app.NotificationManager
-import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
-import android.os.Build
+import android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC
+import android.os.Build.VERSION.SDK_INT
 import androidx.core.app.NotificationCompat
+import androidx.core.app.PendingIntentCompat
 import androidx.core.net.toUri
 import androidx.work.*
 import com.lagradost.cloudstream3.*
@@ -14,7 +14,7 @@ import com.lagradost.cloudstream3.APIHolder.getApiFromNameNull
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.plugins.PluginManager
-import com.lagradost.cloudstream3.ui.result.txt
+import com.lagradost.cloudstream3.utils.txt
 import com.lagradost.cloudstream3.utils.AppContextUtils.createNotificationChannel
 import com.lagradost.cloudstream3.utils.AppContextUtils.getApiDubstatusSettings
 import com.lagradost.cloudstream3.utils.Coroutines.ioWork
@@ -75,7 +75,7 @@ class SubscriptionWorkManager(val context: Context, workerParams: WorkerParamete
             .setPriority(NotificationCompat.PRIORITY_DEFAULT)
             .setColor(context.colorFromAttribute(R.attr.colorPrimary))
             .setContentTitle(context.getString(R.string.subscription_in_progress_notification))
-            .setSmallIcon(R.drawable.quantum_ic_refresh_white_24)
+            .setSmallIcon(com.google.android.gms.cast.framework.R.drawable.quantum_ic_refresh_white_24)
             .setProgress(0, 0, true)
 
     private val updateNotificationBuilder =
@@ -98,7 +98,6 @@ class SubscriptionWorkManager(val context: Context, workerParams: WorkerParamete
         )
     }
 
-    @SuppressLint("UnspecifiedImmutableFlag")
     override suspend fun doWork(): Result {
         try {
 //        println("Update subscriptions!")
@@ -108,12 +107,13 @@ class SubscriptionWorkManager(val context: Context, workerParams: WorkerParamete
                 SUBSCRIPTION_CHANNEL_DESCRIPTION
             )
 
-            setForeground(
+            val foregroundInfo = if (SDK_INT >= 29)
                 ForegroundInfo(
                     SUBSCRIPTION_NOTIFICATION_ID,
-                    progressNotificationBuilder.build()
-                )
-            )
+                    progressNotificationBuilder.build(),
+                    FOREGROUND_SERVICE_TYPE_DATA_SYNC
+                ) else ForegroundInfo(SUBSCRIPTION_NOTIFICATION_ID, progressNotificationBuilder.build(),)
+            setForeground(foregroundInfo)
 
             val subscriptions = getAllSubscriptions()
 
@@ -183,19 +183,10 @@ class SubscriptionWorkManager(val context: Context, workerParams: WorkerParamete
                         val intent = Intent(context, MainActivity::class.java).apply {
                             data = savedData.url.toUri()
                             flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
-                        }
+                        }.putExtra(MainActivity.API_NAME_EXTRA_KEY, api.name)
 
                         val pendingIntent =
-                            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                                PendingIntent.getActivity(
-                                    context,
-                                    0,
-                                    intent,
-                                    PendingIntent.FLAG_IMMUTABLE
-                                )
-                            } else {
-                                PendingIntent.getActivity(context, 0, intent, 0)
-                            }
+                            PendingIntentCompat.getActivity(context, 0, intent, 0, false)
 
                         val poster = ioWork {
                             savedData.posterUrl?.let { url ->
diff --git a/app/src/main/java/com/lagradost/cloudstream3/subtitles/AbstractSubProvider.kt b/app/src/main/java/com/lagradost/cloudstream3/subtitles/AbstractSubProvider.kt
index 857fba11676..bfc6dacb65e 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/subtitles/AbstractSubProvider.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/subtitles/AbstractSubProvider.kt
@@ -2,12 +2,17 @@ package com.lagradost.cloudstream3.subtitles
 
 import androidx.annotation.WorkerThread
 import androidx.core.net.toUri
+import com.lagradost.cloudstream3.APIHolder.unixTime
+import com.lagradost.cloudstream3.ErrorLoadingException
 import com.lagradost.cloudstream3.MainActivity.Companion.deleteFileOnExit
 import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.mvvm.Resource
+import com.lagradost.cloudstream3.mvvm.safeApiCall
 import com.lagradost.cloudstream3.subtitles.AbstractSubtitleEntities.SubtitleEntity
 import com.lagradost.cloudstream3.subtitles.AbstractSubtitleEntities.SubtitleSearch
 import com.lagradost.cloudstream3.syncproviders.AuthAPI
 import com.lagradost.cloudstream3.ui.player.SubtitleOrigin
+import com.lagradost.cloudstream3.utils.Coroutines.threadSafeListOf
 import okio.BufferedSource
 import okio.buffer
 import okio.sink
@@ -19,21 +24,25 @@ interface AbstractSubProvider {
     val idPrefix: String
 
     @WorkerThread
+    @Throws
     suspend fun search(query: SubtitleSearch): List<SubtitleEntity>? {
         throw NotImplementedError()
     }
 
     @WorkerThread
+    @Throws
     suspend fun load(data: SubtitleEntity): String? {
         throw NotImplementedError()
     }
 
     @WorkerThread
+    @Throws
     suspend fun SubtitleResource.getResources(data: SubtitleEntity) {
         this.addUrl(load(data))
     }
 
     @WorkerThread
+    @Throws
     suspend fun getResource(data: SubtitleEntity): SubtitleResource {
         return SubtitleResource().apply {
             this.getResources(data)
@@ -41,6 +50,86 @@ interface AbstractSubProvider {
     }
 }
 
+class SubRepository(val api: AbstractSubProvider) {
+    companion object {
+        data class SavedSearchResponse(
+            val unixTime: Long,
+            val response: List<SubtitleEntity>,
+            val query: SubtitleSearch
+        )
+
+        data class SavedResourceResponse(
+            val unixTime: Long,
+            val response: SubtitleResource,
+            val query: SubtitleEntity
+        )
+
+        // maybe make this a generic struct? right now there is a lot of boilerplate
+        private val searchCache = threadSafeListOf<SavedSearchResponse>()
+        private var searchCacheIndex: Int = 0
+        private val resourceCache = threadSafeListOf<SavedResourceResponse>()
+        private var resourceCacheIndex: Int = 0
+        const val CACHE_SIZE = 20
+    }
+
+    val idPrefix: String get() = api.idPrefix
+
+    @WorkerThread
+    suspend fun getResource(data: SubtitleEntity): Resource<SubtitleResource> = safeApiCall {
+        synchronized(resourceCache) {
+            for (item in resourceCache) {
+                // 20 min save
+                if (item.query == data && (unixTime - item.unixTime) < 60 * 20) {
+                    return@safeApiCall item.response
+                }
+            }
+        }
+
+        val returnValue = api.getResource(data)
+        synchronized(resourceCache) {
+            val add = SavedResourceResponse(unixTime, returnValue, data)
+            if (resourceCache.size > CACHE_SIZE) {
+                resourceCache[resourceCacheIndex] = add // rolling cache
+                resourceCacheIndex = (resourceCacheIndex + 1) % CACHE_SIZE
+            } else {
+                resourceCache.add(add)
+            }
+        }
+        returnValue
+    }
+
+    @WorkerThread
+    suspend fun search(query: SubtitleSearch): Resource<List<SubtitleEntity>> {
+        return safeApiCall {
+            synchronized(searchCache) {
+                for (item in searchCache) {
+                    // 120 min save
+                    if (item.query == query && (unixTime - item.unixTime) < 60 * 120) {
+                        return@safeApiCall item.response
+                    }
+                }
+            }
+
+            val returnValue = api.search(query) ?: throw ErrorLoadingException("Null subtitles")
+
+            // only cache valid return values
+            if (returnValue.isNotEmpty()) {
+                val add = SavedSearchResponse(unixTime, returnValue, query)
+                synchronized(searchCache) {
+                    if (searchCache.size > CACHE_SIZE) {
+                        searchCache[searchCacheIndex] = add // rolling cache
+                        searchCacheIndex = (searchCacheIndex + 1) % CACHE_SIZE
+                    } else {
+                        searchCache.add(add)
+                    }
+                }
+            }
+            returnValue
+        }
+    }
+
+}
+
 /**
  * A builder for subtitle files.
  * @see addUrl
@@ -59,7 +148,7 @@ class SubtitleResource {
         return file
     }
 
-    fun unzip(file: File): List<Pair<String, File>> {
+    private fun unzip(file: File): List<Pair<String, File>> {
         val entries = mutableListOf<Pair<String, File>>()
 
         ZipInputStream(file.inputStream()).use { zipInputStream ->
diff --git a/app/src/main/java/com/lagradost/cloudstream3/subtitles/AbstractSubtitleEntities.kt b/app/src/main/java/com/lagradost/cloudstream3/subtitles/AbstractSubtitleEntities.kt
index ed4ccb74a9b..685b499bb59 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/subtitles/AbstractSubtitleEntities.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/subtitles/AbstractSubtitleEntities.kt
@@ -1,6 +1,5 @@
 package com.lagradost.cloudstream3.subtitles
 
-import com.lagradost.cloudstream3.LoadResponse
 import com.lagradost.cloudstream3.TvType
 
 class AbstractSubtitleEntities {
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 0259ccad35a..2e14c3c46fd 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/AccountManager.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/AccountManager.kt
@@ -56,22 +56,22 @@ abstract class AccountManager(private val defIndex: Int) : AuthAPI {
                 subSourceApi
             )
 
-        const val appString = "cloudstreamapp"
-        const val appStringRepo = "cloudstreamrepo"
-        const val appStringPlayer = "cloudstreamplayer"
+        const val APP_STRING = "cloudstreamapp"
+        const val APP_STRING_REPO = "cloudstreamrepo"
+        const val APP_STRING_PLAYER = "cloudstreamplayer"
 
         // Instantly start the search given a query
-        const val appStringSearch = "cloudstreamsearch"
+        const val APP_STRING_SEARCH = "cloudstreamsearch"
 
         // Instantly resume watching a show
-        const val appStringResumeWatching = "cloudstreamcontinuewatching"
+        const val APP_STRING_RESUME_WATCHING = "cloudstreamcontinuewatching"
 
         val unixTime: Long
             get() = System.currentTimeMillis() / 1000L
         val unixTimeMs: Long
             get() = System.currentTimeMillis()
 
-        const val maxStale = 60 * 10
+        const val MAX_STALE = 60 * 10
 
         fun secondsToReadable(seconds: Int, completedValue: String): String {
             var secondsLong = seconds.toLong()
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 878e0cb3bfe..9d43685c830 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/SyncApi.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/SyncApi.kt
@@ -3,8 +3,9 @@ package com.lagradost.cloudstream3.syncproviders
 import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.ui.SyncWatchType
 import com.lagradost.cloudstream3.ui.library.ListSorting
-import com.lagradost.cloudstream3.ui.result.UiText
+import com.lagradost.cloudstream3.utils.UiText
 import me.xdrop.fuzzywuzzy.FuzzySearch
+import java.util.Date
 
 interface SyncAPI : OAuth2API {
     /**
@@ -124,6 +125,8 @@ interface SyncAPI : OAuth2API {
                 ListSorting.AlphabeticalZ -> items.sortedBy { it.name }.reversed()
                 ListSorting.UpdatedNew -> items.sortedBy { it.lastUpdatedUnixTime?.times(-1) }
                 ListSorting.UpdatedOld -> items.sortedBy { it.lastUpdatedUnixTime }
+                ListSorting.ReleaseDateNew -> items.sortedByDescending { it.releaseDate }
+                ListSorting.ReleaseDateOld -> items.sortedBy { it.releaseDate }
                 else -> items
             }
         }
@@ -158,9 +161,10 @@ interface SyncAPI : OAuth2API {
         override var posterUrl: String?,
         override var posterHeaders: Map<String, String>?,
         override var quality: SearchQuality?,
+        val releaseDate: Date?,
         override var id: Int? = null,
         val plot : String? = null,
         val rating: Int? = null,
-        val tags: List<String>? = null,
+        val tags: List<String>? = null
     ) : SearchResponse
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/Addic7ed.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/Addic7ed.kt
index 507c5e2acf7..db4676393ab 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/Addic7ed.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/Addic7ed.kt
@@ -18,13 +18,13 @@ class Addic7ed : AbstractSubApi {
     override fun logOut() {}
 
     companion object {
-        const val host = "https://www.addic7ed.com"
+        const val HOST = "https://www.addic7ed.com"
         const val TAG = "ADDIC7ED"
     }
 
     private fun fixUrl(url: String): String {
-        return if (url.startsWith("/")) host + url
-        else if (!url.startsWith("http")) "$host/$url"
+        return if (url.startsWith("/")) HOST + url
+        else if (!url.startsWith("http")) "$HOST/$url"
         else url
 
     }
@@ -62,7 +62,7 @@ class Addic7ed : AbstractSubApi {
         }
 
         val title = queryText.substringBefore("(").trim()
-        val url = "$host/search.php?search=${title}&Submit=Search"
+        val url = "$HOST/search.php?search=${title}&Submit=Search"
         val hostDocument = app.get(url).document
         var searchResult = ""
         if (!hostDocument.select("span:contains($title)").isNullOrEmpty()) searchResult = url
@@ -74,8 +74,8 @@ class Addic7ed : AbstractSubApi {
                 hostDocument.selectFirst("#sl button")?.attr("onmouseup")?.substringAfter("(")
                     ?.substringBefore(",")
             val doc = app.get(
-                "$host/ajax_loadShow.php?show=$show&season=$seasonNum&langs=&hd=undefined&hi=undefined",
-                referer = "$host/"
+                "$HOST/ajax_loadShow.php?show=$show&season=$seasonNum&langs=&hd=undefined&hi=undefined",
+                referer = "$HOST/"
             ).document
             doc.select("#season tr:contains($queryLang)").mapNotNull { node ->
                 if (node.selectFirst("td")?.text()
@@ -97,7 +97,7 @@ class Addic7ed : AbstractSubApi {
             val link = fixUrl(node.select("a.buttonDownload").attr("href"))
             val isHearingImpaired =
                 !node.parent()!!.select("tr:last-child [title=\"Hearing Impaired\"]").isNullOrEmpty()
-            cleanResources(results, name, link, mapOf("referer" to "$host/"), isHearingImpaired)
+            cleanResources(results, name, link, mapOf("referer" to "$HOST/"), isHearingImpaired)
         }
         return results
     }
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 8a82cf94e5d..68a4a9a544a 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
@@ -15,16 +15,17 @@ import com.lagradost.cloudstream3.syncproviders.SyncAPI
 import com.lagradost.cloudstream3.syncproviders.SyncIdName
 import com.lagradost.cloudstream3.ui.SyncWatchType
 import com.lagradost.cloudstream3.ui.library.ListSorting
-import com.lagradost.cloudstream3.ui.result.txt
-import com.lagradost.cloudstream3.utils.AppUtils.parseJson
+import com.lagradost.cloudstream3.utils.txt
 import com.lagradost.cloudstream3.utils.AppContextUtils.splitQuery
+import com.lagradost.cloudstream3.utils.AppUtils.parseJson
 import com.lagradost.cloudstream3.utils.AppUtils.toJson
 import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import com.lagradost.cloudstream3.utils.DataStore.toKotlinObject
+import com.lagradost.cloudstream3.utils.DataStoreHelper.toYear
 import java.net.URL
 import java.net.URLEncoder
-import java.util.*
+import java.util.Locale
 
 class AniListApi(index: Int) : AccountManager(index), SyncAPI {
     override var name = "AniList"
@@ -63,7 +64,7 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI {
 
     override suspend fun handleRedirect(url: String): Boolean {
         val sanitizer =
-            splitQuery(URL(url.replace(appString, "https").replace("/#", "?"))) // FIX ERROR
+            splitQuery(URL(url.replace(APP_STRING, "https").replace("/#", "?"))) // FIX ERROR
         val token = sanitizer["access_token"]!!
         val expiresIn = sanitizer["expires_in"]!!
 
@@ -87,7 +88,7 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI {
 
     override suspend fun search(name: String): List<SyncAPI.SyncSearchResult>? {
         val data = searchShows(name) ?: return null
-        return data.data?.Page?.media?.map {
+        return data.data?.page?.media?.map {
             SyncAPI.SyncSearchResult(
                 it.title.romaji ?: return null,
                 this.name,
@@ -101,7 +102,7 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI {
     override suspend fun getResult(id: String): SyncAPI.SyncResult {
         val internalId = (Regex("anilist\\.co/anime/(\\d*)").find(id)?.groupValues?.getOrNull(1)
             ?: id).toIntOrNull() ?: throw ErrorLoadingException("Invalid internalId")
-        val season = getSeason(internalId).data.Media
+        val season = getSeason(internalId).data.media
 
         return SyncAPI.SyncResult(
             season.id.toString(),
@@ -301,12 +302,12 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI {
             //println("NAME $name NEW NAME ${name.replace(blackListRegex, "")}")
             val shows = searchShows(name.replace(blackListRegex, ""))
 
-            shows?.data?.Page?.media?.find {
+            shows?.data?.page?.media?.find {
                 (malId ?: "NONE") == it.idMal.toString()
             }?.let { return it }
 
             val filtered =
-                shows?.data?.Page?.media?.filter {
+                shows?.data?.page?.media?.filter {
                     (((it.startDate.year ?: year.toString()) == year.toString()
                             || year == null))
                 }
@@ -496,7 +497,7 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI {
         val data = postApi(q, true)
         val d = parseJson<GetDataRoot>(data ?: return null)
 
-        val main = d.data?.Media
+        val main = d.data?.media
         if (main?.mediaListEntry != null) {
             return AniListTitleHolder(
                 title = main.title,
@@ -536,7 +537,7 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI {
                     headers = mapOf(
                         "Authorization" to "Bearer " + (getAuth()
                             ?: return@suspendSafeApiCall null),
-                        if (cache) "Cache-Control" to "max-stale=$maxStale" else "Cache-Control" to "no-cache"
+                        if (cache) "Cache-Control" to "max-stale=$MAX_STALE" else "Cache-Control" to "no-cache"
                     ),
                     cacheTime = 0,
                     data = mapOf(
@@ -631,8 +632,9 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI {
                 ?: this.media.coverImage.medium,
                 null,
                 null,
+                this.media.seasonYear.toYear(),
                 null,
-                plot = this.media.description
+                plot = this.media.description,
             )
         }
     }
@@ -647,7 +649,7 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI {
     )
 
     data class Data(
-        @JsonProperty("MediaListCollection") val MediaListCollection: MediaListCollection
+        @JsonProperty("MediaListCollection") val mediaListCollection: MediaListCollection
     )
 
     private fun getAniListListCached(): Array<Lists>? {
@@ -659,7 +661,7 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI {
 
         if (checkToken()) return null
         return if (requireLibraryRefresh) {
-            val list = getFullAniListList()?.data?.MediaListCollection?.lists?.toTypedArray()
+            val list = getFullAniListList()?.data?.mediaListCollection?.lists?.toTypedArray()
             if (list != null) {
                 setKey(ANILIST_CACHED_LIST, list)
             }
@@ -678,7 +680,7 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI {
 
         // To fill empty lists when AniList does not return them
         val baseMap =
-            AniListStatusType.values().filter { it.value >= 0 }.associate {
+            AniListStatusType.entries.filter { it.value >= 0 }.associate {
                 it.stringRes to emptyList<SyncAPI.LibraryItem>()
             }
 
@@ -689,6 +691,8 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI {
                 ListSorting.AlphabeticalZ,
                 ListSorting.UpdatedNew,
                 ListSorting.UpdatedOld,
+                ListSorting.ReleaseDateNew,
+                ListSorting.ReleaseDateOld,
                 ListSorting.RatingHigh,
                 ListSorting.RatingLow,
             )
@@ -764,7 +768,7 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI {
 
     /** Used to query a saved MediaItem on the list to get the id for removal */
     data class MediaListItemRoot(@JsonProperty("data") val data: MediaListItem? = null)
-    data class MediaListItem(@JsonProperty("MediaList") val MediaList: MediaListId? = null)
+    data class MediaListItem(@JsonProperty("MediaList") val mediaList: MediaListId? = null)
     data class MediaListId(@JsonProperty("id") val id: Long? = null)
 
     private suspend fun postDataAboutId(
@@ -787,7 +791,7 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI {
                 """
                 val response = postApi(idQuery)
                 val listId =
-                    tryParseJson<MediaListItemRoot>(response)?.data?.MediaList?.id ?: return false
+                    tryParseJson<MediaListItemRoot>(response)?.data?.mediaList?.id ?: return false
                 """
                     mutation(${'$'}id: Int = $listId) {
                         DeleteMediaListEntry(id: ${'$'}id) {
@@ -836,7 +840,7 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI {
         val data = postApi(q)
         if (data.isNullOrBlank()) return null
         val userData = parseJson<AniListRoot>(data)
-        val u = userData.data?.Viewer
+        val u = userData.data?.viewer
         val user = AniListUser(
             u?.id,
             u?.name,
@@ -858,8 +862,8 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI {
         suspend fun getSeasonRecursive(id: Int) {
             val season = getSeason(id)
             seasons.add(season)
-            if (season.data.Media.format?.startsWith("TV") == true) {
-                season.data.Media.relations?.edges?.forEach {
+            if (season.data.media.format?.startsWith("TV") == true) {
+                season.data.media.relations?.edges?.forEach {
                     if (it.node?.format != null) {
                         if (it.relationType == "SEQUEL" && it.node.format.startsWith("TV")) {
                             getSeasonRecursive(it.node.id)
@@ -878,7 +882,7 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI {
     )
 
     data class SeasonData(
-        @JsonProperty("Media") val Media: SeasonMedia,
+        @JsonProperty("Media") val media: SeasonMedia,
     )
 
     data class SeasonMedia(
@@ -1050,7 +1054,7 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI {
     )
 
     data class AniListData(
-        @JsonProperty("Viewer") val Viewer: AniListViewer?,
+        @JsonProperty("Viewer") val viewer: AniListViewer?,
     )
 
     data class AniListRoot(
@@ -1090,7 +1094,7 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI {
     )
 
     data class LikeData(
-        @JsonProperty("Viewer") val Viewer: LikeViewer?,
+        @JsonProperty("Viewer") val viewer: LikeViewer?,
     )
 
     data class LikeRoot(
@@ -1130,7 +1134,7 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI {
     )
 
     data class GetDataData(
-        @JsonProperty("Media") val Media: GetDataMedia?,
+        @JsonProperty("Media") val media: GetDataMedia?,
     )
 
     data class GetDataRoot(
@@ -1163,7 +1167,7 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI {
     )
 
     data class GetSearchPage(
-        @JsonProperty("Page") val Page: GetSearchData?,
+        @JsonProperty("Page") val page: GetSearchData?,
     )
 
     data class GetSearchData(
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 00f8d00cfb8..2b51f7efdf6 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
@@ -7,7 +7,7 @@ import com.lagradost.cloudstream3.syncproviders.SyncAPI
 import com.lagradost.cloudstream3.syncproviders.SyncIdName
 import com.lagradost.cloudstream3.ui.WatchType
 import com.lagradost.cloudstream3.ui.library.ListSorting
-import com.lagradost.cloudstream3.ui.result.txt
+import com.lagradost.cloudstream3.utils.txt
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
 import com.lagradost.cloudstream3.utils.Coroutines.ioWork
@@ -119,8 +119,11 @@ class LocalList : SyncAPI {
                 ListSorting.AlphabeticalZ,
                 ListSorting.UpdatedNew,
                 ListSorting.UpdatedOld,
+                ListSorting.ReleaseDateNew,
+                ListSorting.ReleaseDateOld,
 //                ListSorting.RatingHigh,
 //                ListSorting.RatingLow,
+
             )
         )
     }
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 24ef7136bda..4836eca131d 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
@@ -18,15 +18,20 @@ import com.lagradost.cloudstream3.syncproviders.SyncAPI
 import com.lagradost.cloudstream3.syncproviders.SyncIdName
 import com.lagradost.cloudstream3.ui.SyncWatchType
 import com.lagradost.cloudstream3.ui.library.ListSorting
-import com.lagradost.cloudstream3.ui.result.txt
-import com.lagradost.cloudstream3.utils.AppUtils.parseJson
+import com.lagradost.cloudstream3.utils.txt
 import com.lagradost.cloudstream3.utils.AppContextUtils.splitQuery
+import com.lagradost.cloudstream3.utils.AppUtils.parseJson
 import com.lagradost.cloudstream3.utils.DataStore.toKotlinObject
 import java.net.URL
 import java.security.SecureRandom
 import java.text.ParseException
 import java.text.SimpleDateFormat
-import java.util.*
+import java.time.Instant
+import java.time.format.DateTimeFormatter
+import java.util.Calendar
+import java.util.Date
+import java.util.Locale
+import java.util.TimeZone
 
 /** max 100 via https://myanimelist.net/apiconfig/references/api/v2#tag/anime */
 const val MAL_MAX_SEARCH_LIMIT = 25
@@ -51,7 +56,6 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI {
     }
 
     override fun loginInfo(): AuthAPI.LoginInfo? {
-        //getMalUser(true)?
         getKey<MalUser>(accountId, MAL_USER_KEY)?.let { user ->
             return AuthAPI.LoginInfo(
                 profilePicture = user.picture,
@@ -84,7 +88,7 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI {
                 this.name,
                 node.id.toString(),
                 "$mainUrl/anime/${node.id}/",
-                node.main_picture?.large ?: node.main_picture?.medium
+                node.mainPicture?.large ?: node.mainPicture?.medium
             )
         }
     }
@@ -178,7 +182,7 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI {
 
     private fun parseDate(string: String?): Long? {
         return try {
-            SimpleDateFormat("yyyy-MM-dd")?.parse(string ?: return null)?.time
+            SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()).parse(string ?: return null)?.time
         } catch (e: Exception) {
             null
         }
@@ -190,7 +194,7 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI {
             apiName = this.name,
             syncId = node.id.toString(),
             url = "$mainUrl/anime/${node.id}",
-            posterUrl = node.main_picture?.large
+            posterUrl = node.mainPicture?.large
         )
     }
 
@@ -244,12 +248,12 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI {
         val internalId = id.toIntOrNull() ?: return null
 
         val data =
-            getDataAboutMalId(internalId)?.my_list_status //?: throw ErrorLoadingException("No my_list_status")
+            getDataAboutMalId(internalId)?.myListStatus //?: throw ErrorLoadingException("No my_list_status")
         return SyncAPI.SyncStatus(
             score = data?.score,
-            status = SyncWatchType.fromInternalId(malStatusAsString.indexOf(data?.status)) ,
+            status = SyncWatchType.fromInternalId(malStatusAsString.indexOf(data?.status)),
             isFavorite = null,
-            watchedEpisodes = data?.num_episodes_watched,
+            watchedEpisodes = data?.numEpisodesWatched,
         )
     }
 
@@ -291,7 +295,7 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI {
 
         private fun parseDateLong(string: String?): Long? {
             return try {
-                SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ").parse(
+                SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ", Locale.getDefault()).parse(
                     string ?: return null
                 )?.time?.div(1000)
             } catch (e: Exception) {
@@ -302,7 +306,7 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI {
 
     override suspend fun handleRedirect(url: String): Boolean {
         val sanitizer =
-            splitQuery(URL(url.replace(appString, "https").replace("/#", "?"))) // FIX ERROR
+            splitQuery(URL(url.replace(APP_STRING, "https").replace("/#", "?"))) // FIX ERROR
         val state = sanitizer["state"]!!
         if (state == "RequestID$requestId") {
             val currentCode = sanitizer["code"]!!
@@ -351,9 +355,9 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI {
         try {
             if (response != "") {
                 val token = parseJson<ResponseToken>(response)
-                setKey(accountId, MAL_UNIXTIME_KEY, (token.expires_in + unixTime))
-                setKey(accountId, MAL_REFRESH_TOKEN_KEY, token.refresh_token)
-                setKey(accountId, MAL_TOKEN_KEY, token.access_token)
+                setKey(accountId, MAL_UNIXTIME_KEY, (token.expiresIn + unixTime))
+                setKey(accountId, MAL_REFRESH_TOKEN_KEY, token.refreshToken)
+                setKey(accountId, MAL_TOKEN_KEY, token.accessToken)
                 requireLibraryRefresh = true
             }
         } catch (e: Exception) {
@@ -395,56 +399,62 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI {
     data class Node(
         @JsonProperty("id") val id: Int,
         @JsonProperty("title") val title: String,
-        @JsonProperty("main_picture") val main_picture: MainPicture?,
-        @JsonProperty("alternative_titles") val alternative_titles: AlternativeTitles?,
-        @JsonProperty("media_type") val media_type: String?,
-        @JsonProperty("num_episodes") val num_episodes: Int?,
+        @JsonProperty("main_picture") val mainPicture: MainPicture?,
+        @JsonProperty("alternative_titles") val alternativeTitles: AlternativeTitles?,
+        @JsonProperty("media_type") val mediaType: String?,
+        @JsonProperty("num_episodes") val numEpisodes: Int?,
         @JsonProperty("status") val status: String?,
-        @JsonProperty("start_date") val start_date: String?,
-        @JsonProperty("end_date") val end_date: String?,
-        @JsonProperty("average_episode_duration") val average_episode_duration: Int?,
+        @JsonProperty("start_date") val startDate: String?,
+        @JsonProperty("end_date") val endDate: String?,
+        @JsonProperty("average_episode_duration") val averageEpisodeDuration: Int?,
         @JsonProperty("synopsis") val synopsis: String?,
         @JsonProperty("mean") val mean: Double?,
         @JsonProperty("genres") val genres: List<Genres>?,
         @JsonProperty("rank") val rank: Int?,
         @JsonProperty("popularity") val popularity: Int?,
-        @JsonProperty("num_list_users") val num_list_users: Int?,
-        @JsonProperty("num_favorites") val num_favorites: Int?,
-        @JsonProperty("num_scoring_users") val num_scoring_users: Int?,
-        @JsonProperty("start_season") val start_season: StartSeason?,
+        @JsonProperty("num_list_users") val numListUsers: Int?,
+        @JsonProperty("num_favorites") val numFavorites: Int?,
+        @JsonProperty("num_scoring_users") val numScoringUsers: Int?,
+        @JsonProperty("start_season") val startSeason: StartSeason?,
         @JsonProperty("broadcast") val broadcast: Broadcast?,
         @JsonProperty("nsfw") val nsfw: String?,
-        @JsonProperty("created_at") val created_at: String?,
-        @JsonProperty("updated_at") val updated_at: String?
+        @JsonProperty("created_at") val createdAt: String?,
+        @JsonProperty("updated_at") val updatedAt: String?
     )
 
     data class ListStatus(
         @JsonProperty("status") val status: String?,
         @JsonProperty("score") val score: Int,
-        @JsonProperty("num_episodes_watched") val num_episodes_watched: Int,
-        @JsonProperty("is_rewatching") val is_rewatching: Boolean,
-        @JsonProperty("updated_at") val updated_at: String,
+        @JsonProperty("num_episodes_watched") val numEpisodesWatched: Int,
+        @JsonProperty("is_rewatching") val isRewatching: Boolean,
+        @JsonProperty("updated_at") val updatedAt: String,
     )
 
     data class Data(
         @JsonProperty("node") val node: Node,
-        @JsonProperty("list_status") val list_status: ListStatus?,
+        @JsonProperty("list_status") val listStatus: ListStatus?,
     ) {
         fun toLibraryItem(): SyncAPI.LibraryItem {
             return SyncAPI.LibraryItem(
                 this.node.title,
                 "https://myanimelist.net/anime/${this.node.id}/",
                 this.node.id.toString(),
-                this.list_status?.num_episodes_watched,
-                this.node.num_episodes,
-                this.list_status?.score?.times(10),
-                parseDateLong(this.list_status?.updated_at),
+                this.listStatus?.numEpisodesWatched,
+                this.node.numEpisodes,
+                this.listStatus?.score?.times(10),
+                parseDateLong(this.listStatus?.updatedAt),
                 "MAL",
                 TvType.Anime,
-                this.node.main_picture?.large ?: this.node.main_picture?.medium,
+                this.node.mainPicture?.large ?: this.node.mainPicture?.medium,
                 null,
                 null,
                 plot = this.node.synopsis,
+                releaseDate = if (this.node.startDate == null) null else try {Date.from(
+                    Instant.from(
+                        DateTimeFormatter.ofPattern(if (this.node.startDate.length == 4) "yyyy" else if (this.node.startDate.length == 7) "yyyy-MM" else "yyyy-MM-dd")
+                            .parse(this.node.startDate)
+                    )
+                )} catch (_: RuntimeException) {null}
             )
         }
     }
@@ -470,8 +480,8 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI {
     )
 
     data class Broadcast(
-        @JsonProperty("day_of_the_week") val day_of_the_week: String?,
-        @JsonProperty("start_time") val start_time: String?
+        @JsonProperty("day_of_the_week") val dayOfTheWeek: String?,
+        @JsonProperty("start_time") val startTime: String?
     )
 
     private fun getMalAnimeListCached(): Array<Data>? {
@@ -491,14 +501,14 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI {
 
     override suspend fun getPersonalLibrary(): SyncAPI.LibraryMetadata {
         val list = getMalAnimeListSmart()?.groupBy {
-            convertToStatus(it.list_status?.status ?: "").stringRes
+            convertToStatus(it.listStatus?.status ?: "").stringRes
         }?.mapValues { group ->
             group.value.map { it.toLibraryItem() }
         } ?: emptyMap()
 
         // To fill empty lists when MAL does not return them
         val baseMap =
-            MalStatusType.values().filter { it.value >= 0 }.associate {
+            MalStatusType.entries.filter { it.value >= 0 }.associate {
                 it.stringRes to emptyList<SyncAPI.LibraryItem>()
             }
 
@@ -509,6 +519,8 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI {
                 ListSorting.AlphabeticalZ,
                 ListSorting.UpdatedNew,
                 ListSorting.UpdatedOld,
+                ListSorting.ReleaseDateNew,
+                ListSorting.ReleaseDateOld,
                 ListSorting.RatingHigh,
                 ListSorting.RatingLow,
             )
@@ -573,7 +585,7 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI {
             ).text
             val values = parseJson<MalRoot>(res)
             val titles =
-                values.data.map { MalTitleHolder(it.list_status, it.node.id, it.node.title) }
+                values.data.map { MalTitleHolder(it.listStatus, it.node.id, it.node.title) }
             for (t in titles) {
                 allTitles[t.id] = t
             }
@@ -582,11 +594,13 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI {
         }
     }
 
-    fun convertJapanTimeToTimeRemaining(date: String, endDate: String? = null): String? {
+    private fun convertJapanTimeToTimeRemaining(date: String, endDate: String? = null): String? {
         // No time remaining if the show has already ended
         try {
             endDate?.let {
-                if (SimpleDateFormat("yyyy-MM-dd").parse(it).time < System.currentTimeMillis()) return@convertJapanTimeToTimeRemaining null
+                if (SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()).parse(it)
+                        ?.before(Date.from(Instant.now())) != false
+                ) return@convertJapanTimeToTimeRemaining null
             }
         } catch (e: ParseException) {
             logError(e)
@@ -603,7 +617,7 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI {
         val currentWeek = currentDate.get(Calendar.WEEK_OF_MONTH)
         val currentYear = currentDate.get(Calendar.YEAR)
 
-        val dateFormat = SimpleDateFormat("yyyy MM W EEEE HH:mm")
+        val dateFormat = SimpleDateFormat("yyyy MM W EEEE HH:mm", Locale.getDefault())
         dateFormat.timeZone = TimeZone.getTimeZone("Japan")
         val parsedDate =
             dateFormat.parse("$currentYear $currentMonth $currentWeek $date") ?: return null
@@ -647,13 +661,13 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI {
         id: Int,
         status: MalStatusType? = null,
         score: Int? = null,
-        num_watched_episodes: Int? = null,
+        numWatchedEpisodes: Int? = null,
     ): Boolean {
         val res = setScoreRequest(
             id,
             if (status == null) null else malStatusAsString[maxOf(0, status.value)],
             score,
-            num_watched_episodes
+            numWatchedEpisodes
         )
 
         return if (res.isNullOrBlank()) {
@@ -670,17 +684,18 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI {
         }
     }
 
+    @Suppress("UNCHECKED_CAST")
     private suspend fun setScoreRequest(
         id: Int,
         status: String? = null,
         score: Int? = null,
-        num_watched_episodes: Int? = null,
+        numWatchedEpisodes: Int? = null,
     ): String? {
         val data = mapOf(
             "status" to status,
             "score" to score?.toString(),
-            "num_watched_episodes" to num_watched_episodes?.toString()
-        ).filter { it.value != null } as Map<String, String>
+            "num_watched_episodes" to numWatchedEpisodes?.toString()
+        ).filterValues { it != null } as Map<String, String>
 
         return app.put(
             "$apiUrl/v2/anime/$id/my_list_status",
@@ -693,10 +708,10 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI {
 
 
     data class ResponseToken(
-        @JsonProperty("token_type") val token_type: String,
-        @JsonProperty("expires_in") val expires_in: Int,
-        @JsonProperty("access_token") val access_token: String,
-        @JsonProperty("refresh_token") val refresh_token: String,
+        @JsonProperty("token_type") val tokenType: String,
+        @JsonProperty("expires_in") val expiresIn: Int,
+        @JsonProperty("access_token") val accessToken: String,
+        @JsonProperty("refresh_token") val refreshToken: String,
     )
 
     data class MalRoot(
@@ -705,7 +720,7 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI {
 
     data class MalDatum(
         @JsonProperty("node") val node: MalNode,
-        @JsonProperty("list_status") val list_status: MalStatus,
+        @JsonProperty("list_status") val listStatus: MalStatus,
     )
 
     data class MalNode(
@@ -722,16 +737,16 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI {
     data class MalStatus(
         @JsonProperty("status") val status: String,
         @JsonProperty("score") val score: Int,
-        @JsonProperty("num_episodes_watched") val num_episodes_watched: Int,
-        @JsonProperty("is_rewatching") val is_rewatching: Boolean,
-        @JsonProperty("updated_at") val updated_at: String,
+        @JsonProperty("num_episodes_watched") val numEpisodesWatched: Int,
+        @JsonProperty("is_rewatching") val isRewatching: Boolean,
+        @JsonProperty("updated_at") val updatedAt: String,
     )
 
     data class MalUser(
         @JsonProperty("id") val id: Int,
         @JsonProperty("name") val name: String,
         @JsonProperty("location") val location: String,
-        @JsonProperty("joined_at") val joined_at: String,
+        @JsonProperty("joined_at") val joinedAt: String,
         @JsonProperty("picture") val picture: String?,
     )
 
@@ -744,9 +759,9 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI {
     data class SmallMalAnime(
         @JsonProperty("id") val id: Int,
         @JsonProperty("title") val title: String?,
-        @JsonProperty("num_episodes") val num_episodes: Int,
-        @JsonProperty("my_list_status") val my_list_status: MalStatus?,
-        @JsonProperty("main_picture") val main_picture: MalMainPicture?,
+        @JsonProperty("num_episodes") val numEpisodes: Int,
+        @JsonProperty("my_list_status") val myListStatus: MalStatus?,
+        @JsonProperty("main_picture") val mainPicture: MalMainPicture?,
     )
 
     data class MalSearchNode(
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 6412ff1b79b..2e28f19455b 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
@@ -15,7 +15,6 @@ import com.lagradost.cloudstream3.subtitles.AbstractSubtitleEntities
 import com.lagradost.cloudstream3.syncproviders.AuthAPI
 import com.lagradost.cloudstream3.syncproviders.InAppAuthAPI
 import com.lagradost.cloudstream3.syncproviders.InAppAuthAPIManager
-import com.lagradost.cloudstream3.utils.AppContextUtils
 import com.lagradost.cloudstream3.utils.AppUtils
 import okhttp3.Interceptor
 import okhttp3.Response
@@ -30,10 +29,10 @@ class OpenSubtitlesApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi
 
     companion object {
         const val OPEN_SUBTITLES_USER_KEY: String = "open_subtitles_user" // user data like profile
-        const val apiKey = "uyBLgFD17MgrYmA0gSXoKllMJBelOYj2"
-        const val host = "https://api.opensubtitles.com/api/v1"
+        const val API_KEY = "uyBLgFD17MgrYmA0gSXoKllMJBelOYj2"
+        const val HOST = "https://api.opensubtitles.com/api/v1"
         const val TAG = "OPENSUBS"
-        const val coolDownDuration: Long = 1000L * 30L // CoolDown if 429 error code in ms
+        const val COOLDOWN_DURATION: Long = 1000L * 30L // CoolDown if 429 error code in ms
         var currentCoolDown: Long = 0L
         var currentSession: SubtitleOAuthEntity? = null
     }
@@ -43,13 +42,13 @@ class OpenSubtitlesApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi
     /** Automatically adds required api headers */
     private class OpenSubtitleInterceptor : Interceptor {
         /** Required user agent! */
-        private val userAgent = "Cloudstream3 v0.1"
+        private val userAgent = "Cloudstream3 v0.2"
         override fun intercept(chain: Interceptor.Chain): Response {
             return chain.proceed(
                 chain.request().newBuilder()
                     .removeHeader("user-agent")
                     .addHeader("user-agent", userAgent)
-                    .addHeader("Api-Key", apiKey)
+                    .addHeader("Api-Key", API_KEY)
                     .build()
             )
         }
@@ -66,7 +65,7 @@ class OpenSubtitlesApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi
     }
 
     private fun throwGotTooManyRequests() {
-        currentCoolDown = unixTimeMs + coolDownDuration
+        currentCoolDown = unixTimeMs + COOLDOWN_DURATION
         throw ErrorLoadingException("Too many requests")
     }
 
@@ -115,11 +114,11 @@ class OpenSubtitlesApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi
     private suspend fun initLogin(username: String, password: String): Boolean {
         //Log.i(TAG, "DATA = [$username] [$password]")
         val response = app.post(
-            url = "$host/login",
+            url = "$HOST/login",
             headers = mapOf(
                 "Content-Type" to "application/json",
             ),
-            data = mapOf(
+            json = mapOf(
                 "username" to username,
                 "password" to password
             ),
@@ -134,7 +133,7 @@ class OpenSubtitlesApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi
                     SubtitleOAuthEntity(
                         user = username,
                         pass = password,
-                        access_token = token.token ?: run {
+                        accessToken = token.token ?: run {
                             return false
                         })
                 )
@@ -197,8 +196,8 @@ class OpenSubtitlesApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi
 
         val searchQueryUrl = when (imdbId > 0) {
             //Use imdb_id to search if its valid
-            true -> "$host/subtitles?imdb_id=$imdbId&languages=${fixedLang}$yearQuery$epQuery$seasonQuery"
-            false -> "$host/subtitles?query=${queryText}&languages=${fixedLang}$yearQuery$epQuery$seasonQuery"
+            true -> "$HOST/subtitles?imdb_id=$imdbId&languages=${fixedLang}$yearQuery$epQuery$seasonQuery"
+            false -> "$HOST/subtitles?query=${queryText}&languages=${fixedLang}$yearQuery$epQuery$seasonQuery"
         }
 
         val req = app.get(
@@ -233,7 +232,7 @@ class OpenSubtitlesApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi
                 val resSeasonNum = featureDetails?.seasonNumber ?: query.seasonNumber
                 val year = featureDetails?.year ?: query.year
                 val type = if ((resSeasonNum ?: 0) > 0) TvType.TvSeries else TvType.Movie
-                val isHearingImpaired = attr.hearing_impaired ?: false
+                val isHearingImpaired = attr.hearingImpaired ?: false
                 //Log.i(TAG, "Result id/name => ${item.id} / $name")
                 item.attributes?.files?.forEach { file ->
                     val resultData = file.fileId?.toString() ?: ""
@@ -266,11 +265,11 @@ class OpenSubtitlesApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi
         throwIfCantDoRequest()
 
         val req = app.post(
-            url = "$host/download",
+            url = "$HOST/download",
             headers = mapOf(
                 Pair(
                     "Authorization",
-                    "Bearer ${currentSession?.access_token ?: throw ErrorLoadingException("No access token active in current session")}"
+                    "Bearer ${currentSession?.accessToken ?: throw ErrorLoadingException("No access token active in current session")}"
                 ),
                 Pair("Content-Type", "application/json"),
                 Pair("Accept", "*/*")
@@ -299,7 +298,7 @@ class OpenSubtitlesApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi
     data class SubtitleOAuthEntity(
         var user: String,
         var pass: String,
-        var access_token: String,
+        var accessToken: String,
     )
 
     data class OAuthToken(
@@ -324,7 +323,7 @@ class OpenSubtitlesApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi
         @JsonProperty("url") var url: String? = null,
         @JsonProperty("files") var files: List<ResultFiles>? = listOf(),
         @JsonProperty("feature_details") var featDetails: ResultFeatureDetails? = ResultFeatureDetails(),
-        @JsonProperty("hearing_impaired") var hearing_impaired: Boolean? = null,
+        @JsonProperty("hearing_impaired") var hearingImpaired: Boolean? = null,
     )
 
     data class ResultFiles(
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
index 27975d1902d..92a181dd1c1 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/SimklApi.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/SimklApi.kt
@@ -29,8 +29,9 @@ import com.lagradost.cloudstream3.syncproviders.SyncAPI
 import com.lagradost.cloudstream3.syncproviders.SyncIdName
 import com.lagradost.cloudstream3.ui.SyncWatchType
 import com.lagradost.cloudstream3.ui.library.ListSorting
-import com.lagradost.cloudstream3.ui.result.txt
+import com.lagradost.cloudstream3.utils.txt
 import com.lagradost.cloudstream3.utils.AppUtils.toJson
+import com.lagradost.cloudstream3.utils.DataStoreHelper.toYear
 import okhttp3.Interceptor
 import okhttp3.Response
 import java.math.BigInteger
@@ -38,6 +39,7 @@ import java.security.SecureRandom
 import java.text.SimpleDateFormat
 import java.time.Instant
 import java.util.Date
+import java.util.Locale
 import java.util.TimeZone
 import kotlin.time.Duration
 import kotlin.time.DurationUnit
@@ -144,8 +146,8 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI {
     }
 
     companion object {
-        private const val clientId: String = BuildConfig.SIMKL_CLIENT_ID
-        private const val clientSecret: String = BuildConfig.SIMKL_CLIENT_SECRET
+        private const val CLIENT_ID: String = BuildConfig.SIMKL_CLIENT_ID
+        private const val CLIENT_SECRET: String = BuildConfig.SIMKL_CLIENT_SECRET
         private var lastLoginState = ""
 
         const val SIMKL_TOKEN_KEY: String = "simkl_token"
@@ -154,10 +156,10 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI {
         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'"
+        private const val SIMKL_DATE_FORMAT = "yyyy-MM-dd'T'HH:mm:ss'Z'"
         fun getUnixTime(string: String?): Long? {
             return try {
-                SimpleDateFormat(simklDateFormat).apply {
+                SimpleDateFormat(SIMKL_DATE_FORMAT, Locale.getDefault()).apply {
                     this.timeZone = TimeZone.getTimeZone("UTC")
                 }.parse(
                     string ?: return null
@@ -171,7 +173,7 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI {
         /** 1409562611 -> 2014-09-01T09:10:11Z */
         fun getDateTime(unixTime: Long?): String? {
             return try {
-                SimpleDateFormat(simklDateFormat).apply {
+                SimpleDateFormat(SIMKL_DATE_FORMAT, Locale.getDefault()).apply {
                     this.timeZone = TimeZone.getTimeZone("UTC")
                 }.format(
                     Date.from(
@@ -208,7 +210,7 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI {
 
             companion object {
                 fun fromString(string: String): SimklListStatusType? {
-                    return SimklListStatusType.values().firstOrNull {
+                    return SimklListStatusType.entries.firstOrNull {
                         it.originalName == string
                     }
                 }
@@ -219,17 +221,17 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI {
         @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"
+            @JsonProperty("client_id") val clientId: String = CLIENT_ID,
+            @JsonProperty("client_secret") val clientSecret: String = CLIENT_SECRET,
+            @JsonProperty("redirect_uri") val redirectUri: String = "$APP_STRING://simkl",
+            @JsonProperty("grant_type") val grantType: String = "authorization_code"
         )
 
         data class TokenResponse(
             /** No expiration date */
-            val access_token: String,
-            val token_type: String,
-            val scope: String
+            @JsonProperty("access_token") val accessToken: String,
+            @JsonProperty("token_type") val tokenType: String,
+            @JsonProperty("scope") val scope: String
         )
         // -------------------
 
@@ -261,15 +263,15 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI {
 
         // -------------------
         data class ActivitiesResponse(
-            val all: String?,
-            val tv_shows: UpdatedAt,
-            val anime: UpdatedAt,
-            val movies: UpdatedAt,
+            @JsonProperty("all") val all: String?,
+            @JsonProperty("tv_shows") val tvShows: UpdatedAt,
+            @JsonProperty("anime") val anime: UpdatedAt,
+            @JsonProperty("movies") val movies: UpdatedAt,
         ) {
             data class UpdatedAt(
-                val all: String?,
-                val removed_from_list: String?,
-                val rated_at: String?,
+                @JsonProperty("all") val all: String?,
+                @JsonProperty("removed_from_list") val removedFromList: String?,
+                @JsonProperty("rated_at") val ratedAt: String?,
             )
         }
 
@@ -308,7 +310,7 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI {
             @JsonProperty("title") val title: String?,
             @JsonProperty("year") val year: Int?,
             @JsonProperty("ids") val ids: Ids?,
-            @JsonProperty("total_episodes") val total_episodes: Int? = null,
+            @JsonProperty("total_episodes") val totalEpisodes: Int? = null,
             @JsonProperty("status") val status: String? = null,
             @JsonProperty("poster") val poster: String? = null,
             @JsonProperty("type") val type: String? = null,
@@ -540,7 +542,7 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI {
             }
 
             debugPrint { "Requesting episodes from $url" }
-            return app.get(url, params = mapOf("client_id" to clientId))
+            return app.get(url, params = mapOf("client_id" to CLIENT_ID))
                 .parsedSafe<Array<EpisodeMetadata>>()?.also {
                     val cacheTime =
                         if (hasEnded == true) SimklCache.CacheTimes.OneMonth.value else SimklCache.CacheTimes.ThirtyMinutes.value
@@ -558,7 +560,7 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI {
             @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,
+            @JsonProperty("rated_at") val ratedAt: String? = null,
         ) : MediaObject(title, year, ids, seasons = seasons, episodes = episodes)
 
         @JsonInclude(JsonInclude.Include.NON_EMPTY)
@@ -567,7 +569,7 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI {
             @JsonProperty("year") year: Int?,
             @JsonProperty("ids") ids: Ids?,
             @JsonProperty("rating") val rating: Int,
-            @JsonProperty("rated_at") val rated_at: String? = getDateTime(unixTime)
+            @JsonProperty("rated_at") val ratedAt: String? = getDateTime(unixTime)
         ) : MediaObject(title, year, ids)
 
         @JsonInclude(JsonInclude.Include.NON_EMPTY)
@@ -576,7 +578,7 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI {
             @JsonProperty("year") year: Int?,
             @JsonProperty("ids") ids: Ids?,
             @JsonProperty("to") val to: String,
-            @JsonProperty("watched_at") val watched_at: String? = getDateTime(unixTime)
+            @JsonProperty("watched_at") val watchedAt: String? = getDateTime(unixTime)
         ) : MediaObject(title, year, ids)
 
         @JsonInclude(JsonInclude.Include.NON_EMPTY)
@@ -631,24 +633,24 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI {
             }
 
             interface Metadata {
-                val last_watched_at: String?
+                val lastWatchedAt: String?
                 val status: String?
-                val user_rating: Int?
-                val last_watched: String?
-                val watched_episodes_count: Int?
-                val total_episodes_count: Int?
+                val userRating: Int?
+                val lastWatched: String?
+                val watchedEpisodesCount: Int?
+                val totalEpisodesCount: 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?,
+                @JsonProperty("last_watched_at") override val lastWatchedAt: String?,
+                @JsonProperty("status") override val status: String,
+                @JsonProperty("user_rating") override val userRating: Int?,
+                @JsonProperty("last_watched") override val lastWatched: String?,
+                @JsonProperty("watched_episodes_count") override val watchedEpisodesCount: Int?,
+                @JsonProperty("total_episodes_count") override val totalEpisodesCount: Int?,
                 val movie: ShowMetadata.Show
             ) : Metadata {
                 override fun getIds(): ShowMetadata.Show.Ids {
@@ -660,27 +662,28 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI {
                         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,
+                        this.watchedEpisodesCount,
+                        this.totalEpisodesCount,
+                        this.userRating?.times(10),
+                        getUnixTime(lastWatchedAt) ?: 0,
                         "Simkl",
                         TvType.Movie,
                         this.movie.poster?.let { getPosterUrl(it) },
                         null,
                         null,
-                        movie.ids.simkl,
+                        this.movie.year?.toYear(),
+                        movie.ids.simkl
                     )
                 }
             }
 
             data class ShowMetadata(
-                @JsonProperty("last_watched_at") override val last_watched_at: String?,
+                @JsonProperty("last_watched_at") override val lastWatchedAt: 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("user_rating") override val userRating: Int?,
+                @JsonProperty("last_watched") override val lastWatched: String?,
+                @JsonProperty("watched_episodes_count") override val watchedEpisodesCount: Int?,
+                @JsonProperty("total_episodes_count") override val totalEpisodesCount: Int?,
                 @JsonProperty("show") val show: Show
             ) : Metadata {
                 override fun getIds(): Show.Ids {
@@ -692,15 +695,16 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI {
                         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,
+                        this.watchedEpisodesCount,
+                        this.totalEpisodesCount,
+                        this.userRating?.times(10),
+                        getUnixTime(lastWatchedAt) ?: 0,
                         "Simkl",
                         TvType.Anime,
                         this.show.poster?.let { getPosterUrl(it) },
                         null,
                         null,
+                        this.show.year?.toYear(),
                         show.ids.simkl
                     )
                 }
@@ -749,7 +753,7 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI {
                 chain.request()
                     .newBuilder()
                     .addHeader("Authorization", "Bearer $token")
-                    .addHeader("simkl-api-key", clientId)
+                    .addHeader("simkl-api-key", CLIENT_ID)
                     .build()
             )
         }
@@ -810,7 +814,7 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI {
         val episodeConstructor = SimklEpisodeConstructor(
             searchResult.ids?.simkl,
             searchResult.type,
-            searchResult.total_episodes,
+            searchResult.totalEpisodes,
             searchResult.hasEnded()
         )
 
@@ -832,12 +836,12 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI {
                     )
                 }
                     ?: return null,
-                score = foundItem.user_rating,
-                watchedEpisodes = foundItem.watched_episodes_count,
-                maxEpisodes = searchResult.total_episodes,
+                score = foundItem.userRating,
+                watchedEpisodes = foundItem.watchedEpisodesCount,
+                maxEpisodes = searchResult.totalEpisodes,
                 episodeConstructor = episodeConstructor,
-                oldEpisodes = foundItem.watched_episodes_count ?: 0,
-                oldScore = foundItem.user_rating,
+                oldEpisodes = foundItem.watchedEpisodesCount ?: 0,
+                oldScore = foundItem.userRating,
                 oldStatus = foundItem.status
             )
         } else {
@@ -845,7 +849,7 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI {
                 status = SyncWatchType.fromInternalId(SimklListStatusType.None.value),
                 score = 0,
                 watchedEpisodes = 0,
-                maxEpisodes = if (searchResult.type == "movie") 0 else searchResult.total_episodes,
+                maxEpisodes = if (searchResult.type == "movie") 0 else searchResult.totalEpisodes,
                 episodeConstructor = episodeConstructor,
                 oldEpisodes = 0,
                 oldStatus = null,
@@ -891,12 +895,12 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI {
 
 
     /** See https://simkl.docs.apiary.io/#reference/search/id-lookup/get-items-by-id */
-    suspend fun searchByIds(serviceMap: Map<SimklSyncServices, String>): Array<MediaObject>? {
+    private suspend fun searchByIds(serviceMap: Map<SimklSyncServices, String>): Array<MediaObject>? {
         if (serviceMap.isEmpty()) return emptyArray()
 
         return app.get(
             "$mainUrl/search/id",
-            params = mapOf("client_id" to clientId) + serviceMap.map { (service, id) ->
+            params = mapOf("client_id" to CLIENT_ID) + serviceMap.map { (service, id) ->
                 service.originalName to id
             }
         ).parsedSafe()
@@ -904,14 +908,14 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI {
 
     override suspend fun search(name: String): List<SyncAPI.SyncSearchResult>? {
         return app.get(
-            "$mainUrl/search/", params = mapOf("client_id" to clientId, "q" to name)
+            "$mainUrl/search/", params = mapOf("client_id" to CLIENT_ID, "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"
+            "https://simkl.com/oauth/authorize?response_type=code&client_id=$CLIENT_ID&redirect_uri=$APP_STRING://${redirectUrl}&state=$lastLoginState"
         openBrowser(url, activity)
     }
 
@@ -961,15 +965,15 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI {
         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
+            activities?.tvShows?.removedFromList,
+            activities?.anime?.removedFromList,
+            activities?.movies?.removedFromList
         ).maxOf {
             getUnixTime(it) ?: -1
         }
         val lastRealUpdate =
             listOf(
-                activities?.tv_shows?.all,
+                activities?.tvShows?.all,
                 activities?.anime?.all,
                 activities?.movies?.all,
             ).maxOf {
@@ -1026,6 +1030,8 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI {
                 ListSorting.AlphabeticalZ,
                 ListSorting.UpdatedNew,
                 ListSorting.UpdatedOld,
+                ListSorting.ReleaseDateNew,
+                ListSorting.ReleaseDateOld,
                 ListSorting.RatingHigh,
                 ListSorting.RatingLow,
             )
@@ -1039,7 +1045,7 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI {
 
     override suspend fun getDevicePin(): OAuth2API.PinAuthData? {
         val pinAuthResp = app.get(
-            "$mainUrl/oauth/pin?client_id=$clientId&redirect_uri=$appString://${redirectUrl}"
+            "$mainUrl/oauth/pin?client_id=$CLIENT_ID&redirect_uri=$APP_STRING://${redirectUrl}"
         ).parsedSafe<PinAuthResponse>() ?: return null
 
         return OAuth2API.PinAuthData(
@@ -1053,7 +1059,7 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI {
 
     override suspend fun handleDeviceAuth(pinAuthData: OAuth2API.PinAuthData): Boolean {
         val pinAuthResp = app.get(
-            "$mainUrl/oauth/pin/${pinAuthData.userCode}?client_id=$clientId"
+            "$mainUrl/oauth/pin/${pinAuthData.userCode}?client_id=$CLIENT_ID"
         ).parsedSafe<PinExchangeResponse>() ?: return false
 
         if (pinAuthResp.accessToken != null) {
@@ -1088,7 +1094,7 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI {
         ).parsedSafe<TokenResponse>() ?: return false
 
         switchToNewAccount()
-        setKey(accountId, SIMKL_TOKEN_KEY, token.access_token)
+        setKey(accountId, SIMKL_TOKEN_KEY, token.accessToken)
 
         val user = getUser()
         if (user == null) {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/SubSource.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/SubSource.kt
index 0e233ece8da..8dad1f88cfe 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/SubSource.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/SubSource.kt
@@ -59,6 +59,7 @@ class SubSourceApi : AbstractSubProvider {
                 it?.subs?.filter { sub ->
                     sub.releaseName!!.contains(
                         String.format(
+                            null,
                             "E%02d",
                             query.epNumber
                         )
diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/Subdl.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/Subdl.kt
index 29544e65abe..9cec1e1cac4 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/Subdl.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/Subdl.kt
@@ -22,10 +22,10 @@ class SubDlApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi {
     override val icon = R.drawable.subdl_logo_big
     override val requiresPassword = true
     override val requiresEmail = true
-    override val createAccountUrl = "https://subdl.com/login"
+    override val createAccountUrl = "https://subdl.com/panel/register"
 
     companion object {
-        const val APIURL = "https://api.subdl.com"
+        const val APIURL = "https://apiold.subdl.com"
         const val APIENDPOINT = "$APIURL/api/v1/subtitles"
         const val DOWNLOADENDPOINT = "https://dl.subdl.com"
         const val SUBDL_SUBTITLES_USER_KEY: String = "subdl_user"
@@ -41,6 +41,7 @@ class SubDlApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi {
         removeAccountKeys()
         currentSession = getAuthKey()
     }
+
     override suspend fun login(data: InAppAuthAPI.LoginData): Boolean {
         val email = data.email ?: throw ErrorLoadingException("Requires Email")
         val password = data.password ?: throw ErrorLoadingException("Requires Password")
@@ -138,7 +139,7 @@ class SubDlApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi {
 
         val tokenResponse = app.post(
             url = "$APIURL/login",
-            data = mapOf(
+            json = mapOf(
                 "email" to useremail,
                 "password" to password
             )
@@ -244,4 +245,4 @@ class SubDlApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi {
         @JsonProperty("language") val language: String? = null,
         @JsonProperty("hi") val hearingImpaired: Boolean? = null,
     )
-}
\ 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 a075cc2e3ba..9bbc5341a67 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/APIRepository.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/APIRepository.kt
@@ -19,6 +19,7 @@ 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
@@ -50,7 +51,7 @@ class APIRepository(val api: MainAPI) {
 
         private val cache = threadSafeListOf<SavedLoadResponse>()
         private var cacheIndex: Int = 0
-        const val cacheSize = 20
+        const val CACHE_SIZE = 20
     }
 
     private fun afterPluginsLoaded(forceReload: Boolean) {
@@ -94,9 +95,9 @@ class APIRepository(val api: MainAPI) {
                 val add = SavedLoadResponse(unixTime, response, lookingForHash)
 
                 synchronized(cache) {
-                    if (cache.size > cacheSize) {
+                    if (cache.size > CACHE_SIZE) {
                         cache[cacheIndex] = add // rolling cache
-                        cacheIndex = (cacheIndex + 1) % cacheSize
+                        cacheIndex = (cacheIndex + 1) % CACHE_SIZE
                     } else {
                         cache.add(add)
                     }
@@ -132,6 +133,7 @@ class APIRepository(val api: MainAPI) {
         delay(delta)
     }
 
+    @OptIn(DelicateCoroutinesApi::class)
     suspend fun getMainPage(page: Int, nameIndex: Int? = null): Resource<List<HomePageResponse?>> {
         return safeApiCall {
             api.lastHomepageRequest = unixTimeMS
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/BaseAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/BaseAdapter.kt
index d90177f5069..e930961c550 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/BaseAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/BaseAdapter.kt
@@ -112,6 +112,7 @@ abstract class BaseAdapter<
         holder.onViewDetachedFromWindow()
     }
 
+    @Suppress("UNCHECKED_CAST")
     fun save(recyclerView: RecyclerView) {
         for (child in recyclerView.children) {
             val holder =
@@ -124,6 +125,7 @@ abstract class BaseAdapter<
         stateViewModel.layoutManagerStates[id]?.clear()
     }
 
+    @Suppress("UNCHECKED_CAST")
     private fun getState(holder: ViewHolderState<S>): S? =
         stateViewModel.layoutManagerStates[id]?.get(holder.absoluteAdapterPosition) as? S
 
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 6bafa975f49..e66b57ab1fc 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/ControllerActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/ControllerActivity.kt
@@ -3,12 +3,19 @@ package com.lagradost.cloudstream3.ui
 import android.os.Bundle
 import android.util.Log
 import android.view.Menu
-import android.view.View.*
-import android.widget.*
+import android.view.View.GONE
+import android.view.View.INVISIBLE
+import android.view.View.VISIBLE
+import android.widget.AbsListView
+import android.widget.ArrayAdapter
+import android.widget.ImageView
+import android.widget.LinearLayout
+import android.widget.ListView
 import androidx.appcompat.app.AlertDialog
 import com.fasterxml.jackson.databind.DeserializationFeature
 import com.fasterxml.jackson.databind.json.JsonMapper
 import com.fasterxml.jackson.module.kotlin.kotlinModule
+import com.google.android.gms.cast.MediaLoadOptions
 import com.google.android.gms.cast.MediaQueueItem
 import com.google.android.gms.cast.MediaSeekOptions
 import com.google.android.gms.cast.MediaStatus.REPEAT_MODE_REPEAT_OFF
@@ -24,7 +31,7 @@ import com.lagradost.cloudstream3.mvvm.Resource
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.mvvm.safeApiCall
 import com.lagradost.cloudstream3.sortUrls
-import com.lagradost.cloudstream3.ui.player.LoadType
+import com.lagradost.cloudstream3.ui.player.LOADTYPE_CHROMECAST
 import com.lagradost.cloudstream3.ui.player.RepoLinkGenerator
 import com.lagradost.cloudstream3.ui.player.SubtitleData
 import com.lagradost.cloudstream3.ui.result.ResultEpisode
@@ -233,12 +240,22 @@ class SelectSourceController(val view: ImageView, val activity: ControllerActivi
                                         loadMirror(index + 1)
                                     }
                                 } else {
-                                    awaitLinks(remoteMediaClient?.load(mediaItem, true, startAt)) {
+                                    val mediaLoadOptions =
+                                        MediaLoadOptions.Builder()
+                                            .setPlayPosition(startAt)
+                                            .setAutoplay(true)
+                                            .build()
+                                    awaitLinks(remoteMediaClient?.load(mediaItem, mediaLoadOptions)) {
                                         loadMirror(index + 1)
                                     }
                                 }
                             } catch (e: Exception) {
-                                awaitLinks(remoteMediaClient?.load(mediaItem, true, startAt)) {
+                                val mediaLoadOptions =
+                                    MediaLoadOptions.Builder()
+                                        .setPlayPosition(startAt)
+                                        .setAutoplay(true)
+                                        .build()
+                                awaitLinks(remoteMediaClient?.load(mediaItem, mediaLoadOptions)) {
                                     loadMirror(index + 1)
                                 }
                             }
@@ -263,6 +280,7 @@ class SelectSourceController(val view: ImageView, val activity: ControllerActivi
 
     var isLoadingMore = false
 
+
     override fun onMediaStatusUpdated() {
         super.onMediaStatusUpdated()
         val meta = getCurrentMetaData()
@@ -296,14 +314,16 @@ class SelectSourceController(val view: ImageView, val activity: ControllerActivi
 
                         val isSuccessful = safeApiCall {
                             generator.generateLinks(
-                                clearCache = false, type = LoadType.Chromecast,
+                                clearCache = false,
+                                allowedTypes = LOADTYPE_CHROMECAST,
                                 callback = {
                                     it.first?.let { link ->
                                         currentLinks.add(link)
                                     }
                                 }, subtitleCallback = {
                                     currentSubs.add(it)
-                                })
+                                },
+                                isCasting = true)
                         }
 
                         val sortedLinks = sortUrls(currentLinks)
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/CustomRecyclerViews.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/CustomRecyclerViews.kt
index 1a9549e175e..78ad2a6bfcb 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/CustomRecyclerViews.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/CustomRecyclerViews.kt
@@ -8,8 +8,8 @@ import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import kotlin.math.abs
 
-class GrdLayoutManager(val context: Context, _spanCount: Int) :
-    GridLayoutManager(context, _spanCount) {
+class GrdLayoutManager(val context: Context, spanCount: Int) :
+    GridLayoutManager(context, spanCount) {
     override fun onFocusSearchFailed(
         focused: View,
         focusDirection: Int,
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/EasterEggMonke.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/EasterEggMonke.kt
deleted file mode 100644
index c70417763d0..00000000000
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/EasterEggMonke.kt
+++ /dev/null
@@ -1,97 +0,0 @@
-// https://github.com/googlecodelabs/android-kotlin-animation-property-animation/tree/master/begin
-
-package com.lagradost.cloudstream3.ui
-
-import android.animation.Animator
-import android.animation.AnimatorListenerAdapter
-import android.animation.AnimatorSet
-import android.animation.ObjectAnimator
-import android.os.Bundle
-import android.os.Handler
-import android.view.View
-import android.view.animation.AccelerateInterpolator
-import android.view.animation.LinearInterpolator
-import android.widget.FrameLayout
-import androidx.appcompat.app.AppCompatActivity
-import androidx.appcompat.widget.AppCompatImageView
-import androidx.core.view.isVisible
-import com.lagradost.cloudstream3.R
-import com.lagradost.cloudstream3.databinding.ActivityEasterEggMonkeBinding
-
-class EasterEggMonke : AppCompatActivity() {
-
-    lateinit var binding : ActivityEasterEggMonkeBinding
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        binding = ActivityEasterEggMonkeBinding.inflate(layoutInflater)
-        setContentView(binding.root)
-
-        val handler = Handler(mainLooper)
-        lateinit var runnable: Runnable
-        runnable = Runnable {
-            shower()
-            handler.postDelayed(runnable, 300)
-        }
-        handler.postDelayed(runnable, 1000)
-    }
-
-    private fun shower() {
-
-        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()
-        newStar.setImageResource(monkeys[idx])
-        newStar.isVisible = true
-        newStar.layoutParams = FrameLayout.LayoutParams(FrameLayout.LayoutParams.WRAP_CONTENT,
-            FrameLayout.LayoutParams.WRAP_CONTENT)
-        binding.frame.addView(newStar)
-
-        newStar.scaleX = Math.random().toFloat() * 1.5f +  newStar.scaleX
-        newStar.scaleY = newStar.scaleX
-        starW *= newStar.scaleX
-        starH *= newStar.scaleY
-
-        newStar.translationX = Math.random().toFloat() * containerW - starW / 2
-
-        val mover = ObjectAnimator.ofFloat(newStar, View.TRANSLATION_Y, -starH, containerH + starH)
-        mover.interpolator = AccelerateInterpolator(1f)
-
-        val rotator = ObjectAnimator.ofFloat(newStar, View.ROTATION,
-            (Math.random() * 1080).toFloat())
-        rotator.interpolator = LinearInterpolator()
-
-        val set = AnimatorSet()
-        set.playTogether(mover, rotator)
-        set.duration = (Math.random() * 1500 + 2500).toLong()
-
-        set.addListener(object : AnimatorListenerAdapter() {
-            override fun onAnimationEnd(animation: Animator) {
-                binding.frame.removeView(newStar)
-            }
-        })
-
-        set.start()
-    }
-
-    companion object {
-        val monkeys = listOf(
-            R.drawable.monke_benene,
-            R.drawable.monke_burrito,
-            R.drawable.monke_coco,
-            R.drawable.monke_cookie,
-            R.drawable.monke_flusdered,
-            R.drawable.monke_funny,
-            R.drawable.monke_like,
-            R.drawable.monke_party,
-            R.drawable.monke_sob,
-            R.drawable.monke_drink,
-            R.drawable.benene,
-            R.drawable.ic_launcher_foreground
-        )
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/EasterEggMonkeFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/EasterEggMonkeFragment.kt
new file mode 100644
index 00000000000..bf7f6b8fc42
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/EasterEggMonkeFragment.kt
@@ -0,0 +1,189 @@
+package com.lagradost.cloudstream3.ui
+
+import android.animation.Animator
+import android.animation.AnimatorListenerAdapter
+import android.animation.ObjectAnimator
+import android.annotation.SuppressLint
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.MotionEvent
+import android.view.View
+import android.view.ViewGroup
+import android.view.animation.AccelerateInterpolator
+import android.view.animation.LinearInterpolator
+import android.widget.FrameLayout
+import android.widget.ImageView
+import androidx.core.view.isVisible
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.lifecycleScope
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.databinding.FragmentEasterEggMonkeBinding
+import com.lagradost.cloudstream3.utils.UIHelper.hideSystemUI
+import com.lagradost.cloudstream3.utils.UIHelper.showSystemUI
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.isActive
+import kotlinx.coroutines.launch
+import kotlin.random.Random
+
+class EasterEggMonkeFragment : Fragment() {
+
+    private var _binding: FragmentEasterEggMonkeBinding? = null
+    private val binding get() = _binding!!
+
+    // planet of monks
+    private val monkeys: List<Int> = listOf(
+        R.drawable.monke_benene,
+        R.drawable.monke_burrito,
+        R.drawable.monke_coco,
+        R.drawable.monke_cookie,
+        R.drawable.monke_flusdered,
+        R.drawable.monke_funny,
+        R.drawable.monke_like,
+        R.drawable.monke_party,
+        R.drawable.monke_sob,
+        R.drawable.monke_drink,
+        R.drawable.benene,
+        R.drawable.ic_launcher_foreground,
+        R.drawable.quick_novel_icon,
+    )
+
+    private val activeMonkeys = mutableListOf<ImageView>()
+    private var spawningJob: Job? = null
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
+    ): View {
+        _binding = FragmentEasterEggMonkeBinding.inflate(layoutInflater)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        activity?.hideSystemUI()
+        spawningJob = lifecycleScope.launch {
+            delay(1000)
+            while (isActive) {
+                spawnMonkey()
+                delay(500)
+            }
+        }
+    }
+
+    private fun spawnMonkey() {
+        val newMonkey = ImageView(context ?: return).apply {
+            setImageResource(monkeys.random())
+            isVisible = true
+        }
+
+        val initialScale = Random.nextFloat() * 1.5f + 0.5f
+        newMonkey.scaleX = initialScale
+        newMonkey.scaleY = initialScale
+
+        newMonkey.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED)
+        val monkeyW = newMonkey.measuredWidth * initialScale
+        val monkeyH = newMonkey.measuredHeight * initialScale
+
+        newMonkey.x = Random.nextFloat() * (binding.frame.width.toFloat() - monkeyW)
+        newMonkey.y = Random.nextFloat() * (binding.frame.height.toFloat() - monkeyH)
+
+        binding.frame.addView(newMonkey, FrameLayout.LayoutParams(
+            FrameLayout.LayoutParams.WRAP_CONTENT, FrameLayout.LayoutParams.WRAP_CONTENT
+        ))
+
+        activeMonkeys.add(newMonkey)
+
+        newMonkey.alpha = 0f
+        ObjectAnimator.ofFloat(newMonkey, View.ALPHA, 0f, 1f).apply {
+            duration = Random.nextLong(1000, 2500)
+            interpolator = AccelerateInterpolator()
+            start()
+        }
+
+        @SuppressLint("ClickableViewAccessibility")
+        newMonkey.setOnTouchListener { view, event -> handleTouch(view, event) }
+
+        startFloatingAnimation(newMonkey)
+    }
+
+    private fun startFloatingAnimation(monkey: ImageView) {
+        val floatUpAnimator = ObjectAnimator.ofFloat(
+            monkey, View.TRANSLATION_Y, monkey.y, -monkey.height.toFloat()
+        ).apply {
+            duration = Random.nextLong(8000, 15000)
+            interpolator = LinearInterpolator()
+        }
+
+        floatUpAnimator.addListener(object : AnimatorListenerAdapter() {
+            override fun onAnimationEnd(animation: Animator) {
+                // necessary check because binding becomes null but monkes are still moving until onDestroy()
+                if (_binding != null) {
+                    binding.frame.removeView(monkey)
+                    activeMonkeys.remove(monkey)
+                }
+            }
+        })
+
+        floatUpAnimator.start()
+        monkey.tag = floatUpAnimator
+    }
+
+    private fun handleTouch(view: View, event: MotionEvent): Boolean {
+        val monkey = view as ImageView
+        when (event.action) {
+            MotionEvent.ACTION_DOWN -> {
+                (monkey.tag as? ObjectAnimator)?.pause()
+                return true
+            }
+
+            MotionEvent.ACTION_MOVE -> {
+                // Update both X and Y positions properly
+                monkey.x = event.rawX - monkey.width / 2
+                monkey.y = event.rawY - monkey.height / 2
+
+                // Check if monkey touches the screen edge
+                if (isTouchingEdge(monkey)) {
+                    removeMonkey(monkey)
+                }
+                return true
+            }
+
+            MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> {
+                if (isTouchingEdge(monkey)) {
+                    removeMonkey(monkey)
+                } else {
+                    startFloatingAnimation(monkey)
+                }
+                return true
+            }
+        }
+        return false
+    }
+
+    private fun isTouchingEdge(monkey: ImageView): Boolean {
+        return monkey.x <= 0 || monkey.x + monkey.width >= binding.frame.width ||
+                monkey.y <= 0 || monkey.y + monkey.height >= binding.frame.height
+    }
+
+    private fun removeMonkey(monkey: ImageView) {
+        // Fade out and remove the monkey
+        ObjectAnimator.ofFloat(monkey, View.ALPHA, 1f, 0f).apply {
+            duration = 300
+            addListener(object : AnimatorListenerAdapter() {
+                override fun onAnimationEnd(animation: Animator) {
+                    binding.frame.removeView(monkey)
+                    activeMonkeys.remove(monkey)
+                }
+            })
+            start()
+        }
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        activity?.showSystemUI()
+        spawningJob?.cancel()
+        _binding = null
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/MiniControllerFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/MiniControllerFragment.kt
index aba6395f9ad..b6326eb366b 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/MiniControllerFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/MiniControllerFragment.kt
@@ -53,8 +53,8 @@ class MyMiniControllerFragment : MiniControllerFragment() {
         // SEE https://github.com/dandar3/android-google-play-services-cast-framework/blob/master/res/layout/cast_mini_controller.xml
         try {
             val progressBar: ProgressBar? = view.findViewById(R.id.progressBar)
-            val containerAll: LinearLayout? = view.findViewById(R.id.container_all)
-            val containerCurrent: RelativeLayout? = view.findViewById(R.id.container_current)
+            val containerAll: LinearLayout? = view.findViewById(com.google.android.gms.cast.framework.R.id.container_all)
+            val containerCurrent: RelativeLayout? = view.findViewById(com.google.android.gms.cast.framework.R.id.container_current)
 
             context?.let { ctx ->
                 progressBar?.setBackgroundColor(
@@ -79,4 +79,4 @@ class MyMiniControllerFragment : MiniControllerFragment() {
             // JUST IN CASE
         }
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/NonFinalAdapterListUpdateCallback.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/NonFinalAdapterListUpdateCallback.kt
index f721401e7d2..12a5ae2a29e 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/NonFinalAdapterListUpdateCallback.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/NonFinalAdapterListUpdateCallback.kt
@@ -15,7 +15,7 @@ open class NonFinalAdapterListUpdateCallback
 /**
  * Creates an AdapterListUpdateCallback that will dispatch update events to the given adapter.
  *
- * @param adapter The Adapter to send updates to.
+ * @param mAdapter The Adapter to send updates to.
  */(private var mAdapter: RecyclerView.Adapter<*>) :
     ListUpdateCallback {
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/WatchType.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/WatchType.kt
index 9532d1a9b91..b778ba5a754 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/WatchType.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/WatchType.kt
@@ -13,7 +13,7 @@ enum class WatchType(val internalId: Int, @StringRes val stringRes: Int, @Drawab
     NONE(5, R.string.type_none, R.drawable.ic_baseline_add_24);
 
     companion object {
-        fun fromInternalId(id: Int?) = values().find { value -> value.internalId == id } ?: NONE
+        fun fromInternalId(id: Int?) = entries.find { value -> value.internalId == id } ?: NONE
     }
 }
 
@@ -36,6 +36,6 @@ enum class SyncWatchType(val internalId: Int, @StringRes val stringRes: Int, @Dr
     REWATCHING(5, R.string.type_re_watching, R.drawable.ic_baseline_bookmark_24);
 
     companion object {
-        fun fromInternalId(id: Int?) = values().find { value -> value.internalId == id } ?: NONE
+        fun fromInternalId(id: Int?) = entries.find { value -> value.internalId == id } ?: NONE
     }
 }
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 15e66b38f3e..5e2b97e57d5 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/WebviewFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/WebviewFragment.kt
@@ -8,8 +8,10 @@ import android.webkit.JavascriptInterface
 import android.webkit.WebResourceRequest
 import android.webkit.WebView
 import android.webkit.WebViewClient
+import androidx.annotation.OptIn
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
+import androidx.media3.common.util.UnstableApi
 import androidx.navigation.fragment.findNavController
 import com.lagradost.cloudstream3.MainActivity
 import com.lagradost.cloudstream3.USER_AGENT
@@ -29,6 +31,7 @@ class WebviewFragment : Fragment() {
         }
 
         binding?.webView?.webViewClient = object : WebViewClient() {
+            @OptIn(UnstableApi::class)
             override fun shouldOverrideUrlLoading(
                 view: WebView?,
                 request: WebResourceRequest?
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountAdapter.kt
index de0b5c058b2..1e7e0f11285 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountAdapter.kt
@@ -6,17 +6,17 @@ import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
 import androidx.recyclerview.widget.RecyclerView
 import androidx.viewbinding.ViewBinding
+import coil3.transform.RoundedCornersTransformation
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.databinding.AccountListItemAddBinding
 import com.lagradost.cloudstream3.databinding.AccountListItemBinding
 import com.lagradost.cloudstream3.databinding.AccountListItemEditBinding
 import com.lagradost.cloudstream3.ui.account.AccountHelper.showAccountEditDialog
-import com.lagradost.cloudstream3.ui.result.setImage
 import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
 import com.lagradost.cloudstream3.utils.DataStoreHelper
-import com.lagradost.cloudstream3.utils.UIHelper.setImage
+import com.lagradost.cloudstream3.utils.ImageLoader.loadImage
 
 class AccountAdapter(
     private val accounts: List<DataStoreHelper.Account>,
@@ -45,7 +45,7 @@ class AccountAdapter(
                     val isLastUsedAccount = account.keyIndex == DataStoreHelper.selectedKeyIndex
 
                     accountName.text = account.name
-                    accountImage.setImage(account.image)
+                    accountImage.loadImage(account.image)
                     lockIcon.isVisible = account.lockPin != null
                     outline.isVisible = !isTv && isLastUsedAccount
 
@@ -87,11 +87,9 @@ class AccountAdapter(
                     val isLastUsedAccount = account.keyIndex == DataStoreHelper.selectedKeyIndex
 
                     accountName.text = account.name
-                    accountImage.setImage(
-                        account.image,
-                        fadeIn = false,
-                        radius = 10
-                    )
+                    accountImage.loadImage(account.image) {
+                        RoundedCornersTransformation(10f)
+                    }
                     lockIcon.isVisible = account.lockPin != null
                     outline.isVisible = !isTv && isLastUsedAccount
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountHelper.kt
index d2aca862b93..ce8d53609de 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountHelper.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountHelper.kt
@@ -3,7 +3,7 @@ package com.lagradost.cloudstream3.ui.account
 import android.app.Activity
 import android.content.Context
 import android.content.DialogInterface
-import android.content.Intent
+import android.os.Bundle
 import android.text.Editable
 import android.view.LayoutInflater
 import android.view.inputmethod.EditorInfo
@@ -25,12 +25,13 @@ import com.lagradost.cloudstream3.databinding.AccountSelectLinearBinding
 import com.lagradost.cloudstream3.databinding.LockPinDialogBinding
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.mvvm.observe
-import com.lagradost.cloudstream3.ui.result.setImage
 import com.lagradost.cloudstream3.ui.result.setLinearListLayout
 import com.lagradost.cloudstream3.utils.AppContextUtils.setDefaultFocus
 import com.lagradost.cloudstream3.utils.DataStoreHelper
 import com.lagradost.cloudstream3.utils.DataStoreHelper.getDefaultAccount
+import com.lagradost.cloudstream3.utils.ImageLoader.loadImage
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
+import com.lagradost.cloudstream3.utils.UIHelper.navigate
 import com.lagradost.cloudstream3.utils.UIHelper.showInputMethod
 
 object AccountHelper {
@@ -90,12 +91,12 @@ object AccountHelper {
         }
 
         // Handle the profile picture and its interactions
-        binding.accountImage.setImage(account.image)
+        binding.accountImage.loadImage(account.image)
         binding.accountImage.setOnClickListener {
             // Roll the image forwards once
             currentEditAccount =
                 currentEditAccount.copy(defaultImageIndex = (currentEditAccount.defaultImageIndex + 1) % DataStoreHelper.profileImages.size)
-            binding.accountImage.setImage(currentEditAccount.image)
+            binding.accountImage.loadImage(currentEditAccount.image)
         }
 
         // Handle applying changes
@@ -217,7 +218,7 @@ object AccountHelper {
                 val activity = context.getActivity()
                 if (activity is AccountSelectActivity) {
                     isPinValid = true
-                    activity.viewModel.handleAccountSelect(getDefaultAccount(context), activity)
+                    activity.accountViewModel.handleAccountSelect(getDefaultAccount(context), activity)
                 }
             }
         }
@@ -307,9 +308,10 @@ object AccountHelper {
         builder.show()
 
         binding.manageAccountsButton.setOnClickListener {
-            val accountSelectIntent = Intent(activity, AccountSelectActivity::class.java)
-            accountSelectIntent.putExtra("isEditingFromMainActivity", true)
-            activity.startActivity(accountSelectIntent)
+            activity.navigate(
+                R.id.accountSelectActivity,
+                Bundle().apply { putBoolean("isEditingFromMainActivity", true) }
+            )
             builder.dismissSafe()
         }
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountSelectActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountSelectActivity.kt
index 0da69f9c7cb..95d8ba15e1c 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountSelectActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountSelectActivity.kt
@@ -1,11 +1,10 @@
 package com.lagradost.cloudstream3.ui.account
 
 import android.annotation.SuppressLint
-import android.content.Intent
 import android.os.Bundle
 import android.util.Log
-import androidx.appcompat.app.AppCompatActivity
-import androidx.lifecycle.ViewModelProvider
+import androidx.activity.ComponentActivity
+import androidx.activity.viewModels
 import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.GridLayoutManager
 import com.lagradost.cloudstream3.CommonActivity
@@ -33,16 +32,18 @@ import com.lagradost.cloudstream3.utils.DataStoreHelper.accounts
 import com.lagradost.cloudstream3.utils.DataStoreHelper.selectedKeyIndex
 import com.lagradost.cloudstream3.utils.DataStoreHelper.setAccount
 import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute
+import com.lagradost.cloudstream3.utils.UIHelper.openActivity
 
-class AccountSelectActivity : AppCompatActivity(), BiometricCallback {
+class AccountSelectActivity : ComponentActivity(), BiometricCallback {
 
-    lateinit var viewModel: AccountViewModel
+    val accountViewModel: AccountViewModel by viewModels()
 
     @SuppressLint("NotifyDataSetChanged")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         loadThemes(this)
 
+        @Suppress("DEPRECATION")
         window.navigationBarColor = colorFromAttribute(R.attr.primaryBlackBackground)
 
         // Are we editing and coming from MainActivity?
@@ -55,8 +56,6 @@ class AccountSelectActivity : AppCompatActivity(), BiometricCallback {
         val skipStartup = settingsManager.getBoolean(getString(R.string.skip_startup_account_select_key), false
         ) || accounts.count() <= 1
 
-        viewModel = ViewModelProvider(this)[AccountViewModel::class.java]
-
         fun askBiometricAuth() {
 
             if (isLayout(PHONE) && isAuthEnabled(this)) {
@@ -74,7 +73,7 @@ class AccountSelectActivity : AppCompatActivity(), BiometricCallback {
             }
         }
 
-        observe(viewModel.isAllowedLogin) { isAllowedLogin ->
+        observe(accountViewModel.isAllowedLogin) { isAllowedLogin ->
             if (isAllowedLogin) {
                 // We are allowed to continue to MainActivity
                 navigateToMainActivity()
@@ -87,7 +86,7 @@ class AccountSelectActivity : AppCompatActivity(), BiometricCallback {
             val currentAccount = accounts.firstOrNull { it.keyIndex == selectedKeyIndex }
             if (currentAccount?.lockPin != null) {
                 CommonActivity.init(this)
-                viewModel.handleAccountSelect(currentAccount, this, true)
+                accountViewModel.handleAccountSelect(currentAccount, this, true)
             } else {
                 if (accounts.count() > 1) {
                     showToast(this, getString(
@@ -109,16 +108,16 @@ class AccountSelectActivity : AppCompatActivity(), BiometricCallback {
 
         val recyclerView: AutofitRecyclerView = binding.accountRecyclerView
 
-        observe(viewModel.accounts) { liveAccounts ->
+        observe(accountViewModel.accounts) { liveAccounts ->
             val adapter = AccountAdapter(
                 liveAccounts,
                 // Handle the selected account
                 accountSelectCallback = {
-                    viewModel.handleAccountSelect(it, this)
+                    accountViewModel.handleAccountSelect(it, this)
                 },
-                accountCreateCallback = { viewModel.handleAccountUpdate(it, this) },
+                accountCreateCallback = { accountViewModel.handleAccountUpdate(it, this) },
                 accountEditCallback = {
-                    viewModel.handleAccountUpdate(it, this)
+                    accountViewModel.handleAccountUpdate(it, this)
 
                     // We came from MainActivity, return there
                     // and switch to the edited account
@@ -127,7 +126,7 @@ class AccountSelectActivity : AppCompatActivity(), BiometricCallback {
                         navigateToMainActivity()
                     }
                 },
-                accountDeleteCallback = { viewModel.handleAccountDelete(it,this) }
+                accountDeleteCallback = { accountViewModel.handleAccountDelete(it,this) }
             )
 
             recyclerView.adapter = adapter
@@ -138,13 +137,13 @@ class AccountSelectActivity : AppCompatActivity(), BiometricCallback {
                 )
             }
 
-            observe(viewModel.selectedKeyIndex) { selectedKeyIndex ->
+            observe(accountViewModel.selectedKeyIndex) { selectedKeyIndex ->
                 // Scroll to current account (which is focused by default)
                 val layoutManager = recyclerView.layoutManager as GridLayoutManager
                 layoutManager.scrollToPositionWithOffset(selectedKeyIndex, 0)
             }
 
-            observe(viewModel.isEditing) { isEditing ->
+            observe(accountViewModel.isEditing) { isEditing ->
                 if (isEditing) {
                     binding.editAccountButton.setImageResource(R.drawable.ic_baseline_close_24)
                     binding.title.setText(R.string.manage_accounts)
@@ -159,7 +158,7 @@ class AccountSelectActivity : AppCompatActivity(), BiometricCallback {
             }
 
             if (isEditingFromMainActivity) {
-                viewModel.setIsEditing(true)
+                accountViewModel.setIsEditing(true)
             }
 
             binding.editAccountButton.setOnClickListener {
@@ -170,7 +169,7 @@ class AccountSelectActivity : AppCompatActivity(), BiometricCallback {
                     return@setOnClickListener
                 }
 
-                viewModel.toggleIsEditing()
+                accountViewModel.toggleIsEditing()
             }
 
             if (isLayout(TV or EMULATOR)) {
@@ -184,8 +183,7 @@ class AccountSelectActivity : AppCompatActivity(), BiometricCallback {
     }
 
     private fun navigateToMainActivity() {
-        val mainIntent = Intent(this, MainActivity::class.java)
-        startActivity(mainIntent)
+        openActivity(MainActivity::class.java)
         finish() // Finish the account selection activity
     }
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountViewModel.kt
index 14559607027..af62a2b0826 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountViewModel.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountViewModel.kt
@@ -6,6 +6,7 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import com.lagradost.cloudstream3.AcraApplication.Companion.context
 import com.lagradost.cloudstream3.AcraApplication.Companion.removeKeys
+import com.lagradost.cloudstream3.MainActivity
 import com.lagradost.cloudstream3.ui.account.AccountHelper.showPinInputDialog
 import com.lagradost.cloudstream3.utils.DataStoreHelper
 import com.lagradost.cloudstream3.utils.DataStoreHelper.getAccounts
@@ -62,6 +63,7 @@ class AccountViewModel : ViewModel() {
 
         _accounts.postValue(getAccounts(context))
         _selectedKeyIndex.postValue(getAccounts(context).indexOf(account))
+        MainActivity.reloadAccountEvent(true)
     }
 
     fun handleAccountDelete(
@@ -84,6 +86,7 @@ class AccountViewModel : ViewModel() {
         _selectedKeyIndex.postValue(getAllAccounts().indexOfFirst {
             it.keyIndex == DataStoreHelper.selectedKeyIndex
         })
+        MainActivity.reloadAccountEvent(true)
     }
 
     fun handleAccountSelect(
@@ -95,6 +98,7 @@ class AccountViewModel : ViewModel() {
         if (reloadForActivity) {
             _accounts.postValue(getAccounts(context))
             _selectedKeyIndex.postValue(getAccounts(context).indexOf(account))
+            MainActivity.reloadAccountEvent(true)
             return
         }
 
@@ -112,12 +116,14 @@ class AccountViewModel : ViewModel() {
                 _isAllowedLogin.postValue(true)
                 _selectedKeyIndex.postValue(getAccounts(context).indexOf(account))
                 setAccount(account)
+                MainActivity.reloadAccountEvent(true)
             }
         } else {
             // No PIN set for the selected account, proceed
             _isAllowedLogin.postValue(true)
             _selectedKeyIndex.postValue(getAccounts(context).indexOf(account))
             setAccount(account)
+            MainActivity.reloadAccountEvent(true)
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadAdapter.kt
index 9a0263342b2..a0e5cabc46a 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadAdapter.kt
@@ -1,9 +1,9 @@
 package com.lagradost.cloudstream3.ui.download
 
-import android.annotation.SuppressLint
 import android.text.format.Formatter.formatShortFileSize
 import android.view.LayoutInflater
 import android.view.ViewGroup
+import android.widget.CheckBox
 import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
 import androidx.recyclerview.widget.DiffUtil
@@ -18,7 +18,7 @@ import com.lagradost.cloudstream3.ui.download.button.DownloadStatusTell
 import com.lagradost.cloudstream3.utils.AppContextUtils.getNameFull
 import com.lagradost.cloudstream3.utils.DataStoreHelper.fixVisual
 import com.lagradost.cloudstream3.utils.DataStoreHelper.getViewPos
-import com.lagradost.cloudstream3.utils.UIHelper.setImage
+import com.lagradost.cloudstream3.utils.ImageLoader.loadImage
 import com.lagradost.cloudstream3.utils.VideoDownloadHelper
 
 const val DOWNLOAD_ACTION_PLAY_FILE = 0
@@ -31,47 +31,30 @@ const val DOWNLOAD_ACTION_LONG_CLICK = 5
 const val DOWNLOAD_ACTION_GO_TO_CHILD = 0
 const val DOWNLOAD_ACTION_LOAD_RESULT = 1
 
-abstract class VisualDownloadCached(
-    open val currentBytes: Long,
-    open val totalBytes: Long,
-    open val data: VideoDownloadHelper.DownloadCached
-) {
-
-    // Just to be extra-safe with areContentsTheSame
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (other !is VisualDownloadCached) return false
-
-        if (currentBytes != other.currentBytes) return false
-        if (totalBytes != other.totalBytes) return false
-        if (data != other.data) return false
-
-        return true
-    }
-
-    override fun hashCode(): Int {
-        var result = currentBytes.hashCode()
-        result = 31 * result + totalBytes.hashCode()
-        result = 31 * result + data.hashCode()
-        return result
-    }
+sealed class VisualDownloadCached {
+    abstract val currentBytes: Long
+    abstract val totalBytes: Long
+    abstract val data: VideoDownloadHelper.DownloadCached
+    abstract var isSelected: Boolean
+
+    data class Child(
+        override val currentBytes: Long,
+        override val totalBytes: Long,
+        override val data: VideoDownloadHelper.DownloadEpisodeCached,
+        override var isSelected: Boolean,
+    ) : VisualDownloadCached()
+
+    data class Header(
+        override val currentBytes: Long,
+        override val totalBytes: Long,
+        override val data: VideoDownloadHelper.DownloadHeaderCached,
+        override var isSelected: Boolean,
+        val child: VideoDownloadHelper.DownloadEpisodeCached?,
+        val currentOngoingDownloads: Int,
+        val totalDownloads: Int,
+    ) : VisualDownloadCached()
 }
 
-data class VisualDownloadChildCached(
-    override val currentBytes: Long,
-    override val totalBytes: Long,
-    override val data: VideoDownloadHelper.DownloadEpisodeCached,
-): VisualDownloadCached(currentBytes, totalBytes, data)
-
-data class VisualDownloadHeaderCached(
-    override val currentBytes: Long,
-    override val totalBytes: Long,
-    override val data: VideoDownloadHelper.DownloadHeaderCached,
-    val child: VideoDownloadHelper.DownloadEpisodeCached?,
-    val currentOngoingDownloads: Int,
-    val totalDownloads: Int,
-): VisualDownloadCached(currentBytes, totalBytes, data)
-
 data class DownloadClickEvent(
     val action: Int,
     val data: VideoDownloadHelper.DownloadEpisodeCached
@@ -83,108 +66,191 @@ data class DownloadHeaderClickEvent(
 )
 
 class DownloadAdapter(
-    private val clickCallback: (DownloadHeaderClickEvent) -> Unit,
-    private val mediaClickCallback: (DownloadClickEvent) -> Unit,
+    private val onHeaderClickEvent: (DownloadHeaderClickEvent) -> Unit,
+    private val onItemClickEvent: (DownloadClickEvent) -> Unit,
+    private val onItemSelectionChanged: (Int, Boolean) -> Unit,
 ) : ListAdapter<VisualDownloadCached, DownloadAdapter.DownloadViewHolder>(DiffCallback()) {
 
+    private var isMultiDeleteState: Boolean = false
+
     companion object {
         private const val VIEW_TYPE_HEADER = 0
         private const val VIEW_TYPE_CHILD = 1
     }
 
     inner class DownloadViewHolder(
-        private val binding: ViewBinding,
-        private val clickCallback: (DownloadHeaderClickEvent) -> Unit,
-        private val mediaClickCallback: (DownloadClickEvent) -> Unit,
+        private val binding: ViewBinding
     ) : RecyclerView.ViewHolder(binding.root) {
 
         fun bind(card: VisualDownloadCached?) {
             when (binding) {
-                is DownloadHeaderEpisodeBinding -> bindHeader(card as? VisualDownloadHeaderCached)
-                is DownloadChildEpisodeBinding -> bindChild(card as? VisualDownloadChildCached)
+                is DownloadHeaderEpisodeBinding -> bindHeader(card as? VisualDownloadCached.Header)
+                is DownloadChildEpisodeBinding -> bindChild(card as? VisualDownloadCached.Child)
             }
         }
 
-        @SuppressLint("SetTextI18n")
-        private fun bindHeader(card: VisualDownloadHeaderCached?) {
-            if (binding !is DownloadHeaderEpisodeBinding) return
-            card ?: return
-            val d = card.data
+        private fun bindHeader(card: VisualDownloadCached.Header?) {
+            if (binding !is DownloadHeaderEpisodeBinding || card == null) return
 
+            val data = card.data
             binding.apply {
-                downloadHeaderPoster.apply {
-                    setImage(d.poster)
-                    setOnClickListener {
-                        clickCallback.invoke(DownloadHeaderClickEvent(DOWNLOAD_ACTION_LOAD_RESULT, d))
+                episodeHolder.apply {
+                    if (isMultiDeleteState) {
+                        setOnClickListener {
+                            toggleIsChecked(deleteCheckbox, data.id)
+                        }
                     }
-                }
 
-                downloadHeaderTitle.text = d.name
-                val formattedSizeString = formatShortFileSize(itemView.context, card.totalBytes)
+                    setOnLongClickListener {
+                        toggleIsChecked(deleteCheckbox, data.id)
+                        true
+                    }
+                }
 
-                if (card.child != null) {
-                    downloadHeaderGotoChild.isVisible = false
-
-                    val status = downloadButton.getStatus(card.child.id, card.currentBytes, card.totalBytes)
-                    if (status == DownloadStatusTell.IsDone) {
-                        // We do this here instead if we are finished downloading
-                        // so that we can use the value from the view model
-                        // rather than extra unneeded disk operations and to prevent a
-                        // delay in updating download icon state.
-                        downloadButton.setProgress(card.currentBytes, card.totalBytes)
-                        downloadButton.applyMetaData(card.child.id, card.currentBytes, card.totalBytes)
-                        // We will let the view model handle this
-                        downloadButton.doSetProgress = false
-                        downloadButton.progressBar.progressDrawable =
-                            downloadButton.getDrawableFromStatus(status)
-                                ?.let { ContextCompat.getDrawable(downloadButton.context, it) }
-                        downloadHeaderInfo.text = formattedSizeString
+                downloadHeaderPoster.apply {
+                    loadImage(data.poster)
+                    if (isMultiDeleteState) {
+                        setOnClickListener {
+                            toggleIsChecked(deleteCheckbox, data.id)
+                        }
                     } else {
-                        downloadButton.doSetProgress = true
-                        downloadButton.progressBar.progressDrawable =
-                            ContextCompat.getDrawable(downloadButton.context, downloadButton.progressDrawable)
+                        setOnClickListener {
+                            onHeaderClickEvent.invoke(
+                                DownloadHeaderClickEvent(
+                                    DOWNLOAD_ACTION_LOAD_RESULT,
+                                    data
+                                )
+                            )
+                        }
                     }
 
-                    downloadButton.setDefaultClickListener(card.child, downloadHeaderInfo, mediaClickCallback)
-                    downloadButton.isVisible = true
-
-                    episodeHolder.setOnClickListener {
-                        mediaClickCallback.invoke(DownloadClickEvent(DOWNLOAD_ACTION_PLAY_FILE, card.child))
-                    }
-                } else {
-                    downloadButton.isVisible = false
-                    downloadHeaderGotoChild.isVisible = true
-
-                    try {
-                        downloadHeaderInfo.text = downloadHeaderInfo.context.getString(R.string.extra_info_format)
-                            .format(
-                                card.totalDownloads,
-                                downloadHeaderInfo.context.resources.getQuantityString(
-                                    R.plurals.episodes,
-                                    card.totalDownloads
-                                ),
-                                formattedSizeString
-                            )
-                    } catch (e: Exception) {
-                        // You probably formatted incorrectly
-                        downloadHeaderInfo.text = "Error"
-                        logError(e)
+                    setOnLongClickListener {
+                        toggleIsChecked(deleteCheckbox, data.id)
+                        true
                     }
+                }
+                downloadHeaderTitle.text = data.name
+                val formattedSize = formatShortFileSize(itemView.context, card.totalBytes)
 
-                    episodeHolder.setOnClickListener {
-                        clickCallback.invoke(DownloadHeaderClickEvent(DOWNLOAD_ACTION_GO_TO_CHILD, d))
+                if (card.child != null) {
+                    handleChildDownload(card, formattedSize)
+                } else handleParentDownload(card, formattedSize)
+
+                if (isMultiDeleteState) {
+                    deleteCheckbox.setOnCheckedChangeListener { _, isChecked ->
+                        onItemSelectionChanged.invoke(data.id, isChecked)
                     }
+                } else deleteCheckbox.setOnCheckedChangeListener(null)
+
+                deleteCheckbox.apply {
+                    isVisible = isMultiDeleteState
+                    isChecked = card.isSelected
                 }
             }
         }
 
-        private fun bindChild(card: VisualDownloadChildCached?) {
-            if (binding !is DownloadChildEpisodeBinding) return
-            card ?: return
-            val d = card.data
+        private fun DownloadHeaderEpisodeBinding.handleChildDownload(
+            card: VisualDownloadCached.Header,
+            formattedSize: String
+        ) {
+            card.child ?: return
+            downloadHeaderGotoChild.isVisible = false
+
+            val posDur = getViewPos(card.data.id)
+            downloadHeaderEpisodeProgress.apply {
+                isVisible = posDur != null
+                posDur?.let {
+                    val visualPos = it.fixVisual()
+                    max = (visualPos.duration / 1000).toInt()
+                    progress = (visualPos.position / 1000).toInt()
+                }
+            }
+
+            val status = downloadButton.getStatus(card.child.id, card.currentBytes, card.totalBytes)
+            if (status == DownloadStatusTell.IsDone) {
+                // We do this here instead if we are finished downloading
+                // so that we can use the value from the view model
+                // rather than extra unneeded disk operations and to prevent a
+                // delay in updating download icon state.
+                downloadButton.setProgress(card.currentBytes, card.totalBytes)
+                downloadButton.applyMetaData(card.child.id, card.currentBytes, card.totalBytes)
+                // We will let the view model handle this
+                downloadButton.doSetProgress = false
+                downloadButton.progressBar.progressDrawable =
+                    downloadButton.getDrawableFromStatus(status)
+                        ?.let { ContextCompat.getDrawable(downloadButton.context, it) }
+                downloadHeaderInfo.text = formattedSize
+            } else {
+                // We need to make sure we restore the correct progress
+                // when we refresh data in the adapter.
+                downloadButton.resetView()
+                val drawable = downloadButton.getDrawableFromStatus(status)?.let {
+                    ContextCompat.getDrawable(downloadButton.context, it)
+                }
+                downloadButton.statusView.setImageDrawable(drawable)
+                downloadButton.progressBar.progressDrawable =
+                    ContextCompat.getDrawable(
+                        downloadButton.context,
+                        downloadButton.progressDrawable
+                    )
+            }
 
+            downloadButton.setDefaultClickListener(card.child, downloadHeaderInfo, onItemClickEvent)
+            downloadButton.isVisible = !isMultiDeleteState
+
+            if (!isMultiDeleteState) {
+                episodeHolder.setOnClickListener {
+                    onItemClickEvent.invoke(
+                        DownloadClickEvent(
+                            DOWNLOAD_ACTION_PLAY_FILE,
+                            card.child
+                        )
+                    )
+                }
+            }
+        }
+
+        private fun DownloadHeaderEpisodeBinding.handleParentDownload(
+            card: VisualDownloadCached.Header,
+            formattedSize: String
+        ) {
+            downloadButton.isVisible = false
+            downloadHeaderEpisodeProgress.isVisible = false
+            downloadHeaderGotoChild.isVisible = !isMultiDeleteState
+
+            try {
+                downloadHeaderInfo.text =
+                    downloadHeaderInfo.context.getString(R.string.extra_info_format).format(
+                        card.totalDownloads,
+                        downloadHeaderInfo.context.resources.getQuantityString(
+                            R.plurals.episodes,
+                            card.totalDownloads
+                        ),
+                        formattedSize
+                    )
+            } catch (e: Exception) {
+                downloadHeaderInfo.text = null
+                logError(e)
+            }
+
+            if (!isMultiDeleteState) {
+                episodeHolder.setOnClickListener {
+                    onHeaderClickEvent.invoke(
+                        DownloadHeaderClickEvent(
+                            DOWNLOAD_ACTION_GO_TO_CHILD,
+                            card.data
+                        )
+                    )
+                }
+            }
+        }
+
+        private fun bindChild(card: VisualDownloadCached.Child?) {
+            if (binding !is DownloadChildEpisodeBinding || card == null) return
+
+            val data = card.data
             binding.apply {
-                val posDur = getViewPos(d.id)
+                val posDur = getViewPos(data.id)
                 downloadChildEpisodeProgress.apply {
                     isVisible = posDur != null
                     posDur?.let {
@@ -194,36 +260,87 @@ class DownloadAdapter(
                     }
                 }
 
-                val status = downloadButton.getStatus(d.id, card.currentBytes, card.totalBytes)
+                val status = downloadButton.getStatus(data.id, card.currentBytes, card.totalBytes)
                 if (status == DownloadStatusTell.IsDone) {
                     // We do this here instead if we are finished downloading
                     // so that we can use the value from the view model
                     // rather than extra unneeded disk operations and to prevent a
                     // delay in updating download icon state.
                     downloadButton.setProgress(card.currentBytes, card.totalBytes)
-                    downloadButton.applyMetaData(d.id, card.currentBytes, card.totalBytes)
+                    downloadButton.applyMetaData(data.id, card.currentBytes, card.totalBytes)
                     // We will let the view model handle this
                     downloadButton.doSetProgress = false
                     downloadButton.progressBar.progressDrawable =
                         downloadButton.getDrawableFromStatus(status)
                             ?.let { ContextCompat.getDrawable(downloadButton.context, it) }
-                    downloadChildEpisodeTextExtra.text = formatShortFileSize(downloadChildEpisodeTextExtra.context, card.totalBytes)
+                    downloadChildEpisodeTextExtra.text =
+                        formatShortFileSize(downloadChildEpisodeTextExtra.context, card.totalBytes)
                 } else {
-                    downloadButton.doSetProgress = true
+                    // We need to make sure we restore the correct progress
+                    // when we refresh data in the adapter.
+                    downloadButton.resetView()
+                    val drawable = downloadButton.getDrawableFromStatus(status)?.let {
+                        ContextCompat.getDrawable(downloadButton.context, it)
+                    }
+                    downloadButton.statusView.setImageDrawable(drawable)
                     downloadButton.progressBar.progressDrawable =
-                        ContextCompat.getDrawable(downloadButton.context, downloadButton.progressDrawable)
+                        ContextCompat.getDrawable(
+                            downloadButton.context,
+                            downloadButton.progressDrawable
+                        )
                 }
 
-                downloadButton.setDefaultClickListener(d, downloadChildEpisodeTextExtra, mediaClickCallback)
-                downloadButton.isVisible = true
+                downloadButton.setDefaultClickListener(
+                    data,
+                    downloadChildEpisodeTextExtra,
+                    onItemClickEvent
+                )
+                downloadButton.isVisible = !isMultiDeleteState
 
                 downloadChildEpisodeText.apply {
-                    text = context.getNameFull(d.name, d.episode, d.season)
+                    text = context.getNameFull(data.name, data.episode, data.season)
                     isSelected = true // Needed for text repeating
                 }
 
                 downloadChildEpisodeHolder.setOnClickListener {
-                    mediaClickCallback.invoke(DownloadClickEvent(DOWNLOAD_ACTION_PLAY_FILE, d))
+                    onItemClickEvent.invoke(DownloadClickEvent(DOWNLOAD_ACTION_PLAY_FILE, data))
+                }
+
+                downloadChildEpisodeHolder.apply {
+                    when {
+                        isMultiDeleteState -> {
+                            setOnClickListener {
+                                toggleIsChecked(deleteCheckbox, data.id)
+                            }
+                        }
+
+                        else -> {
+                            setOnClickListener {
+                                onItemClickEvent.invoke(
+                                    DownloadClickEvent(
+                                        DOWNLOAD_ACTION_PLAY_FILE,
+                                        data
+                                    )
+                                )
+                            }
+                        }
+                    }
+
+                    setOnLongClickListener {
+                        toggleIsChecked(deleteCheckbox, data.id)
+                        true
+                    }
+                }
+
+                if (isMultiDeleteState) {
+                    deleteCheckbox.setOnCheckedChangeListener { _, isChecked ->
+                        onItemSelectionChanged.invoke(data.id, isChecked)
+                    }
+                } else deleteCheckbox.setOnCheckedChangeListener(null)
+
+                deleteCheckbox.apply {
+                    isVisible = isMultiDeleteState
+                    isChecked = card.isSelected
                 }
             }
         }
@@ -236,7 +353,7 @@ class DownloadAdapter(
             VIEW_TYPE_CHILD -> DownloadChildEpisodeBinding.inflate(inflater, parent, false)
             else -> throw IllegalArgumentException("Invalid view type")
         }
-        return DownloadViewHolder(binding, clickCallback, mediaClickCallback)
+        return DownloadViewHolder(binding)
     }
 
     override fun onBindViewHolder(holder: DownloadViewHolder, position: Int) {
@@ -245,18 +362,52 @@ class DownloadAdapter(
 
     override fun getItemViewType(position: Int): Int {
         return when (getItem(position)) {
-            is VisualDownloadChildCached -> VIEW_TYPE_CHILD
-            is VisualDownloadHeaderCached -> VIEW_TYPE_HEADER
+            is VisualDownloadCached.Child -> VIEW_TYPE_CHILD
+            is VisualDownloadCached.Header -> VIEW_TYPE_HEADER
             else -> throw IllegalArgumentException("Invalid data type at position $position")
         }
     }
 
+    fun setIsMultiDeleteState(value: Boolean) {
+        if (isMultiDeleteState == value) return
+        isMultiDeleteState = value
+        notifyItemRangeChanged(0, itemCount)
+    }
+
+    fun notifyAllSelected() {
+        currentList.indices.forEach { index ->
+            if (!currentList[index].isSelected) {
+                notifyItemChanged(index)
+            }
+        }
+    }
+
+    fun notifySelectionStates() {
+        currentList.indices.forEach { index ->
+            if (currentList[index].isSelected) {
+                notifyItemChanged(index)
+            }
+        }
+    }
+
+    private fun toggleIsChecked(checkbox: CheckBox, itemId: Int) {
+        val isChecked = !checkbox.isChecked
+        checkbox.isChecked = isChecked
+        onItemSelectionChanged.invoke(itemId, isChecked)
+    }
+
     class DiffCallback : DiffUtil.ItemCallback<VisualDownloadCached>() {
-        override fun areItemsTheSame(oldItem: VisualDownloadCached, newItem: VisualDownloadCached): Boolean {
+        override fun areItemsTheSame(
+            oldItem: VisualDownloadCached,
+            newItem: VisualDownloadCached
+        ): Boolean {
             return oldItem.data.id == newItem.data.id
         }
 
-        override fun areContentsTheSame(oldItem: VisualDownloadCached, newItem: VisualDownloadCached): Boolean {
+        override fun areContentsTheSame(
+            oldItem: VisualDownloadCached,
+            newItem: VisualDownloadCached
+        ): Boolean {
             return oldItem == newItem
         }
     }
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 c8c40e292cd..83e0d016788 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
@@ -1,11 +1,12 @@
 package com.lagradost.cloudstream3.ui.download
 
 import android.content.DialogInterface
-import android.widget.Toast
+import android.net.Uri
 import androidx.appcompat.app.AlertDialog
+import com.google.android.material.snackbar.Snackbar
 import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
+import com.lagradost.cloudstream3.AcraApplication.Companion.getKeys
 import com.lagradost.cloudstream3.CommonActivity.activity
-import com.lagradost.cloudstream3.CommonActivity.showToast
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.ui.player.DownloadFileGenerator
@@ -13,10 +14,13 @@ import com.lagradost.cloudstream3.ui.player.ExtractorUri
 import com.lagradost.cloudstream3.ui.player.GeneratorPlayer
 import com.lagradost.cloudstream3.utils.AppContextUtils.getNameFull
 import com.lagradost.cloudstream3.utils.AppContextUtils.setDefaultFocus
+import com.lagradost.cloudstream3.utils.DOWNLOAD_EPISODE_CACHE
 import com.lagradost.cloudstream3.utils.DOWNLOAD_HEADER_CACHE
+import com.lagradost.cloudstream3.utils.SnackbarHelper.showSnackbar
 import com.lagradost.cloudstream3.utils.UIHelper.navigate
 import com.lagradost.cloudstream3.utils.VideoDownloadHelper
 import com.lagradost.cloudstream3.utils.VideoDownloadManager
+import kotlinx.coroutines.MainScope
 
 object DownloadButtonSetup {
     fun handleDownloadClick(click: DownloadClickEvent) {
@@ -29,9 +33,15 @@ object DownloadButtonSetup {
                         DialogInterface.OnClickListener { _, which ->
                             when (which) {
                                 DialogInterface.BUTTON_POSITIVE -> {
-                                    VideoDownloadManager.deleteFileAndUpdateSettings(ctx, id)
+                                    VideoDownloadManager.deleteFilesAndUpdateSettings(
+                                        ctx,
+                                        setOf(id),
+                                        MainScope()
+                                    )
                                 }
+
                                 DialogInterface.BUTTON_NEGATIVE -> {
+                                    // Do nothing on cancel
                                 }
                             }
                         }
@@ -56,11 +66,13 @@ object DownloadButtonSetup {
                     }
                 }
             }
+
             DOWNLOAD_ACTION_PAUSE_DOWNLOAD -> {
                 VideoDownloadManager.downloadEvent.invoke(
                     Pair(click.data.id, VideoDownloadManager.DownloadActionType.Pause)
                 )
             }
+
             DOWNLOAD_ACTION_RESUME_DOWNLOAD -> {
                 activity?.let { ctx ->
                     if (VideoDownloadManager.downloadStatus.containsKey(id) && VideoDownloadManager.downloadStatus[id] == VideoDownloadManager.DownloadType.IsPaused) {
@@ -79,6 +91,7 @@ object DownloadButtonSetup {
                     }
                 }
             }
+
             DOWNLOAD_ACTION_LONG_CLICK -> {
                 activity?.let { act ->
                     val length =
@@ -88,64 +101,61 @@ object DownloadButtonSetup {
                         )?.fileLength
                             ?: 0
                     if (length > 0) {
-                        showToast(R.string.delete, Toast.LENGTH_LONG)
-                    } else {
-                        showToast(R.string.download, Toast.LENGTH_LONG)
+                        showSnackbar(
+                            act,
+                            R.string.offline_file,
+                            Snackbar.LENGTH_LONG
+                        )
                     }
                 }
             }
+
             DOWNLOAD_ACTION_PLAY_FILE -> {
                 activity?.let { act ->
-                    val info =
-                        VideoDownloadManager.getDownloadFileInfoAndUpdateSettings(
-                            act,
-                            click.data.id
-                        ) ?: return
-                    val keyInfo = getKey<VideoDownloadManager.DownloadedFileInfo>(
-                        VideoDownloadManager.KEY_DOWNLOAD_INFO,
-                        click.data.id.toString()
-                    ) ?: return
                     val parent = getKey<VideoDownloadHelper.DownloadHeaderCached>(
                         DOWNLOAD_HEADER_CACHE,
                         click.data.parentId.toString()
                     ) ?: return
 
-                    act.navigate(
-                        R.id.global_to_navigation_player, GeneratorPlayer.newInstance(
-                            DownloadFileGenerator(
-                                listOf(
-                                    ExtractorUri(
-                                        uri = info.path,
+                    val episodes = getKeys(DOWNLOAD_EPISODE_CACHE)
+                        ?.mapNotNull {
+                            getKey<VideoDownloadHelper.DownloadEpisodeCached>(it)
+                        }
+                        ?.filter { it.parentId == click.data.parentId }
 
-                                        id = click.data.id,
-                                        parentId = click.data.parentId,
-                                        name = act.getString(R.string.downloaded_file), //click.data.name ?: keyInfo.displayName
-                                        season = click.data.season,
-                                        episode = click.data.episode,
-                                        headerName = parent.name,
-                                        tvType = parent.type,
+                    val items = mutableListOf<ExtractorUri>()
+                    val allRelevantEpisodes = episodes?.sortedWith(compareBy<VideoDownloadHelper.DownloadEpisodeCached> { it.season ?: 0 }.thenBy { it.episode })
 
-                                        basePath = keyInfo.basePath,
-                                        displayName = keyInfo.displayName,
-                                        relativePath = keyInfo.relativePath,
-                                    )
-                                )
+                    allRelevantEpisodes?.forEach {
+                        val keyInfo = getKey<VideoDownloadManager.DownloadedFileInfo>(
+                            VideoDownloadManager.KEY_DOWNLOAD_INFO,
+                            it.id.toString()
+                        ) ?: return@forEach
+
+                        items.add(
+                            ExtractorUri(
+                                // We just use a temporary placeholder for the URI,
+                                // it will be updated in generateLinks().
+                                // We just do this for performance since getting
+                                // all paths at once can be quite expensive.
+                                uri = Uri.EMPTY,
+                                id = it.id,
+                                parentId = it.parentId,
+                                name = act.getString(R.string.downloaded_file),
+                                season = it.season,
+                                episode = it.episode,
+                                headerName = parent.name,
+                                tvType = parent.type,
+                                basePath = keyInfo.basePath,
+                                displayName = keyInfo.displayName,
+                                relativePath = keyInfo.relativePath,
                             )
                         )
-                        //R.id.global_to_navigation_player, PlayerFragment.newInstance(
-                        //    UriData(
-                        //        info.path.toString(),
-                        //        keyInfo.basePath,
-                        //        keyInfo.relativePath,
-                        //        keyInfo.displayName,
-                        //        click.data.parentId,
-                        //        click.data.id,
-                        //        headerName ?: "null",
-                        //        if (click.data.episode <= 0) null else click.data.episode,
-                        //        click.data.season
-                        //    ),
-                        //    getViewPos(click.data.id)?.position ?: 0
-                        //)
+                    }
+                    act.navigate(
+                        R.id.global_to_navigation_player, GeneratorPlayer.newInstance(
+                            DownloadFileGenerator(items).apply { goto(items.indexOfFirst { it.id == click.data.id }) }
+                        )
                     )
                 }
             }
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 03db948c428..1f5b9e337fa 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
@@ -1,29 +1,33 @@
 package com.lagradost.cloudstream3.ui.download
 
 import android.os.Bundle
+import android.os.Handler
+import android.os.Looper
+import android.text.format.Formatter.formatShortFileSize
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
+import androidx.lifecycle.ViewModelProvider
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.databinding.FragmentChildDownloadsBinding
+import com.lagradost.cloudstream3.mvvm.observe
 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.ui.settings.Globals.EMULATOR
 import com.lagradost.cloudstream3.ui.settings.Globals.PHONE
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
-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.BackPressedCallbackHelper.attachBackPressedCallback
+import com.lagradost.cloudstream3.utils.BackPressedCallbackHelper.detachBackPressedCallback
 import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
 import com.lagradost.cloudstream3.utils.UIHelper.setAppBarNoScrollFlagsOnTV
-import com.lagradost.cloudstream3.utils.VideoDownloadHelper
-import com.lagradost.cloudstream3.utils.VideoDownloadManager
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
 
 class DownloadChildFragment : Fragment() {
+    private lateinit var downloadsViewModel: DownloadViewModel
+    private var binding: FragmentChildDownloadsBinding? = null
+
     companion object {
         fun newInstance(headerName: String, folder: String): Bundle {
             return Bundle().apply {
@@ -34,61 +38,54 @@ class DownloadChildFragment : Fragment() {
     }
 
     override fun onDestroyView() {
-        downloadDeleteEventListener?.let { VideoDownloadManager.downloadDeleteEvent -= it }
-        downloadDeleteEventListener = null
+        activity?.detachBackPressedCallback("Downloads")
         binding = null
         super.onDestroyView()
     }
 
-    private var binding: FragmentChildDownloadsBinding? = null
-
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
+        downloadsViewModel = ViewModelProvider(this)[DownloadViewModel::class.java]
         val localBinding = FragmentChildDownloadsBinding.inflate(inflater, container, false)
         binding = localBinding
         return localBinding.root
     }
 
-    private fun updateList(folder: String) = main {
-        context?.let { ctx ->
-            val data = withContext(Dispatchers.IO) { ctx.getKeys(folder) }
-            val eps = withContext(Dispatchers.IO) {
-                data.mapNotNull { key ->
-                    context?.getKey<VideoDownloadHelper.DownloadEpisodeCached>(key)
-                }.mapNotNull {
-                    val info = VideoDownloadManager.getDownloadFileInfoAndUpdateSettings(ctx, it.id)
-                        ?: return@mapNotNull null
-                    VisualDownloadChildCached(
-                        currentBytes = info.fileLength,
-                        totalBytes = info.totalBytes,
-                        data = it,
-                    )
-                }
-            }.sortedBy { it.data.episode + (it.data.season ?: 0) * 100000 }
-            if (eps.isEmpty()) {
-                activity?.onBackPressedDispatcher?.onBackPressed()
-                return@main
-            }
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
 
-            (binding?.downloadChildList?.adapter as? DownloadAdapter)?.submitList(eps)
+        /**
+         * We never want to retain multi-delete state
+         * when navigating to downloads. Setting this state
+         * immediately can sometimes result in the observer
+         * not being notified in time to update the UI.
+         *
+         * By posting to the main looper, we ensure that this
+         * operation is executed after the view has been fully created
+         * and all initializations are completed, allowing the
+         * observer to properly receive and handle the state change.
+         */
+        Handler(Looper.getMainLooper()).post {
+            downloadsViewModel.setIsMultiDeleteState(false)
         }
-    }
 
-    private var downloadDeleteEventListener: ((Int) -> Unit)? = null
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
+        /**
+         * We have to make sure selected items are
+         * cleared here as well so we don't run in an
+         * inconsistent state where selected items do
+         * not match the multi delete state we are in.
+         */
+        downloadsViewModel.clearSelectedItems()
 
         val folder = arguments?.getString("folder")
         val name = arguments?.getString("name")
         if (folder == null) {
-            activity?.onBackPressedDispatcher?.onBackPressed() // TODO FIX
+            activity?.onBackPressedDispatcher?.onBackPressed()
             return
         }
-        fixPaddingStatusbar(binding?.downloadChildRoot)
 
         binding?.downloadChildToolbar?.apply {
             title = name
@@ -101,13 +98,55 @@ class DownloadChildFragment : Fragment() {
             setAppBarNoScrollFlagsOnTV()
         }
 
+        binding?.downloadDeleteAppbar?.setAppBarNoScrollFlagsOnTV()
+
+        observe(downloadsViewModel.childCards) {
+            if (it.isEmpty()) {
+                activity?.onBackPressedDispatcher?.onBackPressed()
+                return@observe
+            }
+
+            (binding?.downloadChildList?.adapter as? DownloadAdapter)?.submitList(it)
+        }
+        observe(downloadsViewModel.isMultiDeleteState) { isMultiDeleteState ->
+            val adapter = binding?.downloadChildList?.adapter as? DownloadAdapter
+            adapter?.setIsMultiDeleteState(isMultiDeleteState)
+            binding?.downloadDeleteAppbar?.isVisible = isMultiDeleteState
+            if (!isMultiDeleteState) {
+                activity?.detachBackPressedCallback("Downloads")
+                downloadsViewModel.clearSelectedItems()
+                binding?.downloadChildToolbar?.isVisible = true
+            }
+        }
+        observe(downloadsViewModel.selectedBytes) {
+            updateDeleteButton(downloadsViewModel.selectedItemIds.value?.count() ?: 0, it)
+        }
+        observe(downloadsViewModel.selectedItemIds) {
+            handleSelectedChange(it)
+            updateDeleteButton(it.count(), downloadsViewModel.selectedBytes.value ?: 0L)
+
+            binding?.btnDelete?.isVisible = it.isNotEmpty()
+            binding?.selectItemsText?.isVisible = it.isEmpty()
+
+            val allSelected = downloadsViewModel.isAllSelected()
+            if (allSelected) {
+                binding?.btnToggleAll?.setText(R.string.deselect_all)
+            } else binding?.btnToggleAll?.setText(R.string.select_all)
+        }
+
         val adapter = DownloadAdapter(
             {},
-            { downloadClickEvent ->
-                handleDownloadClick(downloadClickEvent)
-                if (downloadClickEvent.action == DOWNLOAD_ACTION_DELETE_FILE) {
-                    setUpDownloadDeleteListener(folder)
-                }
+            { click ->
+                if (click.action == DOWNLOAD_ACTION_DELETE_FILE) {
+                    context?.let { ctx ->
+                        downloadsViewModel.handleSingleDelete(ctx, click.data.id)
+                    }
+                } else handleDownloadClick(click)
+            },
+            { itemId, isChecked ->
+                if (isChecked) {
+                    downloadsViewModel.addSelected(itemId)
+                } else downloadsViewModel.removeSelected(itemId)
             }
         )
 
@@ -122,18 +161,47 @@ class DownloadChildFragment : Fragment() {
             )
         }
 
-        updateList(folder)
+        context?.let { downloadsViewModel.updateChildList(it, folder) }
+        fixPaddingStatusbar(binding?.downloadChildRoot)
     }
 
-    private fun setUpDownloadDeleteListener(folder: String) {
-        downloadDeleteEventListener = { id: Int ->
-            val list = (binding?.downloadChildList?.adapter as? DownloadAdapter)?.currentList
-            if (list != null) {
-                if (list.any { it.data.id == id }) {
-                    updateList(folder)
+    private fun handleSelectedChange(selected: MutableSet<Int>) {
+        if (selected.isNotEmpty()) {
+            binding?.downloadDeleteAppbar?.isVisible = true
+            binding?.downloadChildToolbar?.isVisible = false
+            activity?.attachBackPressedCallback("Downloads") {
+                downloadsViewModel.setIsMultiDeleteState(false)
+            }
+
+            binding?.btnDelete?.setOnClickListener {
+                context?.let { ctx ->
+                    downloadsViewModel.handleMultiDelete(ctx)
                 }
             }
+
+            binding?.btnCancel?.setOnClickListener {
+                downloadsViewModel.setIsMultiDeleteState(false)
+            }
+
+            binding?.btnToggleAll?.setOnClickListener {
+                val allSelected = downloadsViewModel.isAllSelected()
+                val adapter = binding?.downloadChildList?.adapter as? DownloadAdapter
+                if (allSelected) {
+                    adapter?.notifySelectionStates()
+                    downloadsViewModel.clearSelectedItems()
+                } else {
+                    adapter?.notifyAllSelected()
+                    downloadsViewModel.selectAllItems()
+                }
+            }
+
+            downloadsViewModel.setIsMultiDeleteState(true)
         }
-        downloadDeleteEventListener?.let { VideoDownloadManager.downloadDeleteEvent += it }
+    }
+
+    private fun updateDeleteButton(count: Int, selectedBytes: Long) {
+        val formattedSize = formatShortFileSize(context, selectedBytes)
+        binding?.btnDelete?.text =
+            getString(R.string.delete_format).format(count, formattedSize)
     }
 }
\ No newline at end of file
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 23d546e1083..d8f666da2ce 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
@@ -8,6 +8,8 @@ import android.content.Intent
 import android.content.Intent.FLAG_GRANT_READ_URI_PERMISSION
 import android.os.Build
 import android.os.Bundle
+import android.os.Handler
+import android.os.Looper
 import android.text.format.Formatter.formatShortFileSize
 import android.view.LayoutInflater
 import android.view.View
@@ -17,7 +19,6 @@ import android.widget.TextView
 import android.widget.Toast
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.annotation.StringRes
-import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.core.widget.doOnTextChanged
@@ -27,7 +28,7 @@ import com.lagradost.cloudstream3.CommonActivity.showToast
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.databinding.FragmentDownloadsBinding
 import com.lagradost.cloudstream3.databinding.StreamInputBinding
-import com.lagradost.cloudstream3.isMovieType
+import com.lagradost.cloudstream3.isEpisodeBased
 import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
 import com.lagradost.cloudstream3.mvvm.observe
 import com.lagradost.cloudstream3.ui.download.DownloadButtonSetup.handleDownloadClick
@@ -40,20 +41,22 @@ import com.lagradost.cloudstream3.ui.result.setLinearListLayout
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
 import com.lagradost.cloudstream3.utils.AppContextUtils.loadResult
+import com.lagradost.cloudstream3.utils.BackPressedCallbackHelper.attachBackPressedCallback
+import com.lagradost.cloudstream3.utils.BackPressedCallbackHelper.detachBackPressedCallback
 import com.lagradost.cloudstream3.utils.DOWNLOAD_EPISODE_CACHE
-import com.lagradost.cloudstream3.utils.DataStore
+import com.lagradost.cloudstream3.utils.DataStore.getFolderName
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
 import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
 import com.lagradost.cloudstream3.utils.UIHelper.hideKeyboard
 import com.lagradost.cloudstream3.utils.UIHelper.navigate
 import com.lagradost.cloudstream3.utils.UIHelper.setAppBarNoScrollFlagsOnTV
-import com.lagradost.cloudstream3.utils.VideoDownloadManager
 import java.net.URI
 
 const val DOWNLOAD_NAVIGATE_TO = "downloadpage"
 
 class DownloadFragment : Fragment() {
     private lateinit var downloadsViewModel: DownloadViewModel
+    private var binding: FragmentDownloadsBinding? = null
 
     private fun View.setLayoutWidth(weight: Long) {
         val param = LinearLayout.LayoutParams(
@@ -65,14 +68,11 @@ class DownloadFragment : Fragment() {
     }
 
     override fun onDestroyView() {
-        downloadDeleteEventListener?.let { VideoDownloadManager.downloadDeleteEvent -= it }
-        downloadDeleteEventListener = null
+        activity?.detachBackPressedCallback("Downloads")
         binding = null
         super.onDestroyView()
     }
 
-    private var binding: FragmentDownloadsBinding? = null
-
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -84,12 +84,34 @@ class DownloadFragment : Fragment() {
         return localBinding.root
     }
 
-    private var downloadDeleteEventListener: ((Int) -> Unit)? = null
-
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         hideKeyboard()
         binding?.downloadStorageAppbar?.setAppBarNoScrollFlagsOnTV()
+        binding?.downloadDeleteAppbar?.setAppBarNoScrollFlagsOnTV()
+
+        /**
+         * We never want to retain multi-delete state
+         * when navigating to downloads. Setting this state
+         * immediately can sometimes result in the observer
+         * not being notified in time to update the UI.
+         *
+         * By posting to the main looper, we ensure that this
+         * operation is executed after the view has been fully created
+         * and all initializations are completed, allowing the
+         * observer to properly receive and handle the state change.
+         */
+        Handler(Looper.getMainLooper()).post {
+            downloadsViewModel.setIsMultiDeleteState(false)
+        }
+
+        /**
+         * We have to make sure selected items are
+         * cleared here as well so we don't run in an
+         * inconsistent state where selected items do
+         * not match the multi delete state we are in.
+         */
+        downloadsViewModel.clearSelectedItems()
 
         observe(downloadsViewModel.headerCards) {
             (binding?.downloadList?.adapter as? DownloadAdapter)?.submitList(it)
@@ -97,25 +119,82 @@ class DownloadFragment : Fragment() {
             binding?.textNoDownloads?.isVisible = it.isEmpty()
         }
         observe(downloadsViewModel.availableBytes) {
-            updateStorageInfo(view.context, it, R.string.free_storage, binding?.downloadFreeTxt, binding?.downloadFree)
+            updateStorageInfo(
+                view.context,
+                it,
+                R.string.free_storage,
+                binding?.downloadFreeTxt,
+                binding?.downloadFree
+            )
         }
         observe(downloadsViewModel.usedBytes) {
-            updateStorageInfo(view.context, it, R.string.used_storage, binding?.downloadUsedTxt, binding?.downloadUsed)
-            binding?.downloadStorageAppbar?.isVisible = it > 0
+            updateStorageInfo(
+                view.context,
+                it,
+                R.string.used_storage,
+                binding?.downloadUsedTxt,
+                binding?.downloadUsed
+            )
+
+            // Prevent race condition and make sure
+            // we don't display it early
+            if (
+                downloadsViewModel.isMultiDeleteState.value == null ||
+                downloadsViewModel.isMultiDeleteState.value == false
+            ) binding?.downloadStorageAppbar?.isVisible = it > 0
         }
         observe(downloadsViewModel.downloadBytes) {
-            updateStorageInfo(view.context, it, R.string.app_storage, binding?.downloadAppTxt, binding?.downloadApp)
+            updateStorageInfo(
+                view.context,
+                it,
+                R.string.app_storage,
+                binding?.downloadAppTxt,
+                binding?.downloadApp
+            )
+        }
+        observe(downloadsViewModel.selectedBytes) {
+            updateDeleteButton(downloadsViewModel.selectedItemIds.value?.count() ?: 0, it)
+        }
+        observe(downloadsViewModel.isMultiDeleteState) { isMultiDeleteState ->
+            val adapter = binding?.downloadList?.adapter as? DownloadAdapter
+            adapter?.setIsMultiDeleteState(isMultiDeleteState)
+            binding?.downloadDeleteAppbar?.isVisible = isMultiDeleteState
+            if (!isMultiDeleteState) {
+                activity?.detachBackPressedCallback("Downloads")
+                downloadsViewModel.clearSelectedItems()
+                // Prevent race condition and make sure
+                // we don't display it early
+                if (downloadsViewModel.usedBytes.value?.let { it > 0 } == true) {
+                    binding?.downloadStorageAppbar?.isVisible = true
+                }
+            }
+        }
+        observe(downloadsViewModel.selectedItemIds) {
+            handleSelectedChange(it)
+            updateDeleteButton(it.count(), downloadsViewModel.selectedBytes.value ?: 0L)
+
+            binding?.btnDelete?.isVisible = it.isNotEmpty()
+            binding?.selectItemsText?.isVisible = it.isEmpty()
+
+            val allSelected = downloadsViewModel.isAllSelected()
+            if (allSelected) {
+                binding?.btnToggleAll?.setText(R.string.deselect_all)
+            } else binding?.btnToggleAll?.setText(R.string.select_all)
         }
 
         val adapter = DownloadAdapter(
+            { click -> handleItemClick(click) },
             { click ->
-                handleItemClick(click)
+                if (click.action == DOWNLOAD_ACTION_DELETE_FILE) {
+                    context?.let { ctx ->
+                        downloadsViewModel.handleSingleDelete(ctx, click.data.id)
+                    }
+                } else handleDownloadClick(click)
             },
-            { downloadClickEvent ->
-                handleDownloadClick(downloadClickEvent)
-                if (downloadClickEvent.action == DOWNLOAD_ACTION_DELETE_FILE) {
-                    setUpDownloadDeleteListener()
-                }
+            { itemId, isChecked ->
+                if (isChecked) {
+                    downloadsViewModel.addSelected(itemId)
+                } else downloadsViewModel.removeSelected(itemId)
             }
         )
 
@@ -126,7 +205,6 @@ class DownloadFragment : Fragment() {
             setLinearListLayout(
                 isHorizontal = false,
                 nextRight = FOCUS_SELF,
-                nextUp = FOCUS_SELF,
                 nextDown = FOCUS_SELF,
             )
         }
@@ -147,35 +225,68 @@ class DownloadFragment : Fragment() {
                 handleScroll(scrollY - oldScrollY)
             }
         }
-        downloadsViewModel.updateList(requireContext())
+
+        context?.let { downloadsViewModel.updateHeaderList(it) }
         fixPaddingStatusbar(binding?.downloadRoot)
     }
 
     private fun handleItemClick(click: DownloadHeaderClickEvent) {
         when (click.action) {
             DOWNLOAD_ACTION_GO_TO_CHILD -> {
-                if (!click.data.type.isMovieType()) {
-                    val folder = DataStore.getFolderName(DOWNLOAD_EPISODE_CACHE, click.data.id.toString())
+                if (click.data.type.isEpisodeBased()) {
+                    val folder =
+                        getFolderName(DOWNLOAD_EPISODE_CACHE, click.data.id.toString())
                     activity?.navigate(
                         R.id.action_navigation_downloads_to_navigation_download_child,
                         DownloadChildFragment.newInstance(click.data.name, folder)
                     )
                 }
             }
+
             DOWNLOAD_ACTION_LOAD_RESULT -> {
-                (activity as AppCompatActivity?)?.loadResult(click.data.url, click.data.apiName)
+                activity?.loadResult(click.data.url, click.data.apiName, click.data.name)
             }
         }
     }
 
-    private fun setUpDownloadDeleteListener() {
-        downloadDeleteEventListener = { id ->
-            val list = (binding?.downloadList?.adapter as? DownloadAdapter)?.currentList
-            if (list?.any { it.data.id == id } == true) {
-                context?.let { downloadsViewModel.updateList(it) }
+    private fun handleSelectedChange(selected: MutableSet<Int>) {
+        if (selected.isNotEmpty()) {
+            binding?.downloadDeleteAppbar?.isVisible = true
+            binding?.downloadStorageAppbar?.isVisible = false
+            activity?.attachBackPressedCallback("Downloads") {
+                downloadsViewModel.setIsMultiDeleteState(false)
+            }
+
+            binding?.btnDelete?.setOnClickListener {
+                context?.let { ctx ->
+                    downloadsViewModel.handleMultiDelete(ctx)
+                }
+            }
+
+            binding?.btnCancel?.setOnClickListener {
+                downloadsViewModel.setIsMultiDeleteState(false)
+            }
+
+            binding?.btnToggleAll?.setOnClickListener {
+                val allSelected = downloadsViewModel.isAllSelected()
+                val adapter = binding?.downloadList?.adapter as? DownloadAdapter
+                if (allSelected) {
+                    adapter?.notifySelectionStates()
+                    downloadsViewModel.clearSelectedItems()
+                } else {
+                    adapter?.notifyAllSelected()
+                    downloadsViewModel.selectAllItems()
+                }
             }
+
+            downloadsViewModel.setIsMultiDeleteState(true)
         }
-        downloadDeleteEventListener?.let { VideoDownloadManager.downloadDeleteEvent += it }
+    }
+
+    private fun updateDeleteButton(count: Int, selectedBytes: Long) {
+        val formattedSize = formatShortFileSize(context, selectedBytes)
+        binding?.btnDelete?.text =
+            getString(R.string.delete_format).format(count, formattedSize)
     }
 
     private fun updateStorageInfo(
@@ -185,7 +296,10 @@ class DownloadFragment : Fragment() {
         textView: TextView?,
         view: View?
     ) {
-        textView?.text = getString(R.string.storage_size_format).format(getString(stringRes), formatShortFileSize(context, bytes))
+        textView?.text = getString(R.string.storage_size_format).format(
+            getString(stringRes),
+            formatShortFileSize(context, bytes)
+        )
         view?.setLayoutWidth(bytes)
     }
 
@@ -218,7 +332,9 @@ class DownloadFragment : Fragment() {
             if (!preventAutoSwitching) activateSwitchOnHls(text?.toString(), binding)
         }
 
-        (activity?.getSystemService(Context.CLIPBOARD_SERVICE) as? ClipboardManager)?.primaryClip?.getItemAt(0)?.text?.toString()?.let { copy ->
+        (activity?.getSystemService(Context.CLIPBOARD_SERVICE) as? ClipboardManager)?.primaryClip?.getItemAt(
+            0
+        )?.text?.toString()?.let { copy ->
             val fixedText = copy.trim()
             binding.streamUrl.setText(fixedText)
             activateSwitchOnHls(fixedText, binding)
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadViewModel.kt
index 83d96592809..137f1355e25 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadViewModel.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadViewModel.kt
@@ -1,122 +1,439 @@
 package com.lagradost.cloudstream3.ui.download
 
 import android.content.Context
+import android.content.DialogInterface
 import android.os.Environment
 import android.os.StatFs
+import androidx.appcompat.app.AlertDialog
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.lagradost.cloudstream3.isMovieType
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.isEpisodeBased
 import com.lagradost.cloudstream3.mvvm.launchSafe
 import com.lagradost.cloudstream3.mvvm.logError
+import com.lagradost.cloudstream3.utils.AppContextUtils.getNameFull
+import com.lagradost.cloudstream3.utils.AppContextUtils.setDefaultFocus
 import com.lagradost.cloudstream3.utils.DOWNLOAD_EPISODE_CACHE
 import com.lagradost.cloudstream3.utils.DOWNLOAD_HEADER_CACHE
 import com.lagradost.cloudstream3.utils.DataStore.getFolderName
 import com.lagradost.cloudstream3.utils.DataStore.getKey
 import com.lagradost.cloudstream3.utils.DataStore.getKeys
 import com.lagradost.cloudstream3.utils.VideoDownloadHelper
+import com.lagradost.cloudstream3.utils.VideoDownloadManager.deleteFilesAndUpdateSettings
 import com.lagradost.cloudstream3.utils.VideoDownloadManager.getDownloadFileInfoAndUpdateSettings
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 
 class DownloadViewModel : ViewModel() {
-    private val _headerCards =
-        MutableLiveData<List<VisualDownloadHeaderCached>>().apply { listOf<VisualDownloadHeaderCached>() }
-    val headerCards: LiveData<List<VisualDownloadHeaderCached>> = _headerCards
 
-    private val _usedBytes = MutableLiveData<Long>()
-    private val _availableBytes = MutableLiveData<Long>()
-    private val _downloadBytes = MutableLiveData<Long>()
+    private val _headerCards = MutableLiveData<List<VisualDownloadCached.Header>>()
+    val headerCards: LiveData<List<VisualDownloadCached.Header>> = _headerCards
+
+    private val _childCards = MutableLiveData<List<VisualDownloadCached.Child>>()
+    val childCards: LiveData<List<VisualDownloadCached.Child>> = _childCards
 
+    private val _usedBytes = MutableLiveData<Long>()
     val usedBytes: LiveData<Long> = _usedBytes
+
+    private val _availableBytes = MutableLiveData<Long>()
     val availableBytes: LiveData<Long> = _availableBytes
+
+    private val _downloadBytes = MutableLiveData<Long>()
     val downloadBytes: LiveData<Long> = _downloadBytes
 
-    private var previousVisual: List<VisualDownloadHeaderCached>? = null
+    private val _selectedBytes = MutableLiveData<Long>(0)
+    val selectedBytes: LiveData<Long> = _selectedBytes
+
+    private val _isMultiDeleteState = MutableLiveData(false)
+    val isMultiDeleteState: LiveData<Boolean> = _isMultiDeleteState
+
+    private val _selectedItemIds = MutableLiveData<MutableSet<Int>>(mutableSetOf())
+    val selectedItemIds: LiveData<MutableSet<Int>> = _selectedItemIds
+
+    private var previousVisual: List<VisualDownloadCached>? = null
+
+    fun setIsMultiDeleteState(value: Boolean) {
+        _isMultiDeleteState.postValue(value)
+    }
+
+    fun addSelected(itemId: Int) {
+        updateSelectedItems { it.add(itemId) }
+    }
+
+    fun removeSelected(itemId: Int) {
+        updateSelectedItems { it.remove(itemId) }
+    }
+
+    fun selectAllItems() {
+        val items = headerCards.value.orEmpty() + childCards.value.orEmpty()
+        updateSelectedItems { it.addAll(items.map { item -> item.data.id }) }
+    }
+
+    fun clearSelectedItems() {
+        // We need this to be done immediately
+        // so we can't use postValue
+        _selectedItemIds.value = mutableSetOf()
+        updateSelectedItems { it.clear() }
+    }
+
+    fun isAllSelected(): Boolean {
+        val currentSelected = selectedItemIds.value ?: return false
+        val items = headerCards.value.orEmpty() + childCards.value.orEmpty()
+        return items.count() == currentSelected.count() && items.all { it.data.id in currentSelected }
+    }
+
+    private fun updateSelectedItems(action: (MutableSet<Int>) -> Unit) {
+        val currentSelected = selectedItemIds.value ?: mutableSetOf()
+        action(currentSelected)
+        _selectedItemIds.postValue(currentSelected)
+        updateSelectedBytes()
+        updateSelectedCards()
+    }
+
+    private fun updateSelectedBytes() = viewModelScope.launchSafe {
+        val selectedItemsList = getSelectedItemsData() ?: return@launchSafe
+        val totalSelectedBytes = selectedItemsList.sumOf { it.totalBytes }
+        _selectedBytes.postValue(totalSelectedBytes)
+    }
+
+    private fun updateSelectedCards() = viewModelScope.launchSafe {
+        val currentSelected = selectedItemIds.value ?: return@launchSafe
+
+        headerCards.value?.let { headers ->
+            headers.forEach { header ->
+                header.isSelected = header.data.id in currentSelected
+            }
+            _headerCards.postValue(headers)
+        }
 
-    fun updateList(context: Context) = viewModelScope.launchSafe {
-        val children = withContext(Dispatchers.IO) {
-            context.getKeys(DOWNLOAD_EPISODE_CACHE)
+        childCards.value?.let { children ->
+            children.forEach { child ->
+                child.isSelected = child.data.id in currentSelected
+            }
+            _childCards.postValue(children)
+        }
+    }
+
+    fun updateHeaderList(context: Context) = viewModelScope.launchSafe {
+        val visual = withContext(Dispatchers.IO) {
+            val children = context.getKeys(DOWNLOAD_EPISODE_CACHE)
                 .mapNotNull { context.getKey<VideoDownloadHelper.DownloadEpisodeCached>(it) }
                 .distinctBy { it.id } // Remove duplicates
+
+            val (totalBytesUsedByChild, currentBytesUsedByChild, totalDownloads) =
+                calculateDownloadStats(context, children)
+
+            val cached = context.getKeys(DOWNLOAD_HEADER_CACHE)
+                .mapNotNull { context.getKey<VideoDownloadHelper.DownloadHeaderCached>(it) }
+
+            createVisualDownloadList(
+                context, cached, totalBytesUsedByChild, currentBytesUsedByChild, totalDownloads
+            )
+        }
+
+        if (visual != previousVisual) {
+            previousVisual = visual
+            updateStorageStats(visual)
+            _headerCards.postValue(visual)
         }
+    }
 
+    private fun calculateDownloadStats(
+        context: Context,
+        children: List<VideoDownloadHelper.DownloadEpisodeCached>
+    ): Triple<Map<Int, Long>, Map<Int, Long>, Map<Int, Int>> {
         // parentId : bytes
-        val totalBytesUsedByChild = HashMap<Int, Long>()
+        val totalBytesUsedByChild = mutableMapOf<Int, Long>()
         // parentId : bytes
-        val currentBytesUsedByChild = HashMap<Int, Long>()
+        val currentBytesUsedByChild = mutableMapOf<Int, Long>()
         // parentId : downloadsCount
-        val totalDownloads = HashMap<Int, Int>()
+        val totalDownloads = mutableMapOf<Int, Int>()
 
-        // Gets all children downloads
-        withContext(Dispatchers.IO) {
-            children.forEach { c ->
-                val childFile = getDownloadFileInfoAndUpdateSettings(context, c.id) ?: return@forEach
+        children.forEach { child ->
+            val childFile = getDownloadFileInfoAndUpdateSettings(context, child.id) ?: return@forEach
+            if (childFile.fileLength <= 1) return@forEach
 
-                if (childFile.fileLength <= 1) return@forEach
-                val len = childFile.totalBytes
-                val flen = childFile.fileLength
+            val len = childFile.totalBytes
+            val flen = childFile.fileLength
 
-                totalBytesUsedByChild[c.parentId] = totalBytesUsedByChild[c.parentId]?.plus(len) ?: len
-                currentBytesUsedByChild[c.parentId] = currentBytesUsedByChild[c.parentId]?.plus(flen) ?: flen
-                totalDownloads[c.parentId] = totalDownloads[c.parentId]?.plus(1) ?: 1
-            }
+            totalBytesUsedByChild.merge(child.parentId, len, Long::plus)
+            currentBytesUsedByChild.merge(child.parentId, flen, Long::plus)
+            totalDownloads.merge(child.parentId, 1, Int::plus)
         }
+        return Triple(totalBytesUsedByChild, currentBytesUsedByChild, totalDownloads)
+    }
+
+    private fun createVisualDownloadList(
+        context: Context,
+        cached: List<VideoDownloadHelper.DownloadHeaderCached>,
+        totalBytesUsedByChild: Map<Int, Long>,
+        currentBytesUsedByChild: Map<Int, Long>,
+        totalDownloads: Map<Int, Int>
+    ): List<VisualDownloadCached.Header> {
+        return cached.mapNotNull {
+            val downloads = totalDownloads[it.id] ?: 0
+            val bytes = totalBytesUsedByChild[it.id] ?: 0
+            val currentBytes = currentBytesUsedByChild[it.id] ?: 0
+            if (bytes <= 0 || downloads <= 0) return@mapNotNull null
+
+            val isSelected = selectedItemIds.value?.contains(it.id) ?: false
+            val movieEpisode = if (it.type.isEpisodeBased()) null else context.getKey<VideoDownloadHelper.DownloadEpisodeCached>(
+                DOWNLOAD_EPISODE_CACHE,
+                getFolderName(it.id.toString(), it.id.toString())
+            )
 
-        val cached = withContext(Dispatchers.IO) { // Won't fetch useless keys
-            totalDownloads.entries.filter { it.value > 0 }.mapNotNull {
-                context.getKey<VideoDownloadHelper.DownloadHeaderCached>(
-                    DOWNLOAD_HEADER_CACHE,
-                    it.key.toString()
+            VisualDownloadCached.Header(
+                currentBytes = currentBytes,
+                totalBytes = bytes,
+                data = it,
+                child = movieEpisode,
+                currentOngoingDownloads = 0,
+                totalDownloads = downloads,
+                isSelected = isSelected,
+            )
+            // Prevent order being almost completely random,
+            // making things difficult to find.
+        }.sortedWith(compareBy<VisualDownloadCached.Header> {
+            // Sort by isEpisodeBased() ascending. We put those that
+            // are episode based at the bottom for UI purposes and to
+            // make it easier to find by grouping them together.
+            it.data.type.isEpisodeBased()
+        }.thenBy {
+            // Then we sort alphabetically by name (case-insensitive).
+            // Again, we do this to make things easier to find.
+            it.data.name.lowercase()
+        })
+    }
+
+    fun updateChildList(context: Context, folder: String) = viewModelScope.launchSafe {
+        val visual = withContext(Dispatchers.IO) {
+            context.getKeys(folder).mapNotNull { key ->
+                context.getKey<VideoDownloadHelper.DownloadEpisodeCached>(key)
+            }.mapNotNull {
+                val isSelected = selectedItemIds.value?.contains(it.id) ?: false
+                val info = getDownloadFileInfoAndUpdateSettings(context, it.id) ?: return@mapNotNull null
+                VisualDownloadCached.Child(
+                    currentBytes = info.fileLength,
+                    totalBytes = info.totalBytes,
+                    isSelected = isSelected,
+                    data = it,
                 )
             }
+        }.sortedWith(compareBy(
+            // Sort by season first, and then by episode number,
+            // to ensure sorting is consistent.
+            { it.data.season ?: 0 },
+            { it.data.episode }
+        ))
+
+        if (previousVisual != visual) {
+            previousVisual = visual
+            _childCards.postValue(visual)
         }
+    }
 
-        val visual = withContext(Dispatchers.IO) {
-            cached.mapNotNull {
-                val downloads = totalDownloads[it.id] ?: 0
-                val bytes = totalBytesUsedByChild[it.id] ?: 0
-                val currentBytes = currentBytesUsedByChild[it.id] ?: 0
-                if (bytes <= 0 || downloads <= 0) return@mapNotNull null
-                val movieEpisode =
-                    if (!it.type.isMovieType()) null
-                    else context.getKey<VideoDownloadHelper.DownloadEpisodeCached>(
-                        DOWNLOAD_EPISODE_CACHE,
-                        getFolderName(it.id.toString(), it.id.toString())
+    private fun removeItems(idsToRemove: Set<Int>) = viewModelScope.launchSafe {
+        val updatedHeaders = headerCards.value.orEmpty().filter { it.data.id !in idsToRemove }
+        val updatedChildren = childCards.value.orEmpty().filter { it.data.id !in idsToRemove }
+        _headerCards.postValue(updatedHeaders)
+        _childCards.postValue(updatedChildren)
+    }
+
+    private fun updateStorageStats(visual: List<VisualDownloadCached.Header>) {
+        try {
+            val stat = StatFs(Environment.getExternalStorageDirectory().path)
+            val localBytesAvailable = stat.availableBytes
+            val localTotalBytes = stat.blockSizeLong * stat.blockCountLong
+            val localDownloadedBytes = visual.sumOf { it.totalBytes }
+            val localUsedBytes = localTotalBytes - localBytesAvailable
+            _usedBytes.postValue(localUsedBytes)
+            _availableBytes.postValue(localBytesAvailable)
+            _downloadBytes.postValue(localDownloadedBytes)
+        } catch (t: Throwable) {
+            _downloadBytes.postValue(0)
+            logError(t)
+        }
+    }
+
+    fun handleMultiDelete(context: Context) = viewModelScope.launchSafe {
+        val selectedItemsList = getSelectedItemsData().orEmpty()
+        val deleteData = processSelectedItems(context, selectedItemsList)
+        val message = buildDeleteMessage(context, deleteData)
+        showDeleteConfirmationDialog(context, message, deleteData.ids, deleteData.parentIds)
+    }
+
+    fun handleSingleDelete(
+        context: Context,
+        itemId: Int
+    ) = viewModelScope.launchSafe {
+        val itemData = getItemDataFromId(itemId)
+        val deleteData = processSelectedItems(context, itemData)
+        val message = buildDeleteMessage(context, deleteData)
+        showDeleteConfirmationDialog(context, message, deleteData.ids, deleteData.parentIds)
+    }
+
+    private fun processSelectedItems(
+        context: Context,
+        selectedItemsList: List<VisualDownloadCached>
+    ): DeleteData {
+        val names = mutableListOf<String>()
+        val seriesNames = mutableListOf<String>()
+
+        val ids = mutableSetOf<Int>()
+        val parentIds = mutableSetOf<Int>()
+
+        var parentName: String? = null
+
+        selectedItemsList.forEach { item ->
+            when (item) {
+                is VisualDownloadCached.Header -> {
+                    if (item.data.type.isEpisodeBased()) {
+                        val episodes = context.getKeys(DOWNLOAD_EPISODE_CACHE)
+                            .mapNotNull {
+                                context.getKey<VideoDownloadHelper.DownloadEpisodeCached>(
+                                    it
+                                )
+                            }
+                            .filter { it.parentId == item.data.id }
+                            .map { it.id }
+                        ids.addAll(episodes)
+                        parentIds.add(item.data.id)
+
+                        val episodeInfo = "${item.data.name} (${item.totalDownloads} ${
+                            context.resources.getQuantityString(
+                                R.plurals.episodes,
+                                item.totalDownloads
+                            ).lowercase()
+                        })"
+                        seriesNames.add(episodeInfo)
+                    } else {
+                        ids.add(item.data.id)
+                        names.add(item.data.name)
+                    }
+                }
+
+                is VisualDownloadCached.Child -> {
+                    ids.add(item.data.id)
+                    val parent = context.getKey<VideoDownloadHelper.DownloadHeaderCached>(
+                        DOWNLOAD_HEADER_CACHE,
+                        item.data.parentId.toString()
                     )
-                VisualDownloadHeaderCached(
-                    currentBytes = currentBytes,
-                    totalBytes = bytes,
-                    data = it,
-                    child = movieEpisode,
-                    currentOngoingDownloads = 0,
-                    totalDownloads = downloads,
+                    parentName = parent?.name
+                    names.add(
+                        context.getNameFull(
+                            item.data.name,
+                            item.data.episode,
+                            item.data.season
+                        )
+                    )
+                }
+            }
+        }
+
+        return DeleteData(ids, parentIds, seriesNames, names, parentName)
+    }
+
+    private fun buildDeleteMessage(
+        context: Context,
+        data: DeleteData
+    ): String {
+        val formattedNames = data.names.sortedBy { it.lowercase() }
+            .joinToString(separator = "\n") { "• $it" }
+        val formattedSeriesNames = data.seriesNames.sortedBy { it.lowercase() }
+            .joinToString(separator = "\n") { "• $it" }
+
+        return when {
+            data.ids.count() == 1 -> {
+                context.getString(R.string.delete_message).format(
+                    data.names.firstOrNull()
                 )
-            }.sortedBy {
-                (it.child?.episode ?: 0) + (it.child?.season?.times(10000) ?: 0)
-            } // Episode sorting by episode, lowest to highest
+            }
+
+            data.seriesNames.isNotEmpty() && data.names.isEmpty() -> {
+                context.getString(R.string.delete_message_series_only).format(formattedSeriesNames)
+            }
+
+            data.parentName != null && data.names.isNotEmpty() -> {
+                context.getString(R.string.delete_message_series_episodes)
+                    .format(data.parentName, formattedNames)
+            }
+
+            data.seriesNames.isNotEmpty() -> {
+                val seriesSection = context.getString(R.string.delete_message_series_section)
+                    .format(formattedSeriesNames)
+                context.getString(R.string.delete_message_multiple)
+                    .format(formattedNames) + "\n\n" + seriesSection
+            }
+
+            else -> context.getString(R.string.delete_message_multiple).format(formattedNames)
         }
+    }
 
-        // Only update list if different from the previous one to prevent duplicate initialization
-        if (visual != previousVisual) {
-            previousVisual = visual
+    private fun showDeleteConfirmationDialog(
+        context: Context,
+        message: String,
+        ids: Set<Int>,
+        parentIds: Set<Int>
+    ) {
+        val builder = AlertDialog.Builder(context)
+        val dialogClickListener =
+            DialogInterface.OnClickListener { _, which ->
+                when (which) {
+                    DialogInterface.BUTTON_POSITIVE -> {
+                        viewModelScope.launchSafe {
+                            setIsMultiDeleteState(false)
+                            deleteFilesAndUpdateSettings(context, ids, this) { successfulIds ->
+                                // We always remove parent because if we are deleting from here
+                                // and we have it as non-empty, it was triggered on
+                                // parent header card
+                                removeItems(successfulIds + parentIds)
+                            }
+                        }
+                    }
 
-            try {
-                val stat = StatFs(Environment.getExternalStorageDirectory().path)
-                val localBytesAvailable = stat.availableBytes
-                val localTotalBytes = stat.blockSizeLong * stat.blockCountLong
-                val localDownloadedBytes = visual.sumOf { it.totalBytes }
-
-                _usedBytes.postValue(localTotalBytes - localBytesAvailable - localDownloadedBytes)
-                _availableBytes.postValue(localBytesAvailable)
-                _downloadBytes.postValue(localDownloadedBytes)
-            } catch (t: Throwable) {
-                _downloadBytes.postValue(0)
-                logError(t)
+                    DialogInterface.BUTTON_NEGATIVE -> {
+                        // Do nothing on cancel
+                    }
+                }
             }
 
-            _headerCards.postValue(visual)
+        try {
+            val title = if (ids.count() == 1) {
+                R.string.delete_file
+            } else R.string.delete_files
+            builder.setTitle(title)
+                .setMessage(message)
+                .setPositiveButton(R.string.delete, dialogClickListener)
+                .setNegativeButton(R.string.cancel, dialogClickListener)
+                .show().setDefaultFocus()
+        } catch (e: Exception) {
+            logError(e)
+        }
+    }
+
+    private fun getSelectedItemsData(): List<VisualDownloadCached>? {
+        val headers = headerCards.value.orEmpty()
+        val children = childCards.value.orEmpty()
+
+        return selectedItemIds.value?.mapNotNull { id ->
+            headers.find { it.data.id == id } ?: children.find { it.data.id == id }
         }
     }
+
+    private fun getItemDataFromId(itemId: Int): List<VisualDownloadCached> {
+        val headers = headerCards.value.orEmpty()
+        val children = childCards.value.orEmpty()
+
+        return (headers + children).filter { it.data.id == itemId }
+    }
+
+    private data class DeleteData(
+        val ids: Set<Int>,
+        val parentIds: Set<Int>,
+        val seriesNames: List<String>,
+        val names: List<String>,
+        val parentName: String?
+    )
 }
\ No newline at end of file
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
index f10e103e753..908e3a80abc 100644
--- 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
@@ -54,6 +54,7 @@ abstract class BaseFetchButton(context: Context, attributeSet: AttributeSet) :
     }
 
     init {
+        @Suppress("LeakingThis")
         resetViewData()
     }
 
@@ -92,7 +93,7 @@ abstract class BaseFetchButton(context: Context, attributeSet: AttributeSet) :
 
     abstract fun setStatus(status: VideoDownloadManager.DownloadType?)
 
-    fun getStatus(id:Int, downloadedBytes: Long, totalBytes: Long): DownloadStatusTell {
+    fun getStatus(id: Int, downloadedBytes: Long, totalBytes: Long): DownloadStatusTell {
         // some extra padding for just in case
         return VideoDownloadManager.downloadStatus[id]
             ?: if (downloadedBytes > 1024L && downloadedBytes + 1024L >= totalBytes) {
@@ -100,7 +101,7 @@ abstract class BaseFetchButton(context: Context, attributeSet: AttributeSet) :
             } else DownloadStatusTell.IsPaused
     }
 
-    fun applyMetaData(id:Int, downloadedBytes: Long, totalBytes: Long) {
+    fun applyMetaData(id: Int, downloadedBytes: Long, totalBytes: Long) {
         val status = getStatus(id, downloadedBytes, totalBytes)
 
         currentMetaData.apply {
@@ -139,7 +140,8 @@ abstract class BaseFetchButton(context: Context, attributeSet: AttributeSet) :
             } else {
                 if (doSetProgress) {
                     progressText?.apply {
-                        val currentFormattedSizeString = formatShortFileSize(context, downloadedBytes)
+                        val currentFormattedSizeString =
+                            formatShortFileSize(context, downloadedBytes)
                         val totalFormattedSizeString = formatShortFileSize(context, totalBytes)
                         text =
                                 // if (isTextPercentage) "%d%%".format(setCurrentBytes * 100L / setTotalBytes) else
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
index d97a4b88798..20a4446114b 100644
--- 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
@@ -13,7 +13,7 @@ import com.lagradost.cloudstream3.utils.VideoDownloadHelper
 class DownloadButton(context: Context, attributeSet: AttributeSet) :
     PieFetchButton(context, attributeSet) {
 
-    var mainText: TextView? = null
+    private var mainText: TextView? = null
     override fun onAttachedToWindow() {
         super.onAttachedToWindow()
         progressText = findViewById(R.id.result_movie_download_text_precentage)
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
index abc159d09ab..29c2daa2cf4 100644
--- 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
@@ -58,7 +58,7 @@ open class PieFetchButton(context: Context, attributeSet: AttributeSet) :
     }
 
     private var progressBarBackground: View
-    private var statusView: ImageView
+    var statusView: ImageView
 
     open fun onInflate() {}
 
@@ -248,7 +248,7 @@ open class PieFetchButton(context: Context, attributeSet: AttributeSet) :
     } */
 
     @MainThread
-    private fun setStatusInternal(status : DownloadStatusTell?) {
+    private fun setStatusInternal(status: DownloadStatusTell?) {
         val isPreActive = isZeroBytes && status == DownloadStatusTell.IsDownloading
         if (animateWaiting && (status == DownloadStatusTell.IsPending || isPreActive)) {
             val animation = AnimationUtils.loadAnimation(context, waitingAnimation)
@@ -286,7 +286,7 @@ open class PieFetchButton(context: Context, attributeSet: AttributeSet) :
         if (Looper.myLooper() == Looper.getMainLooper()) {
             try {
                 setStatusInternal(status)
-            } catch (t : Throwable) {
+            } catch (t: Throwable) {
                 logError(t) // Just in case setStatusInternal throws because thread
                 progressBarBackground.post {
                     setStatusInternal(status)
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 ebed901f928..b25486eb174 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
@@ -15,7 +15,7 @@ import com.lagradost.cloudstream3.ui.search.SearchClickCallback
 import com.lagradost.cloudstream3.ui.search.SearchResultBuilder
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
-import com.lagradost.cloudstream3.utils.UIHelper.IsBottomLayout
+import com.lagradost.cloudstream3.utils.UIHelper.isBottomLayout
 import com.lagradost.cloudstream3.utils.UIHelper.toPx
 
 class HomeScrollViewHolderState(view: ViewBinding) : ViewHolderState<Boolean>(view) {
@@ -54,7 +54,7 @@ class HomeChildItemAdapter(
     var hasNext: Boolean = false
 
     override fun onCreateContent(parent: ViewGroup): ViewHolderState<Boolean> {
-        val expanded = parent.context.IsBottomLayout()
+        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)
@@ -133,7 +133,6 @@ class HomeChildItemAdapter(
             item,
             position,
             holder.itemView,
-            null, // nextFocusBehavior,
             nextFocusUp,
             nextFocusDown
         )
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 82a92d80a45..7579620647e 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
@@ -17,7 +17,6 @@ import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
-import androidx.lifecycle.*
 import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.bottomsheet.BottomSheetBehavior
@@ -37,7 +36,7 @@ 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.account.AccountHelper.showAccountSelectLinear
-import com.lagradost.cloudstream3.ui.result.txt
+import com.lagradost.cloudstream3.utils.txt
 import com.lagradost.cloudstream3.ui.search.*
 import com.lagradost.cloudstream3.ui.search.SearchHelper.handleSearchClickCallback
 import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
@@ -234,7 +233,7 @@ class HomeFragment : Fragment() {
             return bottomSheetDialogBuilder
         }
 
-        fun getPairList(
+        private fun getPairList(
             anime: Chip?,
             cartoons: Chip?,
             tvs: Chip?,
@@ -242,6 +241,7 @@ class HomeFragment : Fragment() {
             movies: Chip?,
             asian: Chip?,
             livestream: Chip?,
+            torrent: Chip?,
             nsfw: Chip?,
             others: Chip?,
         ): List<Pair<Chip?, List<TvType>>> {
@@ -254,6 +254,7 @@ class HomeFragment : Fragment() {
                 Pair(cartoons, listOf(TvType.Cartoon)),
                 Pair(docs, listOf(TvType.Documentary)),
                 Pair(livestream, listOf(TvType.Live)),
+                Pair(torrent, listOf(TvType.Torrent)),
                 Pair(nsfw, listOf(TvType.NSFW)),
                 Pair(others, listOf(TvType.Others)),
             )
@@ -267,6 +268,7 @@ class HomeFragment : Fragment() {
             header.homeSelectMovies,
             header.homeSelectAsian,
             header.homeSelectLivestreams,
+            header.homeSelectTorrents,
             header.homeSelectNsfw,
             header.homeSelectOthers
         )
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 916cb9aeb80..8bc0aa287ea 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
@@ -1,6 +1,8 @@
 package com.lagradost.cloudstream3.ui.home
 
+import android.os.Build
 import android.os.Bundle
+import android.os.Parcelable
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -53,12 +55,12 @@ open class ParentItemAdapter(
                 "value",
                 recyclerView?.layoutManager?.onSaveInstanceState()
             )
-            (recyclerView?.adapter as? BaseAdapter<*,*>)?.save(recyclerView)
+            (recyclerView?.adapter as? BaseAdapter<*, *>)?.save(recyclerView)
         }
 
         override fun restore(state: Bundle) {
             (binding as? HomepageParentBinding)?.homeChildRecyclerview?.layoutManager?.onRestoreInstanceState(
-                state.getParcelable("value")
+                    state.getSafeParcelable<Parcelable>("value")
             )
         }
     }
@@ -169,4 +171,9 @@ open class ParentItemAdapter(
         submitList(newList.map { HomeViewModel.ExpandableHomepageList(it, 1, false) }
             .toMutableList())
     }
-}
\ No newline at end of file
+}
+
+@Suppress("DEPRECATION")
+inline fun <reified T> Bundle.getSafeParcelable(key: String): T? =
+    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) getParcelable(key)
+    else getParcelable(key, T::class.java)
\ No newline at end of file
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 2e98dd1f9f7..361ca0b3178 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
@@ -16,6 +16,8 @@ import androidx.viewbinding.ViewBinding
 import androidx.viewpager2.widget.ViewPager2
 import com.google.android.material.chip.Chip
 import com.google.android.material.chip.ChipGroup
+import com.google.android.material.navigation.NavigationBarItemView
+import com.google.android.material.navigationrail.NavigationRailMenuView
 import com.lagradost.cloudstream3.AcraApplication.Companion.getActivity
 import com.lagradost.cloudstream3.CommonActivity.activity
 import com.lagradost.cloudstream3.HomePageList
@@ -117,15 +119,12 @@ class HomeParentItemAdapterPreview(
             }
 
         override fun restore(state: Bundle) {
-            state.getParcelable<Parcelable>("resumeRecyclerView")?.let { recycle ->
+            state.getSafeParcelable<Parcelable>("resumeRecyclerView")?.let { recycle ->
                 resumeRecyclerView.layoutManager?.onRestoreInstanceState(recycle)
             }
-            state.getParcelable<Parcelable>("bookmarkRecyclerView")?.let { recycle ->
+            state.getSafeParcelable<Parcelable>("bookmarkRecyclerView")?.let { recycle ->
                 bookmarkRecyclerView.layoutManager?.onRestoreInstanceState(recycle)
             }
-            //state.getInt("previewViewpager").let { recycle ->
-            //    previewViewpager.setCurrentItem(recycle,true)
-            //}
         }
 
         val previewAdapter = HomeScrollAdapter(fragment = fragment)
@@ -440,6 +439,8 @@ class HomeParentItemAdapterPreview(
                 }
             }
 
+            homeAccount?.isGone = isLayout(TV or EMULATOR)
+
             homeAccount?.setOnClickListener {
                 activity?.showAccountSelectLinear()
             }
@@ -479,7 +480,8 @@ class HomeParentItemAdapterPreview(
                 homePreviewHiddenPrevFocus.setOnFocusChangeListener { _, hasFocus ->
                     if (!hasFocus) return@setOnFocusChangeListener
                     if (previewViewpager.currentItem <= 0) {
-                        (activity as? MainActivity)?.binding?.navRailView?.requestFocus()
+                        //Focus the Home item as the default focus will be the header item
+                        (activity as? MainActivity)?.binding?.navRailView?.findViewById<NavigationBarItemView>(R.id.navigation_home)?.requestFocus()
                     } else {
                         previewViewpager.setCurrentItem(previewViewpager.currentItem - 1, true)
                         binding.homePreviewPlayBtt.requestFocus()
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 29186e83a4a..4c4dd2d84dc 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
@@ -13,7 +13,7 @@ import com.lagradost.cloudstream3.ui.ViewHolderState
 import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
-import com.lagradost.cloudstream3.utils.UIHelper.setImage
+import com.lagradost.cloudstream3.utils.ImageLoader.loadImage
 
 class HomeScrollAdapter(
     fragment: Fragment
@@ -47,7 +47,7 @@ class HomeScrollAdapter(
 
         when (binding) {
             is HomeScrollViewBinding -> {
-                binding.homeScrollPreview.setImage(posterUrl)
+                binding.homeScrollPreview.loadImage(posterUrl)
                 binding.homeScrollPreviewTags.apply {
                     text = item.tags?.joinToString(" • ") ?: ""
                     isGone = item.tags.isNullOrEmpty()
@@ -57,7 +57,7 @@ class HomeScrollAdapter(
             }
 
             is HomeScrollViewTvBinding -> {
-                binding.homeScrollPreview.setImage(posterUrl)
+                binding.homeScrollPreview.loadImage(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 d03087ea4fa..66f4966ed66 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
@@ -46,6 +46,7 @@ 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.getCurrentAccount
 import com.lagradost.cloudstream3.utils.DataStoreHelper.getLastWatched
 import com.lagradost.cloudstream3.utils.DataStoreHelper.getResultWatchState
 import com.lagradost.cloudstream3.utils.DataStoreHelper.getViewPos
@@ -109,6 +110,9 @@ class HomeViewModel : ViewModel() {
     private val _apiName = MutableLiveData<String>()
     val apiName: LiveData<String> = _apiName
 
+    private val _currentAccount = MutableLiveData<DataStoreHelper.Account?>()
+    val currentAccount: MutableLiveData<DataStoreHelper.Account?> = _currentAccount
+
     private val _randomItems = MutableLiveData<List<SearchResponse>?>(null)
     val randomItems: LiveData<List<SearchResponse>?> = _randomItems
 
@@ -153,7 +157,7 @@ class HomeViewModel : ViewModel() {
             }
         }?.distinctBy { it.first } ?: return@launchSafe
 
-        val length = WatchType.values().size
+        val length = WatchType.entries.size
         val currentWatchTypes = mutableSetOf<WatchType>()
 
         for (watch in watchStatusIds) {
@@ -388,7 +392,9 @@ class HomeViewModel : ViewModel() {
             }
 
             is Resource.Failure -> {
+                @Suppress("UNNECESSARY_NOT_NULL_ASSERTION")
                 _page.postValue(data!!)
+                @Suppress("UNNECESSARY_NOT_NULL_ASSERTION")
                 _preview.postValue(data!!)
             }
 
@@ -398,14 +404,11 @@ class HomeViewModel : ViewModel() {
     }
 
     fun click(callback: SearchClickCallback) {
-        if (callback.action == SEARCH_ACTION_FOCUSED) {
-            //focusCallback(callback.card)
-        } else {
+        if (callback.action != SEARCH_ACTION_FOCUSED) {
             SearchHelper.handleSearchClickCallback(callback)
         }
     }
 
-
     private val _popup = MutableLiveData<Pair<ExpandableHomepageList, (() -> Unit)?>?>(null)
     val popup: LiveData<Pair<ExpandableHomepageList, (() -> Unit)?>?> = _popup
 
@@ -432,11 +435,18 @@ class HomeViewModel : ViewModel() {
         loadAndCancel(DataStoreHelper.currentHomePage, true)
     }
 
+    private fun reloadAccount(unused: Boolean = false) {
+        _currentAccount.postValue(
+            getCurrentAccount()
+        )
+    }
+
     init {
         MainActivity.bookmarksUpdatedEvent += ::bookmarksUpdated
         MainActivity.afterPluginsLoadedEvent += ::afterPluginsLoaded
         MainActivity.mainPluginsLoadedEvent += ::afterMainPluginsLoaded
         MainActivity.reloadHomeEvent += ::reloadHome
+        MainActivity.reloadAccountEvent += ::reloadAccount
     }
 
     override fun onCleared() {
@@ -444,6 +454,7 @@ class HomeViewModel : ViewModel() {
         MainActivity.afterPluginsLoadedEvent -= ::afterPluginsLoaded
         MainActivity.mainPluginsLoadedEvent -= ::afterMainPluginsLoaded
         MainActivity.reloadHomeEvent -= ::reloadHome
+        MainActivity.reloadAccountEvent -= ::reloadAccount
         super.onCleared()
     }
 
@@ -471,7 +482,7 @@ class HomeViewModel : ViewModel() {
     }
 
     fun click(load: LoadClickCallback) {
-        loadResult(load.response.url, load.response.apiName, load.action)
+        loadResult(load.response.url, load.response.apiName, load.response.name, load.action)
     }
 
     // only save the key if it is from UI, as we don't want internal functions changing the setting
@@ -530,12 +541,13 @@ class HomeViewModel : ViewModel() {
                 } else {
                     _page.postValue(Resource.Loading())
                     if (preferredApiName != null)
-                        _apiName.postValue(preferredApiName)
+                        _apiName.postValue(preferredApiName!!)
                 }
             } else {
                 // if the api is found, then set it to it and save key
                 if (fromUI) DataStoreHelper.currentHomePage = api.name
                 loadAndCancel(api)
+                reloadAccount()
             }
         }
 }
\ No newline at end of file
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 7144de09709..bfac72067f0 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
@@ -46,7 +46,7 @@ import com.lagradost.cloudstream3.syncproviders.SyncAPI
 import com.lagradost.cloudstream3.syncproviders.SyncIdName
 import com.lagradost.cloudstream3.ui.AutofitRecyclerView
 import com.lagradost.cloudstream3.ui.quicksearch.QuickSearchFragment
-import com.lagradost.cloudstream3.ui.result.txt
+import com.lagradost.cloudstream3.utils.txt
 import com.lagradost.cloudstream3.ui.search.SEARCH_ACTION_LOAD
 import com.lagradost.cloudstream3.ui.search.SEARCH_ACTION_SHOW_METADATA
 import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
@@ -155,7 +155,7 @@ class LibraryFragment : Fragment() {
         binding?.sortFab?.setOnClickListener(sortChangeClickListener)
         binding?.librarySort?.setOnClickListener(sortChangeClickListener)
 
-        binding?.libraryRoot?.findViewById<TextView>(R.id.search_src_text)?.apply {
+        binding?.libraryRoot?.findViewById<TextView>(androidx.appcompat.R.id.search_src_text)?.apply {
             tag = "tv_no_focus_tag"
             //Expand the Appbar when search bar is focused, fixing scroll up issue
             setOnFocusChangeListener { _, _ ->
@@ -561,6 +561,7 @@ class LibraryFragment : Fragment() {
                     activity?.loadResult(
                         card.url,
                         apiName,
+                        card.name
                     )
                 }
 
@@ -600,8 +601,4 @@ class LibraryFragment : Fragment() {
     }
 }
 
-class MenuSearchView(context: Context) : SearchView(context) {
-    override fun onActionViewCollapsed() {
-        super.onActionViewCollapsed()
-    }
-}
\ No newline at end of file
+class MenuSearchView(context: Context) : SearchView(context)
\ No newline at end of file
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 1bd01c86449..6c602e6c527 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
@@ -23,6 +23,8 @@ enum class ListSorting(@StringRes val stringRes: Int) {
     UpdatedOld(R.string.sort_updated_old),
     AlphabeticalA(R.string.sort_alphabetical_a),
     AlphabeticalZ(R.string.sort_alphabetical_z),
+    ReleaseDateNew(R.string.sort_release_date_new),
+    ReleaseDateOld(R.string.sort_release_date_old),
 }
 
 const val LAST_SYNC_API_KEY = "last_sync_api"
@@ -132,4 +134,4 @@ class LibraryViewModel : ViewModel() {
         MainActivity.reloadLibraryEvent -= ::reloadPages
         super.onCleared()
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/library/ViewpagerAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/library/ViewpagerAdapter.kt
index cfd22220c5b..0110187f603 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
@@ -15,6 +15,7 @@ import com.lagradost.cloudstream3.syncproviders.SyncAPI
 import com.lagradost.cloudstream3.ui.BaseAdapter
 import com.lagradost.cloudstream3.ui.BaseDiffCallback
 import com.lagradost.cloudstream3.ui.ViewHolderState
+import com.lagradost.cloudstream3.ui.home.getSafeParcelable
 import com.lagradost.cloudstream3.ui.search.SearchClickCallback
 import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
@@ -32,7 +33,7 @@ class ViewpagerAdapterViewHolderState(val binding: LibraryViewpagerPageBinding)
         }
 
     override fun restore(state: Bundle) {
-        state.getParcelable<Parcelable>("pageRecyclerview")?.let { recycle ->
+        state.getSafeParcelable<Parcelable>("pageRecyclerview")?.let { recycle ->
             binding.pageRecyclerview.layoutManager?.onRestoreInstanceState(recycle)
         }
     }
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 9d838c97451..8f08970fe4b 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
@@ -27,7 +27,11 @@ import androidx.fragment.app.Fragment
 import androidx.media3.common.PlaybackException
 import androidx.media3.exoplayer.ExoPlayer
 import androidx.media3.session.MediaSession
-import androidx.media3.ui.*
+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 androidx.preference.PreferenceManager
 import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
 import com.github.rubensousa.previewseekbar.PreviewBar
@@ -51,6 +55,7 @@ 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 java.net.SocketTimeoutException
 
 enum class PlayerResize(@StringRes val nameRes: Int) {
     Fit(R.string.resize_fit),
@@ -216,7 +221,7 @@ abstract class AbstractPlayerFragment(
                             return
                         }
                         player.handleEvent(
-                            CSPlayerEvent.values()[intent.getIntExtra(
+                            CSPlayerEvent.entries[intent.getIntExtra(
                                 EXTRA_CONTROL_TYPE,
                                 0
                             )], source = PlayerEventSource.UI
@@ -225,7 +230,9 @@ abstract class AbstractPlayerFragment(
                 }
                 val filter = IntentFilter()
                 filter.addAction(ACTION_MEDIA_CONTROL)
-                activity?.registerReceiver(pipReceiver, filter)
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                    activity?.registerReceiver(pipReceiver, filter, Context.RECEIVER_EXPORTED)
+                } else activity?.registerReceiver(pipReceiver, filter)
                 val isPlaying = player.getIsPlaying()
                 val isPlayingValue =
                     if (isPlaying) CSPlayerLoading.IsPlaying else CSPlayerLoading.IsPaused
@@ -285,27 +292,56 @@ abstract class AbstractPlayerFragment(
                 val msg = exception.message ?: ""
                 val errorName = exception.errorCodeName
                 when (val code = exception.errorCode) {
-                    PlaybackException.ERROR_CODE_IO_FILE_NOT_FOUND, PlaybackException.ERROR_CODE_PARSING_CONTAINER_UNSUPPORTED, PlaybackException.ERROR_CODE_IO_NO_PERMISSION, PlaybackException.ERROR_CODE_IO_UNSPECIFIED -> {
+                    PlaybackException.ERROR_CODE_IO_FILE_NOT_FOUND,
+                    PlaybackException.ERROR_CODE_PARSING_CONTAINER_UNSUPPORTED,
+                    PlaybackException.ERROR_CODE_IO_NO_PERMISSION,
+                    PlaybackException.ERROR_CODE_IO_UNSPECIFIED -> {
                         showToast(
                             "${ctx.getString(R.string.source_error)}\n$errorName ($code)\n$msg",
                             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 -> {
+                    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_NETWORK_CONNECTION_TIMEOUT,
+                    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 -> {
+                    PlaybackErrorEvent.ERROR_AUDIO_TRACK_INIT_FAILED,
+                    PlaybackErrorEvent.ERROR_AUDIO_TRACK_OTHER,
+                    PlaybackException.ERROR_CODE_DECODING_FAILED,
+                    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
                         )
                     }
 
+                    PlaybackException.ERROR_CODE_DECODING_FORMAT_UNSUPPORTED,
+                    PlaybackException.ERROR_CODE_DECODING_FORMAT_EXCEEDS_CAPABILITIES -> {
+                        showToast(
+                            "${ctx.getString(R.string.unsupported_error)}\n$errorName ($code)\n$msg",
+                            gotoNext = true
+                        )
+                    }
+
+                    PlaybackException.ERROR_CODE_PARSING_CONTAINER_MALFORMED,
+                    PlaybackException.ERROR_CODE_PARSING_MANIFEST_MALFORMED -> {
+                        showToast(
+                            "${ctx.getString(R.string.encoding_error)}\n$errorName ($code)\n$msg",
+                            gotoNext = true
+                        )
+                    }
+
                     else -> {
                         showToast(
                             "${ctx.getString(R.string.unexpected_error)}\n$errorName ($code)\n$msg",
@@ -322,6 +358,21 @@ abstract class AbstractPlayerFragment(
                 )
             }
 
+            is SocketTimeoutException -> {
+                /**
+                 * Ensures this is run on the UI thread to prevent issues 
+                 * caused by SocketTimeoutException in torrents. Running 
+                 * on another thread can break player interactions or 
+                 * prevent switching to the next source.
+                 */
+                activity?.runOnUiThread {
+                    showToast(
+                        "${ctx.getString(R.string.remote_error)}\n${exception.message}",
+                        gotoNext = true
+                    )
+                }
+            }
+
             else -> {
                 exception.message?.let {
                     showToast(
@@ -336,6 +387,8 @@ abstract class AbstractPlayerFragment(
     private fun onSubStyleChanged(style: SaveCaptionStyle) {
         if (player is CS3IPlayer) {
             player.updateSubtitleStyle(style)
+            // Forcefully update the subtitle encoding in case the edge size is changed
+            player.seekTime(-1)
         }
     }
 
@@ -351,6 +404,7 @@ abstract class AbstractPlayerFragment(
             }
 
             // Necessary for multiple combined videos
+            @Suppress("DEPRECATION")
             playerView?.setShowMultiWindowTimeBar(true)
             playerView?.player = player
             playerView?.performClick()
@@ -380,12 +434,20 @@ abstract class AbstractPlayerFragment(
     //    }
     //}
 
+    open fun onDownload(event : DownloadEvent) = Unit
+
     /** 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")
+        // we don't want to spam DownloadEvent
+        if(event !is DownloadEvent) {
+            Log.i(TAG, "Handle event: $event")
+        }
         when (event) {
+            is DownloadEvent -> {
+                onDownload(event)
+            }
             is ResizedEvent -> {
                 playerDimensionsLoaded(event.width, event.height)
             }
@@ -517,7 +579,7 @@ abstract class AbstractPlayerFragment(
                 }
             }
 
-            subView = playerView?.findViewById(R.id.exo_subtitles)
+            subView = playerView?.findViewById(androidx.media3.ui.R.id.exo_subtitles)
             subStyle = SubtitlesFragment.getCurrentSavedStyle()
             player.initSubtitles(subView, subtitleHolder, subStyle)
             (player.imageGenerator as? PreviewGenerator)?.params = ImageParams.new16by9(screenWidth)
@@ -603,12 +665,12 @@ abstract class AbstractPlayerFragment(
     }
 
     fun nextResize() {
-        resizeMode = (resizeMode + 1) % PlayerResize.values().size
+        resizeMode = (resizeMode + 1) % PlayerResize.entries.size
         resize(resizeMode, true)
     }
 
     fun resize(resize: Int, showToast: Boolean) {
-        resize(PlayerResize.values()[resize], showToast)
+        resize(PlayerResize.entries[resize], showToast)
     }
 
     @SuppressLint("UnsafeOptInUsageError")
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 8e322f73bb3..d8921e068e5 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,7 +1,10 @@
+@file:Suppress("DEPRECATION")
+
 package com.lagradost.cloudstream3.ui.player
 
 import android.annotation.SuppressLint
 import android.content.Context
+import android.content.DialogInterface
 import android.graphics.Bitmap
 import android.net.Uri
 import android.os.Handler
@@ -9,7 +12,13 @@ import android.os.Looper
 import android.util.Log
 import android.util.Rational
 import android.widget.FrameLayout
-import androidx.media3.common.C.*
+import androidx.annotation.MainThread
+import androidx.annotation.OptIn
+import androidx.appcompat.app.AlertDialog
+import androidx.media3.common.C.TIME_UNSET
+import androidx.media3.common.C.TRACK_TYPE_AUDIO
+import androidx.media3.common.C.TRACK_TYPE_TEXT
+import androidx.media3.common.C.TRACK_TYPE_VIDEO
 import androidx.media3.common.Format
 import androidx.media3.common.MediaItem
 import androidx.media3.common.MimeTypes
@@ -19,9 +28,10 @@ import androidx.media3.common.TrackGroup
 import androidx.media3.common.TrackSelectionOverride
 import androidx.media3.common.Tracks
 import androidx.media3.common.VideoSize
+import androidx.media3.common.util.UnstableApi
 import androidx.media3.database.StandaloneDatabaseProvider
 import androidx.media3.datasource.DataSource
-import androidx.media3.datasource.DefaultDataSourceFactory
+import androidx.media3.datasource.DefaultDataSource
 import androidx.media3.datasource.DefaultHttpDataSource
 import androidx.media3.datasource.HttpDataSource
 import androidx.media3.datasource.cache.CacheDataSource
@@ -30,15 +40,18 @@ 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.Renderer.STATE_ENABLED
+import androidx.media3.exoplayer.Renderer.STATE_STARTED
 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.HttpMediaDrmCallback
 import androidx.media3.exoplayer.drm.LocalMediaDrmCallback
 import androidx.media3.exoplayer.source.ClippingMediaSource
 import androidx.media3.exoplayer.source.ConcatenatingMediaSource
+import androidx.media3.exoplayer.source.ConcatenatingMediaSource2
 import androidx.media3.exoplayer.source.DefaultMediaSourceFactory
 import androidx.media3.exoplayer.source.MergingMediaSource
 import androidx.media3.exoplayer.source.SingleSampleMediaSource
@@ -50,23 +63,35 @@ import androidx.preference.PreferenceManager
 import com.lagradost.cloudstream3.APIHolder.getApiFromNameNull
 import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
 import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
+import com.lagradost.cloudstream3.ErrorLoadingException
 import com.lagradost.cloudstream3.MainActivity.Companion.deleteFileOnExit
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.TvType
 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.settings.Globals.TV
+import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
 import com.lagradost.cloudstream3.ui.subtitles.SaveCaptionStyle
 import com.lagradost.cloudstream3.utils.AppContextUtils.isUsingMobileData
+import com.lagradost.cloudstream3.utils.AppContextUtils.setDefaultFocus
+import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
+import com.lagradost.cloudstream3.utils.Coroutines.runOnMainThread
 import com.lagradost.cloudstream3.utils.DataStoreHelper.currentAccount
 import com.lagradost.cloudstream3.utils.DrmExtractorLink
 import com.lagradost.cloudstream3.utils.EpisodeSkip
 import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.CLEARKEY_UUID
+import com.lagradost.cloudstream3.utils.WIDEVINE_UUID
+import com.lagradost.cloudstream3.utils.PLAYREADY_UUID
 import com.lagradost.cloudstream3.utils.ExtractorLinkPlayList
 import com.lagradost.cloudstream3.utils.ExtractorLinkType
 import com.lagradost.cloudstream3.utils.SubtitleHelper.fromTwoLettersToLanguage
+import io.github.anilbeesetti.nextlib.media3ext.ffdecoder.NextRenderersFactory
+import kotlinx.coroutines.delay
 import java.io.File
-import java.lang.IllegalArgumentException
 import java.util.UUID
 import javax.net.ssl.HttpsURLConnection
 import javax.net.ssl.SSLContext
@@ -85,6 +110,7 @@ const val toleranceBeforeUs = 300_000L
  */
 const val toleranceAfterUs = 300_000L
 
+@OptIn(UnstableApi::class)
 class CS3IPlayer : IPlayer {
     private var isPlaying = false
     private var exoPlayer: ExoPlayer? = null
@@ -129,10 +155,11 @@ class CS3IPlayer : IPlayer {
     )
 
     data class DrmMetadata(
-        val kid: String,
-        val key: String,
+        val kid: String? = null,
+        val key: String? = null,
         val uuid: UUID,
-        val kty: String,
+        val kty: String? = null,
+        val licenseUrl: String? = null,
         val keyRequestParameters: HashMap<String, String>,
     )
 
@@ -143,7 +170,7 @@ class CS3IPlayer : IPlayer {
 
     /**
      * Tracks reported to be used by exoplayer, since sometimes it has a mind of it's own when selecting subs.
-     * String = id
+     * String = id (without exoplayer track number)
      * Boolean = if it's active
      * */
     private var playerSelectedSubtitleTracks = listOf<Pair<String, Boolean>>()
@@ -184,6 +211,10 @@ class CS3IPlayer : IPlayer {
         }
     }
 
+    fun String.stripTrackId(): String {
+        return this.replace(Regex("""^\d+:"""), "")
+    }
+
     fun initSubtitles(subView: SubtitleView?, subHolder: FrameLayout?, style: SaveCaptionStyle?) {
         subtitleHelper.initSubtitles(subView, subHolder, style)
     }
@@ -234,6 +265,7 @@ class CS3IPlayer : IPlayer {
                     gen.clear(sameEpisode)
                 }
             }
+
             loadOnlinePlayer(context, link)
         } else if (data != null) {
             (imageGenerator as? PreviewGenerator)?.let { gen ->
@@ -257,7 +289,6 @@ class CS3IPlayer : IPlayer {
 
     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:
@@ -269,7 +300,11 @@ class CS3IPlayer : IPlayer {
         return this.firstNotNullOfOrNull { group ->
             (0 until group.mediaTrackGroup.length).map {
                 group.getTrackFormat(it) to it
-            }.firstOrNull { it.first.id == id }
+            }.firstOrNull {
+                // The format id system is "trackNumber:trackID"
+                // The track number is not generated by us so we filter it out
+                it.first.id?.stripTrackId() == id
+            }
                 ?.let { group.mediaTrackGroup to it.second }
         }
     }
@@ -342,7 +377,6 @@ 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)
@@ -353,25 +387,31 @@ class CS3IPlayer : IPlayer {
 
     private fun Format.toAudioTrack(): AudioTrack {
         return AudioTrack(
-            this.id,
+            this.id?.stripTrackId(),
             this.label,
-//            isPlaying,
             this.language
         )
     }
 
+    private fun Format.toSubtitleTrack(): TextTrack {
+        return TextTrack(
+            this.id?.stripTrackId(),
+            this.label,
+            this.language,
+            this.sampleMimeType
+        )
+    }
+
     private fun Format.toVideoTrack(): VideoTrack {
         return VideoTrack(
-            this.id,
+            this.id?.stripTrackId(),
             this.label,
-//            isPlaying,
             this.language,
             this.width,
-            this.height
+            this.height,
         )
     }
 
-    @SuppressLint("UnsafeOptInUsageError")
     override fun getVideoTracks(): CurrentTracks {
         val allTracks = exoPlayer?.currentTracks?.groups ?: emptyList()
         val videoTracks = allTracks.filter { it.type == TRACK_TYPE_VIDEO }
@@ -380,18 +420,26 @@ class CS3IPlayer : IPlayer {
         val audioTracks = allTracks.filter { it.type == TRACK_TYPE_AUDIO }.getFormats()
             .map { it.first.toAudioTrack() }
 
+        val textTracks = allTracks.filter { it.type == TRACK_TYPE_TEXT }.getFormats()
+            .map { it.first.toSubtitleTrack() }
+
+        val currentTextTracks = textTracks.filter { track ->
+            playerSelectedSubtitleTracks.any { it.second && it.first == track.id }
+        }
+
         return CurrentTracks(
             exoPlayer?.videoFormat?.toVideoTrack(),
             exoPlayer?.audioFormat?.toAudioTrack(),
+            currentTextTracks,
             videoTracks,
-            audioTracks
+            audioTracks,
+            textTracks
         )
     }
 
     /**
      * @return True if the player should be reloaded
      * */
-    @SuppressLint("UnsafeOptInUsageError")
     override fun setPreferredSubtitles(subtitle: SubtitleData?): Boolean {
         Log.i(TAG, "setPreferredSubtitles init $subtitle")
         currentSubtitles = subtitle
@@ -451,15 +499,26 @@ class CS3IPlayer : IPlayer {
         } ?: false
     }
 
-    var currentSubtitleOffset: Long = 0
+    private var currentSubtitleOffset: Long = 0
 
     override fun setSubtitleOffset(offset: Long) {
         currentSubtitleOffset = offset
-        currentTextRenderer?.setRenderOffsetMs(offset)
+        CustomDecoder.subtitleOffset = offset
+        if (currentTextRenderer?.state == STATE_ENABLED || currentTextRenderer?.state == STATE_STARTED) {
+            exoPlayer?.currentPosition?.let { pos ->
+                // This seems to properly refresh all subtitles
+                // It needs to be done as all subtitle cues with timings are pre-processed
+                currentTextRenderer?.resetPosition(pos)
+            }
+        }
     }
 
     override fun getSubtitleOffset(): Long {
-        return currentSubtitleOffset //currentTextRenderer?.getRenderOffsetMs() ?: currentSubtitleOffset
+        return currentSubtitleOffset
+    }
+
+    override fun getSubtitleCues(): List<SubtitleCue> {
+        return currentSubtitleDecoder?.getSubtitleCues() ?: emptyList()
     }
 
     override fun getCurrentPreferredSubtitle(): SubtitleData? {
@@ -470,7 +529,6 @@ class CS3IPlayer : IPlayer {
         }
     }
 
-    @SuppressLint("UnsafeOptInUsageError")
     override fun getAspectRatio(): Rational? {
         return exoPlayer?.videoFormat?.let { format ->
             Rational(format.width, format.height)
@@ -481,31 +539,39 @@ class CS3IPlayer : IPlayer {
         subtitleHelper.setSubStyle(style)
     }
 
-    @SuppressLint("UnsafeOptInUsageError")
     override fun saveData() {
         Log.i(TAG, "saveData")
         updatedTime()
 
         exoPlayer?.let { exo ->
             playbackPosition = exo.currentPosition
-            currentWindow = exo.currentWindowIndex
+            currentWindow = exo.currentMediaItemIndex
             isPlaying = exo.isPlaying
         }
     }
 
     private fun releasePlayer(saveTime: Boolean = true) {
         Log.i(TAG, "releasePlayer")
-
+        eventLooperIndex += 1
         if (saveTime)
             updatedTime()
 
         exoPlayer?.apply {
-            setPlayWhenReady(false)
+            playWhenReady = false
+
+            // This may look weird, however on some TV devices the audio does not stop playing
+            // so this may fix it?
+            try {
+                pause()
+            } catch (t: Throwable) {
+                // No documented exception, but just to be extra safe
+                logError(t)
+            }
+
             stop()
             release()
         }
         //simpleCache?.release()
-        currentTextRenderer = null
 
         exoPlayer = null
         //simpleCache = null
@@ -563,7 +629,6 @@ 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 {
@@ -571,20 +636,22 @@ class CS3IPlayer : IPlayer {
             }
         }
 
-        @SuppressLint("UnsafeOptInUsageError")
         private fun createOnlineSource(link: ExtractorLink): HttpDataSource.Factory {
             val provider = getApiFromNameNull(link.source)
             val interceptor = provider?.getVideoInterceptor(link)
+            val userAgent = link.headers.entries.find {
+                it.key.equals("User-Agent", ignoreCase = true)
+            }?.value
 
             val source = if (interceptor == null) {
                 DefaultHttpDataSource.Factory() //TODO USE app.baseClient
-                    .setUserAgent(USER_AGENT)
+                    .setUserAgent(userAgent ?: USER_AGENT)
                     .setAllowCrossProtocolRedirects(true)   //https://stackoverflow.com/questions/69040127/error-code-io-bad-http-status-exoplayer-android
             } else {
                 val client = app.baseClient.newBuilder()
                     .addInterceptor(interceptor)
                     .build()
-                OkHttpDataSource.Factory(client).setUserAgent(USER_AGENT)
+                OkHttpDataSource.Factory(client).setUserAgent(userAgent ?: USER_AGENT)
             }
 
             // Do no include empty referer, if the provider wants those they can use the header map.
@@ -604,53 +671,13 @@ class CS3IPlayer : IPlayer {
             }
         }
 
-        @SuppressLint("UnsafeOptInUsageError")
         private fun Context.createOfflineSource(): DataSource.Factory {
-            return DefaultDataSourceFactory(this, USER_AGENT)
+            return DefaultDataSource.Factory(
+                this,
+                DefaultHttpDataSource.Factory().setUserAgent(USER_AGENT)
+            )
         }
 
-        /*private fun getSubSources(
-            onlineSourceFactory: DataSource.Factory?,
-            offlineSourceFactory: DataSource.Factory?,
-            subHelper: PlayerSubtitleHelper,
-        ): Pair<List<SingleSampleMediaSource>, List<SubtitleData>> {
-            val activeSubtitles = ArrayList<SubtitleData>()
-            val subSources = subHelper.getAllSubtitles().mapNotNull { sub ->
-                val subConfig = MediaItem.SubtitleConfiguration.Builder(Uri.parse(sub.url))
-                    .setMimeType(sub.mimeType)
-                    .setLanguage("_${sub.name}")
-                    .setSelectionFlags(C.SELECTION_FLAG_DEFAULT)
-                    .build()
-                when (sub.origin) {
-                    SubtitleOrigin.DOWNLOADED_FILE -> {
-                        if (offlineSourceFactory != null) {
-                            activeSubtitles.add(sub)
-                            SingleSampleMediaSource.Factory(offlineSourceFactory)
-                                .createMediaSource(subConfig, C.TIME_UNSET)
-                        } else {
-                            null
-                        }
-                    }
-                    SubtitleOrigin.URL -> {
-                        if (onlineSourceFactory != null) {
-                            activeSubtitles.add(sub)
-                            SingleSampleMediaSource.Factory(onlineSourceFactory)
-                                .createMediaSource(subConfig, C.TIME_UNSET)
-                        } else {
-                            null
-                        }
-                    }
-                    SubtitleOrigin.OPEN_SUBTITLES -> {
-                        // TODO
-                        throw NotImplementedError()
-                    }
-                }
-            }
-            println("SUBSRC: ${subSources.size} activeSubtitles : ${activeSubtitles.size} of ${subHelper.getAllSubtitles().size} ")
-            return Pair(subSources, activeSubtitles)
-        }*/
-
-        @SuppressLint("UnsafeOptInUsageError")
         private fun getCache(context: Context, cacheSize: Long): SimpleCache? {
             return try {
                 val databaseProvider = StandaloneDatabaseProvider(context)
@@ -682,7 +709,6 @@ 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 = trackSelector.buildUponParameters()
@@ -694,9 +720,9 @@ class CS3IPlayer : IPlayer {
             return trackSelector
         }
 
-        var currentTextRenderer: CustomTextRenderer? = null
+        private var currentSubtitleDecoder: CustomSubtitleDecoderFactory? = null
+        private var currentTextRenderer: TextRenderer? = null
 
-        @SuppressLint("UnsafeOptInUsageError")
         private fun buildExoPlayer(
             context: Context,
             mediaItemSlices: List<MediaItemSlice>,
@@ -719,11 +745,28 @@ class CS3IPlayer : IPlayer {
             val exoPlayerBuilder =
                 ExoPlayer.Builder(context)
                     .setRenderersFactory { eventHandler, videoRendererEventListener, audioRendererEventListener, textRendererOutput, metadataRendererOutput ->
-                        DefaultRenderersFactory(context).apply {
-                            setEnableDecoderFallback(true)
-                            // Enable Ffmpeg extension
-                            setExtensionRendererMode(EXTENSION_RENDERER_MODE_ON)
-                        }.createRenderers(
+                        val settingsManager = PreferenceManager.getDefaultSharedPreferences(context)
+                        val current = settingsManager.getInt(context.getString(R.string.software_decoding_key), -1)
+                        val softwareDecoding = when(current) {
+                            0 -> true // yes
+                            1 -> false // no
+                            // -1 = automatic
+                            else -> {
+                                // we do not want tv to have software decoding, because of crashes
+                                !isLayout(TV)
+                            }
+                        }
+
+                        val factory = if (softwareDecoding) {
+                            NextRenderersFactory(context).apply {
+                                setEnableDecoderFallback(true)
+                                setExtensionRendererMode(DefaultRenderersFactory.EXTENSION_RENDERER_MODE_ON)
+                            }
+                        } else {
+                            DefaultRenderersFactory(context)
+                        }
+
+                        factory.createRenderers(
                             eventHandler,
                             videoRendererEventListener,
                             audioRendererEventListener,
@@ -731,14 +774,24 @@ class CS3IPlayer : IPlayer {
                             metadataRendererOutput
                         ).map {
                             if (it is TextRenderer) {
-                                val currentTextRenderer = CustomTextRenderer(
-                                    subtitleOffset,
+                                CustomDecoder.subtitleOffset = subtitleOffset
+                                val decoder = CustomSubtitleDecoderFactory()
+                                val currentTextRenderer = TextRenderer(
                                     textRendererOutput,
                                     eventHandler.looper,
-                                    CustomSubtitleDecoderFactory()
-                                ).also { this.currentTextRenderer = it }
+                                    decoder
+                                ).apply {
+                                    // Required to make the decoder work with old subtitles
+                                    // Upgrade CustomSubtitleDecoderFactory when media3 supports it
+                                    @Suppress("DEPRECATION")
+                                    experimentalSetLegacyDecodingEnabled(true)
+                                }.also { renderer ->
+                                    this.currentTextRenderer = renderer
+                                    this.currentSubtitleDecoder = decoder
+                                }
                                 currentTextRenderer
-                            } else it
+                            } else
+                                it
                         }.toTypedArray()
                     }
                     .setTrackSelector(
@@ -784,34 +837,86 @@ class CS3IPlayer : IPlayer {
                 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)
+                    when (drm.uuid) {
+                        CLEARKEY_UUID -> {
+                            val client =
+                                OkHttpDataSource.Factory(app.baseClient).setUserAgent(USER_AGENT)
+                            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)
+
+                            DashMediaSource.Factory(client)
+                                .setDrmSessionManagerProvider { manager }
+                                .createMediaSource(item.mediaItem)
+                        }
+
+                        WIDEVINE_UUID,
+                        PLAYREADY_UUID -> {
+                            val client =
+                                OkHttpDataSource.Factory(app.baseClient).setUserAgent(USER_AGENT)
+                            val drmCallback = HttpMediaDrmCallback(drm.licenseUrl, client)
+                            val manager = DefaultDrmSessionManager.Builder()
+                                .setPlayClearSamplesWithoutKeys(true)
+                                .setMultiSession(true)
+                                .setKeyRequestParameters(drm.keyRequestParameters)
+                                .setUuidAndExoMediaDrmProvider(
+                                    drm.uuid,
+                                    FrameworkMediaDrm.DEFAULT_PROVIDER
+                                )
+                                .build(drmCallback)
+
+                            DashMediaSource.Factory(client)
+                                .setDrmSessionManagerProvider { manager }
+                                .createMediaSource(item.mediaItem)
+                        }
+
+                        else -> {
+                            Log.e(
+                                TAG,
+                                "DRM Metadata class is not supported: ${drm::class.simpleName}"
+                            )
+                            null
+                        }
+                    }
                 } ?: run {
                     factory.createMediaSource(item.mediaItem)
                 }
             } else {
-                val source = ConcatenatingMediaSource()
-                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(item.mediaItem),
-                            item.durationUs
+                try {
+                    val source = ConcatenatingMediaSource2.Builder()
+                    mediaItemSlices.map { item ->
+                        source.add(
+                            // The duration MUST be known for it to work properly, see https://github.com/google/ExoPlayer/issues/4727
+                            ClippingMediaSource(
+                                factory.createMediaSource(item.mediaItem),
+                                item.durationUs
+                            )
                         )
-                    )
+                    }
+                    source.build()
+                } catch (_: IllegalArgumentException) {
+                    @Suppress("DEPRECATION")
+                    val source =
+                        ConcatenatingMediaSource() // FIXME figure out why ConcatenatingMediaSource2 seems to fail with Torrents only
+                    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(item.mediaItem),
+                                item.durationUs
+                            )
+                        )
+                    }
+                    source
                 }
-                source
             }
 
             //println("PLAYBACK POS $playbackPosition")
@@ -912,7 +1017,11 @@ class CS3IPlayer : IPlayer {
                     }
 
                     CSPlayerEvent.SeekForward -> seekTime(seekActionTime, source)
+
                     CSPlayerEvent.SeekBack -> seekTime(-seekActionTime, source)
+
+                    CSPlayerEvent.Restart -> seekTo(0, source)
+
                     CSPlayerEvent.NextEpisode -> event(
                         EpisodeSeekEvent(
                             offset = 1,
@@ -946,6 +1055,34 @@ class CS3IPlayer : IPlayer {
         }
     }
 
+    // we want to push metadata when loading torrents, so we just set up a looper that loops until
+    // the index changes, this way only 1 looper is active at a time, and modifying eventLooperIndex
+    // will kill any active loopers
+    private var eventLooperIndex = 0
+    private fun torrentEventLooper(hash: String) = ioSafe {
+        eventLooperIndex += 2
+        // very shitty, but should work fine
+        // release player is called once for the new link
+        val currentIndex = eventLooperIndex + 1
+        while (eventLooperIndex <= currentIndex && eventHandler != null) {
+            try {
+                val status = Torrent.get(hash)
+                event(
+                    DownloadEvent(
+                        connections = status.activePeers,
+                        downloadSpeed = status.downloadSpeed?.toLong()!!,
+                        totalBytes = status.torrentSize!!,
+                        downloadedBytes = status.bytesRead!!,
+                    )
+                )
+            } catch (_: NullPointerException) {
+            } catch (t: Throwable) {
+                logError(t)
+            }
+            delay(1000)
+        }
+    }
+
     private fun loadExo(
         context: Context,
         mediaSlices: List<MediaItemSlice>,
@@ -955,7 +1092,7 @@ class CS3IPlayer : IPlayer {
         Log.i(TAG, "loadExo")
         val settingsManager = PreferenceManager.getDefaultSharedPreferences(context)
         val maxVideoHeight = settingsManager.getInt(
-            context.getString(if (context.isUsingMobileData()) com.lagradost.cloudstream3.R.string.quality_pref_mobile_data_key else com.lagradost.cloudstream3.R.string.quality_pref_key),
+            context.getString(if (context.isUsingMobileData()) R.string.quality_pref_mobile_data_key else R.string.quality_pref_key),
             Int.MAX_VALUE
         )
 
@@ -989,6 +1126,13 @@ class CS3IPlayer : IPlayer {
                 isPlaying = exo.isPlaying
             }
 
+            // we want to avoid an empty exoplayer from sending events
+            // this is because we need PlayerAttachedEvent to be called to render the UI
+            // but don't really want the rest like Player.STATE_ENDED calling next episode
+            if (mediaSlices.isEmpty() && subSources.isEmpty()) {
+                return
+            }
+
             exoPlayer?.addListener(object : Player.Listener {
                 override fun onTracksChanged(tracks: Tracks) {
                     normalSafeApiCall {
@@ -997,7 +1141,8 @@ class CS3IPlayer : IPlayer {
                         playerSelectedSubtitleTracks =
                             textTracks.map { group ->
                                 group.getFormats().mapNotNull { (format, _) ->
-                                    (format.id ?: return@mapNotNull null) to group.isSelected
+                                    (format.id?.stripTrackId()
+                                        ?: return@mapNotNull null) to group.isSelected
                                 }
                             }.flatten()
 
@@ -1015,7 +1160,7 @@ class CS3IPlayer : IPlayer {
                                         fromTwoLettersToLanguage(format.language!!)
                                             ?: format.language!!,
                                         // See setPreferredTextLanguage
-                                        format.id!!,
+                                        format.id!!.stripTrackId(),
                                         SubtitleOrigin.EMBEDDED_IN_VIDEO,
                                         format.sampleMimeType ?: MimeTypes.APPLICATION_SUBRIP,
                                         emptyMap(),
@@ -1029,7 +1174,7 @@ class CS3IPlayer : IPlayer {
                     }
                 }
 
-                @SuppressLint("UnsafeOptInUsageError")
+                //fixme: Use onPlaybackStateChanged(int) and onPlayWhenReadyChanged(boolean, int) instead.
                 override fun onPlayerStateChanged(playWhenReady: Boolean, playbackState: Int) {
                     exoPlayer?.let { exo ->
                         event(
@@ -1123,7 +1268,7 @@ class CS3IPlayer : IPlayer {
                             // Only play next episode if autoplay is on (default)
                             if (PreferenceManager.getDefaultSharedPreferences(context)
                                     ?.getBoolean(
-                                        context.getString(com.lagradost.cloudstream3.R.string.autoplay_next_key),
+                                        context.getString(R.string.autoplay_next_key),
                                         true
                                     ) == true
                             ) {
@@ -1165,7 +1310,6 @@ class CS3IPlayer : IPlayer {
 
     private var lastTimeStamps: List<EpisodeSkip.SkipStamp> = emptyList()
 
-    @SuppressLint("UnsafeOptInUsageError")
     override fun addTimeStamps(timeStamps: List<EpisodeSkip.SkipStamp>) {
         lastTimeStamps = timeStamps
         timeStamps.forEach { timestamp ->
@@ -1183,7 +1327,6 @@ class CS3IPlayer : IPlayer {
         updatedTime(source = PlayerEventSource.Player)
     }
 
-    @SuppressLint("UnsafeOptInUsageError")
     fun onRenderFirst() {
         if (hasUsedFirstRender) { // this insures that we only call this once per player load
             return
@@ -1250,7 +1393,6 @@ class CS3IPlayer : IPlayer {
         }
     }
 
-    @SuppressLint("UnsafeOptInUsageError")
     private fun getSubSources(
         onlineSourceFactory: HttpDataSource.Factory?,
         offlineSourceFactory: DataSource.Factory?,
@@ -1258,7 +1400,7 @@ class CS3IPlayer : IPlayer {
     ): Pair<List<SingleSampleMediaSource>, List<SubtitleData>> {
         val activeSubtitles = ArrayList<SubtitleData>()
         val subSources = subHelper.getAllSubtitles().mapNotNull { sub ->
-            val subConfig = MediaItem.SubtitleConfiguration.Builder(Uri.parse(sub.url))
+            val subConfig = MediaItem.SubtitleConfiguration.Builder(Uri.parse(sub.getFixedUrl()))
                 .setMimeType(sub.mimeType)
                 .setLanguage("_${sub.name}")
                 .setId(sub.getId())
@@ -1306,10 +1448,121 @@ class CS3IPlayer : IPlayer {
         return exoPlayer != null
     }
 
+
+    @MainThread
+    private fun loadTorrent(context: Context, link: ExtractorLink) {
+        ioSafe {
+            // we check exoPlayer a lot here, and that is because we don't want to load exo after
+            // the user has left the player, in the case that the user click back when this is
+            // happening
+            try {
+                if (exoPlayer == null) return@ioSafe
+                val (newLink, status) = Torrent.transformLink(link)
+                val hash = status.hash
+                if (exoPlayer == null) return@ioSafe
+                runOnMainThread {
+                    if (exoPlayer == null) return@runOnMainThread
+                    releasePlayer()
+                    if (hash != null) {
+                        torrentEventLooper(hash)
+                    }
+                    loadOnlinePlayer(context, newLink)
+                }
+            } catch (t: Throwable) {
+                event(ErrorEvent(t))
+            }
+        }
+    }
+
     @SuppressLint("UnsafeOptInUsageError")
-    private fun loadOnlinePlayer(context: Context, link: ExtractorLink) {
+    @MainThread
+    private fun loadOnlinePlayer(context: Context, link: ExtractorLink, retry: Boolean = false) {
         Log.i(TAG, "loadOnlinePlayer $link")
         try {
+            val mime = when (link.type) {
+                ExtractorLinkType.M3U8 -> MimeTypes.APPLICATION_M3U8
+                ExtractorLinkType.DASH -> MimeTypes.APPLICATION_MPD
+                ExtractorLinkType.VIDEO -> MimeTypes.VIDEO_MP4
+                ExtractorLinkType.TORRENT, ExtractorLinkType.MAGNET -> {
+                    // we check settings first, todo cleanup
+                    val default = TvType.entries.toTypedArray()
+                        .sorted()
+                        .filter { it != TvType.NSFW }
+                        .map { it.ordinal }
+
+                    val defaultSet = default.map { it.toString() }.toSet()
+                    val currentPrefMedia = try {
+                        PreferenceManager.getDefaultSharedPreferences(context)
+                            .getStringSet(
+                                context.getString(R.string.prefer_media_type_key),
+                                defaultSet
+                            )
+                            ?.mapNotNull { it.toIntOrNull() ?: return@mapNotNull null }
+                    } catch (e: Throwable) {
+                        null
+                    } ?: default
+
+                    if (!currentPrefMedia.contains(TvType.Torrent.ordinal)) {
+                        val errorMessage = context.getString(R.string.torrent_preferred_media)
+                        event(ErrorEvent(ErrorLoadingException(errorMessage)))
+                        return
+                    }
+
+                    if (Torrent.hasAcceptedTorrentForThisSession == false) {
+                        val errorMessage = context.getString(R.string.torrent_not_accepted)
+                        event(ErrorEvent(ErrorLoadingException(errorMessage)))
+                        return
+                    }
+                    // load the initial UI, we require an exoPlayer to be alive
+                    if (!retry) {
+                        // this causes a *bug* that restarts all torrents from 0
+                        // but I would call this a feature
+                        releasePlayer()
+                        loadExo(context, listOf(), listOf(), null)
+                    }
+                    event(
+                        StatusEvent(
+                            wasPlaying = CSPlayerLoading.IsPlaying,
+                            isPlaying = CSPlayerLoading.IsBuffering
+                        )
+                    )
+
+                    if (Torrent.hasAcceptedTorrentForThisSession == true) {
+                        loadTorrent(context, link)
+                        return
+                    }
+
+                    val builder: AlertDialog.Builder = AlertDialog.Builder(context)
+
+                    val dialogClickListener =
+                        DialogInterface.OnClickListener { _, which ->
+                            when (which) {
+                                DialogInterface.BUTTON_POSITIVE -> {
+                                    Torrent.hasAcceptedTorrentForThisSession = true
+                                    loadTorrent(context, link)
+                                }
+
+                                DialogInterface.BUTTON_NEGATIVE -> {
+                                    Torrent.hasAcceptedTorrentForThisSession = false
+                                    event(ErrorEvent(ErrorLoadingException("Not accepted torrent")))
+                                }
+                            }
+                        }
+
+                    builder.setTitle(R.string.play_torrent_button)
+                        .setMessage(R.string.torrent_info)
+                        // Ensure that the user will not accidentally start a torrent session.
+                        .setCancelable(false).setOnCancelListener {
+                            event(ErrorEvent(ErrorLoadingException("Not accepted torrent")))
+                        }
+                        .setPositiveButton(R.string.ok, dialogClickListener)
+                        .setNegativeButton(R.string.go_back, dialogClickListener)
+                        .show().setDefaultFocus()
+
+                    return
+                }
+            }
+
             currentLink = link
 
             if (ignoreSSL) {
@@ -1323,14 +1576,6 @@ class CS3IPlayer : IPlayer {
                 HttpsURLConnection.setDefaultSSLSocketFactory(sslContext.socketFactory)
             }
 
-            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 = when (link) {
                 is ExtractorLinkPlayList -> link.playlist.map {
@@ -1347,6 +1592,7 @@ class CS3IPlayer : IPlayer {
                                 key = link.key,
                                 uuid = link.uuid,
                                 kty = link.kty,
+                                licenseUrl = link.licenseUrl,
                                 keyRequestParameters = link.keyRequestParameters
                             )
                         )
@@ -1395,4 +1641,4 @@ class CS3IPlayer : IPlayer {
             loadOfflinePlayer(context, it)
         }
     }
-}
+}
\ No newline at end of file
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 20d093a636c..9975d80a136 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
@@ -1,30 +1,35 @@
 package com.lagradost.cloudstream3.ui.player
 
 import android.content.Context
+import android.text.Spannable
+import android.text.SpannableString
 import android.util.Log
-import androidx.preference.PreferenceManager
+import androidx.annotation.OptIn
 import androidx.media3.common.Format
 import androidx.media3.common.MimeTypes
+import androidx.media3.common.util.Consumer
 import androidx.media3.common.util.UnstableApi
-import androidx.media3.exoplayer.text.ExoplayerCuesDecoder
 import androidx.media3.exoplayer.text.SubtitleDecoderFactory
+import androidx.media3.extractor.text.CuesWithTiming
+import androidx.media3.extractor.text.SimpleSubtitleDecoder
+import androidx.media3.extractor.text.Subtitle
 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 androidx.media3.extractor.text.SubtitleParser
+import androidx.media3.extractor.text.dvb.DvbParser
+import androidx.media3.extractor.text.pgs.PgsParser
+import androidx.media3.extractor.text.ssa.SsaParser
+import androidx.media3.extractor.text.subrip.SubripParser
+import androidx.media3.extractor.text.ttml.TtmlParser
+import androidx.media3.extractor.text.tx3g.Tx3gParser
+import androidx.media3.extractor.text.webvtt.Mp4WebvttParser
+import androidx.media3.extractor.text.webvtt.WebvttParser
+import androidx.preference.PreferenceManager
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.mvvm.logError
+import com.lagradost.cloudstream3.ui.subtitles.SaveCaptionStyle
+import com.lagradost.cloudstream3.ui.subtitles.SubtitlesFragment
 import org.mozilla.universalchardet.UniversalDetector
-import java.nio.ByteBuffer
+import java.lang.ref.WeakReference
 import java.nio.charset.Charset
 
 /**
@@ -32,7 +37,7 @@ import java.nio.charset.Charset
  * enough to identify the subtitle format.
  **/
 @UnstableApi
-class CustomDecoder(private val fallbackFormat: Format?) : SubtitleDecoder {
+class CustomDecoder(private val fallbackFormat: Format?) : SubtitleParser {
     companion object {
         fun updateForcedEncoding(context: Context) {
             val settingsManager = PreferenceManager.getDefaultSharedPreferences(context)
@@ -47,12 +52,12 @@ class CustomDecoder(private val fallbackFormat: Format?) : SubtitleDecoder {
             }
         }
 
+        /** Subtitle offset in milliseconds */
+        var subtitleOffset: Long = 0
         private const val UTF_8 = "UTF-8"
         private const val TAG = "CustomDecoder"
         private var overrideEncoding: String? = null
-        var regexSubtitlesToRemoveCaptions = false
-        var regexSubtitlesToRemoveBloat = false
-        var uppercaseSubtitles = false
+        val style: SaveCaptionStyle get() = SubtitlesFragment.getCurrentSavedStyle()
         val bloatRegex =
             listOf(
                 Regex(
@@ -72,7 +77,7 @@ class CustomDecoder(private val fallbackFormat: Format?) : SubtitleDecoder {
                     RegexOption.IGNORE_CASE
                 ),
             )
-        val captionRegex = listOf(Regex("""(-\s?|)[\[({][\w\d\s]*?[])}]\s*"""))
+        val captionRegex = listOf(Regex("""(-\s?|)[\[({][\w\s]*?[])}]\s*"""))
 
         //https://emptycharacter.com/
         //https://www.fileformat.info/info/unicode/char/200b/index.htm
@@ -84,16 +89,7 @@ class CustomDecoder(private val fallbackFormat: Format?) : SubtitleDecoder {
         }
     }
 
-    private var realDecoder: SubtitleDecoder? = null
-
-    override fun getName(): String {
-        return realDecoder?.name ?: this::javaClass.name
-    }
-
-    override fun dequeueInputBuffer(): SubtitleInputBuffer {
-        Log.i(TAG, "dequeueInputBuffer")
-        return realDecoder?.dequeueInputBuffer() ?: SubtitleInputBuffer()
-    }
+    private var realDecoder: SubtitleParser? = null
 
     private fun getStr(byteArray: ByteArray): Pair<String, Charset> {
         val encoding = try {
@@ -127,162 +123,205 @@ class CustomDecoder(private val fallbackFormat: Format?) : SubtitleDecoder {
         }
     }
 
-    private fun getStr(input: SubtitleInputBuffer): String? {
-        try {
-            val data = input.data ?: return null
-            data.position(0)
-            val fullDataArr = ByteArray(data.remaining())
-            data.get(fullDataArr)
-            return trimStr(getStr(fullDataArr).first)
-        } catch (e: Exception) {
-            Log.e(TAG, "Failed to parse text returning plain data")
-            logError(e)
-            return null
+    private fun getSubtitleParser(data: String): SubtitleParser? {
+        // This way we read the subtitle file and decide what decoder to use instead of relying fully on mimetype
+
+        // First we remove all invisible characters at the start, this is an issue in some subtitle files
+        // Cntrl is control characters: https://en.wikipedia.org/wiki/Unicode_control_characters
+        // Cf is formatting characters: https://www.compart.com/en/unicode/category/Cf
+        val controlCharsRegex = Regex("""[\p{Cntrl}\p{Cf}]""")
+        val trimmedText = data.trimStart { it.isWhitespace() || controlCharsRegex.matches(it.toString()) }
+
+        //https://github.com/LagradOst/CloudStream-2/blob/ddd774ee66810137ff7bd65dae70bcf3ba2d2489/CloudStreamForms/CloudStreamForms/Script/MainChrome.cs#L388
+        val subtitleParser = when {
+            // "WEBVTT" can be hidden behind invisible characters not filtered by trim
+            trimmedText.substring(0, 10).contains("WEBVTT", ignoreCase = true) -> WebvttParser()
+            trimmedText.startsWith("<?xml version=\"", ignoreCase = true) -> TtmlParser()
+            (trimmedText.startsWith(
+                "[Script Info]",
+                ignoreCase = true
+            ) || trimmedText.startsWith(
+                "Title:",
+                ignoreCase = true
+            )) -> SsaParser(fallbackFormat?.initializationData)
+
+            trimmedText.startsWith("1", ignoreCase = true) -> SubripParser()
+            fallbackFormat != null -> {
+                when (val mimeType = fallbackFormat.sampleMimeType) {
+                    MimeTypes.TEXT_VTT -> WebvttParser()
+                    MimeTypes.TEXT_SSA -> SsaParser(fallbackFormat.initializationData)
+                    MimeTypes.APPLICATION_MP4VTT -> Mp4WebvttParser()
+                    MimeTypes.APPLICATION_TTML -> TtmlParser()
+                    MimeTypes.APPLICATION_SUBRIP -> SubripParser()
+                    MimeTypes.APPLICATION_TX3G -> Tx3gParser(fallbackFormat.initializationData)
+                    // These decoders are not converted to parsers yet
+                    // TODO
+//                            MimeTypes.APPLICATION_CEA608, MimeTypes.APPLICATION_MP4CEA608 -> Cea608Decoder(
+//                                mimeType,
+//                                fallbackFormat.accessibilityChannel,
+//                                Cea608Decoder.MIN_DATA_CHANNEL_TIMEOUT_MS
+//                            )
+//                            MimeTypes.APPLICATION_CEA708 -> Cea708Decoder(
+//                                fallbackFormat.accessibilityChannel,
+//                                fallbackFormat.initializationData
+//                            )
+                    MimeTypes.APPLICATION_DVBSUBS -> DvbParser(fallbackFormat.initializationData)
+                    MimeTypes.APPLICATION_PGS -> PgsParser()
+                    else -> null
+                }
+            }
+
+            else -> null
         }
+        return subtitleParser
     }
 
-    private fun SubtitleInputBuffer.setSubtitleText(text: String) {
-//        println("Set subtitle text -----\n$text\n-----")
-        this.data = ByteBuffer.wrap(text.toByteArray(charset(UTF_8)))
-    }
+    val currentSubtitleCues = mutableListOf<SubtitleCue>()
+
+    override fun parse(
+        data: ByteArray,
+        offset: Int,
+        length: Int,
+        outputOptions: SubtitleParser.OutputOptions,
+        output: Consumer<CuesWithTiming>
+    ) {
+        val currentStyle = style
+        val customOutput = Consumer<CuesWithTiming> { cue ->
+            currentSubtitleCues.add(
+                SubtitleCue(
+                    cue.startTimeUs / 1000,
+                    cue.durationUs / 1000,
+                    cue.cues.map { it.text.toString() })
+            )
+
+            // add an extra span here to change the subtitle
+            val edgeSize = currentStyle.edgeSize
+            val newCue = if (edgeSize == null) {
+                cue
+            } else {
+                CuesWithTiming(cue.cues.map { c ->
+                    c.buildUpon().apply {
+                        val customSpan = SpannableString.valueOf(text ?: return@apply)
+                        customSpan.setSpan(
+                            OutlineSpan(edgeSize), 0, customSpan.length,
+                            Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
+                        )
+                        setText(customSpan)
+                    }.build()
+                }, cue.startTimeUs, cue.durationUs)
+            }
+
+            val updatedCues =
+                CuesWithTiming(
+                    newCue.cues,
+                    newCue.startTimeUs - subtitleOffset.times(1000),
+                    newCue.durationUs
+                )
 
-    override fun queueInputBuffer(inputBuffer: SubtitleInputBuffer) {
-        Log.i(TAG, "queueInputBuffer")
+            output.accept(updatedCues)
+        }
+        Log.i(TAG, "Parse subtitle, current parser: $realDecoder")
         try {
-            val inputString = getStr(inputBuffer)
-            if (realDecoder == null && !inputString.isNullOrBlank()) {
-                var str: String = inputString
-                // this way we read the subtitle file and decide what decoder to use instead of relying fully on mimetype
-                Log.i(TAG, "Got data from queueInputBuffer")
-                //https://github.com/LagradOst/CloudStream-2/blob/ddd774ee66810137ff7bd65dae70bcf3ba2d2489/CloudStreamForms/CloudStreamForms/Script/MainChrome.cs#L388
-                realDecoder = when {
-                    str.startsWith("WEBVTT", ignoreCase = true) -> WebvttDecoder()
-                    str.startsWith("<?xml version=\"", ignoreCase = true) -> TtmlDecoder()
-                    (str.startsWith(
-                        "[Script Info]",
-                        ignoreCase = true
-                    ) || str.startsWith("Title:", ignoreCase = true)) -> SsaDecoder(fallbackFormat?.initializationData)
-                    str.startsWith("1", ignoreCase = true) -> SubripDecoder()
-                    fallbackFormat != null -> {
-                        when (val mimeType = fallbackFormat.sampleMimeType) {
-                            MimeTypes.TEXT_VTT -> WebvttDecoder()
-                            MimeTypes.TEXT_SSA -> SsaDecoder(fallbackFormat.initializationData)
-                            MimeTypes.APPLICATION_MP4VTT -> Mp4WebvttDecoder()
-                            MimeTypes.APPLICATION_TTML -> TtmlDecoder()
-                            MimeTypes.APPLICATION_SUBRIP -> SubripDecoder()
-                            MimeTypes.APPLICATION_TX3G -> Tx3gDecoder(fallbackFormat.initializationData)
-                            MimeTypes.APPLICATION_CEA608, MimeTypes.APPLICATION_MP4CEA608 -> Cea608Decoder(
-                                mimeType,
-                                fallbackFormat.accessibilityChannel,
-                                Cea608Decoder.MIN_DATA_CHANNEL_TIMEOUT_MS
-                            )
-                            MimeTypes.APPLICATION_CEA708 -> Cea708Decoder(
-                                fallbackFormat.accessibilityChannel,
-                                fallbackFormat.initializationData
-                            )
-                            MimeTypes.APPLICATION_DVBSUBS -> DvbDecoder(fallbackFormat.initializationData)
-                            MimeTypes.APPLICATION_PGS -> PgsDecoder()
-                            MimeTypes.TEXT_EXOPLAYER_CUES -> ExoplayerCuesDecoder()
-                            else -> null
-                        }
-                    }
-                    else -> null
-                }
+            val inputString = getStr(data).first
+            Log.i(TAG, "Subtitle preview: ${inputString.substring(0, 30)}")
+            if (inputString.isNotBlank()) {
+                var str: String = trimStr(inputString)
+                realDecoder = realDecoder ?: getSubtitleParser(inputString)
                 Log.i(
                     TAG,
-                    "Decoder selected: $realDecoder"
+                    "Parser selected: $realDecoder"
                 )
                 realDecoder?.let { decoder ->
-                    decoder.dequeueInputBuffer()?.let { buff ->
-                        if (decoder !is SsaDecoder) {
-                            if (regexSubtitlesToRemoveCaptions)
-                                captionRegex.forEach { rgx ->
-                                    str = str.replace(rgx, "\n")
-                                }
-                            if (regexSubtitlesToRemoveBloat)
-                                bloatRegex.forEach { rgx ->
-                                    str = str.replace(rgx, "\n")
-                                }
-                        }
-                        buff.setSubtitleText(str)
-                        decoder.queueInputBuffer(buff)
-                        Log.i(
-                            TAG,
-                            "Decoder queueInputBuffer successfully"
-                        )
-                    }
-                    CS3IPlayer.requestSubtitleUpdate?.invoke()
-                }
-            } else {
-                Log.i(
-                    TAG,
-                    "Decoder else queueInputBuffer successfully"
-                )
-
-                if (!inputString.isNullOrBlank()) {
-                    var str: String = inputString
-                    if (realDecoder !is SsaDecoder) {
-                        if (regexSubtitlesToRemoveCaptions)
+                    if (decoder !is SsaParser) {
+                        if (currentStyle.removeCaptions)
                             captionRegex.forEach { rgx ->
                                 str = str.replace(rgx, "\n")
                             }
-                        if (regexSubtitlesToRemoveBloat)
+                        if (currentStyle.removeBloat)
                             bloatRegex.forEach { rgx ->
                                 str = str.replace(rgx, "\n")
                             }
-                        if (uppercaseSubtitles) {
+                        if (currentStyle.upperCase) {
                             str = str.uppercase()
                         }
                     }
-                    inputBuffer.setSubtitleText(str)
                 }
-
-                realDecoder?.queueInputBuffer(inputBuffer)
+                val array = str.toByteArray()
+                realDecoder?.parse(
+                    array,
+                    minOf(array.size, offset),
+                    minOf(array.size, length),
+                    outputOptions,
+                    customOutput
+                )
             }
         } catch (e: Exception) {
             logError(e)
         }
     }
 
-    override fun dequeueOutputBuffer(): SubtitleOutputBuffer? {
-        return realDecoder?.dequeueOutputBuffer()
-    }
-
-    override fun flush() {
-        realDecoder?.flush()
+    override fun getCueReplacementBehavior(): Int {
+        // CUE_REPLACEMENT_BEHAVIOR_REPLACE seems most compatible, change if required
+        return realDecoder?.cueReplacementBehavior ?: Format.CUE_REPLACEMENT_BEHAVIOR_REPLACE
     }
 
-    override fun release() {
-        realDecoder?.release()
-    }
-
-    override fun setPositionUs(positionUs: Long) {
-        realDecoder?.setPositionUs(positionUs)
+    override fun reset() {
+        currentSubtitleCues.clear()
+        super.reset()
     }
 }
 
 /** See https://github.com/google/ExoPlayer/blob/release-v2/library/core/src/main/java/com/google/android/exoplayer2/text/SubtitleDecoderFactory.java */
-@UnstableApi
+@OptIn(UnstableApi::class)
 class CustomSubtitleDecoderFactory : SubtitleDecoderFactory {
+
     override fun supportsFormat(format: Format): Boolean {
-//        return SubtitleDecoderFactory.DEFAULT.supportsFormat(format)
         return listOf(
             MimeTypes.TEXT_VTT,
             MimeTypes.TEXT_SSA,
             MimeTypes.APPLICATION_TTML,
             MimeTypes.APPLICATION_MP4VTT,
             MimeTypes.APPLICATION_SUBRIP,
-            //MimeTypes.APPLICATION_TX3G,
+            MimeTypes.APPLICATION_TX3G,
             //MimeTypes.APPLICATION_CEA608,
             //MimeTypes.APPLICATION_MP4CEA608,
             //MimeTypes.APPLICATION_CEA708,
-            //MimeTypes.APPLICATION_DVBSUBS,
-            //MimeTypes.APPLICATION_PGS,
+            MimeTypes.APPLICATION_DVBSUBS,
+            MimeTypes.APPLICATION_PGS,
             //MimeTypes.TEXT_EXOPLAYER_CUES
         ).contains(format.sampleMimeType)
     }
 
+    private var latestDecoder: WeakReference<CustomDecoder>? = null
+
+    fun getSubtitleCues(): List<SubtitleCue>? {
+        return latestDecoder?.get()?.currentSubtitleCues
+    }
+
+    /**
+     * Decoders created here persists across reset()
+     * Do not save state in the decoder which you want to reset (e.g subtitle offset)
+     **/
     override fun createDecoder(format: Format): SubtitleDecoder {
-        return CustomDecoder(format)
+        val parser = CustomDecoder(format)
+        // Allow garbage collection if player releases the decoder
+        latestDecoder = WeakReference(parser)
+
+        return DelegatingSubtitleDecoder(
+            parser::class.simpleName + "Decoder", parser
+        )
     }
-}
\ No newline at end of file
+}
+
+@OptIn(UnstableApi::class)
+/** We need to convert the newer SubtitleParser to an older SubtitleDecoder */
+class DelegatingSubtitleDecoder(name: String, private val parser: SubtitleParser) :
+    SimpleSubtitleDecoder(name) {
+
+    override fun decode(data: ByteArray, length: Int, reset: Boolean): Subtitle {
+        if (reset) {
+            parser.reset()
+        }
+        return parser.parseToLegacySubtitle(data, 0, length);
+    }
+}
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
deleted file mode 100644
index d6b0735d0f9..00000000000
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CustomTextRenderer.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.lagradost.cloudstream3.ui.player
-
-import android.os.Looper
-import androidx.media3.common.util.UnstableApi
-import androidx.media3.exoplayer.text.SubtitleDecoderFactory
-import androidx.media3.exoplayer.text.TextOutput
-
-@UnstableApi
-class CustomTextRenderer(
-    offset: Long,
-    output: TextOutput?,
-    outputLooper: Looper?,
-    decoderFactory: SubtitleDecoderFactory = SubtitleDecoderFactory.DEFAULT
-) : NonFinalTextRenderer(output, outputLooper, decoderFactory) {
-    private var offsetPositionUs: Long = 0L
-
-    init {
-        setRenderOffsetMs(offset)
-    }
-
-    fun setRenderOffsetMs(offset : Long) {
-        offsetPositionUs = offset * 1000L
-    }
-
-    fun getRenderOffsetMs() : Long {
-        return offsetPositionUs / 1000L
-    }
-
-    override fun render( positionUs: Long,  elapsedRealtimeUs: Long) {
-        super.render(positionUs + offsetPositionUs, elapsedRealtimeUs + offsetPositionUs)
-    }
-}
\ No newline at end of file
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 3b242172f0b..7d3d18ca9af 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
@@ -1,10 +1,16 @@
 package com.lagradost.cloudstream3.ui.player
 
+import android.net.Uri
 import com.lagradost.cloudstream3.AcraApplication.Companion.context
+import com.lagradost.cloudstream3.CommonActivity.activity
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.ui.player.PlayerSubtitleHelper.Companion.toSubtitleMimeType
 import com.lagradost.cloudstream3.utils.ExtractorLink
-import com.lagradost.cloudstream3.utils.VideoDownloadManager
+import com.lagradost.cloudstream3.utils.ExtractorLinkType
+import com.lagradost.cloudstream3.utils.SubtitleUtils.cleanDisplayName
+import com.lagradost.cloudstream3.utils.SubtitleUtils.isMatchingSubtitle
+import com.lagradost.cloudstream3.utils.VideoDownloadManager.getDownloadFileInfoAndUpdateSettings
+import com.lagradost.cloudstream3.utils.VideoDownloadManager.getFolder
 import kotlin.math.max
 import kotlin.math.min
 
@@ -13,6 +19,7 @@ class DownloadFileGenerator(
     private var currentIndex: Int = 0
 ) : IGenerator {
     override val hasCache = false
+    override val canSkipLoading = false
 
     override fun hasNext(): Boolean {
         return currentIndex < episodes.size - 1
@@ -49,19 +56,30 @@ class DownloadFileGenerator(
         return null
     }
 
-    fun cleanDisplayName(name: String): String {
-        return name.substringBeforeLast('.').trim()
-    }
-
     override suspend fun generateLinks(
         clearCache: Boolean,
-        type: LoadType,
+        sourceTypes: Set<ExtractorLinkType>,
         callback: (Pair<ExtractorLink?, ExtractorUri?>) -> Unit,
         subtitleCallback: (SubtitleData) -> Unit,
-        offset: Int
+        offset: Int,
+        isCasting: Boolean
     ): Boolean {
         val meta = episodes[currentIndex + offset]
-        callback(null to meta)
+
+        if (meta.uri == Uri.EMPTY) {
+            // We do this here so that we only load it when
+            // we actually need it as it can be more expensive.
+            val info = meta.id?.let { id ->
+                activity?.let { act ->
+                    getDownloadFileInfoAndUpdateSettings(act, id)
+                }
+            }
+
+            if (info != null) {
+                val newMeta = meta.copy(uri = info.path)
+                callback(null to newMeta)
+            } else callback(null to meta)
+        } else callback(null to meta)
 
         val ctx = context ?: return true
         val relative = meta.relativePath ?: return true
@@ -69,28 +87,9 @@ class DownloadFileGenerator(
 
         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
-
+        getFolder(ctx, relative, meta.basePath)?.forEach { (name, uri) ->
+            if (isMatchingSubtitle(name, display, cleanDisplay)) {
                 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(
@@ -104,6 +103,7 @@ class DownloadFileGenerator(
                     )
                 )
             }
+        }
 
         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 92ef279d442..13f1637d950 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
@@ -4,17 +4,13 @@ import android.content.Intent
 import android.os.Bundle
 import android.util.Log
 import android.view.KeyEvent
-import androidx.activity.OnBackPressedCallback
 import androidx.appcompat.app.AppCompatActivity
 import com.lagradost.cloudstream3.CommonActivity
 import com.lagradost.cloudstream3.R
-import com.lagradost.cloudstream3.utils.UIHelper.navigate
-import com.lagradost.safefile.SafeFile
 import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
 import com.lagradost.cloudstream3.ui.player.OfflinePlaybackHelper.playLink
 import com.lagradost.cloudstream3.ui.player.OfflinePlaybackHelper.playUri
-
-const val DTAG = "PlayerActivity"
+import com.lagradost.cloudstream3.utils.BackPressedCallbackHelper.attachBackPressedCallback
 
 class DownloadedPlayerActivity : AppCompatActivity() {
     private val dTAG = "DownloadedPlayerAct"
@@ -46,7 +42,7 @@ class DownloadedPlayerActivity : AppCompatActivity() {
 
         val data = intent.data
 
-        if (intent?.action == Intent.ACTION_SEND) {
+        if (intent?.action == Intent.ACTION_SEND || intent?.action == Intent.ACTION_OPEN_DOCUMENT || intent?.action == Intent.ACTION_VIEW) {
             val extraText = normalSafeApiCall { // I dont trust android
                 intent.getStringExtra(Intent.EXTRA_TEXT)
             }
@@ -74,14 +70,7 @@ class DownloadedPlayerActivity : AppCompatActivity() {
             return
         }
 
-        onBackPressedDispatcher.addCallback(
-            this,
-            object : OnBackPressedCallback(true) {
-                override fun handleOnBackPressed() {
-                    finish()
-                }
-            }
-        )
+        attachBackPressedCallback("DownloadedPlayerActivity") { finish() }
     }
 
     override fun onResume() {
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 8255360c640..794dd762df2 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
@@ -1,12 +1,14 @@
 package com.lagradost.cloudstream3.ui.player
 
 import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.ExtractorLinkType
 
 class ExtractorLinkGenerator(
     private val links: List<ExtractorLink>,
     private val subtitles: List<SubtitleData>,
 ) : IGenerator {
     override val hasCache = false
+    override val canSkipLoading = true
 
     override fun getCurrentId(): Int? {
         return null
@@ -36,15 +38,15 @@ class ExtractorLinkGenerator(
 
     override suspend fun generateLinks(
         clearCache: Boolean,
-        type: LoadType,
+        sourceTypes: Set<ExtractorLinkType>,
         callback: (Pair<ExtractorLink?, ExtractorUri?>) -> Unit,
         subtitleCallback: (SubtitleData) -> Unit,
-        offset: Int
+        offset: Int,
+        isCasting: Boolean
     ): Boolean {
         subtitles.forEach(subtitleCallback)
-        val allowedTypes = type.toSet()
         links.forEach {
-            if(allowedTypes.contains(it.type)) {
+            if(sourceTypes.contains(it.type)) {
                 callback.invoke(it to null)
             }
         }
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 75a861c0957..f248c414088 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
@@ -3,6 +3,7 @@ package com.lagradost.cloudstream3.ui.player
 import android.animation.ObjectAnimator
 import android.annotation.SuppressLint
 import android.app.Activity
+import android.app.Dialog
 import android.content.Context
 import android.content.pm.ActivityInfo
 import android.content.res.ColorStateList
@@ -14,20 +15,33 @@ import android.os.Bundle
 import android.provider.Settings
 import android.text.Editable
 import android.text.format.DateUtils
-import android.view.*
+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.WindowInsets
+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 androidx.appcompat.app.AlertDialog
+import android.widget.LinearLayout
+import androidx.annotation.OptIn
 import androidx.core.graphics.blue
 import androidx.core.graphics.green
 import androidx.core.graphics.red
+import androidx.core.view.children
 import androidx.core.view.isGone
 import androidx.core.view.isInvisible
 import androidx.core.view.isVisible
 import androidx.core.widget.doOnTextChanged
+import androidx.media3.common.MimeTypes
+import androidx.media3.common.util.UnstableApi
 import androidx.preference.PreferenceManager
+import androidx.recyclerview.widget.SimpleItemAnimator
+import com.google.android.material.button.MaterialButton
 import com.lagradost.cloudstream3.CommonActivity.keyEventListener
 import com.lagradost.cloudstream3.CommonActivity.playerEventListener
 import com.lagradost.cloudstream3.CommonActivity.screenHeight
@@ -39,9 +53,8 @@ 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.ui.result.setText
-import com.lagradost.cloudstream3.ui.result.txt
-import com.lagradost.cloudstream3.ui.settings.Globals
+import com.lagradost.cloudstream3.utils.setText
+import com.lagradost.cloudstream3.utils.txt
 import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
@@ -58,7 +71,12 @@ import com.lagradost.cloudstream3.utils.UIHelper.showSystemUI
 import com.lagradost.cloudstream3.utils.UIHelper.toPx
 import com.lagradost.cloudstream3.utils.UserPreferenceDelegate
 import com.lagradost.cloudstream3.utils.Vector2
-import kotlin.math.*
+import kotlin.math.abs
+import kotlin.math.ceil
+import kotlin.math.max
+import kotlin.math.min
+import kotlin.math.round
+
 
 const val MINIMUM_SEEK_TIME = 7000L         // when swipe seeking
 const val MINIMUM_VERTICAL_SWIPE = 2.0f     // in percentage
@@ -77,7 +95,8 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
     protected open var isFullScreenPlayer = true
     protected var playerBinding: PlayerCustomLayoutBinding? = null
 
-    private var durationMode : Boolean by UserPreferenceDelegate("duration_mode", false)
+    private var durationMode: Boolean by UserPreferenceDelegate("duration_mode", false)
+
     // state of player UI
     protected var isShowing = false
     protected var isLocked = false
@@ -109,6 +128,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
     protected var doubleTapPauseEnabled = true
     protected var playerRotateEnabled = false
     protected var autoPlayerRotateEnabled = false
+    private var hideControlsNames = false
 
     protected var subtitleDelay
         set(value) = try {
@@ -184,12 +204,34 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
         throw NotImplementedError()
     }
 
-    /** Returns false if the touch is on the status bar or navigation bar*/
-    private fun isValidTouch(rawX: Float, rawY: Float): Boolean {
-        val statusHeight = statusBarHeight ?: 0
-        // val navHeight = navigationBarHeight ?: 0
-        // nav height is removed because screenWidth already takes into account that
-        return rawY > statusHeight && rawX < screenWidth //- navHeight
+    /**
+     * [isValidTouch] should be called on a [View] spanning across the screen for reliable results.
+     *
+     * Android has supported gesture navigation properly since API-30. We get the absolute screen dimens using
+     * [WindowManager.getCurrentWindowMetrics] and remove the stable insets
+     * {[WindowInsets.getInsetsIgnoringVisibility]} to get a safe perimeter.
+     * This approach supports any and all types of necessary system insets.
+     *
+     * @return false if the touch is on the status bar or navigation bar
+     * */
+    private fun View.isValidTouch(rawX: Float, rawY: Float): Boolean {
+        // NOTE: screenWidth is without the navbar width when 3button nav is turned on.
+        if(Build.VERSION.SDK_INT >= 30) {
+            // real = absolute dimen without any default deductions like navbar width
+            val windowMetrics = (context?.getSystemService(Context.WINDOW_SERVICE) as? WindowManager)?.currentWindowMetrics
+            val realScreenHeight = windowMetrics?.let { windowMetrics.bounds.bottom - windowMetrics.bounds.top } ?: screenHeight
+            val realScreenWidth = windowMetrics?.let { windowMetrics.bounds.right - windowMetrics.bounds.left } ?: screenWidth
+
+            val insets = rootWindowInsets.getInsetsIgnoringVisibility(WindowInsets.Type.systemBars())
+            val isOutsideHeight = rawY < insets.top || rawY > (realScreenHeight - insets.bottom)
+            val isOutsideWidth = if(windowMetrics == null) rawX < screenWidth
+                else rawX < insets.left || rawX > (realScreenWidth - insets.right)
+
+            return !(isOutsideWidth || isOutsideHeight)
+        } else {
+            val statusHeight = statusBarHeight ?: 0
+            return rawY > statusHeight && rawX < screenWidth
+        }
     }
 
     override fun exitedPipMode() {
@@ -230,6 +272,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
         fadeAnimation.duration = 100
         fadeAnimation.fillAfter = true
 
+        @OptIn(UnstableApi::class)
         val sView = subView
         val sStyle = subStyle
         if (sView != null && sStyle != null) {
@@ -243,7 +286,6 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
 
         val playerSourceMove = if (isShowing) 0f else -50.toPx.toFloat()
 
-
         playerBinding?.apply {
             playerOpenSource.let {
                 ObjectAnimator.ofFloat(it, "translationY", playerSourceMove).apply {
@@ -261,6 +303,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
                 playerFfwdHolder.startAnimation(fadeAnimation)
                 playerRewHolder.startAnimation(fadeAnimation)
                 playerPausePlay.startAnimation(fadeAnimation)
+                downloadBothHeader.startAnimation(fadeAnimation)
 
                 /*if (isBuffering) {
                         player_pause_play?.isVisible = false
@@ -280,48 +323,51 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
     }
 
     override fun subtitlesChanged() {
+        val tracks = player.getVideoTracks()
+        val isBuiltinSubtitles = tracks.currentTextTracks.all { track ->
+            track.mimeType == MimeTypes.APPLICATION_MEDIA3_CUES
+        }
+        // Subtitle offset is not possible on built-in media3 tracks
         playerBinding?.playerSubtitleOffsetBtt?.isGone =
-            player.getCurrentPreferredSubtitle() == null
+            isBuiltinSubtitles || tracks.currentTextTracks.isEmpty()
     }
 
-    private fun restoreOrientationWithSensor(activity: Activity){
+    private fun restoreOrientationWithSensor(activity: Activity) {
         val currentOrientation = activity.resources.configuration.orientation
-        var orientation = 0
-        when (currentOrientation) {
+        val orientation = when (currentOrientation) {
             Configuration.ORIENTATION_LANDSCAPE ->
-                orientation = ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE
-
-            Configuration.ORIENTATION_SQUARE, Configuration.ORIENTATION_UNDEFINED ->
-                orientation = dynamicOrientation()
+                ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE
 
             Configuration.ORIENTATION_PORTRAIT ->
-                orientation = ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT
+                ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT
+
+            else -> dynamicOrientation()
         }
         activity.requestedOrientation = orientation
     }
 
-    private fun toggleOrientationWithSensor(activity: Activity){
+    private fun toggleOrientationWithSensor(activity: Activity) {
         val currentOrientation = activity.resources.configuration.orientation
-        var orientation = 0
-        when (currentOrientation) {
+        val orientation: Int = when (currentOrientation) {
             Configuration.ORIENTATION_LANDSCAPE ->
-                orientation = ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT
-
-            Configuration.ORIENTATION_SQUARE, Configuration.ORIENTATION_UNDEFINED ->
-                orientation = dynamicOrientation()
+                ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT
 
             Configuration.ORIENTATION_PORTRAIT ->
-                orientation = ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE
+                ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE
+
+            else -> dynamicOrientation()
         }
         activity.requestedOrientation = orientation
     }
 
     open fun lockOrientation(activity: Activity) {
-        val display =
+        @Suppress("DEPRECATION")
+        val display = if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R)
             (activity.getSystemService(Context.WINDOW_SERVICE) as WindowManager).defaultDisplay
+        else activity.display!!
         val rotation = display.rotation
         val currentOrientation = activity.resources.configuration.orientation
-        var orientation = 0
+        val orientation: Int
         when (currentOrientation) {
             Configuration.ORIENTATION_LANDSCAPE ->
                 orientation =
@@ -330,27 +376,25 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
                     else
                         ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE
 
-            Configuration.ORIENTATION_SQUARE, Configuration.ORIENTATION_UNDEFINED ->
-                orientation = dynamicOrientation()
-
             Configuration.ORIENTATION_PORTRAIT ->
                 orientation =
                     if (rotation == Surface.ROTATION_0 || rotation == Surface.ROTATION_270)
                         ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
                     else
                         ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT
+
+            else -> orientation = dynamicOrientation()
         }
         activity.requestedOrientation = orientation
     }
 
     private fun updateOrientation(ignoreDynamicOrientation: Boolean = false) {
         activity?.apply {
-            if(lockRotation) {
-                if(isLocked) {
+            if (lockRotation) {
+                if (isLocked) {
                     lockOrientation(this)
-                }
-                else {
-                    if(ignoreDynamicOrientation){
+                } else {
+                    if (ignoreDynamicOrientation) {
                         // restore when lock is disabled
                         restoreOrientationWithSensor(this)
                     } else {
@@ -420,29 +464,39 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
 
     private fun showSubtitleOffsetDialog() {
         val ctx = context ?: return
+        // Pause player because the subtitles cannot be continuously updated to follow playback.
+        player.handleEvent(
+            CSPlayerEvent.Pause,
+            PlayerEventSource.UI
+        )
 
         val binding = SubtitleOffsetBinding.inflate(LayoutInflater.from(ctx), null, false)
 
-        val builder =
-            AlertDialog.Builder(ctx, R.style.AlertDialogCustom)
-                .setView(binding.root)
-        val dialog = builder.create()
+        // Use dialog as opposed to alertdialog to get fullscreen
+        val dialog = Dialog(ctx, R.style.AlertDialogCustomBlack).apply {
+            setContentView(binding.root)
+        }
         dialog.show()
 
         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 {
+            var subtitleAdapter: SubtitleOffsetItemAdapter? = null
+
             subtitleOffsetInput.doOnTextChanged { text, _, _, _ ->
                 text?.toString()?.toLongOrNull()?.let { time ->
                     subtitleDelay = time
+
+                    // Scroll to the first active subtitle
+                    val playerPosition = player.getPosition() ?: 0
+                    val totalPosition = playerPosition - subtitleDelay
+                    subtitleAdapter?.updateTime(totalPosition)
+
+                    subtitleAdapter?.getLatestActiveItem(totalPosition)
+                        ?.let { subtitlePos ->
+                            subtitleOffsetRecyclerview.scrollToPosition(subtitlePos)
+                        }
+
                     val str = when {
                         time > 0L -> {
                             txt(R.string.subtitle_offset_extra_hint_later_format, time)
@@ -462,6 +516,26 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
             subtitleOffsetInput.text =
                 Editable.Factory.getInstance()?.newEditable(beforeOffset.toString())
 
+            val subtitles = player.getSubtitleCues().toMutableList()
+
+            subtitleOffsetRecyclerview.isVisible = subtitles.isNotEmpty()
+            noSubtitlesLoadedNotice.isVisible = subtitles.isEmpty()
+
+            val initialSubtitlePosition = (player.getPosition() ?: 0) - subtitleDelay
+            subtitleAdapter =
+                SubtitleOffsetItemAdapter(initialSubtitlePosition, subtitles) { subtitleCue ->
+                    val playerPosition = player.getPosition() ?: 0
+                    subtitleOffsetInput.text = Editable.Factory.getInstance()
+                        ?.newEditable((playerPosition - subtitleCue.startTimeMs).toString())
+                }
+
+            subtitleOffsetRecyclerview.adapter = subtitleAdapter
+            // Prevent flashing changes when changing items
+            (subtitleOffsetRecyclerview.itemAnimator as? SimpleItemAnimator)?.supportsChangeAnimations = false
+
+            val firstSubtitle = subtitleAdapter.getLatestActiveItem(initialSubtitlePosition)
+            subtitleOffsetRecyclerview.scrollToPosition(firstSubtitle)
+
             val buttonChange = 100L
             val buttonChangeMore = 1000L
 
@@ -557,7 +631,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
                 playerRewHolder.alpha = 1f
 
                 val rotateLeft = AnimationUtils.loadAnimation(context, R.anim.rotate_left)
-                exoRew.startAnimation(rotateLeft)
+                playerRew.startAnimation(rotateLeft)
 
                 val goLeft = AnimationUtils.loadAnimation(context, R.anim.go_left)
                 goLeft.setAnimationListener(object : Animation.AnimationListener {
@@ -590,7 +664,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
                 playerFfwdHolder.alpha = 1f
 
                 val rotateRight = AnimationUtils.loadAnimation(context, R.anim.rotate_right)
-                exoFfwd.startAnimation(rotateRight)
+                playerFfwd.startAnimation(rotateRight)
 
                 val goRight = AnimationUtils.loadAnimation(context, R.anim.go_right)
                 goRight.setAnimationListener(object : Animation.AnimationListener {
@@ -657,6 +731,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
             playerPausePlay.startAnimation(fadeAnimation)
             playerFfwdHolder.startAnimation(fadeAnimation)
             playerRewHolder.startAnimation(fadeAnimation)
+            downloadBothHeader.startAnimation(fadeAnimation)
 
             //if (hasEpisodes)
             //    player_episodes_button?.startAnimation(fadeAnimation)
@@ -678,7 +753,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
         updateLockUI()
     }
 
-    fun updateUIVisibility() {
+    open fun updateUIVisibility() {
         val isGone = isLocked || !isShowing
         var togglePlayerTitleGone = isGone
         context?.let {
@@ -728,6 +803,15 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
     private var currentTapIndex = 0
     protected fun autoHide() {
         currentTapIndex++
+        delayHide()
+    }
+
+    override fun playerStatusChanged() {
+        super.playerStatusChanged()
+        delayHide()
+    }
+
+    private fun delayHide() {
         val index = currentTapIndex
         playerBinding?.playerHolder?.postDelayed({
             if (!isCurrentTouchValid && isShowing && index == currentTapIndex && player.getIsPlaying()) {
@@ -879,7 +963,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
             when (event.action) {
                 MotionEvent.ACTION_DOWN -> {
                     // validates if the touch is inside of the player area
-                    isCurrentTouchValid = isValidTouch(currentTouch.x, currentTouch.y)
+                    isCurrentTouchValid = view.isValidTouch(currentTouch.x, currentTouch.y)
                     /*if (isCurrentTouchValid && player_episode_list?.isVisible == true) {
                         player_episode_list?.isVisible = false
                     } else*/ if (isCurrentTouchValid) {
@@ -949,7 +1033,10 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
                                         }
 
                                         else -> {
-                                            player.handleEvent(CSPlayerEvent.PlayPauseToggle, PlayerEventSource.UI)
+                                            player.handleEvent(
+                                                CSPlayerEvent.PlayPauseToggle,
+                                                PlayerEventSource.UI
+                                            )
                                         }
                                     }
                                 } else if (doubleTapEnabled && isFullScreenPlayer) {
@@ -1142,6 +1229,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
         return true
     }
 
+    @SuppressLint("GestureBackNavigation")
     private fun handleKeyEvent(event: KeyEvent, hasNavigated: Boolean): Boolean {
         if (hasNavigated) {
             autoHide()
@@ -1225,6 +1313,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
         // if nothing has loaded these buttons should not be visible
         playerBinding?.apply {
             playerSkipEpisode.isVisible = false
+            playerGoForwardRoot.isVisible = false
             playerTracksBtt.isVisible = false
             playerSkipOp.isVisible = false
             shadowOverlay.isVisible = false
@@ -1298,6 +1387,10 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
                     player.handleEvent(CSPlayerEvent.SeekBack)
                 }
 
+                PlayerEventType.Restart -> {
+                    player.handleEvent(CSPlayerEvent.Restart)
+                }
+
                 PlayerEventType.ToggleMute -> {
                     player.handleEvent(CSPlayerEvent.ToggleMute)
                 }
@@ -1393,6 +1486,8 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
                         false
                     )
 
+                hideControlsNames = settingsManager.getBoolean(ctx.getString(R.string.hide_player_control_names_key), false)
+
                 val profiles = QualityDataHelper.getProfiles()
                 val type = if (ctx.isUsingMobileData())
                     QualityDataHelper.QualityProfileType.Data
@@ -1413,12 +1508,35 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
                 playerSpeedBtt.isVisible = playBackSpeedEnabled
                 playerResizeBtt.isVisible = playerResizeEnabled
                 playerRotateBtt.isVisible = playerRotateEnabled
+                if (hideControlsNames) {
+                    hideControlsNames()
+                }
             }
         } catch (e: Exception) {
             logError(e)
         }
 
         playerBinding?.apply {
+
+            if (isLayout(TV or EMULATOR)) {
+                mapOf(
+                    playerGoBack to playerGoBackText,
+                    playerRestart to playerRestartText,
+                    playerGoForward to playerGoForwardText,
+                    downloadHeaderToggle to downloadHeaderToggleText,
+                ).forEach { (button, text) ->
+                    button.setOnFocusChangeListener { _, hasFocus ->
+                        if (!hasFocus) {
+                            text.isSelected = false
+                            text.isVisible = false
+                            return@setOnFocusChangeListener
+                        }
+                        text.isSelected = true
+                        text.isVisible = true
+                    }
+                }
+            }
+
             playerPausePlay.setOnClickListener {
                 autoHide()
                 player.handleEvent(CSPlayerEvent.PlayPauseToggle)
@@ -1462,6 +1580,16 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
                 player.handleEvent(CSPlayerEvent.NextEpisode)
             }
 
+            playerGoForward.setOnClickListener {
+                autoHide()
+                player.handleEvent(CSPlayerEvent.NextEpisode)
+            }
+
+            playerRestart.setOnClickListener {
+                autoHide()
+                player.handleEvent(CSPlayerEvent.Restart)
+            }
+
             playerLock.setOnClickListener {
                 autoHide()
                 toggleLock()
@@ -1471,12 +1599,12 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
                 showSubtitleOffsetDialog()
             }
 
-            exoRew.setOnClickListener {
+            playerRew.setOnClickListener {
                 autoHide()
                 rewind()
             }
 
-            exoFfwd.setOnClickListener {
+            playerFfwd.setOnClickListener {
                 autoHide()
                 fastForward()
             }
@@ -1517,7 +1645,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
             }
         }
         // cs3 is peak media center
-        setRemainingTimeCounter(durationMode || Globals.isLayout(Globals.TV))
+        setRemainingTimeCounter(durationMode || isLayout(TV))
         playerBinding?.exoPosition?.doOnTextChanged { _, _, _, _ ->
             updateRemainingTime()
         }
@@ -1536,6 +1664,22 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
         }
     }
 
+    private fun PlayerCustomLayoutBinding.hideControlsNames() {
+        fun iterate(layout: LinearLayout) {
+            layout.children.forEach {
+                if (it is MaterialButton) {
+                    it.textSize = 0f
+                    it.iconPadding = 0
+                    it.iconGravity = MaterialButton.ICON_GRAVITY_TEXT_START
+                    it.setPadding(0,0,0,0)
+                } else if (it is LinearLayout) {
+                    iterate(it)
+                }
+            }
+        }
+        iterate(playerLockHolder.parent as LinearLayout)
+    }
+
     override fun playerDimensionsLoaded(width: Int, height: Int) {
         isVerticalOrientation = height > width
         updateOrientation()
@@ -1555,7 +1699,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
 
     private fun setRemainingTimeCounter(showRemaining: Boolean) {
         durationMode = showRemaining
-        playerBinding?.exoDuration?.isInvisible= showRemaining
+        playerBinding?.exoDuration?.isInvisible = showRemaining
         playerBinding?.timeLeft?.isVisible = showRemaining
     }
 
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 d827d31e98f..77332329b15 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
@@ -6,52 +6,86 @@ import android.app.Dialog
 import android.content.Context
 import android.content.Intent
 import android.content.res.ColorStateList
+import android.os.Build
 import android.os.Bundle
+import android.text.Spanned
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.*
+import android.widget.AbsListView
+import android.widget.ArrayAdapter
+import android.widget.ImageView
+import android.widget.LinearLayout
+import android.widget.TextView
+import android.widget.Toast
 import androidx.activity.result.contract.ActivityResultContracts
+import androidx.annotation.MainThread
+import androidx.annotation.OptIn
 import androidx.core.animation.addListener
 import androidx.core.content.ContextCompat
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.lifecycle.ViewModelProvider
-import androidx.preference.PreferenceManager
+import androidx.lifecycle.viewModelScope
 import androidx.media3.common.Format.NO_VALUE
 import androidx.media3.common.MimeTypes
-import com.lagradost.cloudstream3.*
+import androidx.media3.common.util.UnstableApi
+import androidx.preference.PreferenceManager
 import com.lagradost.cloudstream3.APIHolder.getApiFromNameNull
+import com.lagradost.cloudstream3.AcraApplication
 import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
 import com.lagradost.cloudstream3.CommonActivity.showToast
+import com.lagradost.cloudstream3.LoadResponse
 import com.lagradost.cloudstream3.LoadResponse.Companion.getAniListId
 import com.lagradost.cloudstream3.LoadResponse.Companion.getImdbId
 import com.lagradost.cloudstream3.LoadResponse.Companion.getMalId
 import com.lagradost.cloudstream3.LoadResponse.Companion.getTMDbId
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.TvType
+import com.lagradost.cloudstream3.amap
 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.isAnimeOp
+import com.lagradost.cloudstream3.isEpisodeBased
+import com.lagradost.cloudstream3.isLiveStream
+import com.lagradost.cloudstream3.isMovieType
+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.subtitles.AbstractSubApi
 import com.lagradost.cloudstream3.subtitles.AbstractSubtitleEntities
+import com.lagradost.cloudstream3.subtitles.AbstractSubtitleEntities.SubtitleSearch
+import com.lagradost.cloudstream3.subtitles.SubRepository
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.subtitleProviders
 import com.lagradost.cloudstream3.ui.player.CS3IPlayer.Companion.preferredAudioTrackLanguage
 import com.lagradost.cloudstream3.ui.player.CustomDecoder.Companion.updateForcedEncoding
 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.result.*
+import com.lagradost.cloudstream3.ui.result.ResultEpisode
+import com.lagradost.cloudstream3.ui.result.ResultFragment
+import com.lagradost.cloudstream3.ui.result.SyncViewModel
 import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
+import com.lagradost.cloudstream3.ui.settings.Globals.PHONE
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
 import com.lagradost.cloudstream3.ui.subtitles.SUBTITLE_AUTO_SELECT_KEY
+import com.lagradost.cloudstream3.ui.subtitles.SubtitlesFragment
 import com.lagradost.cloudstream3.ui.subtitles.SubtitlesFragment.Companion.getAutoSelectLanguageISO639_1
-import com.lagradost.cloudstream3.utils.*
+import com.lagradost.cloudstream3.utils.AppContextUtils.html
 import com.lagradost.cloudstream3.utils.AppContextUtils.sortSubs
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import com.lagradost.cloudstream3.utils.Coroutines.runOnMainThread
+import com.lagradost.cloudstream3.utils.DataStoreHelper
+import com.lagradost.cloudstream3.utils.EpisodeSkip
+import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.ExtractorLinkType
+import com.lagradost.cloudstream3.utils.Qualities
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showDialog
 import com.lagradost.cloudstream3.utils.SubtitleHelper.fromTwoLettersToLanguage
 import com.lagradost.cloudstream3.utils.SubtitleHelper.languages
@@ -60,9 +94,14 @@ 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 com.lagradost.cloudstream3.utils.setText
+import com.lagradost.cloudstream3.utils.txt
 import com.lagradost.safefile.SafeFile
 import kotlinx.coroutines.Job
-import java.util.*
+import kotlinx.coroutines.isActive
+import kotlinx.coroutines.launch
+import java.io.Serializable
+import java.util.Calendar
 import kotlin.math.abs
 
 class GeneratorPlayer : FullScreenPlayer() {
@@ -80,7 +119,7 @@ class GeneratorPlayer : FullScreenPlayer() {
             get() = subtitleProviders.filter { provider ->
                 (provider as? AbstractSubApi)?.let { !it.requiresLogin || it.loginInfo() != null }
                     ?: true
-            }
+            }.map { SubRepository(it) }
         val subsProvidersIsActive
             get() = subsProviders.isNotEmpty()
     }
@@ -158,6 +197,7 @@ class GeneratorPlayer : FullScreenPlayer() {
     }
 
     override fun playerStatusChanged() {
+        super.playerStatusChanged()
         if (player.getIsPlaying()) {
             viewModel.forceClearCache = false
         }
@@ -190,11 +230,58 @@ class GeneratorPlayer : FullScreenPlayer() {
         }
     }
 
+    override fun onDownload(event: DownloadEvent) {
+        super.onDownload(event)
+        showDownloadProgress(event)
+    }
+
+    private fun showDownloadProgress(event: DownloadEvent) {
+        activity?.runOnUiThread {
+            playerBinding?.downloadedProgress?.apply {
+                val indeterminate = event.totalBytes <= 0 || event.downloadedBytes <= 0
+                isIndeterminate = indeterminate
+                if (!indeterminate) {
+                    max = (event.totalBytes / 1000).toInt()
+                    progress = (event.downloadedBytes / 1000).toInt()
+                }
+            }
+            playerBinding?.downloadedProgressText.setText(
+                txt(
+                    R.string.download_size_format,
+                    android.text.format.Formatter.formatShortFileSize(
+                        context,
+                        event.downloadedBytes
+                    ),
+                    android.text.format.Formatter.formatShortFileSize(context, event.totalBytes)
+                )
+            )
+            val downloadSpeed =
+                android.text.format.Formatter.formatShortFileSize(context, event.downloadSpeed)
+            playerBinding?.downloadedProgressSpeedText?.text =
+                    // todo string fmt
+                event.connections?.let { connections ->
+                    "%s/s - %d Connections".format(downloadSpeed, connections)
+                } ?: downloadSpeed
+
+            // don't display when done
+            playerBinding?.downloadedProgressSpeedText?.isGone =
+                event.downloadedBytes != 0L && event.downloadedBytes - 1024 >= event.totalBytes
+        }
+    }
+
     private fun loadLink(link: Pair<ExtractorLink?, ExtractorUri?>?, sameEpisode: Boolean) {
         if (link == null) return
 
         // manage UI
         binding?.playerLoadingOverlay?.isVisible = false
+        val isTorrent =
+            link.first?.type == ExtractorLinkType.MAGNET || link.first?.type == ExtractorLinkType.TORRENT
+
+        playerBinding?.downloadHeader?.isVisible = false
+        playerBinding?.downloadHeaderToggle?.isVisible = isTorrent
+
+        showDownloadProgress(DownloadEvent(0, 0, 0, null))
+
         uiReset()
         currentSelectedLink = link
         currentMeta = viewModel.getMeta()
@@ -232,7 +319,7 @@ class GeneratorPlayer : FullScreenPlayer() {
 
     private fun closestQuality(target: Int?): Qualities {
         if (target == null) return Qualities.Unknown
-        return Qualities.values().minBy { abs(it.value - target) }
+        return Qualities.entries.minBy { abs(it.value - target) }
     }
 
     private fun getLinkPriority(
@@ -288,6 +375,14 @@ class GeneratorPlayer : FullScreenPlayer() {
         return meta
     }
 
+    fun getName(entry: AbstractSubtitleEntities.SubtitleEntity, withLanguage: Boolean): String {
+        if (entry.lang.isBlank() || !withLanguage) {
+            return entry.name
+        }
+        val language = fromTwoLettersToLanguage(entry.lang.trim()) ?: entry.lang
+        return "$language ${entry.name}"
+    }
+
     override fun openOnlineSubPicker(
         context: Context, loadResponse: LoadResponse?, dismissCallback: (() -> Unit)
     ) {
@@ -302,13 +397,6 @@ class GeneratorPlayer : FullScreenPlayer() {
         var currentSubtitles: List<AbstractSubtitleEntities.SubtitleEntity> = emptyList()
         var currentSubtitle: AbstractSubtitleEntities.SubtitleEntity? = null
 
-        fun getName(entry: AbstractSubtitleEntities.SubtitleEntity, withLanguage: Boolean): String {
-            if (entry.lang.isBlank() || !withLanguage) {
-                return entry.name
-            }
-            val language = fromTwoLettersToLanguage(entry.lang.trim()) ?: entry.lang
-            return "$language ${entry.name}"
-        }
 
         val layout = R.layout.sort_bottom_single_choice_double_text
         val arrayAdapter =
@@ -365,8 +453,6 @@ class GeneratorPlayer : FullScreenPlayer() {
 
         binding.subtitleAdapter.choiceMode = AbsListView.CHOICE_MODE_SINGLE
         binding.subtitleAdapter.adapter = arrayAdapter
-        val adapter =
-            binding.subtitleAdapter.adapter as? ArrayAdapter<AbstractSubtitleEntities.SubtitleEntity>
 
         binding.subtitleAdapter.setOnItemClickListener { _, _, position, _ ->
             currentSubtitle = currentSubtitles.getOrNull(position) ?: return@setOnItemClickListener
@@ -377,14 +463,14 @@ class GeneratorPlayer : FullScreenPlayer() {
 
         fun setSubtitlesList(list: List<AbstractSubtitleEntities.SubtitleEntity>) {
             currentSubtitles = list
-            adapter?.clear()
-            adapter?.addAll(currentSubtitles)
+            arrayAdapter.clear()
+            arrayAdapter.addAll(currentSubtitles)
         }
 
         val currentTempMeta = getMetaData()
 
         // bruh idk why it is not correct
-        val color = ColorStateList.valueOf(context.colorFromAttribute(R.attr.colorAccent))
+        val color = ColorStateList.valueOf(context.colorFromAttribute(androidx.appcompat.R.attr.colorAccent))
         binding.searchLoadingBar.progressTintList = color
         binding.searchLoadingBar.indeterminateTintList = color
 
@@ -428,7 +514,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                 binding.searchLoadingBar.show()
                 ioSafe {
                     val search =
-                        AbstractSubtitleEntities.SubtitleSearch(
+                        SubtitleSearch(
                             query = query ?: return@ioSafe,
                             imdbId = loadResponse?.getImdbId(),
                             tmdbId = loadResponse?.getTMDbId()?.toInt(),
@@ -439,13 +525,24 @@ class GeneratorPlayer : FullScreenPlayer() {
                             lang = currentLanguageTwoLetters.ifBlank { null },
                             year = viewModel.currentSubtitleYear.value
                         )
+
+                    // TODO Make ui a lot better, like search with tabs
                     val results = providers.amap {
-                        try {
-                            it.search(search)
-                        } catch (e: Exception) {
-                            null
+                        when (val response = it.search(search)) {
+                            is Resource.Success -> {
+                                response.value
+                            }
+
+                            is Resource.Loading -> {
+                                emptyList()
+                            }
+
+                            is Resource.Failure -> {
+                                showToast(response.errorString)
+                                emptyList()
+                            }
                         }
-                    }.filterNotNull()
+                    }
                     val max = results.maxOfOrNull { it.size } ?: return@ioSafe
 
                     // very ugly
@@ -489,20 +586,33 @@ class GeneratorPlayer : FullScreenPlayer() {
             currentSubtitle?.let { currentSubtitle ->
                 providers.firstOrNull { it.idPrefix == currentSubtitle.idPrefix }?.let { api ->
                     ioSafe {
-                        val subtitles =
-                            api.getResource(currentSubtitle).getSubtitles().map { resource ->
-                                SubtitleData(
-                                    name = resource.name ?: getName(currentSubtitle, true),
-                                    url = resource.url,
-                                    origin = resource.origin,
-                                    mimeType = resource.url.toSubtitleMimeType(),
-                                    headers = currentSubtitle.headers,
-                                    currentSubtitle.lang
-                                )
+                        when (val apiResource = api.getResource(currentSubtitle)) {
+                            is Resource.Success -> {
+                                val subtitles = apiResource.value.getSubtitles().map { resource ->
+                                    SubtitleData(
+                                        name = resource.name ?: getName(currentSubtitle, true),
+                                        url = resource.url,
+                                        origin = resource.origin,
+                                        mimeType = resource.url.toSubtitleMimeType(),
+                                        headers = currentSubtitle.headers,
+                                        currentSubtitle.lang
+                                    )
+                                }
+                                if (subtitles.isEmpty()) {
+                                    showToast(R.string.no_subtitles)
+                                    return@ioSafe
+                                }
+                                runOnMainThread {
+                                    addAndSelectSubtitles(*subtitles.toTypedArray())
+                                }
                             }
-                        if (subtitles.isNotEmpty()) {
-                            runOnMainThread {
-                                addAndSelectSubtitles(*subtitles.toTypedArray())
+
+                            is Resource.Failure -> {
+                                showToast(apiResource.errorString)
+                            }
+
+                            is Resource.Loading -> {
+                                // not possible
                             }
                         }
                     }
@@ -521,6 +631,7 @@ class GeneratorPlayer : FullScreenPlayer() {
         //dialog.subtitles_search_year?.setText(currentTempMeta.year)
     }
 
+    @OptIn(UnstableApi::class)
     private fun openSubPicker() {
         try {
             subsPathPicker.launch(
@@ -541,6 +652,7 @@ class GeneratorPlayer : FullScreenPlayer() {
         }
     }
 
+    @MainThread
     private fun addAndSelectSubtitles(
         vararg subtitleData: SubtitleData
     ) {
@@ -600,9 +712,92 @@ class GeneratorPlayer : FullScreenPlayer() {
             }
         }
 
-    var selectSourceDialog: Dialog? = null
+    private var selectSourceDialog: Dialog? = null
 //    var selectTracksDialog: AlertDialog? = null
 
+
+    /** Will toast both when an error is found and when a subtitle is selected,
+     * so only use from a user click and not a background process */
+    private fun addFirstSub(query: SubtitleSearch) =
+        viewModel.viewModelScope.launch {
+            // async should not have a race condition if they are on the same group
+            var hasSelectASubtitle = false
+
+            // first come first served with these subtitles
+            // we might want to change it to prefer different sources when used multiple times,
+            // however caching might make this random after the first click too
+            subsProviders.amap { provider ->
+                val success = when (val result = provider.search(
+                    query = query
+                )) {
+                    is Resource.Failure -> {
+                        // scope might cancel, so we do an extra check
+                        if (this.isActive) {
+                            showToast("${provider.idPrefix}${result.errorString}")
+                        }
+                        return@amap
+                    }
+
+                    is Resource.Loading -> {
+                        // unreachable
+                        return@amap
+                    }
+
+                    is Resource.Success -> {
+                        result.value
+                    }
+                }
+
+                // try to add every subtitle until we have added a new subtitle file
+                for (subtitleEntry in success) {
+                    if (hasSelectASubtitle || !this.isActive) {
+                        break
+                    }
+
+                    val subtitleResources =
+                        when (val result = provider.getResource(subtitleEntry)) {
+                            is Resource.Failure -> {
+                                continue
+                            }
+
+                            is Resource.Loading -> {
+                                // unreachable
+                                continue
+                            }
+
+                            is Resource.Success -> {
+                                result.value
+                            }
+                        }
+
+                    val subtitles = subtitleResources.getSubtitles().map { resource ->
+                        SubtitleData(
+                            name = resource.name ?: getName(subtitleEntry, true),
+                            url = resource.url,
+                            origin = resource.origin,
+                            mimeType = resource.url.toSubtitleMimeType(),
+                            headers = subtitleEntry.headers,
+                            languageCode = subtitleEntry.lang
+                        )
+                    }
+
+                    // checks for both a race condition and if any of the subs generated is new
+                    if (this.isActive && !currentSubs.containsAll(subtitles) && !hasSelectASubtitle) {
+                        hasSelectASubtitle = true
+                        runOnMainThread {
+                            addAndSelectSubtitles(*subtitles.toTypedArray())
+                        }
+                        break
+                    }
+                }
+            }
+            // maybe better error here?
+            if (!hasSelectASubtitle && this.isActive) {
+                showToast(R.string.no_subtitles)
+            }
+        }
+
+
     override fun showMirrorsDialogue() {
         try {
             currentSelectedSubtitles = player.getCurrentPreferredSubtitle()
@@ -634,6 +829,12 @@ class GeneratorPlayer : FullScreenPlayer() {
 
                 var shouldDismiss = true
 
+                binding.subtitleSettingsBtt.setOnClickListener {
+                    normalSafeApiCall {
+                        SubtitlesFragment().show(this.parentFragmentManager, "SubtitleSettings")
+                    }
+                }
+
                 fun dismiss() {
                     if (isPlaying) {
                         player.handleEvent(CSPlayerEvent.Play)
@@ -659,6 +860,38 @@ class GeneratorPlayer : FullScreenPlayer() {
                         }
                     }
                     subtitleList.addFooterView(loadFromOpenSubsFooter)
+
+                    // subs from 1 button here
+                    val metadata = getMetaData()
+                    val queryName = metadata.name ?: currentLoadResponse?.name
+                    if (queryName != null) {
+                        val currentLanguageTwoLetters: String = getAutoSelectLanguageISO639_1()
+                        val loadFromFirstSubsFooter: TextView = layoutInflater.inflate(
+                            R.layout.sort_bottom_footer_add_choice, null
+                        ) as TextView
+
+                        loadFromFirstSubsFooter.text =
+                            ctx.getString(R.string.player_load_one_subtitle_online)
+
+                        loadFromFirstSubsFooter.setOnClickListener {
+                            sourceDialog.dismissSafe(activity)
+                            showToast(R.string.loading)
+                            addFirstSub(
+                                SubtitleSearch(
+                                    query = queryName,
+                                    imdbId = currentLoadResponse?.getImdbId(),
+                                    tmdbId = currentLoadResponse?.getTMDbId()?.toInt(),
+                                    malId = currentLoadResponse?.getMalId()?.toInt(),
+                                    aniListId = currentLoadResponse?.getAniListId()?.toInt(),
+                                    epNumber = metadata.episode,
+                                    seasonNumber = metadata.season,
+                                    lang = currentLanguageTwoLetters.ifBlank { null },
+                                    year = viewModel.currentSubtitleYear.value
+                                )
+                            )
+                        }
+                        subtitleList.addFooterView(loadFromFirstSubsFooter)
+                    }
                 }
 
                 var sourceIndex = 0
@@ -704,9 +937,10 @@ class GeneratorPlayer : FullScreenPlayer() {
                 val subtitleIndexStart = currentSubtitles.indexOf(currentSelectedSubtitles) + 1
                 var subtitleIndex = subtitleIndexStart
 
-                val subsArrayAdapter = ArrayAdapter<String>(ctx, R.layout.sort_bottom_single_choice)
-                subsArrayAdapter.add(ctx.getString(R.string.no_subtitles))
-                subsArrayAdapter.addAll(currentSubtitles.map { it.name })
+                val subsArrayAdapter =
+                    ArrayAdapter<Spanned>(ctx, R.layout.sort_bottom_single_choice)
+                subsArrayAdapter.add(ctx.getString(R.string.no_subtitles).html())
+                subsArrayAdapter.addAll(currentSubtitles.map { it.name.html() })
 
                 subtitleList.adapter = subsArrayAdapter
                 subtitleList.choiceMode = AbsListView.CHOICE_MODE_SINGLE
@@ -771,7 +1005,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                     text = prefNames[if (index == -1) 0 else index]
                 }
 
-                binding.subtitlesClickSettings.setOnClickListener {
+                binding.subtitlesEncodingFormat.setOnClickListener {
                     val settingsManager = PreferenceManager.getDefaultSharedPreferences(ctx)
 
                     val prefNames = ctx.resources.getStringArray(R.array.subtitles_encoding_list)
@@ -793,7 +1027,6 @@ class GeneratorPlayer : FullScreenPlayer() {
                         settingsManager.edit().putString(
                             ctx.getString(R.string.subtitles_encoding_key), prefValues[it]
                         ).apply()
-
                         updateForcedEncoding(ctx)
                         dismiss()
                         player.seekTime(-1) // to update subtitles, a dirty trick
@@ -1096,8 +1329,15 @@ class GeneratorPlayer : FullScreenPlayer() {
         }
 
         playerBinding?.playerSkipOp?.isVisible = isOpVisible
-        playerBinding?.playerSkipEpisode?.isVisible =
-            !isOpVisible && viewModel.hasNextEpisode() == true
+
+        when {
+            isLayout(PHONE) ->
+                playerBinding?.playerSkipEpisode?.isVisible =
+                    !isOpVisible && viewModel.hasNextEpisode() == true
+
+            else ->
+                playerBinding?.playerGoForwardRoot?.isVisible = viewModel.hasNextEpisode() == true
+        }
 
         if (percentage >= PRELOAD_NEXT_EPISODE_PERCENTAGE) {
             viewModel.preLoadNextLinks()
@@ -1253,7 +1493,7 @@ class GeneratorPlayer : FullScreenPlayer() {
     fun setPlayerDimen(widthHeight: Pair<Int, Int>?) {
         val extra = if (widthHeight != null) {
             val (width, height) = widthHeight
-            "${width}x${height}"
+            "- ${width}x${height}"
         } else {
             ""
         }
@@ -1264,7 +1504,7 @@ class GeneratorPlayer : FullScreenPlayer() {
             0 -> ""
             1 -> extra
             2 -> source
-            3 -> "$source - $extra"
+            3 -> "$source $extra"
             else -> ""
         }
         playerBinding?.playerVideoTitleRez?.apply {
@@ -1281,7 +1521,7 @@ class GeneratorPlayer : FullScreenPlayer() {
     private fun unwrapBundle(savedInstanceState: Bundle?) {
         Log.i(TAG, "unwrapBundle = $savedInstanceState")
         savedInstanceState?.let { bundle ->
-            sync.addSyncs(bundle.getSerializable("syncData") as? HashMap<String, String>?)
+            sync.addSyncs(bundle.getSafeSerializable<HashMap<String, String>>("syncData"))
         }
     }
 
@@ -1289,7 +1529,8 @@ class GeneratorPlayer : FullScreenPlayer() {
         inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
     ): View? {
         // this is used instead of layout-television to follow the settings and some TV devices are not classified as TV for some reason
-        layout = if (isLayout(TV or EMULATOR)) R.layout.fragment_player_tv else R.layout.fragment_player
+        layout =
+            if (isLayout(TV or EMULATOR)) R.layout.fragment_player_tv else R.layout.fragment_player
 
         viewModel = ViewModelProvider(this)[PlayerGeneratorViewModel::class.java]
         sync = ViewModelProvider(this)[SyncViewModel::class.java]
@@ -1424,6 +1665,16 @@ class GeneratorPlayer : FullScreenPlayer() {
             activity?.popCurrentPage()
         }
 
+        playerBinding?.downloadHeader?.setOnClickListener {
+            it?.isVisible = false
+        }
+
+        playerBinding?.downloadHeaderToggle?.setOnClickListener {
+            playerBinding?.downloadHeader?.let {
+                it.isVisible = !it.isVisible
+            }
+        }
+
         observe(viewModel.currentStamps) { stamps ->
             player.addTimeStamps(stamps)
         }
@@ -1451,7 +1702,7 @@ class GeneratorPlayer : FullScreenPlayer() {
 
         observe(viewModel.currentLinks) {
             currentLinks = it
-            val turnVisible = it.isNotEmpty()
+            val turnVisible = it.isNotEmpty() && lastUsedGenerator?.canSkipLoading == true
             val wasGone = binding?.overlayLoadingSkipButton?.isGone == true
             binding?.overlayLoadingSkipButton?.isVisible = turnVisible
 
@@ -1497,3 +1748,10 @@ class GeneratorPlayer : FullScreenPlayer() {
         }
     }
 }
+
+@Suppress("DEPRECATION")
+inline fun <reified T : Serializable> Bundle.getSafeSerializable(key: String): T? =
+    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) getSerializable(key) as? T else getSerializable(
+        key,
+        T::class.java
+    )
\ 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 1e2cf4f508f..4aaee7bb7ad 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
@@ -3,48 +3,31 @@ package com.lagradost.cloudstream3.ui.player
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.ExtractorLinkType
 
-enum class LoadType {
-    Unknown,
-    InApp,
-    InAppDownload,
-    ExternalApp,
-    Browser,
-    Chromecast,
-    Fcast
-}
+val LOADTYPE_INAPP = setOf(
+    ExtractorLinkType.VIDEO,
+    ExtractorLinkType.DASH,
+    ExtractorLinkType.M3U8,
+    ExtractorLinkType.TORRENT,
+    ExtractorLinkType.MAGNET
+)
+
+val LOADTYPE_INAPP_DOWNLOAD = setOf(
+    ExtractorLinkType.VIDEO,
+    ExtractorLinkType.M3U8
+)
+
+val LOADTYPE_CHROMECAST = setOf(
+    ExtractorLinkType.VIDEO,
+    ExtractorLinkType.DASH,
+    ExtractorLinkType.M3U8
+)
+
+val LOADTYPE_ALL = ExtractorLinkType.entries.toSet()
 
-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.entries.toSet()
-        LoadType.Chromecast -> setOf(
-            ExtractorLinkType.VIDEO,
-            ExtractorLinkType.DASH,
-            ExtractorLinkType.M3U8
-        )
-        LoadType.Fcast -> setOf(
-            ExtractorLinkType.VIDEO,
-            ExtractorLinkType.DASH,
-            ExtractorLinkType.M3U8
-        )
-    }
-}
 
 interface IGenerator {
     val hasCache: Boolean
+    val canSkipLoading: Boolean
 
     fun hasNext(): Boolean
     fun hasPrev(): Boolean
@@ -59,9 +42,10 @@ interface IGenerator {
     /* not safe, must use try catch */
     suspend fun generateLinks(
         clearCache: Boolean,
-        type: LoadType,
+        sourceTypes: Set<ExtractorLinkType>,
         callback: (Pair<ExtractorLink?, ExtractorUri?>) -> Unit,
         subtitleCallback: (SubtitleData) -> Unit,
         offset: Int = 0,
+        isCasting: Boolean = false
     ): 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 4bd5c7699e2..9b8ad294d23 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
@@ -8,7 +8,6 @@ import com.lagradost.cloudstream3.utils.EpisodeSkip
 import com.lagradost.cloudstream3.utils.ExtractorLink
 
 enum class PlayerEventType(val value: Int) {
-    //Stop(-1),
     Pause(0),
     Play(1),
     SeekForward(2),
@@ -26,6 +25,7 @@ enum class PlayerEventType(val value: Int) {
     Resize(13),
     SearchSubtitlesOnline(14),
     SkipOp(15),
+    Restart(16),
 }
 
 enum class CSPlayerEvent(val value: Int) {
@@ -39,6 +39,7 @@ enum class CSPlayerEvent(val value: Int) {
     PrevEpisode(6),
     PlayPauseToggle(7),
     ToggleMute(8),
+    Restart(9),
 }
 
 enum class CSPlayerLoading {
@@ -160,6 +161,17 @@ data class VideoEndedEvent(
     override val source: PlayerEventSource = PlayerEventSource.Player
 ) : PlayerEvent()
 
+/** Used for torrent to pre-download a video before playing it */
+data class DownloadEvent(
+    val downloadedBytes: Long,
+    val totalBytes: Long,
+    /** bytes / sec */
+    val downloadSpeed: Long,
+    val connections: Int?,
+
+    override val source: PlayerEventSource = PlayerEventSource.Player
+) : PlayerEvent()
+
 interface Track {
     /**
      * Unique among the class, used to check which track is used.
@@ -167,15 +179,12 @@ interface Track {
      **/
     val id: String?
     val label: String?
-
-    //    val isCurrentlyPlaying: Boolean
     val language: String?
 }
 
 data class VideoTrack(
     override val id: String?,
     override val label: String?,
-//    override val isCurrentlyPlaying: Boolean,
     override val language: String?,
     val width: Int?,
     val height: Int?,
@@ -184,15 +193,24 @@ data class VideoTrack(
 data class AudioTrack(
     override val id: String?,
     override val label: String?,
-//    override val isCurrentlyPlaying: Boolean,
     override val language: String?,
 ) : Track
 
+data class TextTrack(
+    override val id: String?,
+    override val label: String?,
+    override val language: String?,
+    val mimeType: String?,
+) : Track
+
+
 data class CurrentTracks(
     val currentVideoTrack: VideoTrack?,
     val currentAudioTrack: AudioTrack?,
+    val currentTextTracks: List<TextTrack>,
     val allVideoTracks: List<VideoTrack>,
     val allAudioTracks: List<AudioTrack>,
+    val allTextTracks: List<TextTrack>,
 )
 
 class InvalidFileException(msg: String) : Exception(msg)
@@ -207,7 +225,9 @@ interface IPlayer {
     fun setPlaybackSpeed(speed: Float)
 
     fun getIsPlaying(): Boolean
+    /** Current player duration in milliseconds */
     fun getDuration(): Long?
+    /** Current player position in milliseconds */
     fun getPosition(): Long?
 
     fun seekTime(time: Long, source: PlayerEventSource = PlayerEventSource.UI)
@@ -281,4 +301,7 @@ interface IPlayer {
 
     /** If no trackLanguage is set it'll default to first track. Specifying the id allows for track overrides as the language can be identical. */
     fun setPreferredAudioTrack(trackLanguage: String?, id: String? = null)
+
+    /** Get the current subtitle cues, for use with syncing */
+    fun getSubtitleCues(): List<SubtitleCue>
 }
\ No newline at end of file
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 89e3c8de987..109e3137bdd 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
@@ -4,7 +4,7 @@ import android.net.Uri
 import com.lagradost.cloudstream3.TvType
 import com.lagradost.cloudstream3.amap
 import com.lagradost.cloudstream3.utils.ExtractorLink
-import com.lagradost.cloudstream3.ui.player.ExtractorUri
+import com.lagradost.cloudstream3.utils.ExtractorLinkType
 import com.lagradost.cloudstream3.utils.INFER_TYPE
 import com.lagradost.cloudstream3.utils.Qualities
 import com.lagradost.cloudstream3.utils.loadExtractor
@@ -40,6 +40,7 @@ class LinkGenerator(
     private val isM3u8: Boolean? = null
 ) : IGenerator {
     override val hasCache = false
+    override val canSkipLoading = true
 
     override fun getCurrentId(): Int? {
         return null
@@ -69,10 +70,11 @@ class LinkGenerator(
 
     override suspend fun generateLinks(
         clearCache: Boolean,
-        type: LoadType,
+        sourceTypes: Set<ExtractorLinkType>,
         callback: (Pair<ExtractorLink?, ExtractorUri?>) -> Unit,
         subtitleCallback: (SubtitleData) -> Unit,
-        offset: Int
+        offset: Int,
+        isCasting: Boolean
     ): Boolean {
         links.amap { link ->
             if (!extract || !loadExtractor(link.url, referer, {
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
deleted file mode 100644
index 3482f21c7ce..00000000000
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/NonFinalTextRenderer.java
+++ /dev/null
@@ -1,459 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.lagradost.cloudstream3.ui.player;
-
-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;
-import android.os.Handler.Callback;
-import android.os.Looper;
-import android.os.Message;
-
-import androidx.annotation.IntDef;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-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.UnstableApi;
-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;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-// DO NOT CONVERT TO KOTLIN AUTOMATICALLY, IT FUCKS UP AND DOES NOT DISPLAY SUBS FOR SOME REASON
-// IF YOU CHANGE THE CODE MAKE SURE YOU GET THE CUES CORRECT!
-
-/**
- * A renderer for text.
- *
- * <p>{@link Subtitle}s are decoded from sample data using {@link SubtitleDecoder} instances
- * obtained from a {@link SubtitleDecoderFactory}. The actual rendering of the subtitle {@link Cue}s
- * is delegated to a {@link TextOutput}.
- */
-@UnstableApi
-public class NonFinalTextRenderer extends BaseRenderer implements Callback {
-
-    private static final String TAG = "TextRenderer";
-
-    /**
-     * @param trackType     The track type that the renderer handles. One of the {@link C} {@code
-     *                      TRACK_TYPE_*} constants.
-     * @param outputHandler
-     */
-    public NonFinalTextRenderer(int trackType, @Nullable Handler outputHandler) {
-        super(trackType);
-        this.outputHandler = outputHandler;
-    }
-
-    @Documented
-    @Retention(RetentionPolicy.SOURCE)
-    @Target(TYPE_USE)
-    @IntDef({
-            REPLACEMENT_STATE_NONE,
-            REPLACEMENT_STATE_SIGNAL_END_OF_STREAM,
-            REPLACEMENT_STATE_WAIT_END_OF_STREAM
-    })
-    private @interface ReplacementState {
-    }
-
-    /**
-     * The decoder does not need to be replaced.
-     */
-    private static final int REPLACEMENT_STATE_NONE = 0;
-    /**
-     * The decoder needs to be replaced, but we haven't yet signaled an end of stream to the existing
-     * decoder. We need to do so in order to ensure that it outputs any remaining buffers before we
-     * release it.
-     */
-    private static final int REPLACEMENT_STATE_SIGNAL_END_OF_STREAM = 1;
-    /**
-     * The decoder needs to be replaced, and we've signaled an end of stream to the existing decoder.
-     * We're waiting for the decoder to output an end of stream signal to indicate that it has output
-     * any remaining buffers before we release it.
-     */
-    private static final int REPLACEMENT_STATE_WAIT_END_OF_STREAM = 2;
-
-    private static final int MSG_UPDATE_OUTPUT = 0;
-
-    @Nullable
-    private final Handler outputHandler;
-    private TextOutput output = null;
-    private SubtitleDecoderFactory decoderFactory = null;
-    private FormatHolder formatHolder = null;
-
-    private boolean inputStreamEnded;
-    private boolean outputStreamEnded;
-    private boolean waitingForKeyFrame;
-    private @ReplacementState int decoderReplacementState;
-    @Nullable
-    private Format streamFormat;
-    @Nullable
-    private SubtitleDecoder decoder;
-    @Nullable
-    private SubtitleInputBuffer nextInputBuffer;
-    @Nullable
-    private SubtitleOutputBuffer subtitle;
-    @Nullable
-    private SubtitleOutputBuffer nextSubtitle;
-    private int nextSubtitleEventIndex;
-    private long finalStreamEndPositionUs;
-
-    /**
-     * @param output       The output.
-     * @param outputLooper The looper associated with the thread on which the output should be called.
-     *                     If the output makes use of standard Android UI components, then this should normally be the
-     *                     looper associated with the application's main thread, which can be obtained using {@link
-     *                     android.app.Activity#getMainLooper()}. Null may be passed if the output should be called
-     *                     directly on the player's internal rendering thread.
-     */
-    public NonFinalTextRenderer(TextOutput output, @Nullable Looper outputLooper) {
-        this(output, outputLooper, SubtitleDecoderFactory.DEFAULT);
-    }
-
-    /**
-     * @param output         The output.
-     * @param outputLooper   The looper associated with the thread on which the output should be called.
-     *                       If the output makes use of standard Android UI components, then this should normally be the
-     *                       looper associated with the application's main thread, which can be obtained using {@link
-     *                       android.app.Activity#getMainLooper()}. Null may be passed if the output should be called
-     *                       directly on the player's internal rendering thread.
-     * @param decoderFactory A factory from which to obtain {@link SubtitleDecoder} instances.
-     */
-    public NonFinalTextRenderer(
-            TextOutput output, @Nullable Looper outputLooper, SubtitleDecoderFactory decoderFactory) {
-        super(C.TRACK_TYPE_TEXT);
-        this.output = checkNotNull(output);
-        this.outputHandler =
-                outputLooper == null ? null : Util.createHandler(outputLooper, /* callback= */ this);
-        this.decoderFactory = decoderFactory;
-        formatHolder = new FormatHolder();
-        finalStreamEndPositionUs = C.TIME_UNSET;
-    }
-
-    @NonNull
-    @Override
-    public String getName() {
-        return TAG;
-    }
-
-    @Override
-    public @Capabilities int supportsFormat(@NonNull Format format) {
-        if (decoderFactory.supportsFormat(format)) {
-            return RendererCapabilities.create(
-                    format.cryptoType == C.CRYPTO_TYPE_NONE ? C.FORMAT_HANDLED : C.FORMAT_UNSUPPORTED_DRM);
-        } else if (MimeTypes.isText(format.sampleMimeType)) {
-            return RendererCapabilities.create(C.FORMAT_UNSUPPORTED_SUBTYPE);
-        } else {
-            return RendererCapabilities.create(C.FORMAT_UNSUPPORTED_TYPE);
-        }
-    }
-
-    /**
-     * Sets the position at which to stop rendering the current stream.
-     *
-     * <p>Must be called after {@link #setCurrentStreamFinal()}.
-     *
-     * @param streamEndPositionUs The position to stop rendering at or {@link C#LENGTH_UNSET} to
-     *                            render until the end of the current stream.
-     */
-    // TODO(internal b/181312195): Remove this when it's no longer needed once subtitles are decoded
-    // on the loading side of SampleQueue.
-    public void setFinalStreamEndPositionUs(long streamEndPositionUs) {
-        checkState(isCurrentStreamFinal());
-        this.finalStreamEndPositionUs = streamEndPositionUs;
-    }
-
-    @Override
-    protected void onStreamChanged(Format[] formats, long startPositionUs, long offsetUs) {
-        streamFormat = formats[0];
-        if (decoder != null) {
-            decoderReplacementState = REPLACEMENT_STATE_SIGNAL_END_OF_STREAM;
-        } else {
-            initDecoder();
-        }
-    }
-
-    @Override
-    protected void onPositionReset(long positionUs, boolean joining) {
-        clearOutput();
-        inputStreamEnded = false;
-        outputStreamEnded = false;
-        finalStreamEndPositionUs = C.TIME_UNSET;
-        if (decoderReplacementState != REPLACEMENT_STATE_NONE) {
-            replaceDecoder();
-        } else {
-            releaseBuffers();
-            checkNotNull(decoder).flush();
-        }
-    }
-
-    @Override
-    public void render(long positionUs, long elapsedRealtimeUs) {
-        if (isCurrentStreamFinal()
-                && finalStreamEndPositionUs != C.TIME_UNSET
-                && positionUs >= finalStreamEndPositionUs) {
-            releaseBuffers();
-            outputStreamEnded = true;
-        }
-
-        if (outputStreamEnded) {
-            return;
-        }
-
-        if (nextSubtitle == null) {
-            checkNotNull(decoder).setPositionUs(positionUs);
-            try {
-                nextSubtitle = checkNotNull(decoder).dequeueOutputBuffer();
-            } catch (SubtitleDecoderException e) {
-                handleDecoderError(e);
-                return;
-            }
-        }
-
-        if (getState() != STATE_STARTED) {
-            return;
-        }
-
-        boolean textRendererNeedsUpdate = false;
-        if (subtitle != null) {
-            // We're iterating through the events in a subtitle. Set textRendererNeedsUpdate if we
-            // advance to the next event.
-            long subtitleNextEventTimeUs = getNextEventTime();
-            while (subtitleNextEventTimeUs <= positionUs) {
-                nextSubtitleEventIndex++;
-                subtitleNextEventTimeUs = getNextEventTime();
-                textRendererNeedsUpdate = true;
-            }
-        }
-        if (nextSubtitle != null) {
-            SubtitleOutputBuffer nextSubtitle = this.nextSubtitle;
-            if (nextSubtitle.isEndOfStream()) {
-                if (!textRendererNeedsUpdate && getNextEventTime() == Long.MAX_VALUE) {
-                    if (decoderReplacementState == REPLACEMENT_STATE_WAIT_END_OF_STREAM) {
-                        replaceDecoder();
-                    } else {
-                        releaseBuffers();
-                        outputStreamEnded = true;
-                    }
-                }
-            } else if (nextSubtitle.timeUs <= positionUs) {
-                // Advance to the next subtitle. Sync the next event index and trigger an update.
-                if (subtitle != null) {
-                    subtitle.release();
-                }
-                nextSubtitleEventIndex = nextSubtitle.getNextEventTimeIndex(positionUs);
-                subtitle = nextSubtitle;
-                this.nextSubtitle = null;
-                textRendererNeedsUpdate = true;
-            }
-        }
-
-        if (textRendererNeedsUpdate) {
-            // If textRendererNeedsUpdate then subtitle must be non-null.
-            checkNotNull(subtitle);
-            // textRendererNeedsUpdate is set and we're playing. Update the renderer.
-            updateOutput(subtitle.getCues(positionUs));
-        }
-
-        if (decoderReplacementState == REPLACEMENT_STATE_WAIT_END_OF_STREAM) {
-            return;
-        }
-
-        try {
-            while (!inputStreamEnded) {
-                @Nullable SubtitleInputBuffer nextInputBuffer = this.nextInputBuffer;
-                if (nextInputBuffer == null) {
-                    nextInputBuffer = checkNotNull(decoder).dequeueInputBuffer();
-                    if (nextInputBuffer == null) {
-                        return;
-                    }
-                    this.nextInputBuffer = nextInputBuffer;
-                }
-                if (decoderReplacementState == REPLACEMENT_STATE_SIGNAL_END_OF_STREAM) {
-                    nextInputBuffer.setFlags(C.BUFFER_FLAG_END_OF_STREAM);
-                    checkNotNull(decoder).queueInputBuffer(nextInputBuffer);
-                    this.nextInputBuffer = null;
-                    decoderReplacementState = REPLACEMENT_STATE_WAIT_END_OF_STREAM;
-                    return;
-                }
-                // Try and read the next subtitle from the source.
-                @SampleStream.ReadDataResult int result = readSource(formatHolder, nextInputBuffer, /* readFlags= */ 0);
-                if (result == C.RESULT_BUFFER_READ) {
-                    if (nextInputBuffer.isEndOfStream()) {
-                        inputStreamEnded = true;
-                        waitingForKeyFrame = false;
-                    } else {
-                        @Nullable Format format = formatHolder.format;
-                        if (format == null) {
-                            // We haven't received a format yet.
-                            return;
-                        }
-                        nextInputBuffer.subsampleOffsetUs = format.subsampleOffsetUs;
-                        nextInputBuffer.flip();
-                        waitingForKeyFrame &= !nextInputBuffer.isKeyFrame();
-                    }
-                    if (!waitingForKeyFrame) {
-                        checkNotNull(decoder).queueInputBuffer(nextInputBuffer);
-                        this.nextInputBuffer = null;
-                    }
-                } else if (result == C.RESULT_NOTHING_READ) {
-                    return;
-                }
-            }
-        } catch (SubtitleDecoderException e) {
-            handleDecoderError(e);
-        }
-    }
-
-    @Override
-    protected void onDisabled() {
-        streamFormat = null;
-        finalStreamEndPositionUs = C.TIME_UNSET;
-        clearOutput();
-        releaseDecoder();
-    }
-
-    @Override
-    public boolean isEnded() {
-        return outputStreamEnded;
-    }
-
-    @Override
-    public boolean isReady() {
-        // Don't block playback whilst subtitles are loading.
-        // Note: To change this behavior, it will be necessary to consider [Internal: b/12949941].
-        return true;
-    }
-
-    private void releaseBuffers() {
-        nextInputBuffer = null;
-        nextSubtitleEventIndex = C.INDEX_UNSET;
-        if (subtitle != null) {
-            subtitle.release();
-            subtitle = null;
-        }
-        if (nextSubtitle != null) {
-            nextSubtitle.release();
-            nextSubtitle = null;
-        }
-    }
-
-    private void releaseDecoder() {
-        releaseBuffers();
-        checkNotNull(decoder).release();
-        decoder = null;
-        decoderReplacementState = REPLACEMENT_STATE_NONE;
-    }
-
-    private void initDecoder() {
-        waitingForKeyFrame = true;
-        decoder = decoderFactory.createDecoder(checkNotNull(streamFormat));
-    }
-
-    private void replaceDecoder() {
-        releaseDecoder();
-        initDecoder();
-    }
-
-    private long getNextEventTime() {
-        if (nextSubtitleEventIndex == C.INDEX_UNSET) {
-            return Long.MAX_VALUE;
-        }
-        checkNotNull(subtitle);
-        return nextSubtitleEventIndex >= subtitle.getEventTimeCount()
-                ? Long.MAX_VALUE
-                : subtitle.getEventTime(nextSubtitleEventIndex);
-    }
-
-    private void updateOutput(List<Cue> cues) {
-        if (outputHandler != null) {
-            outputHandler.obtainMessage(MSG_UPDATE_OUTPUT, cues).sendToTarget();
-        } else {
-            invokeUpdateOutputInternal(cues);
-        }
-    }
-
-    private void clearOutput() {
-        updateOutput(Collections.emptyList());
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public boolean handleMessage(Message msg) {
-        switch (msg.what) {
-            case MSG_UPDATE_OUTPUT:
-                invokeUpdateOutputInternal((List<Cue>) msg.obj);
-                return true;
-            default:
-                throw new IllegalStateException();
-        }
-    }
-
-    private void invokeUpdateOutputInternal(List<Cue> cues) {
-        // See https://github.com/google/ExoPlayer/issues/7934
-        // SubripDecoder texts tend to be DIMEN_UNSET which pushes up the
-        // subs unlike WEBVTT which creates an inconsistency
-
-        List<Cue> fixedCues = cues.stream().map(
-                cue -> {
-                    Cue.Builder builder = cue.buildUpon();
-
-                    if (cue.line == DIMEN_UNSET)
-                        builder.setLine(-1f, LINE_TYPE_NUMBER);
-
-                    return builder.setSize(DIMEN_UNSET).build();
-                }
-        ).collect(Collectors.toList());
-
-        output.onCues(fixedCues);
-        output.onCues(new CueGroup(fixedCues, 0L));
-    }
-
-    /**
-     * Called when {@link #decoder} throws an exception, so it can be logged and playback can
-     * continue.
-     *
-     * <p>Logs {@code e} and resets state to allow decoding the next sample.
-     */
-    private void handleDecoderError(SubtitleDecoderException e) {
-        Log.e(TAG, "Subtitle decoding failed. streamFormat=" + streamFormat, e);
-        clearOutput();
-        replaceDecoder();
-    }
-}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/OfflinePlaybackHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/OfflinePlaybackHelper.kt
index e6de1266b34..542699e8ba4 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/OfflinePlaybackHelper.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/OfflinePlaybackHelper.kt
@@ -4,8 +4,8 @@ import android.app.Activity
 import android.content.ContentUris
 import android.net.Uri
 import androidx.core.content.ContextCompat.getString
+import androidx.media3.common.util.UnstableApi
 import com.lagradost.cloudstream3.R
-import com.lagradost.cloudstream3.ui.player.ExtractorUri
 import com.lagradost.cloudstream3.utils.UIHelper.navigate
 import com.lagradost.safefile.SafeFile
 
@@ -23,6 +23,10 @@ object OfflinePlaybackHelper {
     }
 
     fun playUri(activity: Activity, uri: Uri) {
+        if (uri.scheme == "magnet") {
+            playLink(activity, uri.toString())
+            return
+        }
         val name = SafeFile.fromUri(activity, uri)?.name()
         activity.navigate(
             R.id.global_to_navigation_player, GeneratorPlayer.newInstance(
@@ -33,7 +37,8 @@ object OfflinePlaybackHelper {
                             name = name ?: getString(activity, 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()
+                            id = kotlin.runCatching { ContentUris.parseId(uri) }.getOrNull()
+                                ?.hashCode()
                         )
                     )
                 )
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/OutlineSpan.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/OutlineSpan.kt
new file mode 100644
index 00000000000..f011ef37bfc
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/OutlineSpan.kt
@@ -0,0 +1,10 @@
+package com.lagradost.cloudstream3.ui.player
+
+import android.text.TextPaint
+import android.text.style.CharacterStyle
+import androidx.annotation.Px
+
+// source: https://github.com/androidx/media/pull/1840
+class OutlineSpan(@Px val outlineWidth : Float) : CharacterStyle() {
+    override fun updateDrawState(tp: TextPaint?) { tp?.strokeWidth = outlineWidth }
+}
\ 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 1ba5a29f1d7..67cd9de6dbc 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
@@ -15,12 +15,13 @@ import com.lagradost.cloudstream3.ui.result.ResultEpisode
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import com.lagradost.cloudstream3.utils.EpisodeSkip
 import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.ExtractorLinkType
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 
 class PlayerGeneratorViewModel : ViewModel() {
     companion object {
-        val TAG = "PlayViewGen"
+        const val TAG = "PlayViewGen"
     }
 
     private var generator: IGenerator? = null
@@ -94,7 +95,7 @@ class PlayerGeneratorViewModel : ViewModel() {
                 if (generator?.hasCache == true && generator?.hasNext() == true) {
                     safeApiCall {
                         generator?.generateLinks(
-                            type = LoadType.InApp,
+                            sourceTypes = LOADTYPE_INAPP,
                             clearCache = false,
                             callback = {},
                             subtitleCallback = {},
@@ -173,7 +174,7 @@ class PlayerGeneratorViewModel : ViewModel() {
         }
     }
 
-    fun loadLinks(type: LoadType = LoadType.InApp) {
+    fun loadLinks(sourceTypes: Set<ExtractorLinkType> = LOADTYPE_INAPP) {
         Log.i(TAG, "loadLinks")
         currentJob?.cancel()
 
@@ -188,7 +189,7 @@ class PlayerGeneratorViewModel : ViewModel() {
             // load more data
             _loadingLinks.postValue(Resource.Loading())
             val loadingState = safeApiCall {
-                generator?.generateLinks(type = type, clearCache = forceClearCache, callback = {
+                generator?.generateLinks(sourceTypes = sourceTypes, clearCache = forceClearCache, callback = {
                     currentLinks.add(it)
                     // Clone to prevent ConcurrentModificationException
                     normalSafeApiCall {
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 25d7e3dddad..0893527d4cb 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,14 +4,13 @@ import android.util.Log
 import android.util.TypedValue
 import android.view.ViewGroup
 import android.widget.FrameLayout
+import androidx.annotation.OptIn
 import androidx.media3.common.MimeTypes
+import androidx.media3.common.util.UnstableApi
 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
-import com.lagradost.cloudstream3.ui.player.CustomDecoder.Companion.uppercaseSubtitles
 import com.lagradost.cloudstream3.ui.subtitles.SaveCaptionStyle
-import com.lagradost.cloudstream3.ui.subtitles.SubtitlesFragment.Companion.fromSaveToStyle
+import com.lagradost.cloudstream3.ui.subtitles.SubtitlesFragment.Companion.setSubtitleViewStyle
 import com.lagradost.cloudstream3.utils.UIHelper.toPx
 
 enum class SubtitleStatus {
@@ -45,8 +44,22 @@ data class SubtitleData(
         return if (origin == SubtitleOrigin.EMBEDDED_IN_VIDEO) url
         else "$url|$name"
     }
+
+    /**
+     * Gets the URL, but tries to fix it if it is malformed.
+     */
+    fun getFixedUrl(): String {
+        // Some extensions fail to include the protocol, this helps with that.
+        val fixedSubUrl = if (this.url.startsWith("//")) {
+            "https:${this.url}"
+        } else {
+            this.url
+        }
+        return fixedSubUrl
+    }
 }
 
+@OptIn(UnstableApi::class)
 class PlayerSubtitleHelper {
     private var activeSubtitles: Set<SubtitleData> = emptySet()
     private var allSubtitles: Set<SubtitleData> = emptySet()
@@ -99,20 +112,15 @@ class PlayerSubtitleHelper {
     }
 
     fun setSubStyle(style: SaveCaptionStyle) {
-        regexSubtitlesToRemoveBloat = style.removeBloat
-        uppercaseSubtitles = style.upperCase
-        regexSubtitlesToRemoveCaptions = style.removeCaptions
-        subtitleView?.context?.let { ctx ->
-            subStyle = style
-            Log.i(TAG, "SET STYLE = $style")
-            subtitleView?.setStyle(ctx.fromSaveToStyle(style))
-            subtitleView?.translationY = -style.elevation.toPx.toFloat()
-            val size = style.fixedTextSize
-            if (size != null) {
-                subtitleView?.setFixedTextSize(TypedValue.COMPLEX_UNIT_SP, size)
-            } else {
-                subtitleView?.setUserDefaultTextSize()
-            }
+        subStyle = style
+        Log.i(TAG, "SET STYLE = $style")
+        setSubtitleViewStyle(subtitleView, style)
+        subtitleView?.translationY = -style.elevation.toPx.toFloat()
+        val size = style.fixedTextSize
+        if (size != null) {
+            subtitleView?.setFixedTextSize(TypedValue.COMPLEX_UNIT_SP, size)
+        } else {
+            subtitleView?.setUserDefaultTextSize()
         }
     }
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/PreviewGenerator.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PreviewGenerator.kt
index 7c78ce63896..9f92d395375 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/PreviewGenerator.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PreviewGenerator.kt
@@ -8,6 +8,9 @@ import android.os.Build
 import android.util.Log
 import androidx.annotation.WorkerThread
 import androidx.core.graphics.scale
+import androidx.preference.PreferenceManager
+import com.lagradost.cloudstream3.AcraApplication
+import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
@@ -62,8 +65,12 @@ interface IPreviewGenerator {
 
     companion object {
         fun new(): IPreviewGenerator {
+            val userDisabled = AcraApplication.context?.let { ctx ->
+                PreferenceManager.getDefaultSharedPreferences(ctx)?.getBoolean(
+                    ctx.getString(R.string.preview_seekbar_key), true) == false
+            } ?: false
             /** because TV has low ram + not show we disable this for now */
-            return if (isLayout(TV)) {
+            return if (isLayout(TV) || userDisabled) {
                 empty()
             } else {
                 PreviewGenerator()
@@ -239,7 +246,11 @@ private class M3u8PreviewGenerator(override var params: ImageParams) : IPreviewG
     // generated images 1:1 to idx of hsl
     private var images: Array<Bitmap?> = arrayOf()
 
-    private val TAG = "PreviewImgM3u8"
+    companion object {
+        private const val TAG = "PreviewImgM3u8"
+    }
+
+
 
     // prefixSum[i] = sum(hsl.ts[0..i].time)
     // where [0] = 0, [1] = hsl.ts[0].time aka time at start of segment, do [b] - [a] for range a,b
@@ -260,7 +271,7 @@ private class M3u8PreviewGenerator(override var params: ImageParams) : IPreviewG
         var bestDiff = Double.MAX_VALUE
         synchronized(images) {
             // just find the best one in a for loop, we don't care about bin searching rn
-            for (i in 0..images.size) {
+            for (i in images.indices) {
                 val diff = prefixSum[i].minus(fraction).absoluteValue
                 if (diff > bestDiff) {
                     break
@@ -388,13 +399,6 @@ private class M3u8PreviewGenerator(override var params: ImageParams) : IPreviewG
                             logError(t)
                             continue
                         }
-
-                        /*
-                        val buffer = hsl.resolveLinkSafe(index) ?: continue
-                        tmpFile?.writeBytes(buffer)
-                        val buff = FileOutputStream(tmpFile)
-                        retriever.setDataSource(buff.fd)
-                        val frame = retriever.getFrameAtTime(0L)*/
                     }
                 }
 
@@ -412,14 +416,16 @@ private class Mp4PreviewGenerator(override var params: ImageParams) : IPreviewGe
         null
     }
 
+    companion object {
+        private const val TAG = "PreviewImgMp4"
+    }
+
     override fun hasPreview(): Boolean {
         synchronized(images) {
             return loadedLod >= MIN_LOD
         }
     }
 
-    val TAG = "PreviewImgMp4"
-
     override fun getPreviewImage(fraction: Float): Bitmap? {
         synchronized(images) {
             if (loadedLod < MIN_LOD) {
@@ -524,7 +530,7 @@ private class Mp4PreviewGenerator(override var params: ImageParams) : IPreviewGe
                 val fraction = (1.0f.div((1 shl l).toFloat()) + i * 1.0f.div(items.toFloat()))
                 Log.i(TAG, "Generating preview for ${fraction * 100}%")
                 val frame = durationUs * fraction
-                val img = retriever.image(frame.toLong(), params);
+                val img = retriever.image(frame.toLong(), params)
                 if (!scope.isActive) return
                 if (img == null || img.width <= 1 || img.height <= 1) continue
                 synchronized(images) {
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 90bd1ca7303..b97ca155ba7 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
@@ -7,6 +7,7 @@ import com.lagradost.cloudstream3.LoadResponse
 import com.lagradost.cloudstream3.ui.APIRepository
 import com.lagradost.cloudstream3.ui.result.ResultEpisode
 import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.ExtractorLinkType
 import kotlin.math.max
 import kotlin.math.min
 
@@ -28,6 +29,7 @@ class RepoLinkGenerator(
     }
 
     override val hasCache = true
+    override val canSkipLoading = true
 
     override fun hasNext(): Boolean {
         return currentIndex < episodes.size - 1
@@ -73,12 +75,12 @@ class RepoLinkGenerator(
 
     override suspend fun generateLinks(
         clearCache: Boolean,
-        type: LoadType,
+        allowedTypes: Set<ExtractorLinkType>,
         callback: (Pair<ExtractorLink?, ExtractorUri?>) -> Unit,
         subtitleCallback: (SubtitleData) -> Unit,
-        offset: Int
+        offset: Int,
+        isCasting: Boolean,
     ): Boolean {
-        val allowedTypes = type.toSet()
         val index = currentIndex
         val current = episodes.getOrNull(index + offset) ?: return false
 
@@ -121,7 +123,7 @@ class RepoLinkGenerator(
         val result = APIRepository(
             getApiFromNameNull(current.apiName) ?: throw Exception("This provider does not exist")
         ).loadLinks(current.data,
-            isCasting = LoadType.Chromecast == type,
+            isCasting = isCasting,
             subtitleCallback = { file ->
                 val correctFile = PlayerSubtitleHelper.getSubtitleData(file)
                 if (correctFile.url.isNotEmpty() && !currentSubsUrls.contains(correctFile.url)) {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/SubtitleOffsetItemAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/SubtitleOffsetItemAdapter.kt
new file mode 100644
index 00000000000..9e3e778beb9
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/SubtitleOffsetItemAdapter.kt
@@ -0,0 +1,112 @@
+package com.lagradost.cloudstream3.ui.player
+
+import android.animation.ObjectAnimator
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import android.view.animation.DecelerateInterpolator
+import androidx.core.view.isInvisible
+import androidx.recyclerview.widget.RecyclerView
+import com.lagradost.cloudstream3.databinding.SubtitleOffsetItemBinding
+import com.lagradost.cloudstream3.utils.AppContextUtils
+import kotlin.math.roundToInt
+
+data class SubtitleCue(val startTimeMs: Long, val durationMs: Long, val text: List<String>) {
+    val endTimeMs = startTimeMs + durationMs
+}
+
+class SubtitleOffsetItemAdapter(
+    private var currentTimeMs: Long,
+    override val items: MutableList<SubtitleCue>,
+    val clickCallback: (SubtitleCue) -> Unit
+) :
+    AppContextUtils.DiffAdapter<SubtitleCue>(items) {
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+        val inflater = LayoutInflater.from(parent.context)
+        val binding = SubtitleOffsetItemBinding.inflate(inflater, parent, false)
+        return SubtitleViewHolder(binding)
+    }
+
+    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
+        when (holder) {
+            is SubtitleViewHolder -> holder.bind(items[position])
+        }
+    }
+
+    fun getLatestActiveItem(position: Long): Int {
+        return items.withIndex().lastOrNull {
+            position >= it.value.startTimeMs
+        }?.index ?: 0
+    }
+
+    fun updateTime(timeMs: Long) {
+        val previousTime = currentTimeMs
+        currentTimeMs = timeMs
+
+        val earlyTime = minOf(previousTime, timeMs)
+        val lateTime = maxOf(previousTime, timeMs)
+        val affectedItems = items.withIndex().filter { cue ->
+            // Padding is required in the range because changes can be done within one single subtitle range,
+            // and that subtitle needs to be updated
+            cue.value.startTimeMs in (earlyTime - cue.value.durationMs)..(lateTime + cue.value.durationMs)
+        }
+
+        affectedItems.forEach { item ->
+            // This could likely be a range
+            this.notifyItemChanged(item.index)
+        }
+    }
+
+    private inner class SubtitleViewHolder(
+        val binding: SubtitleOffsetItemBinding,
+    ) :
+        RecyclerView.ViewHolder(binding.root) {
+
+        fun bind(
+            data: SubtitleCue
+        ) {
+            binding.root.setOnClickListener {
+                clickCallback.invoke(data)
+            }
+
+            binding.subtitleText.text = data.text.joinToString("\n")
+
+            val timeMs = currentTimeMs
+            val startTime = data.startTimeMs
+            val endTime = data.endTimeMs
+
+            val newAlpha = if (timeMs >= startTime) 1f else 0.5f
+            ObjectAnimator.ofFloat(
+                binding.subtitleText,
+                "alpha",
+                binding.subtitleText.alpha,
+                newAlpha
+            ).apply {
+                interpolator = DecelerateInterpolator()
+            }.start()
+
+            val showProgress = timeMs in startTime..<endTime
+            // Invisible to prevent layout changes
+            binding.subtitleProgress.isInvisible = !showProgress
+
+            if (showProgress) {
+                // Set progress to currentTime/remainingTime
+                // Multiply by 1000 since the max is 1000
+                val progressValue = ((timeMs - startTime) * 1000f / data.durationMs).roundToInt()
+
+                // Animate the progress change
+                ObjectAnimator.ofInt(
+                    binding.subtitleProgress,
+                    "progress",
+                    binding.subtitleProgress.progress,
+                    progressValue
+                ).apply {
+                    interpolator = DecelerateInterpolator()
+                }.start()
+            } else {
+                // Reset progress when not visible
+                binding.subtitleProgress.progress = 0
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/Torrent.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/Torrent.kt
new file mode 100644
index 00000000000..005ac71e5b8
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/Torrent.kt
@@ -0,0 +1,390 @@
+package com.lagradost.cloudstream3.ui.player
+
+import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.api.Log
+import com.lagradost.cloudstream3.CommonActivity
+import com.lagradost.cloudstream3.ErrorLoadingException
+import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.mvvm.logError
+import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.ExtractorLinkType
+import torrServer.TorrServer
+import java.io.File
+import java.net.ConnectException
+import java.net.URLEncoder
+
+object Torrent {
+    var hasAcceptedTorrentForThisSession: Boolean? = null
+    private const val TORRENT_SERVER_PATH: String = "torrent_tmp"
+    private const val TIMEOUT: Long = 3
+    private const val TAG: String = "Torrent"
+
+    /** Cleans up both old aria2c files and newer go server, (even if the new is also self cleaning) */
+    @Throws
+    fun deleteAllFiles(): Boolean {
+        val act = CommonActivity.activity ?: return false
+        val defaultDirectory = "${act.cacheDir.path}/$TORRENT_SERVER_PATH"
+        return File(defaultDirectory).deleteRecursively()
+    }
+
+    private var TORRENT_SERVER_URL = "" // https://github.com/Diegopyl1209/torrentserver-aniyomi/blob/main/server.go#L23
+
+    /** Returns true if the server is up */
+    private suspend fun echo(): Boolean {
+        if(TORRENT_SERVER_URL.isEmpty()) {
+            return false
+        }
+        return try {
+            app.get(
+                "$TORRENT_SERVER_URL/echo",
+            ).text.isNotEmpty()
+        } catch (e: ConnectException) {
+            // `Failed to connect to /127.0.0.1:8090` if the server is down
+            false
+        } catch (t: Throwable) {
+            logError(t)
+            false
+        }
+    }
+
+    // https://github.com/Diegopyl1209/torrentserver-aniyomi/blob/c18f58e51b6738f053261bc863177078aa9c1c98/web/api/shutdown.go#L22
+    /** Gracefully shutdown the server.
+     * should not be used because I am unable to start it again, and the stopTorrentServer() crashes the app */
+    suspend fun shutdown(): Boolean {
+        if(TORRENT_SERVER_URL.isEmpty()) {
+            return false
+        }
+        return try {
+            app.get(
+                "$TORRENT_SERVER_URL/shutdown",
+            ).isSuccessful
+        } catch (t: Throwable) {
+            logError(t)
+            false
+        }
+    }
+
+    /** Lists all torrents by the server */
+    @Throws
+    private suspend fun list(): Array<TorrentStatus> {
+        if(TORRENT_SERVER_URL.isEmpty()) {
+            throw ErrorLoadingException("Not initialized")
+        }
+        return app.post(
+            "$TORRENT_SERVER_URL/torrents",
+            json = TorrentRequest(
+                action = "list",
+            ),
+            timeout = TIMEOUT,
+            headers = emptyMap()
+        ).parsed<Array<TorrentStatus>>()
+    }
+
+    /** Drops a single torrent, (I think) this means closing the stream. Returns returns if it is successful */
+    private suspend fun drop(hash: String): Boolean {
+        if(TORRENT_SERVER_URL.isEmpty()) {
+            return false
+        }
+        return try {
+            return app.post(
+                "$TORRENT_SERVER_URL/torrents",
+                json = TorrentRequest(
+                    action = "drop",
+                    hash = hash
+                ),
+                timeout = TIMEOUT,
+                headers = emptyMap()
+            ).isSuccessful
+        } catch (t: Throwable) {
+            logError(t)
+            false
+        }
+    }
+
+    /** Removes a single torrent from the server registry */
+    private suspend fun rem(hash: String): Boolean {
+        if(TORRENT_SERVER_URL.isEmpty()) {
+            return false
+        }
+        return try {
+            return app.post(
+                "$TORRENT_SERVER_URL/torrents",
+                json = TorrentRequest(
+                    action = "rem",
+                    hash = hash
+                ),
+                timeout = TIMEOUT,
+                headers = emptyMap()
+            ).isSuccessful
+        } catch (t: Throwable) {
+            logError(t)
+            false
+        }
+    }
+
+
+    /** Removes all torrents from the server, and returns if it is successful */
+    suspend fun clearAll(): Boolean {
+        if(TORRENT_SERVER_URL.isEmpty()) {
+            return true
+        }
+        return try {
+            val items = list()
+            var allSuccess = true
+            for (item in items) {
+                val hash = item.hash
+                if (hash == null) {
+                    Log.i(TAG, "No hash on ${item.name}")
+                    allSuccess = false
+                    continue
+                }
+                if (drop(hash)) {
+                    Log.i(TAG, "Successfully dropped ${item.name}")
+                } else {
+                    Log.i(TAG, "Failed to drop ${item.name}")
+                    allSuccess = false
+                    continue
+                }
+                if (rem(hash)) {
+                    Log.i(TAG, "Successfully removed ${item.name}")
+                } else {
+                    Log.i(TAG, "Failed to remove ${item.name}")
+                    allSuccess = false
+                    continue
+                }
+            }
+            allSuccess
+        } catch (t: Throwable) {
+            logError(t)
+            false
+        }
+    }
+
+    /** Gets all the metadata of a torrent, will throw if that hash does not exists
+     * https://github.com/Diegopyl1209/torrentserver-aniyomi/blob/c18f58e51b6738f053261bc863177078aa9c1c98/web/api/torrents.go#L126 */
+    @Throws
+    suspend fun get(
+        hash: String,
+    ): TorrentStatus {
+        if(TORRENT_SERVER_URL.isEmpty()) {
+            throw ErrorLoadingException("Not initialized")
+        }
+        return app.post(
+            "$TORRENT_SERVER_URL/torrents",
+            json = TorrentRequest(
+                action = "get",
+                hash = hash,
+            ),
+            timeout = TIMEOUT,
+            headers = emptyMap()
+        ).parsed<TorrentStatus>()
+    }
+
+    /** Adds a torrent to the server, this is needed for us to get the hash for further modification, as well as start streaming it*/
+    @Throws
+    private suspend fun add(url: String): TorrentStatus {
+        if(TORRENT_SERVER_URL.isEmpty()) {
+            throw ErrorLoadingException("Not initialized")
+        }
+        return app.post(
+            "$TORRENT_SERVER_URL/torrents",
+            json = TorrentRequest(
+                action = "add",
+                link = url,
+            ),
+            headers = emptyMap()
+        ).parsed<TorrentStatus>()
+    }
+
+    /** Spins up the torrent server. */
+    private suspend fun setup(dir: String): Boolean {
+        go.Seq.load()
+        if (echo()) {
+            return true
+        }
+        val port = TorrServer.startTorrentServer(dir, 0)
+        if(port < 0) {
+            return false
+        }
+        TORRENT_SERVER_URL = "http://127.0.0.1:$port"
+        TorrServer.addTrackers(trackers.joinToString(separator = ",\n"))
+        return echo()
+    }
+
+    /** Transforms a torrent link into a streamable link via the server */
+    @Throws
+    suspend fun transformLink(link: ExtractorLink): Pair<ExtractorLink, TorrentStatus> {
+        val act = CommonActivity.activity ?: throw IllegalArgumentException("No activity")
+        val defaultDirectory = "${act.cacheDir.path}/$TORRENT_SERVER_PATH"
+        File(defaultDirectory).mkdir()
+        if (!setup(defaultDirectory)) {
+            throw ErrorLoadingException("Unable to setup the torrent server")
+        }
+        val status = add(link.url)
+
+        return ExtractorLink(
+            source = link.source,
+            link.name,
+            url = status.streamUrl(link.url),
+            type = ExtractorLinkType.VIDEO,
+            referer = "",
+            quality = link.quality
+        ) to status
+    }
+
+    private val trackers = listOf(
+        "udp://tracker.opentrackr.org:1337/announce",
+        "https://tracker2.ctix.cn/announce",
+        "https://tracker1.520.jp:443/announce",
+        "udp://opentracker.i2p.rocks:6969/announce",
+        "udp://open.tracker.cl:1337/announce",
+        "udp://open.demonii.com:1337/announce",
+        "http://tracker.openbittorrent.com:80/announce",
+        "udp://tracker.openbittorrent.com:6969/announce",
+        "udp://open.stealth.si:80/announce",
+        "udp://exodus.desync.com:6969/announce",
+        "udp://tracker-udp.gbitt.info:80/announce",
+        "udp://explodie.org:6969/announce",
+        "https://tracker.gbitt.info:443/announce",
+        "http://tracker.gbitt.info:80/announce",
+        "udp://uploads.gamecoast.net:6969/announce",
+        "udp://tracker1.bt.moack.co.kr:80/announce",
+        "udp://tracker.tiny-vps.com:6969/announce",
+        "udp://tracker.theoks.net:6969/announce",
+        "udp://tracker.dump.cl:6969/announce",
+        "udp://tracker.bittor.pw:1337/announce",
+        "https://tracker1.520.jp:443/announce",
+        "udp://opentracker.i2p.rocks:6969/announce",
+        "udp://open.tracker.cl:1337/announce",
+        "udp://open.demonii.com:1337/announce",
+        "http://tracker.openbittorrent.com:80/announce",
+        "udp://tracker.openbittorrent.com:6969/announce",
+        "udp://open.stealth.si:80/announce",
+        "udp://exodus.desync.com:6969/announce",
+        "udp://tracker-udp.gbitt.info:80/announce",
+        "udp://explodie.org:6969/announce",
+        "https://tracker.gbitt.info:443/announce",
+        "http://tracker.gbitt.info:80/announce",
+        "udp://uploads.gamecoast.net:6969/announce",
+        "udp://tracker1.bt.moack.co.kr:80/announce",
+        "udp://tracker.tiny-vps.com:6969/announce",
+        "udp://tracker.theoks.net:6969/announce",
+        "udp://tracker.dump.cl:6969/announce",
+        "udp://tracker.bittor.pw:1337/announce"
+    )
+
+
+    // https://github.com/Diegopyl1209/torrentserver-aniyomi/blob/c18f58e51b6738f053261bc863177078aa9c1c98/web/api/torrents.go#L18
+    // https://github.com/Diegopyl1209/torrentserver-aniyomi/blob/main/web/api/route.go#L7
+    data class TorrentRequest(
+        @JsonProperty("action")
+        val action: String,
+        @JsonProperty("hash")
+        val hash: String = "",
+        @JsonProperty("link")
+        val link: String = "",
+        @JsonProperty("title")
+        val title: String = "",
+        @JsonProperty("poster")
+        val poster: String = "",
+        @JsonProperty("data")
+        val data: String = "",
+        @JsonProperty("save_to_db")
+        val saveToDB: Boolean = false,
+    )
+
+    // https://github.com/Diegopyl1209/torrentserver-aniyomi/blob/c18f58e51b6738f053261bc863177078aa9c1c98/torr/state/state.go#L33
+    // omitempty = nullable
+    data class TorrentStatus(
+        @JsonProperty("title")
+        var title: String,
+        @JsonProperty("poster")
+        var poster: String,
+        @JsonProperty("data")
+        var data: String?,
+        @JsonProperty("timestamp")
+        var timestamp: Long,
+        @JsonProperty("name")
+        var name: String?,
+        @JsonProperty("hash")
+        var hash: String?,
+        @JsonProperty("stat")
+        var stat: Int,
+        @JsonProperty("stat_string")
+        var statString: String,
+        @JsonProperty("loaded_size")
+        var loadedSize: Long?,
+        @JsonProperty("torrent_size")
+        var torrentSize: Long?,
+        @JsonProperty("preloaded_bytes")
+        var preloadedBytes: Long?,
+        @JsonProperty("preload_size")
+        var preloadSize: Long?,
+        @JsonProperty("download_speed")
+        var downloadSpeed: Double?,
+        @JsonProperty("upload_speed")
+        var uploadSpeed: Double?,
+        @JsonProperty("total_peers")
+        var totalPeers: Int?,
+        @JsonProperty("pending_peers")
+        var pendingPeers: Int?,
+        @JsonProperty("active_peers")
+        var activePeers: Int?,
+        @JsonProperty("connected_seeders")
+        var connectedSeeders: Int?,
+        @JsonProperty("half_open_peers")
+        var halfOpenPeers: Int?,
+        @JsonProperty("bytes_written")
+        var bytesWritten: Long?,
+        @JsonProperty("bytes_written_data")
+        var bytesWrittenData: Long?,
+        @JsonProperty("bytes_read")
+        var bytesRead: Long?,
+        @JsonProperty("bytes_read_data")
+        var bytesReadData: Long?,
+        @JsonProperty("bytes_read_useful_data")
+        var bytesReadUsefulData: Long?,
+        @JsonProperty("chunks_written")
+        var chunksWritten: Long?,
+        @JsonProperty("chunks_read")
+        var chunksRead: Long?,
+        @JsonProperty("chunks_read_useful")
+        var chunksReadUseful: Long?,
+        @JsonProperty("chunks_read_wasted")
+        var chunksReadWasted: Long?,
+        @JsonProperty("pieces_dirtied_good")
+        var piecesDirtiedGood: Long?,
+        @JsonProperty("pieces_dirtied_bad")
+        var piecesDirtiedBad: Long?,
+        @JsonProperty("duration_seconds")
+        var durationSeconds: Double?,
+        @JsonProperty("bit_rate")
+        var bitRate: String?,
+        @JsonProperty("file_stats")
+        var fileStats: List<TorrentFileStat>?,
+        @JsonProperty("trackers")
+        var trackers: List<String>?,
+    ) {
+        fun streamUrl(url: String): String {
+            val fileName =
+                this.fileStats?.first { !it.path.isNullOrBlank() }?.path
+                    ?: throw ErrorLoadingException("Null path")
+
+            val index = url.substringAfter("index=").substringBefore("&").toIntOrNull() ?: 0
+
+            //  https://github.com/Diegopyl1209/torrentserver-aniyomi/blob/c18f58e51b6738f053261bc863177078aa9c1c98/web/api/stream.go#L18
+            return "$TORRENT_SERVER_URL/stream/${
+                URLEncoder.encode(fileName, "utf-8")
+            }?link=${this.hash}&index=$index&play"
+        }
+    }
+
+    data class TorrentFileStat(
+        @JsonProperty("id")
+        val id: Int?,
+        @JsonProperty("path")
+        val path: String?,
+        @JsonProperty("length")
+        val length: Long?,
+    )
+}
\ No newline at end of file
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 1e2c9f67338..ce457740d34 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
@@ -17,7 +17,6 @@ class PriorityAdapter<T>(override val items: MutableList<SourcePriority<T>>) :
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
         return PriorityViewHolder(
             PlayerPrioritizeItemBinding.inflate(LayoutInflater.from(parent.context),parent,false),
-            //LayoutInflater.from(parent.context).inflate(R.layout.player_prioritize_item, parent, false)
         )
     }
 
@@ -31,10 +30,6 @@ class PriorityAdapter<T>(override val items: MutableList<SourcePriority<T>>) :
         val binding: PlayerPrioritizeItemBinding,
     ) : RecyclerView.ViewHolder(binding.root) {
         fun <T> bind(item: SourcePriority<T>) {
-           /* val plusButton: ImageView = itemView.add_button
-            val subtractButton: ImageView = itemView.subtract_button
-            val priorityText: TextView = itemView.priority_text
-            val priorityNumber: TextView = itemView.priority_number*/
             binding.priorityText.text = item.name
 
             fun 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 b587276fa66..821bccd6a84 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
@@ -9,12 +9,13 @@ import android.widget.ImageView
 import android.widget.TextView
 import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
+import androidx.palette.graphics.Palette
 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.AppContextUtils
-import com.lagradost.cloudstream3.utils.UIHelper.setImage
+import com.lagradost.cloudstream3.utils.ImageLoader.loadImage
+import com.lagradost.cloudstream3.utils.drawableToBitmap
 
 class ProfilesAdapter(
     override val items: MutableList<QualityDataHelper.QualityProfile>,
@@ -29,8 +30,6 @@ class ProfilesAdapter(
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
         return ProfilesViewHolder(
             PlayerQualityProfileItemBinding.inflate(LayoutInflater.from(parent.context),parent,false)
-            //LayoutInflater.from(parent.context)
-            //    .inflate(R.layout.player_quality_profile_item, parent, false)
         )
     }
 
@@ -82,16 +81,29 @@ class ProfilesAdapter(
             }
 
             outline.isVisible = currentItem?.second?.id == item.id
+            val drawableResId = art[index % art.size]
+            profileBg.loadImage(drawableResId)
 
-            profileBg.setImage(UiImage.Drawable(art[index % art.size]), null, false) { palette ->
-                val color = palette.getDarkVibrantColor(
-                    ContextCompat.getColor(
-                        itemView.context,
-                        R.color.dubColorBg
-                    )
-                )
-                wifiText.backgroundTintList = ColorStateList.valueOf(color)
-                dataText.backgroundTintList = ColorStateList.valueOf(color)
+            val drawable = ContextCompat.getDrawable(itemView.context, drawableResId)
+            if (drawable != null) {
+                // Convert Drawable to Bitmap
+                val bitmap = drawableToBitmap(drawable)
+                if (bitmap != null) {
+                    // Use Palette to extract colors from the bitmap
+                    Palette.from(bitmap).generate { palette ->
+                        val color = palette?.getDarkVibrantColor(
+                            ContextCompat.getColor(
+                                itemView.context,
+                                R.color.dubColorBg
+                            )
+                        )
+
+                        if (color != null) {
+                            wifiText.backgroundTintList = ColorStateList.valueOf(color)
+                            dataText.backgroundTintList = ColorStateList.valueOf(color)
+                        }
+                    }
+                }
             }
 
             val textStyle =
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/QualityDataHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/QualityDataHelper.kt
index 96249db406f..0922bdb5aa6 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/QualityDataHelper.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/QualityDataHelper.kt
@@ -1,14 +1,13 @@
 package com.lagradost.cloudstream3.ui.player.source_priority
 
-import android.content.Context
 import androidx.annotation.StringRes
 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.R
 import com.lagradost.cloudstream3.mvvm.debugAssert
-import com.lagradost.cloudstream3.ui.result.UiText
-import com.lagradost.cloudstream3.ui.result.txt
+import com.lagradost.cloudstream3.utils.UiText
+import com.lagradost.cloudstream3.utils.txt
 import com.lagradost.cloudstream3.utils.DataStoreHelper.currentAccount
 import com.lagradost.cloudstream3.utils.Qualities
 
@@ -104,7 +103,7 @@ object QualityDataHelper {
      * Must under all circumstances at least return one profile
      **/
     fun getProfiles(): List<QualityProfile> {
-        val availableTypes = QualityProfileType.values().toMutableList()
+        val availableTypes = QualityProfileType.entries.toMutableList()
         val profiles = (1..PROFILE_COUNT).map { profileNumber ->
             // Get the real type
             val type = getQualityProfileType(profileNumber)
@@ -140,12 +139,12 @@ object QualityDataHelper {
                 }
         }
 
-        QualityProfileType.values().forEach {
+        QualityProfileType.entries.forEach {
             if (it.unique) insertType(profiles, it)
         }
 
         debugAssert({
-            !QualityProfileType.values().all { type ->
+            !QualityProfileType.entries.all { type ->
                 !type.unique || profiles.any { it.type == type }
             }
         }, { "All unique quality types do not exist" })
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 e3629158487..19e98138cbd 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
@@ -7,7 +7,7 @@ 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.txt
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialog
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
@@ -65,7 +65,7 @@ class QualityProfileDialog(
 
             setDefaultBtt.setOnClickListener {
                 val currentProfile = getCurrentProfile() ?: return@setOnClickListener
-                val choices = QualityDataHelper.QualityProfileType.values()
+                val choices = QualityDataHelper.QualityProfileType.entries
                     .filter { it != QualityDataHelper.QualityProfileType.None }
                 val choiceNames = choices.map { txt(it.stringRes).asString(context) }
 
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 1b59882e282..4c74ec80f39 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
@@ -7,7 +7,7 @@ import androidx.annotation.StyleRes
 import androidx.appcompat.app.AlertDialog
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.databinding.PlayerSelectSourcePriorityBinding
-import com.lagradost.cloudstream3.ui.result.txt
+import com.lagradost.cloudstream3.utils.txt
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.Qualities
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
@@ -47,7 +47,7 @@ class SourcePriorityDialog(
         )
 
         qualitiesRecyclerView.adapter = PriorityAdapter(
-            Qualities.values().mapNotNull {
+            Qualities.entries.mapNotNull {
                 SourcePriority(
                     it,
                     Qualities.getStringByIntFull(it.value).ifBlank { return@mapNotNull null },
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 611889057dc..b9893193be1 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
@@ -1,10 +1,10 @@
 package com.lagradost.cloudstream3.ui.result
 
+import android.app.SearchManager
+import android.content.Intent
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.annotation.IdRes
-import androidx.annotation.LayoutRes
 import androidx.core.view.isVisible
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView
@@ -12,7 +12,9 @@ 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 com.lagradost.cloudstream3.ui.settings.Globals.PHONE
+import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
+import com.lagradost.cloudstream3.utils.ImageLoader.loadImage
 
 class ActorAdaptor(
     private var nextFocusUpId: Int? = null,
@@ -70,8 +72,7 @@ class ActorAdaptor(
         }
     }
 
-    private inner class CardViewHolder
-    constructor(
+    private inner class CardViewHolder(
         val binding: CastItemBinding,
         private val focusCallback: (View?) -> Unit = {}
     ) :
@@ -104,8 +105,23 @@ class ActorAdaptor(
                 callback(position)
             }
 
+            itemView.setOnLongClickListener {
+                if (isLayout(PHONE)) {
+                    Intent(Intent.ACTION_WEB_SEARCH).apply {
+                        putExtra(SearchManager.QUERY, actor.actor.name)
+                    }.also { intent ->
+                        itemView.context.packageManager?.let { pm ->
+                            if (intent.resolveActivity(pm) != null) {
+                                itemView.context.startActivity(intent)
+                            }
+                        }
+                    }
+                }
+                true
+            }
+
             binding.apply {
-                actorImage.setImage(mainImg)
+                actorImage.loadImage(mainImg)
 
                 actorName.text = actor.actor.name
                 actor.role?.let {
@@ -139,7 +155,9 @@ class ActorAdaptor(
                     voiceActorName.isVisible = false
                 } else {
                     voiceActorName.text = actor.voiceActor?.name
-                    voiceActorImageHolder.isVisible = voiceActorImage.setImage(vaImage)
+                    if (!vaImage.isNullOrEmpty())
+                        voiceActorImageHolder.isVisible = true
+                    voiceActorImage.loadImage(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 ed5e51f12b4..51acd15a441 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
@@ -11,6 +11,7 @@ import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView
 import com.lagradost.cloudstream3.APIHolder.unixTimeMS
 import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.actions.VideoClickActionHolder
 import com.lagradost.cloudstream3.databinding.ResultEpisodeBinding
 import com.lagradost.cloudstream3.databinding.ResultEpisodeLargeBinding
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.secondsToReadable
@@ -22,16 +23,21 @@ import com.lagradost.cloudstream3.ui.settings.Globals.PHONE
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
 import com.lagradost.cloudstream3.utils.AppContextUtils.html
-import com.lagradost.cloudstream3.utils.UIHelper.setImage
+import com.lagradost.cloudstream3.utils.ImageLoader.loadImage
 import com.lagradost.cloudstream3.utils.UIHelper.toPx
 import com.lagradost.cloudstream3.utils.VideoDownloadHelper
+import com.lagradost.cloudstream3.utils.setText
+import com.lagradost.cloudstream3.utils.txt
 import java.text.DateFormat
 import java.text.SimpleDateFormat
-import java.util.*
+import java.util.Date
+import java.util.Locale
 
+/**
+ * Ids >= 1000 are reserved for VideoClickActions
+ * @see VideoClickActionHolder
+ */
 const val ACTION_PLAY_EPISODE_IN_PLAYER = 1
-const val ACTION_PLAY_EPISODE_IN_VLC_PLAYER = 2
-const val ACTION_PLAY_EPISODE_IN_BROWSER = 3
 
 const val ACTION_CHROME_CAST_EPISODE = 4
 const val ACTION_CHROME_CAST_MIRROR = 5
@@ -40,7 +46,6 @@ const val ACTION_DOWNLOAD_EPISODE = 6
 const val ACTION_DOWNLOAD_MIRROR = 7
 
 const val ACTION_RELOAD_EPISODE = 8
-const val ACTION_COPY_LINK = 9
 
 const val ACTION_SHOW_OPTIONS = 10
 
@@ -51,13 +56,10 @@ const val ACTION_SHOW_DESCRIPTION = 15
 const val ACTION_DOWNLOAD_EPISODE_SUBTITLE = 13
 const val ACTION_DOWNLOAD_EPISODE_SUBTITLE_MIRROR = 14
 
-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 ACTION_FCAST = 19
 
 const val TV_EP_SIZE = 400
+
 data class EpisodeClickEvent(val action: Int, val data: ResultEpisode)
 
 class EpisodeAdapter(
@@ -66,21 +68,10 @@ class EpisodeAdapter(
     private val downloadClickCallback: (DownloadClickEvent) -> Unit,
 ) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
     companion object {
-        /**
-         * @return ACTION_PLAY_EPISODE_IN_PLAYER, ACTION_PLAY_EPISODE_IN_BROWSER or ACTION_PLAY_EPISODE_IN_VLC_PLAYER depending on player settings.
-         * See array.xml/player_pref_values
-         **/
         fun getPlayerAction(context: Context): Int {
-
             val settingsManager = PreferenceManager.getDefaultSharedPreferences(context)
-            return when (settingsManager.getInt(context.getString(R.string.player_pref_key), 1)) {
-                1 -> ACTION_PLAY_EPISODE_IN_PLAYER
-                2 -> ACTION_PLAY_EPISODE_IN_VLC_PLAYER
-                3 -> ACTION_PLAY_EPISODE_IN_BROWSER
-                4 -> ACTION_PLAY_EPISODE_IN_WEB_VIDEO
-                5 -> ACTION_PLAY_EPISODE_IN_MPV
-                else -> ACTION_PLAY_EPISODE_IN_PLAYER
-            }
+            val playerPref = settingsManager.getString(context.getString(R.string.player_default_key), "")
+            return VideoClickActionHolder.uniqueIdToId(playerPref) ?: ACTION_PLAY_EPISODE_IN_PLAYER
         }
     }
 
@@ -167,8 +158,7 @@ class EpisodeAdapter(
         return cardList.size
     }
 
-    class EpisodeCardViewHolderLarge
-    constructor(
+    class EpisodeCardViewHolderLarge(
         val binding: ResultEpisodeLargeBinding,
         private val hasDownloadSupport: Boolean,
         private val clickCallback: (EpisodeClickEvent) -> Unit,
@@ -237,7 +227,7 @@ class EpisodeAdapter(
                     episodeProgress.isVisible = displayPos > 0L
                 }
 
-                episodePoster.isVisible = episodePoster.setImage(card.poster) == true
+                episodePoster.loadImage(card.poster)
 
                 if (card.rating != null) {
                     episodeRating.text = episodeRating.context?.getString(R.string.rated_format)
@@ -272,9 +262,12 @@ class EpisodeAdapter(
                         episodePlayIcon.isVisible = false
                         episodeUpcomingIcon.isVisible = !episodePoster.isVisible
                         episodeDate.setText(
-                            txt(
+                            com.lagradost.cloudstream3.utils.txt(
                                 R.string.episode_upcoming_format,
-                                secondsToReadable(card.airDate.minus(unixTimeMS).div(1000).toInt(), "")
+                                secondsToReadable(
+                                    card.airDate.minus(unixTimeMS).div(1000).toInt(),
+                                    ""
+                                )
                             )
                         )
                     } else {
@@ -292,6 +285,12 @@ class EpisodeAdapter(
                     episodeDate.isVisible = false
                 }
 
+                episodeRuntime.setText(
+                    txt(
+                        card.runTime?.times(60L)?.toInt()?.let { secondsToReadable(it, "") }
+                    )
+                )
+
                 if (isLayout(EMULATOR or PHONE)) {
                     episodePoster.setOnClickListener {
                         clickCallback.invoke(EpisodeClickEvent(ACTION_CLICK_DEFAULT, card))
@@ -324,8 +323,7 @@ class EpisodeAdapter(
         }
     }
 
-    class EpisodeCardViewHolderSmall
-    constructor(
+    class EpisodeCardViewHolderSmall(
         val binding: ResultEpisodeBinding,
         private val hasDownloadSupport: Boolean,
         private val clickCallback: (EpisodeClickEvent) -> Unit,
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 7b7bae43dfb..eecd6262f0a 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
@@ -8,18 +8,6 @@ import com.lagradost.cloudstream3.databinding.ResultMiniImageBinding
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
 
-/*
-class ImageAdapter(context: Context, val resource: Int) : ArrayAdapter<Int>(context, resource) {
-    override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
-        val newConvertView = convertView ?: run {
-            val mInflater = context
-                .getSystemService(Activity.LAYOUT_INFLATER_SERVICE) as LayoutInflater
-            mInflater.inflate(resource, null)
-        }
-        getItem(position)?.let { (newConvertView as? ImageView?)?.setImageResource(it) }
-        return newConvertView
-    }
-}*/
 const val IMAGE_CLICK = 0
 const val IMAGE_LONG_CLICK = 1
 
@@ -66,8 +54,7 @@ class ImageAdapter(
         diffResult.dispatchUpdatesTo(this)
     }
 
-    class ImageViewHolder
-    constructor(val binding: ResultMiniImageBinding) :
+    class ImageViewHolder(val binding: ResultMiniImageBinding) :
         RecyclerView.ViewHolder(binding.root) {
         fun bind(
             img: Int,
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 c687eaa064d..c12f011831b 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
@@ -51,6 +51,7 @@ data class ResultEpisode(
     /** Sum of all previous season episode counts + episode */
     val totalEpisodeIndex: Int? = null,
     val airDate: Long? = null,
+    val runTime: Int? = null,
 )
 
 fun ResultEpisode.getRealPosition(): Long {
@@ -87,6 +88,7 @@ fun buildResultEpisode(
     parentId: Int,
     totalEpisodeIndex: Int? = null,
     airDate: Long? = null,
+    runTime: Int? = null,
 ): ResultEpisode {
     val posDur = getViewPos(id)
     val videoWatchState = getVideoWatchState(id) ?: VideoWatchState.None
@@ -111,6 +113,7 @@ fun buildResultEpisode(
         videoWatchState,
         totalEpisodeIndex,
         airDate,
+        runTime,
     )
 }
 
@@ -121,6 +124,7 @@ fun ResultEpisode.getWatchProgress(): Float {
 
 object ResultFragment {
     private const val URL_BUNDLE = "url"
+    private const val NAME_BUNDLE = "name"
     private const val API_NAME_BUNDLE = "apiName"
     private const val SEASON_BUNDLE = "season"
     private const val EPISODE_BUNDLE = "episode"
@@ -134,6 +138,7 @@ object ResultFragment {
         return Bundle().apply {
             putString(URL_BUNDLE, card.url)
             putString(API_NAME_BUNDLE, card.apiName)
+            putString(NAME_BUNDLE, card.name)
             if (card is DataStoreHelper.ResumeWatchingResult) {
                 if (card.season != null)
                     putInt(SEASON_BUNDLE, card.season)
@@ -152,12 +157,14 @@ object ResultFragment {
     fun newInstance(
         url: String,
         apiName: String,
+        name : String,
         startAction: Int = 0,
         startValue: Int = 0
     ): Bundle {
         return Bundle().apply {
             putString(URL_BUNDLE, url)
             putString(API_NAME_BUNDLE, apiName)
+            putString(NAME_BUNDLE, name)
             putInt(START_ACTION_BUNDLE, startAction)
             putInt(START_VALUE_BUNDLE, startValue)
             putBoolean(RESTART_BUNDLE, true)
@@ -215,6 +222,7 @@ object ResultFragment {
     data class StoredData(
         val url: String,
         val apiName: String,
+        val name : String,
         val showFillers: Boolean,
         val dubStatus: DubStatus,
         val start: AutoResume?,
@@ -227,6 +235,7 @@ object ResultFragment {
         val settingsManager = PreferenceManager.getDefaultSharedPreferences(context)
         val url = arguments?.getString(URL_BUNDLE) ?: return null
         val apiName = arguments?.getString(API_NAME_BUNDLE) ?: return null
+        val name = arguments?.getString(NAME_BUNDLE) ?: return null
         val showFillers =
             settingsManager.getBoolean(context.getString(R.string.show_fillers_key), false)
         val dubStatus = if (context.getApiDubstatusSettings()
@@ -255,7 +264,7 @@ object ResultFragment {
                 season = resumeSeason
             )
         }
-        return StoredData(url, apiName, showFillers, dubStatus, start, playerAction, restart)
+        return StoredData(url, apiName, name, showFillers, dubStatus, start, playerAction, restart)
     }
 
     /*private fun reloadViewModel(forceReload: Boolean) {
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 2f2970986b1..32c7e425c4d 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
@@ -2,6 +2,7 @@ package com.lagradost.cloudstream3.ui.result
 
 import android.annotation.SuppressLint
 import android.app.Dialog
+import android.content.Context
 import android.content.Intent
 import android.content.res.ColorStateList
 import android.graphics.Rect
@@ -23,6 +24,7 @@ import androidx.core.widget.NestedScrollView
 import androidx.core.widget.doOnTextChanged
 import androidx.lifecycle.ViewModelProvider
 import com.discord.panels.OverlappingPanelsLayout
+import com.discord.panels.PanelState
 import com.discord.panels.PanelsChildGestureRegionObserver
 import com.google.android.gms.cast.framework.CastButtonFactory
 import com.google.android.gms.cast.framework.CastContext
@@ -35,6 +37,7 @@ 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.BottomSelectionDialogBinding
 import com.lagradost.cloudstream3.databinding.FragmentResultBinding
 import com.lagradost.cloudstream3.databinding.FragmentResultSwipeBinding
 import com.lagradost.cloudstream3.databinding.ResultRecommendationsBinding
@@ -63,6 +66,7 @@ import com.lagradost.cloudstream3.utils.AppContextUtils.openBrowser
 import com.lagradost.cloudstream3.utils.AppContextUtils.updateHasTrailers
 import com.lagradost.cloudstream3.utils.BatteryOptimizationChecker.openBatteryOptimizationSettings
 import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.ImageLoader.loadImage
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialog
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialogInstant
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showDialog
@@ -74,15 +78,18 @@ 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 com.lagradost.cloudstream3.utils.UIHelper.setImage
 import com.lagradost.cloudstream3.utils.VideoDownloadHelper
+import com.lagradost.cloudstream3.utils.getImageFromDrawable
+import com.lagradost.cloudstream3.utils.setText
+import com.lagradost.cloudstream3.utils.setTextHtml
 
 open class ResultFragmentPhone : FullScreenPlayer() {
-    private val gestureRegionsListener = object : PanelsChildGestureRegionObserver.GestureRegionsListener {
-        override fun onGestureRegionsUpdate(gestureRegions: List<Rect>) {
-            binding?.resultOverlappingPanels?.setChildGestureRegions(gestureRegions)
+    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
@@ -117,6 +124,14 @@ open class ResultFragmentPhone : FullScreenPlayer() {
         return root
     }
 
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        PanelsChildGestureRegionObserver.Provider.get().apply {
+            resultBinding?.resultCastItems?.let { register(it) }
+        }
+    }
+
     var currentTrailers: List<ExtractorLink> = emptyList()
     var currentTrailerIndex = 0
 
@@ -209,9 +224,6 @@ open class ResultFragmentPhone : FullScreenPlayer() {
     }
 
     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 ->
             resultBinding?.resultCastItems?.let {
                 obs.unregister(it)
@@ -243,6 +255,7 @@ open class ResultFragmentPhone : FullScreenPlayer() {
 
     var selectSeason: String? = null
     var selectEpisodeRange: String? = null
+    var selectSort: EpisodeSortType? = null
 
     private fun setUrl(url: String?) {
         if (url == null) {
@@ -285,6 +298,7 @@ open class ResultFragmentPhone : FullScreenPlayer() {
     override fun onResume() {
         afterPluginsLoadedEvent += ::reloadViewModel
         activity?.let {
+            @Suppress("DEPRECATION")
             it.window?.navigationBarColor =
                 it.colorFromAttribute(R.attr.primaryBlackBackground)
         }
@@ -328,17 +342,26 @@ open class ResultFragmentPhone : FullScreenPlayer() {
         syncModel.addFromUrl(storedData.url)
         val api = APIHolder.getApiFromNameNull(storedData.apiName)
 
-        PanelsChildGestureRegionObserver.Provider.get().apply {
-            resultBinding?.resultCastItems?.let {
-                register(it)
+        // This may not be 100% reliable, and may delay for small period
+        // before resultCastItems will be scrollable again, but this does work
+        // most of the time.
+        binding?.resultOverlappingPanels?.registerEndPanelStateListeners(
+            object : OverlappingPanelsLayout.PanelStateListener {
+                override fun onPanelStateChange(panelState: PanelState) {
+                    PanelsChildGestureRegionObserver.Provider.get().apply {
+                        resultBinding?.resultCastItems?.let { register(it) }
+                    }
+                }
             }
-            addGestureRegionsUpdateListener(gestureRegionsListener)
-        }
-
-
+        )
 
         // ===== ===== =====
 
+        binding?.resultSearch?.isGone = storedData.name.isBlank()
+        binding?.resultSearch?.setOnClickListener {
+            QuickSearchFragment.pushSearch(activity, storedData.name)
+        }
+
         resultBinding?.apply {
             resultReloadConnectionerror.setOnClickListener {
                 viewModel.load(
@@ -386,8 +409,32 @@ open class ResultFragmentPhone : FullScreenPlayer() {
                     { downloadClickEvent ->
                         DownloadButtonSetup.handleDownloadClick(downloadClickEvent)
                     }
+
                 )
 
+            observeNullable(viewModel.selectedSorting) {
+                resultSortButton.setText(it)
+            }
+
+            observe(viewModel.sortSelections) { sort ->
+                resultBinding?.resultSortButton?.setOnClickListener { view ->
+                    view?.context?.let { ctx ->
+                        val names = sort
+                            .mapNotNull { (text, r) ->
+                                r to (text.asStringNull(ctx) ?: return@mapNotNull null)
+                            }
+
+                        activity?.showDialog(
+                            names.map { it.second },
+                            viewModel.selectedSortingIndex.value ?: -1,
+                            "",
+                            false,
+                            {}) { itemId ->
+                            viewModel.setSort(names[itemId].first)
+                        }
+                    }
+                }
+            }
 
             resultScroll.setOnScrollChangeListener(NestedScrollView.OnScrollChangeListener { _, _, scrollY, _, oldScrollY ->
                 val dy = scrollY - oldScrollY
@@ -430,16 +477,20 @@ open class ResultFragmentPhone : FullScreenPlayer() {
                     if (newStatus == null) return@toggleSubscriptionStatus
 
                     val message = if (newStatus) {
-                            // Kinda icky to have this here, but it works.
-                            SubscriptionWorkManager.enqueuePeriodicWork(context)
-                            R.string.subscription_new
-                        } else {
-                            R.string.subscription_deleted
-                        }
+                        // 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(txt(message, name), Toast.LENGTH_SHORT)
+                    val name = (viewModel.page.value as? Resource.Success)?.value?.title
+                        ?: com.lagradost.cloudstream3.utils.txt(R.string.no_data)
+                            .asStringNull(context) ?: ""
+                    showToast(
+                        com.lagradost.cloudstream3.utils.txt(message, name),
+                        Toast.LENGTH_SHORT
+                    )
                 }
                 context?.let { openBatteryOptimizationSettings(it) }
             }
@@ -454,8 +505,12 @@ open class ResultFragmentPhone : FullScreenPlayer() {
                     }
 
                     val name = (viewModel.page.value as? Resource.Success)?.value?.title
-                        ?: txt(R.string.no_data).asStringNull(context) ?: ""
-                    showToast(txt(message, name), Toast.LENGTH_SHORT)
+                        ?: com.lagradost.cloudstream3.utils.txt(R.string.no_data)
+                            .asStringNull(context) ?: ""
+                    showToast(
+                        com.lagradost.cloudstream3.utils.txt(message, name),
+                        Toast.LENGTH_SHORT
+                    )
                 }
             }
             mediaRouteButton.apply {
@@ -473,8 +528,16 @@ open class ResultFragmentPhone : FullScreenPlayer() {
                     if (act.isCastApiAvailable()) {
                         try {
                             CastButtonFactory.setUpMediaRouteButton(act, this)
-                            val castContext = CastContext.getSharedInstance(act.applicationContext)
-                            isGone = castContext.castState == CastState.NO_DEVICES_AVAILABLE
+                            CastContext.getSharedInstance(act.applicationContext) {
+                                it.run()
+                            }.addOnCompleteListener {
+                                isGone = if (it.isSuccessful) {
+                                    it.result.castState == CastState.NO_DEVICES_AVAILABLE
+                                } else {
+                                    true
+                                }
+
+                            }
                             // this shit leaks for some reason
                             //castContext.addCastStateListener { state ->
                             //    media_route_button?.isGone = state == CastState.NO_DEVICES_AVAILABLE
@@ -666,6 +729,9 @@ open class ResultFragmentPhone : FullScreenPlayer() {
         observe(viewModel.page) { data ->
             if (data == null) return@observe
             resultBinding?.apply {
+                PanelsChildGestureRegionObserver.Provider.get().apply {
+                    register(resultCastItems)
+                }
                 (data as? Resource.Success)?.value?.let { d ->
                     resultVpn.setText(d.vpnText)
                     resultInfo.setText(d.metaText)
@@ -681,8 +747,25 @@ open class ResultFragmentPhone : FullScreenPlayer() {
                     resultCastText.setText(d.actorsText)
                     resultNextAiring.setText(d.nextAiringEpisode)
                     resultNextAiringTime.setText(d.nextAiringDate)
-                    resultPoster.setImage(d.posterImage)
-                    resultPosterBackground.setImage(d.posterBackgroundImage)
+                    resultPoster.loadImage(d.posterImage, headers = d.posterHeaders) {
+                        error {
+                            getImageFromDrawable(
+                                context ?: return@error null,
+                                R.drawable.default_cover
+                            )
+                        }
+                    }
+                    resultPosterBackground.loadImage(
+                        d.posterBackgroundImage,
+                        headers = d.posterHeaders
+                    ) {
+                        error {
+                            getImageFromDrawable(
+                                context ?: return@error null,
+                                R.drawable.default_cover
+                            )
+                        }
+                    }
 
                     var isExpanded = false
                     resultDescription.apply {
@@ -716,6 +799,7 @@ open class ResultFragmentPhone : FullScreenPlayer() {
                     }
 
                     binding?.apply {
+                        resultSearch.isGone = d.title.isBlank()
                         resultSearch.setOnClickListener {
                             QuickSearchFragment.pushSearch(activity, d.title)
                         }
@@ -754,7 +838,10 @@ open class ResultFragmentPhone : FullScreenPlayer() {
                 resultReloadConnectionOpenInBrowser.isVisible = data is Resource.Failure
 
                 resultTitle.setOnLongClickListener {
-                    clipboardHelper(txt(R.string.title), resultTitle.text)
+                    clipboardHelper(
+                        com.lagradost.cloudstream3.utils.txt(R.string.title),
+                        resultTitle.text
+                    )
                     true
                 }
             }
@@ -961,12 +1048,12 @@ open class ResultFragmentPhone : FullScreenPlayer() {
 
                 setOnClickListener { fab ->
                     activity?.showBottomDialog(
-                        WatchType.values().map { fab.context.getString(it.stringRes) }.toList(),
+                        WatchType.entries.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], context)
+                        viewModel.updateWatchStatus(WatchType.entries[it], context)
                     }
                 }
             }
@@ -1046,7 +1133,7 @@ open class ResultFragmentPhone : FullScreenPlayer() {
                                 text?.asStringNull(ctx) ?: return@mapNotNull null
                             )
                         }) {
-                        viewModel.changeDubStatus(DubStatus.values()[itemId])
+                        viewModel.changeDubStatus(DubStatus.entries[itemId])
                     }
                 }
             }
@@ -1103,7 +1190,8 @@ open class ResultFragmentPhone : FullScreenPlayer() {
 
     override fun onPause() {
         super.onPause()
-        PanelsChildGestureRegionObserver.Provider.get().addGestureRegionsUpdateListener(gestureRegionsListener)
+        PanelsChildGestureRegionObserver.Provider.get()
+            .addGestureRegionsUpdateListener(gestureRegionsListener)
     }
 
     private fun setRecommendations(rec: List<SearchResponse>?, validApiName: String?) {
@@ -1158,4 +1246,4 @@ open class ResultFragmentPhone : FullScreenPlayer() {
             }
         }
     }
-}
+}
\ 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 a0207060a85..ea055376e78 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
@@ -46,6 +46,7 @@ import com.lagradost.cloudstream3.utils.AppContextUtils.html
 import com.lagradost.cloudstream3.utils.AppContextUtils.isRtl
 import com.lagradost.cloudstream3.utils.AppContextUtils.loadCache
 import com.lagradost.cloudstream3.utils.AppContextUtils.updateHasTrailers
+import com.lagradost.cloudstream3.utils.ImageLoader.loadImage
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialog
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialogInstant
 import com.lagradost.cloudstream3.utils.UIHelper
@@ -53,10 +54,12 @@ 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.setImage
+import com.lagradost.cloudstream3.utils.getImageFromDrawable
+import com.lagradost.cloudstream3.utils.setText
+import com.lagradost.cloudstream3.utils.setTextHtml
 
 class ResultFragmentTv : Fragment() {
-    protected lateinit var viewModel: ResultViewModel2
+    private lateinit var viewModel: ResultViewModel2
     private var binding: FragmentResultTvBinding? = null
 
     override fun onDestroyView() {
@@ -150,7 +153,9 @@ class ResultFragmentTv : Fragment() {
             rec?.map { it.apiName }?.distinct()?.let { apiNames ->
                 // very dirty selection
                 resultRecommendationsFilterSelection.isVisible = apiNames.size > 1
-                resultRecommendationsFilterSelection.update(apiNames.map { txt(it) to it })
+                resultRecommendationsFilterSelection.update(apiNames.map { com.lagradost.cloudstream3.utils.txt(
+                    it
+                ) to it })
                 resultRecommendationsFilterSelection.select(apiNames.indexOf(matchAgainst))
             } ?: run {
                 resultRecommendationsFilterSelection.isVisible = false
@@ -177,6 +182,7 @@ class ResultFragmentTv : Fragment() {
 
     override fun onResume() {
         activity?.let {
+            @Suppress("DEPRECATION")
             it.window?.navigationBarColor =
                 it.colorFromAttribute(R.attr.primaryBlackBackground)
         }
@@ -418,10 +424,6 @@ class ResultFragmentTv : Fragment() {
 
             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,
@@ -583,8 +585,12 @@ class ResultFragmentTv : Fragment() {
                         }
 
                         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)
+                            ?: com.lagradost.cloudstream3.utils.txt(R.string.no_data).asStringNull(context) ?: ""
+                        CommonActivity.showToast(
+                            com.lagradost.cloudstream3.utils.txt(
+                                message,
+                                name
+                            ), Toast.LENGTH_SHORT)
                     }
                 }
             }
@@ -626,8 +632,12 @@ class ResultFragmentTv : Fragment() {
                         }
 
                         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)
+                            ?: com.lagradost.cloudstream3.utils.txt(R.string.no_data).asStringNull(context) ?: ""
+                        CommonActivity.showToast(
+                            com.lagradost.cloudstream3.utils.txt(
+                                message,
+                                name
+                            ), Toast.LENGTH_SHORT)
                     }
                 }
 
@@ -649,7 +659,7 @@ class ResultFragmentTv : Fragment() {
 
             binding?.apply {
 
-                (data as? Resource.Success)?.value?.let { (text, ep) ->
+                (data as? Resource.Success)?.value?.let { (_, ep) ->
 
                     resultPlayMovieButton.setOnClickListener {
                         viewModel.handleAction(
@@ -817,45 +827,8 @@ class ResultFragmentTv : Fragment() {
                         }
                     }
 
-                    /*
-                     * 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()*/
                 }
             }
         }
@@ -880,7 +853,7 @@ class ResultFragmentTv : Fragment() {
                         resultCastText.setText(d.actorsText)
                         resultNextAiring.setText(d.nextAiringEpisode)
                         resultNextAiringTime.setText(d.nextAiringDate)
-                        resultPoster.setImage(d.posterImage)
+                        resultPoster.loadImage(d.posterImage)
 
                         var isExpanded = false
                         resultDescription.apply {
@@ -915,11 +888,9 @@ class ResultFragmentTv : Fragment() {
                         //Change poster crop area to 20% from Top
                         backgroundPoster.cropYCenterOffsetPct = 0.20F
                         
-                        backgroundPoster.setImage(
-                            d.posterBackgroundImage ?: UiImage.Drawable(error),
-                            radius = 0,
-                            errorImageDrawable = error
-                        )
+                        backgroundPoster.loadImage(d.posterBackgroundImage) {
+                            error { getImageFromDrawable(context ?: return@error null, error) }
+                        }
                         comingSoon = d.comingSoon
                         resultTvComingSoon.isVisible = d.comingSoon
 
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 135dc5306d2..5253974e83e 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
@@ -7,7 +7,6 @@ import android.os.Bundle
 import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
-import androidx.activity.OnBackPressedCallback
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import com.lagradost.cloudstream3.CommonActivity.screenHeight
@@ -17,6 +16,8 @@ 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.BackPressedCallbackHelper.attachBackPressedCallback
+import com.lagradost.cloudstream3.utils.BackPressedCallbackHelper.detachBackPressedCallback
 
 open class ResultTrailerPlayer : ResultFragmentPhone() {
 
@@ -156,8 +157,15 @@ open class ResultTrailerPlayer : ResultFragmentPhone() {
         uiReset()
 
         if (isFullScreenPlayer) {
-            attachBackPressedCallback()
-        } else detachBackPressedCallback()
+            activity?.attachBackPressedCallback("ResultTrailerPlayer") {
+                updateFullscreen(false)
+            }
+        } else activity?.detachBackPressedCallback("ResultTrailerPlayer")
+    }
+
+    override fun updateUIVisibility() {
+        super.updateUIVisibility()
+        playerBinding?.playerGoBackHolder?.isVisible = false
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -175,27 +183,4 @@ open class ResultTrailerPlayer : ResultFragmentPhone() {
             fixPlayerSize()
         }
     }
-
-    private var backPressedCallback: OnBackPressedCallback? = null
-
-    private fun attachBackPressedCallback() {
-        if (backPressedCallback == null) {
-            backPressedCallback = object : OnBackPressedCallback(true) {
-                override fun handleOnBackPressed() {
-                    updateFullscreen(false)
-                }
-            }
-        }
-
-        backPressedCallback?.isEnabled = true
-
-        activity?.onBackPressedDispatcher?.addCallback(
-            activity ?: return,
-            backPressedCallback ?: return
-        )
-    }
-
-    private fun detachBackPressedCallback() {
-        backPressedCallback?.isEnabled = false
-    }
 }
\ No newline at end of file
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 8e8dfe30a29..bc2030d4c3a 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
@@ -2,16 +2,11 @@ package com.lagradost.cloudstream3.ui.result
 
 import android.app.Activity
 import android.content.*
-import android.net.Uri
-import android.os.Build
-import android.os.Bundle
 import android.text.format.Formatter.formatFileSize
 import android.util.Log
 import android.widget.Toast
 import androidx.annotation.MainThread
 import androidx.appcompat.app.AlertDialog
-import androidx.core.content.FileProvider
-import androidx.core.net.toUri
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
@@ -30,34 +25,28 @@ import com.lagradost.cloudstream3.LoadResponse.Companion.getAniListId
 import com.lagradost.cloudstream3.LoadResponse.Companion.getMalId
 import com.lagradost.cloudstream3.LoadResponse.Companion.isMovie
 import com.lagradost.cloudstream3.LoadResponse.Companion.readIdFromString
-import com.lagradost.cloudstream3.MainActivity.Companion.MPV
-import com.lagradost.cloudstream3.MainActivity.Companion.MPV_COMPONENT
-import com.lagradost.cloudstream3.MainActivity.Companion.MPV_PACKAGE
-import com.lagradost.cloudstream3.MainActivity.Companion.VLC
-import com.lagradost.cloudstream3.MainActivity.Companion.VLC_COMPONENT
-import com.lagradost.cloudstream3.MainActivity.Companion.VLC_PACKAGE
-import com.lagradost.cloudstream3.MainActivity.Companion.WEB_VIDEO
-import com.lagradost.cloudstream3.MainActivity.Companion.WEB_VIDEO_CAST_PACKAGE
+import com.lagradost.cloudstream3.actions.VideoClickActionHolder
 import com.lagradost.cloudstream3.metaproviders.SyncRedirector
 import com.lagradost.cloudstream3.mvvm.*
 import com.lagradost.cloudstream3.syncproviders.AccountManager
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.secondsToReadable
 import com.lagradost.cloudstream3.syncproviders.SyncAPI
 import com.lagradost.cloudstream3.syncproviders.providers.Kitsu
-import com.lagradost.cloudstream3.syncproviders.providers.SimklApi
 import com.lagradost.cloudstream3.ui.APIRepository
 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.LOADTYPE_ALL
+import com.lagradost.cloudstream3.ui.player.LOADTYPE_CHROMECAST
+import com.lagradost.cloudstream3.ui.player.LOADTYPE_INAPP
+import com.lagradost.cloudstream3.ui.player.LOADTYPE_INAPP_DOWNLOAD
 import com.lagradost.cloudstream3.ui.player.RepoLinkGenerator
 import com.lagradost.cloudstream3.ui.player.SubtitleData
 import com.lagradost.cloudstream3.ui.result.EpisodeAdapter.Companion.getPlayerAction
 import com.lagradost.cloudstream3.ui.subtitles.SubtitlesFragment
 import com.lagradost.cloudstream3.utils.*
 import com.lagradost.cloudstream3.utils.AppContextUtils.getNameFull
-import com.lagradost.cloudstream3.utils.AppContextUtils.isAppInstalled
 import com.lagradost.cloudstream3.utils.AppContextUtils.isConnectedToChromecast
 import com.lagradost.cloudstream3.utils.AppContextUtils.setDefaultFocus
 import com.lagradost.cloudstream3.utils.AppContextUtils.sortSubs
@@ -66,6 +55,7 @@ import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import com.lagradost.cloudstream3.utils.Coroutines.ioWork
 import com.lagradost.cloudstream3.utils.Coroutines.ioWorkSafe
 import com.lagradost.cloudstream3.utils.Coroutines.main
+import com.lagradost.cloudstream3.utils.DataStore.setKey
 import com.lagradost.cloudstream3.utils.DataStoreHelper.deleteBookmarkedData
 import com.lagradost.cloudstream3.utils.DataStoreHelper.getAllBookmarkedData
 import com.lagradost.cloudstream3.utils.DataStoreHelper.getAllFavorites
@@ -91,14 +81,8 @@ import com.lagradost.cloudstream3.utils.DataStoreHelper.setResultWatchState
 import com.lagradost.cloudstream3.utils.DataStoreHelper.setSubscribedData
 import com.lagradost.cloudstream3.utils.DataStoreHelper.setVideoWatchState
 import com.lagradost.cloudstream3.utils.DataStoreHelper.updateSubscribedData
-import com.lagradost.cloudstream3.utils.UIHelper.clipboardHelper
 import com.lagradost.cloudstream3.utils.UIHelper.navigate
-import com.lagradost.cloudstream3.utils.fcast.FcastManager
-import com.lagradost.cloudstream3.utils.fcast.FcastSession
-import com.lagradost.cloudstream3.utils.fcast.Opcode
-import com.lagradost.cloudstream3.utils.fcast.PlayMessage
 import kotlinx.coroutines.*
-import java.io.File
 import java.util.concurrent.TimeUnit
 
 /** This starts at 1 */
@@ -129,8 +113,8 @@ data class ResultData(
     val title: String,
     var syncData: Map<String, String>,
 
-    val posterImage: UiImage?,
-    val posterBackgroundImage: UiImage?,
+    val posterImage: String?,
+    val posterBackgroundImage: String?,
     val plotText: UiText,
     val apiName: UiText,
     val ratingText: UiText?,
@@ -146,6 +130,7 @@ data class ResultData(
     val nextAiringDate: UiText?,
     val nextAiringEpisode: UiText?,
     val plotHeaderText: UiText,
+    val posterHeaders: Map<String, String>? = null,
 )
 
 data class CheckDuplicateData(
@@ -160,6 +145,15 @@ enum class LibraryListType {
     SUBSCRIPTIONS
 }
 
+enum class EpisodeSortType {
+    NUMBER_ASC,
+    NUMBER_DESC,
+    RATING_HIGH_LOW,
+    RATING_LOW_HIGH,
+    DATE_NEWEST,
+    DATE_OLDEST
+}
+
 fun txt(status: DubStatus?): UiText? {
     return txt(
         when (status) {
@@ -230,12 +224,9 @@ fun LoadResponse.toResultData(repo: APIRepository): ResultData {
         ),
         nextAiringDate = nextAiringDate,
         nextAiringEpisode = nextAiringEpisode,
-        posterImage = img(
-            posterUrl, posterHeaders
-        ) ?: img(R.drawable.default_cover),
-        posterBackgroundImage = img(
-            backgroundPosterUrl ?: posterUrl, posterHeaders
-        ) ?: img(R.drawable.default_cover),
+        posterImage = posterUrl ?: backgroundPosterUrl,
+        posterHeaders = posterHeaders,
+        posterBackgroundImage = backgroundPosterUrl ?: posterUrl,
         titleText = txt(name),
         url = url,
         tags = tags ?: emptyList(),
@@ -267,6 +258,8 @@ fun LoadResponse.toResultData(repo: APIRepository): ResultData {
                 TvType.Music -> R.string.music_singlar
                 TvType.AudioBook -> R.string.audio_book_singular
                 TvType.CustomMedia -> R.string.custom_media_singluar
+                TvType.Audio -> R.string.audio_singluar
+                TvType.Podcast -> R.string.podcast_singluar
             }
         ),
         yearText = txt(year?.toString()),
@@ -415,6 +408,7 @@ class ResultViewModel2 : ViewModel() {
     private var currentMeta: SyncAPI.SyncResult? = null
     private var currentSync: Map<String, String>? = null
     private var currentIndex: EpisodeIndexer? = null
+    private var currentSorting: EpisodeSortType? = null
     private var currentRange: EpisodeRange? = null
     private var currentShowFillers: Boolean = false
     var currentRepo: APIRepository? = null
@@ -468,6 +462,18 @@ class ResultViewModel2 : ViewModel() {
         MutableLiveData(null)
     val selectedRange: LiveData<UiText?> = _selectedRange
 
+    private val _selectedSorting: MutableLiveData<UiText?> =
+        MutableLiveData(null)
+    val selectedSorting: LiveData<UiText?> = _selectedSorting
+
+    private val _selectedSortingIndex: MutableLiveData<Int> =
+        MutableLiveData(-1)
+    val selectedSortingIndex: LiveData<Int> = _selectedSortingIndex
+
+    private val _sortSelections: MutableLiveData<List<Pair<UiText, EpisodeSortType>>> =
+        MutableLiveData(emptyList())
+    val sortSelections: LiveData<List<Pair<UiText, EpisodeSortType>>> = _sortSelections
+
     private val _selectedSeason: MutableLiveData<UiText?> =
         MutableLiveData(null)
     val selectedSeason: LiveData<UiText?> = _selectedSeason
@@ -514,7 +520,7 @@ class ResultViewModel2 : ViewModel() {
 
         private fun filterName(name: String?): String? {
             if (name == null) return null
-            Regex("[eE]pisode [0-9]*(.*)").find(name)?.groupValues?.get(1)?.let {
+            Regex("^[eE]pisode [0-9]*(.*)").find(name)?.groupValues?.get(1)?.let {
                 if (it.isEmpty())
                     return null
             }
@@ -651,24 +657,10 @@ class ResultViewModel2 : ViewModel() {
         }
 
         private fun getFolder(currentType: TvType, titleName: String): String {
-            val sanitizedFileName = VideoDownloadManager.sanitizeFilename(titleName)
-            return when (currentType) {
-                TvType.Anime -> "Anime/$sanitizedFileName"
-                TvType.Movie -> "Movies"
-                TvType.AnimeMovie -> "Movies"
-                TvType.TvSeries -> "TVSeries/$sanitizedFileName"
-                TvType.OVA -> "OVA"
-                TvType.Cartoon -> "Cartoons/$sanitizedFileName"
-                TvType.Torrent -> "Torrent"
-                TvType.Documentary -> "Documentaries"
-                TvType.AsianDrama -> "AsianDrama"
-                TvType.Live -> "LiveStreams"
-                TvType.NSFW -> "NSFW"
-                TvType.Others -> "Others"
-                TvType.Music -> "Music"
-                TvType.AudioBook -> "AudioBooks"
-                TvType.CustomMedia -> "Media"
-            }
+            return if (currentType.isEpisodeBased()) {
+                val sanitizedFileName = VideoDownloadManager.sanitizeFilename(titleName)
+                "${currentType.getFolderPrefix()}/$sanitizedFileName"
+            } else currentType.getFolderPrefix()
         }
 
         private fun downloadSubtitle(
@@ -800,13 +792,17 @@ class ResultViewModel2 : ViewModel() {
                 val generator = RepoLinkGenerator(listOf(episode))
                 val currentLinks = mutableSetOf<ExtractorLink>()
                 val currentSubs = mutableSetOf<SubtitleData>()
-                generator.generateLinks(clearCache = false, LoadType.Chromecast, callback = {
-                    it.first?.let { link ->
-                        currentLinks.add(link)
-                    }
-                }, subtitleCallback = { sub ->
-                    currentSubs.add(sub)
-                })
+                generator.generateLinks(
+                    clearCache = false,
+                    allowedTypes = LOADTYPE_INAPP_DOWNLOAD,
+                    callback = {
+                        it.first?.let { link ->
+                            currentLinks.add(link)
+                        }
+                    },
+                    subtitleCallback = { sub ->
+                        currentSubs.add(sub)
+                    })
 
                 if (currentLinks.isEmpty()) {
                     main {
@@ -951,7 +947,12 @@ class ResultViewModel2 : ViewModel() {
         isVisible: Boolean = true
     ) {
         if (activity == null) return
-        loadLinks(result, isVisible = isVisible, LoadType.Chromecast) { data ->
+        loadLinks(
+            result,
+            isVisible = isVisible,
+            sourceTypes = LOADTYPE_CHROMECAST,
+            isCasting = true
+        ) { data ->
             startChromecast(activity, result, data.links, data.subs, 0)
         }
     }
@@ -1213,17 +1214,19 @@ class ResultViewModel2 : ViewModel() {
 
     private fun getImdbIdFromSyncData(syncData: Map<String, String>?): String? {
         return normalSafeApiCall {
-            readIdFromString(
+            val imdbId = readIdFromString(
                 syncData?.get(AccountManager.simklApi.idPrefix)
             )[SimklSyncServices.Imdb]
+            if (imdbId == "null") null else imdbId
         }
     }
 
     private fun getTMDbIdFromSyncData(syncData: Map<String, String>?): String? {
         return normalSafeApiCall {
-            readIdFromString(
+            val tmdbId = readIdFromString(
                 syncData?.get(AccountManager.simklApi.idPrefix)
             )[SimklSyncServices.Tmdb]
+            if (tmdbId == "null") null else tmdbId
         }
     }
 
@@ -1261,7 +1264,7 @@ class ResultViewModel2 : ViewModel() {
         _loadedLinks.postValue(null)
     }
 
-    private fun postPopup(text: UiText, options: List<UiText>, callback: suspend (Int?) -> Unit) {
+    fun postPopup(text: UiText, options: List<UiText>, callback: suspend (Int?) -> Unit) {
         _selectPopup.postValue(
             SelectPopup.SelectText(
                 text,
@@ -1297,8 +1300,9 @@ class ResultViewModel2 : ViewModel() {
     private fun loadLinks(
         result: ResultEpisode,
         isVisible: Boolean,
-        type: LoadType,
+        sourceTypes: Set<ExtractorLinkType> = LOADTYPE_ALL,
         clearCache: Boolean = false,
+        isCasting: Boolean = false,
         work: suspend (CoroutineScope.(LinkLoadingResult) -> Unit)
     ) {
         currentLoadLinkJob?.cancel()
@@ -1306,8 +1310,9 @@ class ResultViewModel2 : ViewModel() {
             val links = loadLinks(
                 result,
                 isVisible = isVisible,
-                type = type,
-                clearCache = clearCache
+                sourceTypes = sourceTypes,
+                clearCache = clearCache,
+                isCasting = isCasting
             )
             if (!this.isActive) return@ioSafe
             work(links)
@@ -1317,11 +1322,12 @@ class ResultViewModel2 : ViewModel() {
     private var currentLoadLinkJob: Job? = null
     private fun acquireSingleLink(
         result: ResultEpisode,
-        type: LoadType,
+        sourceTypes: Set<ExtractorLinkType>,
         text: UiText,
-        callback: (Pair<LinkLoadingResult, Int>) -> Unit,
+        isCasting: Boolean = false,
+        callback: (Pair<LinkLoadingResult, Int>) -> Unit
     ) {
-        loadLinks(result, isVisible = true, type) { links ->
+        loadLinks(result, isVisible = true, sourceTypes, isCasting = isCasting) { links ->
             // Could not find a better way to do this
             val context = AcraApplication.context
             postPopup(
@@ -1341,7 +1347,7 @@ class ResultViewModel2 : ViewModel() {
         text: UiText,
         callback: (Pair<LinkLoadingResult, Int>) -> Unit,
     ) {
-        loadLinks(result, isVisible = true, type = LoadType.Unknown) { links ->
+        loadLinks(result, isVisible = true) { links ->
             postPopup(
                 text,
                 links.subs.map { txt(it.name) })
@@ -1354,8 +1360,9 @@ class ResultViewModel2 : ViewModel() {
     private suspend fun CoroutineScope.loadLinks(
         result: ResultEpisode,
         isVisible: Boolean,
-        type: LoadType,
+        sourceTypes: Set<ExtractorLinkType> = LOADTYPE_ALL,
         clearCache: Boolean = false,
+        isCasting: Boolean = false
     ): LinkLoadingResult {
         val tempGenerator = RepoLinkGenerator(listOf(result))
 
@@ -1368,15 +1375,21 @@ class ResultViewModel2 : ViewModel() {
         }
         try {
             updatePage()
-            tempGenerator.generateLinks(clearCache, type, { (link, _) ->
-                if (link != null) {
-                    links += link
+            tempGenerator.generateLinks(
+                clearCache,
+                allowedTypes = sourceTypes,
+                callback = { (link, _) ->
+                    if (link != null) {
+                        links += link
+                        updatePage()
+                    }
+                },
+                subtitleCallback = { sub ->
+                    subs += sub
                     updatePage()
-                }
-            }, { sub ->
-                subs += sub
-                updatePage()
-            })
+                },
+                isCasting = isCasting
+            )
         } catch (e: Exception) {
             logError(e)
         } finally {
@@ -1386,161 +1399,11 @@ class ResultViewModel2 : ViewModel() {
         return LinkLoadingResult(sortUrls(links), sortSubs(subs))
     }
 
-    private fun launchActivity(
-        activity: Activity?,
-        resumeApp: MainActivity.Companion.ResultResume,
-        id: Int? = null,
-        work: suspend (Intent.(Activity) -> Unit)
-    ): Job? {
-        val act = activity ?: return null
-        return CoroutineScope(Dispatchers.IO).launch {
-            try {
-                resumeApp.launch(id) {
-                    work(act)
-                }
-            } catch (t: Throwable) {
-                logError(t)
-                main {
-                    if (t is ActivityNotFoundException) {
-                        showToast(txt(R.string.app_not_found_error), Toast.LENGTH_LONG)
-                    } else {
-                        showToast(t.toString(), Toast.LENGTH_LONG)
-                    }
-                }
-            }
-        }
-    }
-
-    private fun playInWebVideo(
-        activity: Activity?,
-        link: ExtractorLink,
-        title: String?,
-        posterUrl: String?,
-        subtitles: List<SubtitleData>
-    ) = launchActivity(activity, WEB_VIDEO) {
-        setDataAndType(Uri.parse(link.url), "video/*")
-
-        putExtra("subs", subtitles.map { it.url.toUri() }.toTypedArray())
-        title?.let { putExtra("title", title) }
-        posterUrl?.let { putExtra("poster", posterUrl) }
-        val headers = Bundle().apply {
-            if (link.referer.isNotBlank())
-                putString("Referer", link.referer)
-            putString("User-Agent", USER_AGENT)
-            for ((key, value) in link.headers) {
-                putString(key, value)
-            }
-        }
-        putExtra("android.media.intent.extra.HTTP_HEADERS", headers)
-        putExtra("secure_uri", true)
-    }
-
-    private fun playWithMpv(
-        activity: Activity?,
-        id: Int,
-        link: ExtractorLink,
-        subtitles: List<SubtitleData>,
-        resume: Boolean = true,
-    ) = launchActivity(activity, MPV, id) {
-        putExtra("subs", subtitles.map { it.url.toUri() }.toTypedArray())
-        putExtra("subs.name", subtitles.map { it.name }.toTypedArray())
-        putExtra("subs.filename", subtitles.map { it.name }.toTypedArray())
-        setDataAndType(Uri.parse(link.url), "video/*")
-        component = MPV_COMPONENT
-        putExtra("secure_uri", true)
-        putExtra("return_result", true)
-        val position = getViewPos(id)?.position
-        if (resume && position != null)
-            putExtra("position", position.toInt())
-    }
-
-    // https://wiki.videolan.org/Android_Player_Intents/
-    private fun playWithVlc(
-        activity: Activity?,
-        data: LinkLoadingResult,
-        id: Int,
-        resume: Boolean = true,
-        // if it is only a single link then resume works correctly
-        singleFile: Boolean? = null
-    ) = launchActivity(activity, VLC, id) { act ->
-        addFlags(Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION)
-        addFlags(Intent.FLAG_GRANT_PREFIX_URI_PERMISSION)
-        addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
-        addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
-
-        val outputDir = act.cacheDir
-
-        if (singleFile ?: (data.links.size == 1)) {
-            setDataAndType(data.links.first().url.toUri(), "video/*")
-        } else {
-            val outputFile = File.createTempFile("mirrorlist", ".m3u8", outputDir)
-
-            var text = "#EXTM3U"
-
-            // With subtitles it doesn't work for no reason :(
-//            for (sub in data.subs) {
-//                text += "\n#EXT-X-MEDIA:TYPE=SUBTITLES,GROUP-ID=\"subs\",NAME=\"${sub.name}\",DEFAULT=NO,AUTOSELECT=NO,FORCED=NO,LANGUAGE=\"${sub.name}\",URI=\"${sub.url}\""
-//            }
-            for (link in data.links) {
-                text += "\n#EXTINF:, ${link.name}\n${link.url}"
-            }
-            outputFile.writeText(text)
-
-            setDataAndType(
-                FileProvider.getUriForFile(
-                    act,
-                    act.applicationContext.packageName + ".provider",
-                    outputFile
-                ), "video/*"
-            )
-        }
-
-        val position = if (resume) {
-            getViewPos(id)?.position ?: 0L
-        } else {
-            1L
-        }
-
-        // Component no longer safe to use in A13 for VLC
-        // https://code.videolan.org/videolan/vlc-android/-/issues/2776
-        // This will likely need to be updated once VLC fixes their documentation.
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
-            component = VLC_COMPONENT
-        }
-
-        putExtra("from_start", !resume)
-        putExtra("position", position)
-    }
-
-
     fun handleAction(click: EpisodeClickEvent) =
         viewModelScope.launchSafe {
             handleEpisodeClickEvent(click)
         }
 
-    data class ExternalApp(
-        val packageString: String,
-        val name: Int,
-        val action: Int,
-    )
-
-    private val apps = listOf(
-        ExternalApp(
-            VLC_PACKAGE,
-            R.string.player_settings_play_in_vlc,
-            ACTION_PLAY_EPISODE_IN_VLC_PLAYER
-        ), ExternalApp(
-            WEB_VIDEO_CAST_PACKAGE,
-            R.string.player_settings_play_in_web,
-            ACTION_PLAY_EPISODE_IN_WEB_VIDEO
-        ),
-        ExternalApp(
-            MPV_PACKAGE,
-            R.string.player_settings_play_in_mpv,
-            ACTION_PLAY_EPISODE_IN_MPV
-        )
-    )
-
     fun releaseEpisodeSynopsis() {
         _episodeSynopsis.postValue(null)
     }
@@ -1549,6 +1412,7 @@ class ResultViewModel2 : ViewModel() {
         when (click.action) {
             ACTION_SHOW_OPTIONS -> {
                 val options = mutableListOf<Pair<UiText, Int>>()
+
                 if (activity?.isConnectedToChromecast() == true) {
                     options.addAll(
                         listOf(
@@ -1558,29 +1422,10 @@ class ResultViewModel2 : ViewModel() {
                     )
                 }
 
-                if (FcastManager.currentDevices.isNotEmpty()) {
-                    options.add(
-                        txt(R.string.player_settings_play_in_fcast) to ACTION_FCAST
-                    )
-                }
-
                 options.add(txt(R.string.episode_action_play_in_app) to ACTION_PLAY_EPISODE_IN_PLAYER)
 
-                for (app in apps) {
-                    if (activity?.isAppInstalled(app.packageString) == true) {
-                        options.add(
-                            txt(
-                                R.string.episode_action_play_in_format,
-                                txt(app.name)
-                            ) to app.action
-                        )
-                    }
-                }
-
                 options.addAll(
                     listOf(
-                        txt(R.string.episode_action_play_in_browser) to ACTION_PLAY_EPISODE_IN_BROWSER,
-                        txt(R.string.episode_action_copy_link) to ACTION_COPY_LINK,
                         txt(R.string.episode_action_auto_download) to ACTION_DOWNLOAD_EPISODE,
                         txt(R.string.episode_action_download_mirror) to ACTION_DOWNLOAD_MIRROR,
                         txt(R.string.episode_action_download_subtitle) to ACTION_DOWNLOAD_EPISODE_SUBTITLE_MIRROR,
@@ -1588,6 +1433,10 @@ class ResultViewModel2 : ViewModel() {
                     )
                 )
 
+                options.addAll(
+                    VideoClickActionHolder.makeOptionMap(activity, click.data)
+                )
+
                 // Do not add mark as watched on movies
                 if (!listOf(TvType.Movie, TvType.AnimeMovie).contains(click.data.tvType)) {
                     val isWatched =
@@ -1689,7 +1538,7 @@ class ResultViewModel2 : ViewModel() {
                 val response = currentResponse ?: return
                 acquireSingleLink(
                     click.data,
-                    LoadType.InAppDownload,
+                    LOADTYPE_INAPP_DOWNLOAD,
                     txt(R.string.episode_action_download_mirror)
                 ) { (result, index) ->
                     ioSafe {
@@ -1719,7 +1568,7 @@ class ResultViewModel2 : ViewModel() {
                     loadLinks(
                         click.data,
                         isVisible = false,
-                        type = LoadType.InApp,
+                        LOADTYPE_INAPP,
                         clearCache = true
                     )
                 }
@@ -1732,123 +1581,18 @@ class ResultViewModel2 : ViewModel() {
             ACTION_CHROME_CAST_MIRROR -> {
                 acquireSingleLink(
                     click.data,
-                    LoadType.Chromecast,
-                    txt(R.string.episode_action_chromecast_mirror)
+                    LOADTYPE_CHROMECAST,
+                    txt(R.string.episode_action_chromecast_mirror),
+                    isCasting = true
                 ) { (result, index) ->
                     startChromecast(activity, click.data, result.links, result.subs, index)
                 }
             }
 
-            ACTION_FCAST -> {
-                val devices = FcastManager.currentDevices.toList()
-                postPopup(
-                    txt(R.string.player_settings_select_cast_device),
-                    devices.map { txt(it.name) }) { index ->
-                    if (index == null) return@postPopup
-                    val device = devices.getOrNull(index)
-
-                    acquireSingleLink(
-                        click.data,
-                        LoadType.Fcast,
-                        txt(R.string.episode_action_cast_mirror)
-                    ) { (result, index) ->
-                        val host = device?.host ?: return@acquireSingleLink
-                        val link = result.links.getOrNull(index) ?: return@acquireSingleLink
-
-                        FcastSession(host).use { session ->
-                            session.sendMessage(
-                                Opcode.Play,
-                                PlayMessage(
-                                    link.type.getMimeType(),
-                                    link.url,
-                                    headers = mapOf(
-                                        "referer" to link.referer,
-                                        "user-agent" to USER_AGENT
-                                    ) + link.headers
-                                )
-                            )
-                        }
-                    }
-                }
-            }
-
-            ACTION_PLAY_EPISODE_IN_BROWSER -> acquireSingleLink(
-                click.data,
-                LoadType.Browser,
-                txt(R.string.episode_action_play_in_browser)
-            ) { (result, index) ->
-                try {
-                    val i = Intent(Intent.ACTION_VIEW)
-                    i.data = Uri.parse(result.links[index].url)
-                    activity?.startActivity(i)
-                } catch (e: Exception) {
-                    logError(e)
-                }
-            }
-
-            ACTION_COPY_LINK -> {
-                acquireSingleLink(
-                    click.data,
-                    LoadType.ExternalApp,
-                    txt(R.string.episode_action_copy_link)
-                ) { (result, index) ->
-                    val link = result.links[index]
-                    clipboardHelper(txt(link.name), link.url)
-                }
-            }
-
             ACTION_CHROME_CAST_EPISODE -> {
                 startChromecast(activity, click.data)
             }
 
-            ACTION_PLAY_EPISODE_IN_VLC_PLAYER -> {
-                loadLinks(click.data, isVisible = true, LoadType.ExternalApp) { links ->
-                    if (links.links.isEmpty()) {
-                        showToast(R.string.no_links_found_toast, Toast.LENGTH_SHORT)
-                        return@loadLinks
-                    }
-
-                    playWithVlc(
-                        activity,
-                        links,
-                        click.data.id
-                    )
-                }
-            }
-
-            ACTION_PLAY_EPISODE_IN_WEB_VIDEO -> acquireSingleLink(
-                click.data,
-                LoadType.Chromecast,
-                txt(
-                    R.string.episode_action_play_in_format,
-                    txt(R.string.player_settings_play_in_web)
-                )
-            ) { (result, index) ->
-                playInWebVideo(
-                    activity,
-                    result.links[index],
-                    click.data.name ?: click.data.headerName,
-                    click.data.poster,
-                    result.subs
-                )
-            }
-
-            ACTION_PLAY_EPISODE_IN_MPV -> acquireSingleLink(
-                click.data,
-                LoadType.Chromecast,
-                txt(
-                    R.string.episode_action_play_in_format,
-                    txt(R.string.player_settings_play_in_mpv)
-                )
-            ) { (result, index) ->
-                playWithMpv(
-                    activity,
-                    click.data.id,
-                    result.links[index],
-                    result.subs
-                )
-            }
-
             ACTION_PLAY_EPISODE_IN_PLAYER -> {
                 val data = currentResponse?.syncData?.toList() ?: emptyList()
                 val list =
@@ -1864,7 +1608,7 @@ class ResultViewModel2 : ViewModel() {
                 if (currentResponse?.type == TvType.CustomMedia) {
                     generator?.generateLinks(
                         clearCache = true,
-                        LoadType.Unknown,
+                        LOADTYPE_ALL,
                         callback = {},
                         subtitleCallback = {})
                 } else {
@@ -1890,6 +1634,35 @@ class ResultViewModel2 : ViewModel() {
                 // Kinda dirty to reload all episodes :(
                 reloadEpisodes()
             }
+
+            else -> {
+                val action = VideoClickActionHolder.getActionById(click.action) ?: return
+
+                activity?.setKey("last_click_action", action.uniqueId())
+                if (action.oneSource) {
+                    acquireSingleLink(
+                        click.data,
+                        action.sourceTypes,
+                        action.name
+                    ) { (result, index) ->
+                        action.runActionSafe(
+                            activity,
+                            click.data,
+                            result,
+                            index
+                        )
+                    }
+                } else {
+                    loadLinks(click.data, isVisible = true, action.sourceTypes) { links ->
+                        action.runActionSafe(
+                            activity,
+                            click.data,
+                            links,
+                            null
+                        )
+                    }
+                }
+            }
         }
     }
 
@@ -1997,7 +1770,7 @@ class ResultViewModel2 : ViewModel() {
                             isResponseRequired = false
                         )
                     if (map.isNullOrEmpty()) return@argamap
-                    updateEpisodes = DubStatus.values().map { dubStatus ->
+                    updateEpisodes = DubStatus.entries.map { dubStatus ->
                         val current =
                             this.episodes[dubStatus]?.mapIndexed { index, episode ->
                                 episode.apply {
@@ -2066,15 +1839,21 @@ class ResultViewModel2 : ViewModel() {
     }
 
     fun changeDubStatus(status: DubStatus) {
-        postEpisodeRange(currentIndex?.copy(dubStatus = status), currentRange)
+        postEpisodeRange(currentIndex?.copy(dubStatus = status), currentRange, currentSorting ?: DataStoreHelper.resultsSortingMode)
     }
 
     fun changeRange(range: EpisodeRange) {
-        postEpisodeRange(currentIndex, range)
+        postEpisodeRange(currentIndex, range, currentSorting ?: DataStoreHelper.resultsSortingMode)
     }
 
     fun changeSeason(season: Int) {
-        postEpisodeRange(currentIndex?.copy(season = season), currentRange)
+        postEpisodeRange(currentIndex?.copy(season = season), currentRange, currentSorting ?: DataStoreHelper.resultsSortingMode)
+    }
+
+    fun setSort(sortType: EpisodeSortType) {
+        // we only update here as postEpisodeRange might change the sorting mode if it does not fit
+        DataStoreHelper.resultsSortingMode = sortType
+        postEpisodeRange(currentIndex, currentRange, sortType)
     }
 
     private fun getMovie(): ResultEpisode? {
@@ -2084,26 +1863,37 @@ class ResultViewModel2 : ViewModel() {
         }
     }
 
-    private fun getEpisodes(indexer: EpisodeIndexer, range: EpisodeRange): List<ResultEpisode> {
-        val startIndex = range.startIndex
-        val length = range.length
-
-        return currentEpisodes[indexer]
-            ?.let { list ->
-                val start = minOf(list.size, startIndex)
-                val end = minOf(list.size, start + length)
-                list.subList(start, end).map {
-                    val posDur = getViewPos(it.id)
-                    val watchState =
-                        getVideoWatchState(it.id) ?: VideoWatchState.None
-                    it.copy(
-                        position = posDur?.position ?: 0,
-                        duration = posDur?.duration ?: 0,
-                        videoWatchState = watchState
-                    )
-                }
+    private fun getEpisodes(
+        indexer: EpisodeIndexer,
+        range: EpisodeRange,
+    ): List<ResultEpisode> {
+        return currentEpisodes[indexer]?.let { list ->
+            val start = minOf(list.size, range.startIndex)
+            val end = minOf(list.size, start + range.length)
+            list.subList(start, end).map {
+                val posDur = getViewPos(it.id)
+                val watchState = getVideoWatchState(it.id) ?: VideoWatchState.None
+                it.copy(
+                    position = posDur?.position ?: 0,
+                    duration = posDur?.duration ?: 0,
+                    videoWatchState = watchState
+                )
             }
-            ?: emptyList()
+        } ?: emptyList()
+    }
+
+    private fun getSortedEpisodes(
+        episodes: List<ResultEpisode>,
+        sorting: EpisodeSortType
+    ): List<ResultEpisode> {
+        return when (sorting) {
+            EpisodeSortType.NUMBER_ASC -> episodes.sortedBy { it.episode }
+            EpisodeSortType.NUMBER_DESC -> episodes.sortedByDescending { it.episode }
+            EpisodeSortType.RATING_HIGH_LOW -> episodes.sortedByDescending { it.rating ?: 0 }
+            EpisodeSortType.RATING_LOW_HIGH -> episodes.sortedBy { it.rating ?: 0 }
+            EpisodeSortType.DATE_NEWEST -> episodes.sortedByDescending { it.airDate }
+            EpisodeSortType.DATE_OLDEST -> episodes.sortedBy { it.airDate }
+        }
     }
 
     private fun postMovie() {
@@ -2142,9 +1932,11 @@ class ResultViewModel2 : ViewModel() {
         } else {
             _episodes.postValue(
                 Resource.Success(
-                    getEpisodes(
-                        currentIndex ?: return,
-                        currentRange ?: return
+                    getSortedEpisodes(
+                        getEpisodes(
+                            currentIndex ?: return,
+                            currentRange ?: return,
+                        ), currentSorting ?: return
                     )
                 )
             )
@@ -2163,7 +1955,7 @@ class ResultViewModel2 : ViewModel() {
         // lets say that we have subscribed, then we must be able to unsubscribe no matter what
         else if (data != null) {
             _subscribeStatus.postValue(true)
-        }
+        } else _subscribeStatus.postValue(null)
     }
 
     private fun postFavorites(loadResponse: LoadResponse) {
@@ -2172,8 +1964,24 @@ class ResultViewModel2 : ViewModel() {
         _favoriteStatus.postValue(isFavorite)
     }
 
-    private fun postEpisodeRange(indexer: EpisodeIndexer?, range: EpisodeRange?) {
-        if (range == null || indexer == null) {
+    private fun shouldEnableSort(type: EpisodeSortType, episodes: List<ResultEpisode>?): Boolean {
+        if (episodes.isNullOrEmpty()) return false
+        return when (type) {
+            EpisodeSortType.NUMBER_ASC, EpisodeSortType.NUMBER_DESC -> true
+            EpisodeSortType.RATING_HIGH_LOW, EpisodeSortType.RATING_LOW_HIGH ->
+                episodes.any { it.rating != null }
+
+            EpisodeSortType.DATE_NEWEST, EpisodeSortType.DATE_OLDEST ->
+                episodes.any { it.airDate != null }
+        }
+    }
+
+    private fun postEpisodeRange(
+        indexer: EpisodeIndexer?,
+        range: EpisodeRange?,
+        sorting: EpisodeSortType?
+    ) {
+        if (range == null || indexer == null || sorting == null) {
             return
         }
 
@@ -2181,10 +1989,10 @@ class ResultViewModel2 : ViewModel() {
 
         if (ranges?.contains(range) != true) {
             // if the current ranges does not include the range then select the range with the closest matching start episode
-            // this usually happends when dub has less episodes then sub -> the range does not exist
+            // this usually happens when dub has less episodes then sub -> the range does not exist
             ranges?.minByOrNull { kotlin.math.abs(it.startEpisode - range.startEpisode) }
                 ?.let { r ->
-                    postEpisodeRange(indexer, r)
+                    postEpisodeRange(indexer, r, sorting)
                     return
                 }
         }
@@ -2287,16 +2095,64 @@ class ResultViewModel2 : ViewModel() {
         }
 
         if (isMovie) {
+            _sortSelections.postValue(emptyList())
+            _selectedSortingIndex.postValue(-1)
+            _selectedSorting.postValue(null)
+
             postMovie()
         } else {
             val ret = getEpisodes(indexer, range)
-            /*if (ret.isEmpty()) {
-                val index = ranges?.indexOf(range)
-                if(index != null && index > 0) {
 
+            if (ret.size <= 1) {
+                // we cant sort on an empty list or a list with only 1 episode
+                _sortSelections.postValue(emptyList())
+                _selectedSortingIndex.postValue(-1)
+                _selectedSorting.postValue(null)
+                _episodes.postValue(Resource.Success(ret))
+            } else {
+                val sortOptions = mutableListOf<Pair<UiText, EpisodeSortType>>().apply {
+                    // Episode number sorting is always available
+                    add(txt(R.string.sort_episodes_number_asc) to EpisodeSortType.NUMBER_ASC)
+                    add(txt(R.string.sort_episodes_number_desc) to EpisodeSortType.NUMBER_DESC)
+
+                    // Only add rating options if any episodes have ratings
+                    if (shouldEnableSort(EpisodeSortType.RATING_HIGH_LOW, ret)) {
+                        add(txt(R.string.sort_episodes_rating_high_low) to EpisodeSortType.RATING_HIGH_LOW)
+                        add(txt(R.string.sort_episodes_rating_low_high) to EpisodeSortType.RATING_LOW_HIGH)
+                    }
+
+                    // Only add air date options if any episodes have air dates
+                    if (shouldEnableSort(EpisodeSortType.DATE_NEWEST, ret)) {
+                        add(txt(R.string.sort_episodes_date_newest) to EpisodeSortType.DATE_NEWEST)
+                        add(txt(R.string.sort_episodes_date_oldest) to EpisodeSortType.DATE_OLDEST)
+                    }
                 }
-            }*/
-            _episodes.postValue(Resource.Success(ret))
+
+                var sortIndex = sortOptions.indexOfFirst { it.second == sorting }
+
+                // correct the sorting order so if we have a selected that is not possible we just choose the default NUMBER_ASC
+                val correctedSorting = if (sortIndex == -1) {
+                    sortIndex = 0
+                    EpisodeSortType.NUMBER_ASC
+                } else {
+                    sorting
+                }
+
+                currentSorting = correctedSorting
+                _sortSelections.postValue(sortOptions)
+                _selectedSortingIndex.postValue(sortIndex)
+                _selectedSorting.postValue(
+                    when (correctedSorting) {
+                        EpisodeSortType.NUMBER_ASC -> txt(R.string.sort_button_episode, "↑")
+                        EpisodeSortType.NUMBER_DESC -> txt(R.string.sort_button_episode, "↓")
+                        EpisodeSortType.RATING_HIGH_LOW -> txt(R.string.sort_button_rating, "↓")
+                        EpisodeSortType.RATING_LOW_HIGH -> txt(R.string.sort_button_rating, "↑")
+                        EpisodeSortType.DATE_NEWEST -> txt(R.string.sort_button_date, "↓")
+                        EpisodeSortType.DATE_OLDEST -> txt(R.string.sort_button_date, "↑")
+                    }
+                )
+                _episodes.postValue(Resource.Success(getSortedEpisodes(ret, correctedSorting)))
+            }
         }
     }
 
@@ -2371,7 +2227,8 @@ class ResultViewModel2 : ViewModel() {
                                     loadResponse.type,
                                     mainId,
                                     totalIndex,
-                                    airDate = i.date
+                                    airDate = i.date,
+                                    runTime = i.runTime,
                                 )
 
                             val season = eps.seasonIndex ?: 0
@@ -2426,7 +2283,8 @@ class ResultViewModel2 : ViewModel() {
                                 loadResponse.type,
                                 mainId,
                                 totalIndex,
-                                airDate = episode.date
+                                airDate = episode.date,
+                                runTime = episode.runTime,
                             )
 
                         val season = ep.seasonIndex ?: 0
@@ -2561,7 +2419,7 @@ class ResultViewModel2 : ViewModel() {
             it.startEpisode >= (preferStartEpisode ?: 0)
         } ?: ranger?.lastOrNull()
 
-        postEpisodeRange(min, range)
+        postEpisodeRange(min, range, DataStoreHelper.resultsSortingMode)
         postResume()
     }
 
@@ -2632,6 +2490,7 @@ class ResultViewModel2 : ViewModel() {
                                     trailerData.extractorUrl,
                                     trailerData.referer ?: "",
                                     Qualities.Unknown.value,
+                                    headers = trailerData.headers,
                                     type = INFER_TYPE
                                 )
                             ) to arrayListOf()
@@ -2721,7 +2580,7 @@ class ResultViewModel2 : ViewModel() {
         val id: Int?,
     ) : LoadResponse
 
-    fun loadSmall(activity: Activity?, searchResponse: SearchResponse) = ioSafe {
+    fun loadSmall(searchResponse: SearchResponse) = ioSafe {
         val url = searchResponse.url
         _page.postValue(Resource.Loading(url))
         _episodes.postValue(Resource.Loading())
@@ -2859,4 +2718,4 @@ class ResultViewModel2 : ViewModel() {
                 }
             }
         }
-}
+}
\ 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 5a23bfc165b..ad5d89d18e5 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
@@ -8,6 +8,8 @@ import com.google.android.material.button.MaterialButton
 import com.lagradost.cloudstream3.databinding.ResultSelectionBinding
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
+import com.lagradost.cloudstream3.utils.UiText
+import com.lagradost.cloudstream3.utils.setText
 
 typealias SelectData = Pair<UiText?, Any>
 
@@ -63,8 +65,7 @@ class SelectAdaptor(val callback: (Any) -> Unit) : RecyclerView.Adapter<Recycler
     }
 
 
-    private class SelectViewHolder
-    constructor(
+    private class SelectViewHolder(
         binding: ResultSelectionBinding,
     ) :
         RecyclerView.ViewHolder(binding.root) {
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 b516348dad1..f318401c092 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
@@ -11,7 +11,7 @@ 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.UIHelper.IsBottomLayout
+import com.lagradost.cloudstream3.utils.UIHelper.isBottomLayout
 import com.lagradost.cloudstream3.utils.UIHelper.toPx
 import kotlin.math.roundToInt
 
@@ -41,7 +41,7 @@ class SearchAdapter(
         val inflater = LayoutInflater.from(parent.context)
 
         val layout =
-            if (parent.context.IsBottomLayout()) SearchResultGridExpandedBinding.inflate(
+            if (parent.context.isBottomLayout()) SearchResultGridExpandedBinding.inflate(
                 inflater,
                 parent,
                 false
@@ -83,8 +83,7 @@ class SearchAdapter(
         diffResult.dispatchUpdatesTo(this)
     }
 
-    class CardViewHolder
-    constructor(
+    class CardViewHolder(
         val binding: ViewBinding,
         private val clickCallback: (SearchClickCallback) -> Unit,
         resView: AutofitRecyclerView
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 ef10fcee596..38691186e72 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
@@ -229,7 +229,7 @@ class SearchFragment : Fragment() {
                     SearchHelper.handleSearchClickCallback(callback)
                 }
 
-            searchRoot.findViewById<TextView>(R.id.search_src_text)?.tag = "tv_no_focus_tag"
+            searchRoot.findViewById<TextView>(androidx.appcompat.R.id.search_src_text)?.tag = "tv_no_focus_tag"
             searchAutofitResults.adapter = adapter
             searchLoadingBar.alpha = 0f
         }
@@ -576,4 +576,4 @@ class SearchFragment : Fragment() {
             .commit()*/
     }
 
-}
+}
\ No newline at end of file
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 0a2ecb81e1d..4ef5fa698b2 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
@@ -1,16 +1,11 @@
 package com.lagradost.cloudstream3.ui.search
 
 import android.view.LayoutInflater
-import android.view.View
 import android.view.ViewGroup
-import android.widget.ImageView
-import android.widget.TextView
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView
 import com.fasterxml.jackson.annotation.JsonProperty
-import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.TvType
-import com.lagradost.cloudstream3.databinding.AccountSingleBinding
 import com.lagradost.cloudstream3.databinding.SearchHistoryItemBinding
 
 data class SearchHistoryItem(
@@ -63,8 +58,7 @@ class SearchHistoryAdaptor(
         diffResult.dispatchUpdatesTo(this)
     }
 
-    class CardViewHolder
-    constructor(
+    class CardViewHolder(
         val binding: SearchHistoryItemBinding,
         private val clickCallback: (SearchHistoryCallback) -> Unit,
     ) :
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 f597132bd4b..9b4e06a093c 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,5 +1,6 @@
 package com.lagradost.cloudstream3.ui.search
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.View
 import android.widget.ImageView
@@ -9,6 +10,8 @@ import androidx.cardview.widget.CardView
 import androidx.core.view.isVisible
 import androidx.palette.graphics.Palette
 import androidx.preference.PreferenceManager
+import coil3.request.error
+import coil3.toBitmap
 import com.lagradost.cloudstream3.AnimeSearchResponse
 import com.lagradost.cloudstream3.DubStatus
 import com.lagradost.cloudstream3.LiveSearchResponse
@@ -22,8 +25,10 @@ import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
 import com.lagradost.cloudstream3.utils.AppContextUtils.getNameFull
 import com.lagradost.cloudstream3.utils.DataStoreHelper
 import com.lagradost.cloudstream3.utils.DataStoreHelper.fixVisual
+import com.lagradost.cloudstream3.utils.ImageLoader.loadImage
 import com.lagradost.cloudstream3.utils.SubtitleHelper
-import com.lagradost.cloudstream3.utils.UIHelper.setImage
+import com.lagradost.cloudstream3.utils.UIHelper.createPaletteAsync
+import com.lagradost.cloudstream3.utils.getImageFromDrawable
 
 object SearchResultBuilder {
     private val showCache: MutableMap<String, Boolean> = mutableMapOf()
@@ -37,16 +42,12 @@ object SearchResultBuilder {
         }
     }
 
-    /**
-     * @param nextFocusBehavior True if first, False if last, Null if between.
-     * Used to prevent escaping the adapter horizontally (focus wise).
-     */
+    @SuppressLint("StringFormatInvalid")
     fun bind(
         clickCallback: (SearchClickCallback) -> Unit,
         card: SearchResponse,
         position: Int,
         itemView: View,
-        nextFocusBehavior: Boolean? = null,
         nextFocusUp: Int? = null,
         nextFocusDown: Int? = null,
         colorCallback : ((Palette) -> Unit)? = null
@@ -123,11 +124,17 @@ object SearchResultBuilder {
         cardText?.text = card.name
         cardText?.isVisible = showTitle
         cardView.isVisible = true
-
-        if (!cardView.setImage(card.posterUrl, card.posterHeaders, colorCallback = colorCallback)) {
-            cardView.setImageResource(R.drawable.default_cover)
+        cardView.loadImage(card.posterUrl, card.posterHeaders) {
+            error { getImageFromDrawable(itemView.context, R.drawable.default_cover) }
+            val posterUrl = card.posterUrl
+            if (posterUrl != null && colorCallback != null) {
+                this.listener(onSuccess = { _,success ->
+                    val bitmap = success.image.toBitmap()
+                    createPaletteAsync(posterUrl, bitmap, colorCallback)
+                })
+            }
         }
-
+        
         fun click(view: View?) {
             clickCallback.invoke(
                 SearchClickCallback(
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SyncSearchViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SyncSearchViewModel.kt
index 9e03079f633..71077e91f7c 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SyncSearchViewModel.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SyncSearchViewModel.kt
@@ -3,11 +3,9 @@ package com.lagradost.cloudstream3.ui.search
 import com.lagradost.cloudstream3.SearchQuality
 import com.lagradost.cloudstream3.SearchResponse
 import com.lagradost.cloudstream3.TvType
-import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.SyncApis
 
+//TODO Relevance of this class since it's not used
 class SyncSearchViewModel {
-    private val repos = SyncApis
-
     data class SyncSearchResultSearchResponse(
         override val name: String,
         override val url: String,
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 1dc79dc0539..ba53f96f1fb 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
@@ -1,5 +1,6 @@
 package com.lagradost.cloudstream3.ui.settings
 
+import android.annotation.SuppressLint
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -8,12 +9,12 @@ 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
+import com.lagradost.cloudstream3.utils.ImageLoader.loadImage
 
 class AccountClickCallback(val action: Int, val view: View, val card: AuthAPI.LoginInfo)
 
 class AccountAdapter(
-    val cardList: List<AuthAPI.LoginInfo>,
+    private val cardList: List<AuthAPI.LoginInfo>,
     private val clickCallback: (AccountClickCallback) -> Unit
 ) :
     RecyclerView.Adapter<RecyclerView.ViewHolder>() {
@@ -42,22 +43,23 @@ class AccountAdapter(
         return cardList[position].accountIndex.toLong()
     }
 
-    class CardViewHolder
-    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)!!
+    class CardViewHolder(val binding: AccountSingleBinding?, private val clickCallback: (AccountClickCallback) -> Unit) :
+        RecyclerView.ViewHolder(binding?.root!!) {
 
+        @SuppressLint("StringFormatInvalid")
         fun bind(card: AuthAPI.LoginInfo) {
             // just in case name is null account index will show, should never happened
-            binding.accountName.text = card.name ?: "%s %d".format(
-                binding.accountName.context.getString(R.string.account),
-                card.accountIndex
-            )
-            binding.accountProfilePicture.isVisible = binding.accountProfilePicture.setImage(card.profilePicture)
+            binding?.apply {
+                accountName.text = card.name ?: "%s %d".format(
+                    binding.accountName.context.getString(R.string.account),
+                    card.accountIndex
+                )
+                accountProfilePicture.isVisible = true
+                accountProfilePicture.loadImage(card.profilePicture)
 
-            itemView.setOnClickListener {
-                clickCallback.invoke(AccountClickCallback(0, itemView, card))
+                itemView.setOnClickListener {
+                    clickCallback.invoke(AccountClickCallback(0, itemView, card))
+                }
             }
         }
     }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/LogcatAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/LogcatAdapter.kt
new file mode 100644
index 00000000000..7fcfefb7b0c
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/LogcatAdapter.kt
@@ -0,0 +1,26 @@
+package com.lagradost.cloudstream3.ui.settings
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import com.lagradost.cloudstream3.databinding.ItemLogcatBinding
+
+class LogcatAdapter(
+    private val logs: List<String>
+) : RecyclerView.Adapter<LogcatAdapter.LogViewHolder>() {
+
+    inner class LogViewHolder(
+        val binding: ItemLogcatBinding
+    ) : RecyclerView.ViewHolder(binding.root)
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): LogViewHolder {
+        val binding = ItemLogcatBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        return LogViewHolder(binding)
+    }
+
+    override fun onBindViewHolder(holder: LogViewHolder, position: Int) {
+        holder.binding.logText.text = logs[position]
+    }
+
+    override fun getItemCount(): Int = logs.count()
+}
\ No newline at end of file
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 15f8735fea6..daeab0500de 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
@@ -34,10 +34,6 @@ import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.subDlAp
 import com.lagradost.cloudstream3.syncproviders.AuthAPI
 import com.lagradost.cloudstream3.syncproviders.InAppAuthAPI
 import com.lagradost.cloudstream3.syncproviders.OAuth2API
-import com.lagradost.cloudstream3.ui.result.img
-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.settings.Globals.EMULATOR
 import com.lagradost.cloudstream3.ui.settings.Globals.PHONE
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
@@ -57,11 +53,13 @@ import com.lagradost.cloudstream3.utils.BiometricAuthenticator.isAuthEnabled
 import com.lagradost.cloudstream3.utils.BiometricAuthenticator.promptInfo
 import com.lagradost.cloudstream3.utils.BiometricAuthenticator.startBiometricAuthentication
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
+import com.lagradost.cloudstream3.utils.ImageLoader.loadImage
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialogText
 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.setImage
+import com.lagradost.cloudstream3.utils.setText
+import com.lagradost.cloudstream3.utils.txt
 import qrcode.QRCode
 
 class SettingsAccount : PreferenceFragmentCompat(), BiometricCallback {
@@ -80,8 +78,9 @@ class SettingsAccount : PreferenceFragmentCompat(), BiometricCallback {
                     .setView(binding.root)
             val dialog = builder.show()
 
-            binding.accountMainProfilePictureHolder.isVisible =
-                binding.accountMainProfilePicture.setImage(info.profilePicture)
+            binding.accountMainProfilePictureHolder.isVisible = !info.profilePicture.isNullOrEmpty()
+            binding.accountMainProfilePicture.loadImage(info.profilePicture)
+
 
             binding.accountLogout.setOnClickListener {
                 api.logOut()
@@ -198,9 +197,7 @@ class SettingsAccount : PreferenceFragmentCompat(), BiometricCallback {
                                                     pinCodeData.verificationUrl
                                                 )
                                             )
-                                            deviceAuthQrcode.setImage(
-                                                img(qrCodeImage)
-                                            )
+                                            deviceAuthQrcode.loadImage(qrCodeImage)
                                         }
 
                                         val expirationMillis =
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 6ba93c0fa46..f256a31e79e 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
@@ -20,19 +20,19 @@ import com.lagradost.cloudstream3.databinding.MainSettingsBinding
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.syncproviders.AccountManager
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.accountManagers
-import com.lagradost.cloudstream3.ui.home.HomeFragment
-import com.lagradost.cloudstream3.ui.result.txt
+import com.lagradost.cloudstream3.ui.home.HomeFragment.Companion.errorProfilePic
 import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
 import com.lagradost.cloudstream3.ui.settings.Globals.PHONE
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
-import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.getPref
 import com.lagradost.cloudstream3.utils.DataStoreHelper
+import com.lagradost.cloudstream3.utils.ImageLoader.loadImage
 import com.lagradost.cloudstream3.utils.UIHelper
 import com.lagradost.cloudstream3.utils.UIHelper.clipboardHelper
 import com.lagradost.cloudstream3.utils.UIHelper.navigate
-import com.lagradost.cloudstream3.utils.UIHelper.setImage
 import com.lagradost.cloudstream3.utils.UIHelper.toPx
+import com.lagradost.cloudstream3.utils.getImageFromDrawable
+import com.lagradost.cloudstream3.utils.txt
 import java.io.File
 import java.text.DateFormat
 import java.text.SimpleDateFormat
@@ -42,10 +42,8 @@ import java.util.TimeZone
 
 class SettingsFragment : Fragment() {
     companion object {
-
         fun PreferenceFragmentCompat?.getPref(id: Int): Preference? {
             if (this == null) return null
-
             return try {
                 findPreference(getString(id))
             } catch (e: Exception) {
@@ -70,12 +68,16 @@ class SettingsFragment : Fragment() {
         }
 
         /**
-         * Hide the Preference on selected layouts.
+         * Hide the [Preference] on selected layouts.
+         * @return [Preference] if visible otherwise null.
+         *
+         * [hideOn] is usually followed by some actions on the preference which are mostly
+         * unnecessary when the preference is disabled for the said layout thus returning null.
          **/
         fun Preference?.hideOn(layoutFlags: Int): Preference? {
             if (this == null) return null
             this.isVisible = !isLayout(layoutFlags)
-            return this
+            return if(this.isVisible) this else null
         }
 
         /**
@@ -86,6 +88,7 @@ class SettingsFragment : Fragment() {
                 listView?.setPadding(0, 0, 0, 100.toPx)
             }
         }
+
         fun PreferenceFragmentCompat.setToolBarScrollFlags() {
             if (isLayout(TV or EMULATOR)) {
                 val settingsAppbar = view?.findViewById<MaterialToolbar>(R.id.settings_toolbar)
@@ -95,6 +98,7 @@ class SettingsFragment : Fragment() {
                 }
             }
         }
+
         fun Fragment?.setToolBarScrollFlags() {
             if (isLayout(TV or EMULATOR)) {
                 val settingsAppbar = this?.view?.findViewById<MaterialToolbar>(R.id.settings_toolbar)
@@ -104,6 +108,7 @@ class SettingsFragment : Fragment() {
                 }
             }
         }
+
         fun Fragment?.setUpToolbar(title: String) {
             if (this == null) return
             val settingsToolbar = view?.findViewById<MaterialToolbar>(R.id.settings_toolbar) ?: return
@@ -151,12 +156,14 @@ class SettingsFragment : Fragment() {
             return size
         }
     }
+
     override fun onDestroyView() {
         binding = null
         super.onDestroyView()
     }
 
     var binding: MainSettingsBinding? = null
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -181,14 +188,15 @@ class SettingsFragment : Fragment() {
                 val login = syncApi.loginInfo()
                 val pic = login?.profilePicture ?: continue
 
-                if (binding?.settingsProfilePic?.setImage(
-                        pic,
-                        errorImageDrawable = HomeFragment.errorProfilePic
-                    ) == true
-                ) {
-                    binding?.settingsProfileText?.text = login.name
-                    return true // sync profile exists
+                binding?.settingsProfilePic?.let { imageView ->
+                    imageView.loadImage(pic) {
+                        // Fallback to random error drawable
+                        error { getImageFromDrawable(context ?: return@error null, errorProfilePic) }
+                    }
                 }
+                binding?.settingsProfileText?.text = login.name
+                return true // sync profile exists
+
             }
             return false // not syncing
         }
@@ -206,7 +214,7 @@ class SettingsFragment : Fragment() {
                 null
             }
 
-            binding?.settingsProfilePic?.setImage(currentAccount?.image)
+            binding?.settingsProfilePic?.loadImage(currentAccount?.image)
             binding?.settingsProfileText?.text = currentAccount?.name
         }
 
@@ -250,4 +258,4 @@ class SettingsFragment : Fragment() {
             true
         }
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
index abed5148258..a4dc65644da 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
@@ -1,13 +1,11 @@
 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.view.View
 import android.widget.Toast
-import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AlertDialog
 import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.PreferenceManager
@@ -26,17 +24,15 @@ import com.lagradost.cloudstream3.databinding.AddSiteInputBinding
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
 import com.lagradost.cloudstream3.network.initClient
-import com.lagradost.cloudstream3.ui.EasterEggMonke
 import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
-import com.lagradost.cloudstream3.ui.settings.Globals.PHONE
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
 import com.lagradost.cloudstream3.ui.settings.Globals.beneneCount
-import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.getPref
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.hideOn
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setPaddingBottom
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setToolBarScrollFlags
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setUpToolbar
+import com.lagradost.cloudstream3.ui.settings.utils.getChooseFolderLauncher
 import com.lagradost.cloudstream3.utils.BatteryOptimizationChecker.isAppRestricted
 import com.lagradost.cloudstream3.utils.BatteryOptimizationChecker.showBatteryOptimizationDialog
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialog
@@ -45,10 +41,10 @@ import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showMultiDialog
 import com.lagradost.cloudstream3.utils.SubtitleHelper
 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.USER_PROVIDER_API
 import com.lagradost.cloudstream3.utils.VideoDownloadManager
 import com.lagradost.cloudstream3.utils.VideoDownloadManager.getBasePath
-import com.lagradost.safefile.SafeFile
 
 // Change local language settings in the app.
 fun getCurrentLocale(context: Context): String {
@@ -93,34 +89,15 @@ class SettingsGeneral : PreferenceFragmentCompat() {
         val lang: String,
     )
 
-    // Open file picker
-    private val pathPicker =
-        registerForActivityResult(ActivityResultContracts.OpenDocumentTree()) { uri ->
-            // It lies, it can be null if file manager quits.
-            if (uri == null) return@registerForActivityResult
-            val context = context ?: AcraApplication.context ?: return@registerForActivityResult
-            // RW perms for the path
-            val flags = Intent.FLAG_GRANT_READ_URI_PERMISSION or
-                    Intent.FLAG_GRANT_WRITE_URI_PERMISSION
-
-            context.contentResolver.takePersistableUriPermission(uri, flags)
-
-            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.
-            PreferenceManager.getDefaultSharedPreferences(context)
-                .edit().putString(getString(R.string.download_path_key), uri.toString()).apply()
-
-            // From URI -> File path
-            // File path here is purely for cosmetic purposes in settings
-            (filePath ?: uri.toString()).let {
-                PreferenceManager.getDefaultSharedPreferences(context)
-                    .edit().putString(getString(R.string.download_path_pref), it).apply()
-            }
+    private val pathPicker = getChooseFolderLauncher { uri, path ->
+        val context = context ?: AcraApplication.context ?: return@getChooseFolderLauncher
+        (path ?: uri.toString()).let {
+            PreferenceManager.getDefaultSharedPreferences(context).edit()
+                .putString(getString(R.string.download_path_key), uri.toString())
+                .putString(getString(R.string.download_path_key_visual), it)
+                .apply()
         }
+    }
 
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         hideKeyboard()
@@ -161,7 +138,7 @@ class SettingsGeneral : PreferenceFragmentCompat() {
             val ctx = context ?: return@setOnPreferenceClickListener false
 
             if (isAppRestricted(ctx)) {
-                showBatteryOptimizationDialog(ctx)
+                ctx.showBatteryOptimizationDialog()
             } else {
                 showToast(R.string.app_unrestricted_toast)
             }
@@ -314,11 +291,11 @@ class SettingsGeneral : PreferenceFragmentCompat() {
             val dirs = getDownloadDirs()
 
             val currentDir =
-                settingsManager.getString(getString(R.string.download_path_pref), null)
+                settingsManager.getString(getString(R.string.download_path_key_visual), null)
                     ?: context?.let { ctx -> VideoDownloadManager.getDefaultDir(ctx)?.filePath() }
 
             activity?.showBottomDialog(
-                dirs + listOf("Custom"),
+                dirs + listOf(getString(R.string.custom)),
                 dirs.indexOf(currentDir),
                 getString(R.string.download_path_pref),
                 true,
@@ -333,11 +310,11 @@ class SettingsGeneral : PreferenceFragmentCompat() {
                 } else {
                     // Sets both visual and actual paths.
                     // key = used path
-                    // pref = visual path
-                    settingsManager.edit()
-                        .putString(getString(R.string.download_path_key), dirs[it]).apply()
+                    // visual = visual path
                     settingsManager.edit()
-                        .putString(getString(R.string.download_path_pref), dirs[it]).apply()
+                        .putString(getString(R.string.download_path_key), dirs[it])
+                        .putString(getString(R.string.download_path_key_visual), dirs[it])
+                        .apply()
                 }
             }
             return@setOnPreferenceClickListener true
@@ -358,16 +335,13 @@ class SettingsGeneral : PreferenceFragmentCompat() {
                     try {
                         beneneCount++
                         if (beneneCount%20 == 0) {
-                            val intent = Intent(context, EasterEggMonke::class.java)
-                            startActivity(intent)
+                            activity?.navigate(R.id.action_navigation_settings_general_to_easterEggMonkeFragment)
                         }
                         settingsManager.edit().putInt(
                             getString(R.string.benene_count),
                             beneneCount
-                        )
-                            .apply()
-                        it.summary =
-                            getString(R.string.benene_count_text).format(beneneCount)
+                        ).apply()
+                        it.summary = getString(R.string.benene_count_text).format(beneneCount)
                     } catch (e: Exception) {
                         logError(e)
                     }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsPlayer.kt
index 20279cd17ac..2eaea61bf42 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsPlayer.kt
@@ -6,11 +6,11 @@ import android.view.View
 import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.PreferenceManager
 import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.actions.VideoClickActionHolder
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
 import com.lagradost.cloudstream3.ui.settings.Globals.PHONE
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
-import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.getFolderSize
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.getPref
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.hideOn
@@ -46,7 +46,8 @@ class SettingsPlayer : PreferenceFragmentCompat() {
             ),
             TV or EMULATOR
         )
-
+        
+        getPref(R.string.preview_seekbar_key)?.hideOn(TV)
         getPref(R.string.pref_category_android_tv_key)?.hideOn(PHONE)
 
         getPref(R.string.video_buffer_length_key)?.setOnPreferenceClickListener {
@@ -87,9 +88,23 @@ class SettingsPlayer : PreferenceFragmentCompat() {
             return@setOnPreferenceClickListener true
         }
 
-        /*(getPref(R.string.double_tap_seek_time_key) as? SeekBarPreference?)?.let {
+        getPref(R.string.software_decoding_key)?.setOnPreferenceClickListener {
+            val prefNames = resources.getStringArray(R.array.software_decoding_switch)
+            val prefValues = resources.getIntArray(R.array.software_decoding_switch_values)
+            val current = settingsManager.getInt(getString(R.string.software_decoding_key), -1)
 
-        }*/
+            activity?.showBottomDialog(
+                prefNames.toList(),
+                prefValues.indexOf(current),
+                getString(R.string.software_decoding),
+                true,
+                {}) {
+                settingsManager.edit()
+                    .putInt(getString(R.string.software_decoding_key), prefValues[it])
+                    .apply()
+            }
+            return@setOnPreferenceClickListener true
+        }
 
         getPref(R.string.prefer_limit_title_rez_key)?.setOnPreferenceClickListener {
             val prefNames = resources.getStringArray(R.array.limit_title_rez_pref_names)
@@ -109,8 +124,10 @@ class SettingsPlayer : PreferenceFragmentCompat() {
             return@setOnPreferenceClickListener true
         }
 
+        getPref(R.string.hide_player_control_names_key)?.hideOn(TV)
+
         getPref(R.string.quality_pref_key)?.setOnPreferenceClickListener {
-            val prefValues = Qualities.values().map { it.value }.reversed().toMutableList()
+            val prefValues = Qualities.entries.map { it.value }.reversed().toMutableList()
             prefValues.remove(Qualities.Unknown.value)
 
             val prefNames = prefValues.map { Qualities.getStringByInt(it) }
@@ -118,7 +135,7 @@ class SettingsPlayer : PreferenceFragmentCompat() {
             val currentQuality =
                 settingsManager.getInt(
                     getString(R.string.quality_pref_key),
-                    Qualities.values().last().value
+                    Qualities.entries.last().value
                 )
 
             activity?.showBottomDialog(
@@ -134,7 +151,7 @@ class SettingsPlayer : PreferenceFragmentCompat() {
         }
 
         getPref(R.string.quality_pref_mobile_data_key)?.setOnPreferenceClickListener {
-            val prefValues = Qualities.values().map { it.value }.reversed().toMutableList()
+            val prefValues = Qualities.entries.map { it.value }.reversed().toMutableList()
             prefValues.remove(Qualities.Unknown.value)
 
             val prefNames = prefValues.map { Qualities.getStringByInt(it) }
@@ -142,7 +159,7 @@ class SettingsPlayer : PreferenceFragmentCompat() {
             val currentQuality =
                 settingsManager.getInt(
                     getString(R.string.quality_pref_mobile_data_key),
-                    Qualities.values().last().value
+                    Qualities.entries.last().value
                 )
 
             activity?.showBottomDialog(
@@ -157,10 +174,17 @@ class SettingsPlayer : PreferenceFragmentCompat() {
             return@setOnPreferenceClickListener true
         }
 
-        getPref(R.string.player_pref_key)?.setOnPreferenceClickListener {
-            val prefNames = resources.getStringArray(R.array.player_pref_names)
-            val prefValues = resources.getIntArray(R.array.player_pref_values)
-            val current = settingsManager.getInt(getString(R.string.player_pref_key), 1)
+        getPref(R.string.player_default_key)?.setOnPreferenceClickListener {
+            val players = VideoClickActionHolder.getPlayers(activity)
+            val prefNames = buildList {
+                add(getString(R.string.player_settings_play_in_app))
+                addAll(players.map { it.name.asStringNull(activity) ?: it.javaClass.simpleName })
+            }
+            val prefValues = buildList {
+                add("")
+                addAll(players.map { it.uniqueId() })
+            }
+            val current = settingsManager.getString(getString(R.string.player_default_key), "") ?: ""
 
             activity?.showBottomDialog(
                 prefNames.toList(),
@@ -168,7 +192,7 @@ class SettingsPlayer : PreferenceFragmentCompat() {
                 getString(R.string.player_pref),
                 true,
                 {}) {
-                settingsManager.edit().putInt(getString(R.string.player_pref_key), prefValues[it]).apply()
+                settingsManager.edit().putString(getString(R.string.player_default_key), prefValues[it]).apply()
             }
             return@setOnPreferenceClickListener true
         }
@@ -246,4 +270,4 @@ class SettingsPlayer : PreferenceFragmentCompat() {
             }
         }
     }
-}
\ No newline at end of file
+}
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 cfb46c3955f..cb7d25fd7d5 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
@@ -34,7 +34,7 @@ class SettingsProviders : PreferenceFragmentCompat() {
 
         getPref(R.string.display_sub_key)?.setOnPreferenceClickListener {
             activity?.getApiDubstatusSettings()?.let { current ->
-                val dublist = DubStatus.values()
+                val dublist = DubStatus.entries
                 val names = dublist.map { it.name }
 
                 val currentList = ArrayList<Int>()
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUI.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUI.kt
index cc14e7617da..014bd93fac1 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUI.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUI.kt
@@ -67,31 +67,32 @@ class SettingsUI : PreferenceFragmentCompat() {
                 settingsManager.getInt(getString(R.string.app_layout_key), -1)
 
             activity?.showBottomDialog(
-                prefNames.toList(),
-                prefValues.indexOf(currentLayout),
-                getString(R.string.app_layout),
-                true,
-                {}) {
-                try {
-                    settingsManager.edit()
-                        .putInt(getString(R.string.app_layout_key), prefValues[it])
-                        .apply()
-                    context?.updateTv()
-                    activity?.recreate()
-                } catch (e: Exception) {
-                    logError(e)
+                items = prefNames.toList(),
+                selectedIndex = prefValues.indexOf(currentLayout),
+                name = getString(R.string.app_layout),
+                showApply = true,
+                dismissCallback = {},
+                callback = {
+                    try {
+                        settingsManager.edit()
+                            .putInt(getString(R.string.app_layout_key), prefValues[it])
+                            .apply()
+                        context?.updateTv()
+                        activity?.recreate()
+                    } catch (e: Exception) {
+                        logError(e)
+                    }
                 }
-            }
+            )
             return@setOnPreferenceClickListener true
         }
 
         getPref(R.string.app_theme_key)?.setOnPreferenceClickListener {
             val prefNames = resources.getStringArray(R.array.themes_names).toMutableList()
             val prefValues = resources.getStringArray(R.array.themes_names_values).toMutableList()
-
-            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) { // remove monet on android 11 and less
+            val removeIncompatible = { text: String ->
                 val toRemove = prefValues
-                    .mapIndexed { idx, s -> if (s.startsWith("Monet")) idx else null }
+                    .mapIndexed { idx, s -> if (s.startsWith(text)) idx else null }
                     .filterNotNull()
                 var offset = 0
                 toRemove.forEach { idx ->
@@ -100,6 +101,12 @@ class SettingsUI : PreferenceFragmentCompat() {
                     offset += 1
                 }
             }
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) { // remove monet on android 11 and less
+                removeIncompatible("Monet")
+            }
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) { // Remove system on android 9 and less
+                removeIncompatible("System")
+            }
 
             val currentLayout =
                 settingsManager.getString(getString(R.string.app_theme_key), prefValues.first())
@@ -123,7 +130,8 @@ class SettingsUI : PreferenceFragmentCompat() {
         }
         getPref(R.string.primary_color_key)?.setOnPreferenceClickListener {
             val prefNames = resources.getStringArray(R.array.themes_overlay_names).toMutableList()
-            val prefValues = resources.getStringArray(R.array.themes_overlay_names_values).toMutableList()
+            val prefValues =
+                resources.getStringArray(R.array.themes_overlay_names_values).toMutableList()
 
             if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) { // remove monet on android 11 and less
                 val toRemove = prefValues
@@ -181,5 +189,24 @@ class SettingsUI : PreferenceFragmentCompat() {
             return@setOnPreferenceClickListener true
         }
 
+        getPref(R.string.confirm_exit_key)?.setOnPreferenceClickListener {
+            val prefNames = resources.getStringArray(R.array.confirm_exit)
+            val prefValues = resources.getIntArray(R.array.confirm_exit_values)
+            val confirmExit = settingsManager.getInt(getString(R.string.confirm_exit_key), -1)
+
+            activity?.showBottomDialog(
+                items = prefNames.toList(),
+                selectedIndex = prefValues.indexOf(confirmExit),
+                name = getString(R.string.confirm_before_exiting_title),
+                showApply = true,
+                dismissCallback = {},
+                callback = { selectedOption ->
+                    settingsManager.edit()
+                        .putInt(getString(R.string.confirm_exit_key), prefValues[selectedOption])
+                        .apply()
+                }
+            )
+            return@setOnPreferenceClickListener true
+        }
     }
 }
\ No newline at end of file
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 4aaa5e12f11..9dea754deed 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
@@ -1,5 +1,6 @@
 package com.lagradost.cloudstream3.ui.settings
 
+import android.net.Uri
 import android.os.Bundle
 import android.view.View
 import android.widget.Toast
@@ -7,6 +8,7 @@ import androidx.appcompat.app.AlertDialog
 import androidx.navigation.fragment.findNavController
 import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.PreferenceManager
+import androidx.recyclerview.widget.LinearLayoutManager
 import com.lagradost.cloudstream3.AcraApplication
 import com.lagradost.cloudstream3.AutoDownloadMode
 import com.lagradost.cloudstream3.CommonActivity.showToast
@@ -14,13 +16,18 @@ 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.mvvm.normalSafeApiCall
 import com.lagradost.cloudstream3.network.initClient
+import com.lagradost.cloudstream3.plugins.PluginManager
 import com.lagradost.cloudstream3.services.BackupWorkManager
-import com.lagradost.cloudstream3.ui.result.txt
+import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
+import com.lagradost.cloudstream3.ui.settings.Globals.TV
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.getPref
+import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.hideOn
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setPaddingBottom
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setToolBarScrollFlags
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setUpToolbar
+import com.lagradost.cloudstream3.ui.settings.utils.getChooseFolderLauncher
 import com.lagradost.cloudstream3.utils.BackupUtils
 import com.lagradost.cloudstream3.utils.BackupUtils.restorePrompt
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
@@ -31,13 +38,14 @@ import com.lagradost.cloudstream3.utils.UIHelper.clipboardHelper
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
 import com.lagradost.cloudstream3.utils.UIHelper.hideKeyboard
 import com.lagradost.cloudstream3.utils.VideoDownloadManager
-import okhttp3.internal.closeQuietly
+import com.lagradost.cloudstream3.utils.txt
 import java.io.BufferedReader
 import java.io.InputStreamReader
 import java.io.OutputStream
 import java.lang.System.currentTimeMillis
 import java.text.SimpleDateFormat
-import java.util.*
+import java.util.Date
+import java.util.Locale
 
 class SettingsUpdates : PreferenceFragmentCompat() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -47,10 +55,20 @@ class SettingsUpdates : PreferenceFragmentCompat() {
         setToolBarScrollFlags()
     }
 
+    private val pathPicker = getChooseFolderLauncher { uri, path ->
+        val context = context ?: AcraApplication.context ?: return@getChooseFolderLauncher
+        (path ?: uri.toString()).let {
+            PreferenceManager.getDefaultSharedPreferences(context).edit()
+                .putString(getString(R.string.backup_path_key), uri.toString())
+                .putString(getString(R.string.backup_dir_key), it)
+                .apply()
+        }
+    }
+
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         hideKeyboard()
         setPreferencesFromResource(R.xml.settings_updates, rootKey)
-        //val settingsManager = PreferenceManager.getDefaultSharedPreferences(requireContext())
+        val settingsManager = PreferenceManager.getDefaultSharedPreferences(requireContext())
 
         getPref(R.string.backup_key)?.setOnPreferenceClickListener {
             BackupUtils.backup(activity)
@@ -58,8 +76,6 @@ class SettingsUpdates : PreferenceFragmentCompat() {
         }
 
         getPref(R.string.automatic_backup_key)?.setOnPreferenceClickListener {
-            val settingsManager = PreferenceManager.getDefaultSharedPreferences(requireContext())
-
             val prefNames = resources.getStringArray(R.array.periodic_work_names)
             val prefValues = resources.getIntArray(R.array.periodic_work_values)
             val current = settingsManager.getInt(getString(R.string.automatic_backup_key), 0)
@@ -89,36 +105,63 @@ class SettingsUpdates : PreferenceFragmentCompat() {
             activity?.restorePrompt()
             return@setOnPreferenceClickListener true
         }
+        getPref(R.string.backup_path_key)?.hideOn(TV or EMULATOR)?.setOnPreferenceClickListener {
+            val dirs = getBackupDirsForDisplay()
+            val currentDir =
+                settingsManager.getString(getString(R.string.backup_dir_key), null)
+                    ?: context?.let { ctx -> BackupUtils.getDefaultBackupDir(ctx)?.filePath() }
+
+            activity?.showBottomDialog(
+                dirs + listOf(getString(R.string.custom)),
+                dirs.indexOf(currentDir),
+                getString(R.string.backup_path_title),
+                true,
+                {}) {
+                // Last = custom
+                if (it == dirs.size) {
+                    try {
+                        pathPicker.launch(Uri.EMPTY)
+                    } catch (e: Exception) {
+                        logError(e)
+                    }
+                } else {
+                    // Sets both visual and actual paths.
+                    // path = used uri
+                    // dir = dir path
+                    settingsManager.edit()
+                        .putString(getString(R.string.backup_path_key), dirs[it])
+                        .putString(getString(R.string.backup_dir_key), dirs[it])
+                        .apply()
+                }
+            }
+            return@setOnPreferenceClickListener true
+        }
+
         getPref(R.string.show_logcat_key)?.setOnPreferenceClickListener { pref ->
-            val builder =
-                AlertDialog.Builder(pref.context, R.style.AlertDialogCustom)
+            val builder = AlertDialog.Builder(pref.context, R.style.AlertDialogCustom)
 
             val binding = LogcatBinding.inflate(layoutInflater, null, false)
             builder.setView(binding.root)
 
             val dialog = builder.create()
             dialog.show()
-            val log = StringBuilder()
+
+            val logList = mutableListOf<String>()
             try {
-                //https://developer.android.com/studio/command-line/logcat
+                // https://developer.android.com/studio/command-line/logcat
                 val process = Runtime.getRuntime().exec("logcat -d")
-                val bufferedReader = BufferedReader(
-                    InputStreamReader(process.inputStream)
-                )
-
-                var line: String?
-                while (bufferedReader.readLine().also { line = it } != null) {
-                    log.append("${line}\n")
-                }
+                val bufferedReader = BufferedReader(InputStreamReader(process.inputStream))
+                bufferedReader.lineSequence().forEach { logList.add(it) }
             } catch (e: Exception) {
                 logError(e) // kinda ironic
             }
 
-            val text = log.toString()
-            binding.text1.text = text
+            val adapter = LogcatAdapter(logList)
+            binding.logcatRecyclerView.layoutManager = LinearLayoutManager(pref.context)
+            binding.logcatRecyclerView.adapter = adapter
 
             binding.copyBtt.setOnClickListener {
-                clipboardHelper(txt("Logcat"), text)
+                clipboardHelper(txt("Logcat"), logList.joinToString("\n"))
                 dialog.dismissSafe(activity)
             }
 
@@ -128,23 +171,21 @@ class SettingsUpdates : PreferenceFragmentCompat() {
             }
 
             binding.saveBtt.setOnClickListener {
-                val date = SimpleDateFormat("yyyy_MM_dd_HH_mm").format(Date(currentTimeMillis()))
+                val date = SimpleDateFormat("yyyy_MM_dd_HH_mm", Locale.getDefault()).format(Date(currentTimeMillis()))
                 var fileStream: OutputStream? = null
                 try {
                     fileStream = VideoDownloadManager.setupStream(
-                            it.context,
-                            "logcat_${date}",
-                            null,
-                            "txt",
-                            false
-                        ).openNew()
-                    fileStream.writer().write(text)
+                        it.context,
+                        "logcat_${date}",
+                        null,
+                        "txt",
+                        false
+                    ).openNew()
+                    fileStream.writer().use { writer -> writer.write(logList.joinToString("\n")) }
                     dialog.dismissSafe(activity)
                 } catch (t: Throwable) {
                     logError(t)
                     showToast(t.message)
-                } finally {
-                    fileStream?.closeQuietly()
                 }
             }
 
@@ -156,8 +197,6 @@ class SettingsUpdates : PreferenceFragmentCompat() {
         }
 
         getPref(R.string.apk_installer_key)?.setOnPreferenceClickListener {
-            val settingsManager = PreferenceManager.getDefaultSharedPreferences(it.context)
-
             val prefNames = resources.getStringArray(R.array.apk_installer_pref)
             val prefValues = resources.getIntArray(R.array.apk_installer_values)
 
@@ -169,10 +208,10 @@ class SettingsUpdates : PreferenceFragmentCompat() {
                 prefValues.indexOf(currentInstaller),
                 getString(R.string.apk_installer_settings),
                 true,
-                {}) {
+                {}) { num ->
                 try {
                     settingsManager.edit()
-                        .putInt(getString(R.string.apk_installer_key), prefValues[it])
+                        .putInt(getString(R.string.apk_installer_key), prefValues[num])
                         .apply()
                 } catch (e: Exception) {
                     logError(e)
@@ -196,8 +235,6 @@ class SettingsUpdates : PreferenceFragmentCompat() {
         }
 
         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 }
@@ -209,12 +246,33 @@ class SettingsUpdates : PreferenceFragmentCompat() {
                 prefValues.indexOf(current),
                 getString(R.string.automatic_plugin_download_mode_title),
                 true,
-                {}) {
+                {}) { num ->
                 settingsManager.edit()
-                    .putInt(getString(R.string.auto_download_plugins_key), prefValues[it]).apply()
+                    .putInt(getString(R.string.auto_download_plugins_key), prefValues[num]).apply()
                 (context ?: AcraApplication.context)?.let { ctx -> app.initClient(ctx) }
             }
             return@setOnPreferenceClickListener true
         }
+
+        getPref(R.string.manual_update_plugins_key)?.setOnPreferenceClickListener {
+            ioSafe {
+                PluginManager.manuallyReloadAndUpdatePlugins(activity ?: return@ioSafe)
+            }
+            return@setOnPreferenceClickListener true // Return true for the listener
+        }
+    }
+
+    private fun getBackupDirsForDisplay(): List<String> {
+        return normalSafeApiCall {
+            context?.let { ctx ->
+                val defaultDir = BackupUtils.getDefaultBackupDir(ctx)?.filePath()
+                val first = listOf(defaultDir)
+                (runCatching {
+                    first + BackupUtils.getCurrentBackupDir(ctx).let {
+                                it.first?.filePath() ?: it.second
+                            }
+                }.getOrNull() ?: first).filterNotNull().distinct()
+            }
+        } ?: emptyList()
     }
-}
+}
\ No newline at end of file
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 1b48762939d..bd1e219d046 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
@@ -28,7 +28,7 @@ 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.utils.setText
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setToolBarScrollFlags
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 866d167c160..ebe9fc88865 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
@@ -12,8 +12,8 @@ import com.lagradost.cloudstream3.plugins.PluginManager
 import com.lagradost.cloudstream3.plugins.PluginManager.getPluginsOnline
 import com.lagradost.cloudstream3.plugins.RepositoryManager
 import com.lagradost.cloudstream3.plugins.RepositoryManager.PREBUILT_REPOSITORIES
-import com.lagradost.cloudstream3.ui.result.UiText
-import com.lagradost.cloudstream3.ui.result.txt
+import com.lagradost.cloudstream3.utils.UiText
+import com.lagradost.cloudstream3.utils.txt
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 
 data class RepositoryData(
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 909c30be1f3..15228b260d6 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
@@ -1,5 +1,6 @@
 package com.lagradost.cloudstream3.ui.settings.extensions
 
+import android.annotation.SuppressLint
 import android.text.format.Formatter.formatShortFileSize
 import android.util.Log
 import android.view.LayoutInflater
@@ -16,23 +17,24 @@ import com.lagradost.cloudstream3.TvType
 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
-import com.lagradost.cloudstream3.ui.result.txt
+import com.lagradost.cloudstream3.utils.setText
+import com.lagradost.cloudstream3.utils.txt
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
 import com.lagradost.cloudstream3.utils.AppContextUtils.html
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import com.lagradost.cloudstream3.utils.Coroutines.main
+import com.lagradost.cloudstream3.utils.ImageLoader.loadImage
 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 com.lagradost.cloudstream3.utils.getImageFromDrawable
 import org.junit.Assert
 import org.junit.Test
 import java.text.DecimalFormat
 import kotlin.math.floor
 import kotlin.math.log10
-
+import kotlin.math.pow
 
 data class PluginViewData(
     val plugin: Plugin,
@@ -84,12 +86,10 @@ class PluginAdapter(
         return PluginManager.getPluginsOnline().also { storedPlugins = it }
     }*/
 
-    // Clear glide image because setImageResource doesn't override
+    // Clear coil image because setImageResource doesn't override
     override fun onViewRecycled(holder: RecyclerView.ViewHolder) {
         if (holder is PluginViewHolder) {
-            holder.binding.entryIcon.let { pluginIcon ->
-                com.bumptech.glide.Glide.with(pluginIcon).clear(pluginIcon)
-            }
+            holder.binding.entryIcon.loadImage(R.drawable.ic_github_logo)
         }
         super.onViewRecycled(holder)
     }
@@ -101,6 +101,8 @@ class PluginAdapter(
             return findClosestBase2(target, current * 2, max)
         }
 
+        // DO NOT MOVE, as running this test will result in ExceptionInInitializerError on prerelease due to static variables using Resources.getSystem()
+        // this test function is only to show how the function works
         @Test
         fun testFindClosestBase2() {
             Assert.assertEquals(16, findClosestBase2(0))
@@ -122,10 +124,7 @@ class PluginAdapter(
             val base = value / 3
             return if (value >= 3 && base < suffix.size) {
                 DecimalFormat("#0.00").format(
-                    numValue / Math.pow(
-                        10.0,
-                        (base * 3).toDouble()
-                    )
+                    numValue / 10.0.pow((base * 3).toDouble())
                 ) + suffix[base]
             } else {
                 DecimalFormat().format(numValue)
@@ -136,6 +135,7 @@ class PluginAdapter(
     inner class PluginViewHolder(val binding: RepositoryItemBinding) :
         RecyclerView.ViewHolder(binding.root) {
 
+        @SuppressLint("SetTextI18n")
         fun bind(
             data: PluginViewData,
         ) {
@@ -176,7 +176,8 @@ 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]
+                    (PluginManager.urlPlugins[metadata.url] ?: (PluginManager.plugins[metadata.url])) as? com.lagradost.cloudstream3.plugins.Plugin
+
                 if (plugin?.openSettings != null) {
                     binding.actionSettings.isVisible = true
                     binding.actionSettings.setOnClickListener {
@@ -198,20 +199,15 @@ class PluginAdapter(
                 binding.actionSettings.isVisible = false
             }
 
-            if (!binding.entryIcon.setImage(//itemView.entry_icon?.height ?:
+            binding.entryIcon.loadImage(
                     metadata.iconUrl?.replace(
                         "%size%",
                         "$iconSize"
                     )?.replace(
                         "%exact_size%",
                         "$iconSizeExact"
-                    ),
-                    null,
-                    errorImageDrawable = R.drawable.ic_baseline_extension_24
-                )
-            ) {
-                binding.entryIcon.setImageResource(R.drawable.ic_baseline_extension_24)
-            }
+                    )
+                ) { error(getImageFromDrawable(itemView.context, R.drawable.ic_baseline_extension_24)) }
 
             binding.extVersion.isVisible = true
             binding.extVersion.text = "v${metadata.version}"
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 7d733be09e3..80be3cf4b22 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
@@ -19,11 +19,12 @@ 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.ImageLoader.loadImage
 import com.lagradost.cloudstream3.utils.SubtitleHelper.fromTwoLettersToLanguage
 import com.lagradost.cloudstream3.utils.SubtitleHelper.getFlagFromIso
 import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute
-import com.lagradost.cloudstream3.utils.UIHelper.setImage
 import com.lagradost.cloudstream3.utils.UIHelper.toPx
+import com.lagradost.cloudstream3.utils.getImageFromDrawable
 
 
 class PluginDetailsFragment(val data: PluginViewData) : BottomSheetDialogFragment() {
@@ -61,19 +62,9 @@ class PluginDetailsFragment(val data: PluginViewData) : BottomSheetDialogFragmen
         super.onViewCreated(view, savedInstanceState)
         val metadata = data.plugin.second
         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)
+            pluginIcon.loadImage(metadata.iconUrl?.replace("%size%", "$iconSize")
+                ?.replace("%exact_size%", "$iconSizeExact")) {
+                error { getImageFromDrawable(context ?: return@error null , R.drawable.ic_baseline_extension_24) }
             }
             pluginName.text = metadata.name.removeSuffix("Provider")
             pluginVersion.text = metadata.version.toString()
@@ -111,7 +102,7 @@ class PluginDetailsFragment(val data: PluginViewData) : BottomSheetDialogFragmen
             if (data.isDownloaded) {
                 // On local plugins page the filepath is provided instead of url.
                 val plugin =
-                    PluginManager.urlPlugins[metadata.url] ?: PluginManager.plugins[metadata.url]
+                    (PluginManager.urlPlugins[metadata.url] ?: PluginManager.plugins[metadata.url]) as? com.lagradost.cloudstream3.plugins.Plugin
                 if (plugin?.openSettings != null && context != null) {
                     actionSettings.isVisible = true
                     actionSettings.setOnClickListener {
@@ -159,7 +150,7 @@ class PluginDetailsFragment(val data: PluginViewData) : BottomSheetDialogFragmen
                 )
             } else {
                 upvote.imageTintList = ColorStateList.valueOf(
-                    context?.colorFromAttribute(R.attr.colorOnSurface) ?: R.color.white
+                    context?.colorFromAttribute(com.google.android.material.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 c5319c37b53..4878049b4cf 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
@@ -190,7 +190,7 @@ class PluginsFragment : Fragment() {
             bindChips(
                 binding?.tvtypesChipsScroll?.tvtypesChips,
                 emptyList(),
-                TvType.values().toList(),
+                TvType.entries.toList(),
                 callback = { list ->
                     pluginViewModel.tvTypes.clear()
                     pluginViewModel.tvTypes.addAll(list.map { it.name })
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 56014eb4dcc..a6f9148985c 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
@@ -10,7 +10,6 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import androidx.preference.PreferenceManager
 import com.lagradost.cloudstream3.CommonActivity.showToast
-import com.lagradost.cloudstream3.MainAPI.Companion.settingsForProvider
 import com.lagradost.cloudstream3.PROVIDER_STATUS_DOWN
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.TvType
@@ -20,7 +19,7 @@ import com.lagradost.cloudstream3.plugins.PluginManager
 import com.lagradost.cloudstream3.plugins.PluginManager.getPluginPath
 import com.lagradost.cloudstream3.plugins.RepositoryManager
 import com.lagradost.cloudstream3.plugins.SitePlugin
-import com.lagradost.cloudstream3.ui.result.txt
+import com.lagradost.cloudstream3.utils.txt
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import com.lagradost.cloudstream3.utils.Coroutines.main
 import com.lagradost.cloudstream3.utils.Coroutines.runOnMainThread
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 faf6d38bf7b..9d633314413 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
@@ -9,7 +9,7 @@ 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.result.txt
+import com.lagradost.cloudstream3.utils.txt
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
 import com.lagradost.cloudstream3.utils.UIHelper.clipboardHelper
@@ -46,14 +46,6 @@ class RepoAdapter(
         }
     }
 
-    // Clear glide image because setImageResource doesn't override
-//    override fun onViewRecycled(holder: RecyclerView.ViewHolder) {
-//        holder.itemView.entry_icon?.let { repoIcon ->
-//            GlideApp.with(repoIcon).clear(repoIcon)
-//        }
-//        super.onViewRecycled(holder)
-//    }
-
     override fun getItemCount(): Int {
         return repositories.size
     }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/utils/DirectoryPicker.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/utils/DirectoryPicker.kt
new file mode 100644
index 00000000000..9e126b7a6a5
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/utils/DirectoryPicker.kt
@@ -0,0 +1,27 @@
+package com.lagradost.cloudstream3.ui.settings.utils
+
+import android.content.Intent
+import android.net.Uri
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.fragment.app.Fragment
+import com.lagradost.cloudstream3.AcraApplication
+import com.lagradost.safefile.SafeFile
+
+fun Fragment.getChooseFolderLauncher(dirSelected: (uri: Uri?, path: String?) -> Unit) =
+    registerForActivityResult(ActivityResultContracts.OpenDocumentTree()) { uri ->
+        // It lies, it can be null if file manager quits.
+        if (uri == null) return@registerForActivityResult
+        val context = context ?: AcraApplication.context ?: return@registerForActivityResult
+        // RW perms for the path
+        val flags = Intent.FLAG_GRANT_READ_URI_PERMISSION or
+                Intent.FLAG_GRANT_WRITE_URI_PERMISSION
+
+        context.contentResolver.takePersistableUriPermission(uri, flags)
+
+        val filePath = SafeFile.fromUri(context, uri)?.filePath()
+        println("Selected URI path: $uri - Full path: $filePath")
+
+        // store the actual URI instead of the path due to permissions.
+        // filePath should only be used for cosmetic purposes.
+        dirSelected(uri, filePath)
+    }
\ No newline at end of file
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 5c473b73106..fc7fe093f9e 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
@@ -60,7 +60,7 @@ class SetupFragmentLanguage : Fragment() {
                 normalSafeApiCall {
                     val drawable = when {
                         BuildConfig.DEBUG -> R.drawable.cloud_2_gradient_debug
-                        BuildConfig.BUILD_TYPE == "prerelease" -> R.drawable.cloud_2_gradient_beta
+                        BuildConfig.FLAVOR == "prerelease" -> R.drawable.cloud_2_gradient_beta
                         else -> R.drawable.cloud_2_gradient
                     }
                     appIconImage.setImageDrawable(ContextCompat.getDrawable(ctx, drawable))
@@ -109,6 +109,4 @@ class SetupFragmentLanguage : Fragment() {
 
         }
     }
-
-
 }
\ No newline at end of file
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 d8fa46e63b6..9de6038e3b3 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
@@ -68,7 +68,7 @@ class SetupFragmentLayout : Fragment() {
                         .apply()
                     activity?.recreate()
                 }
-                acraSwitch.setOnCheckedChangeListener { _, enableCrashReporting ->
+                /*acraSwitch.setOnCheckedChangeListener { _, enableCrashReporting ->
                     // Use same pref as in settings
                     settingsManager.edit().putBoolean(ACRA.PREF_DISABLE_ACRA, !enableCrashReporting)
                         .apply()
@@ -83,7 +83,7 @@ class SetupFragmentLayout : Fragment() {
                 crashReportingText.text =
                     getText(
                         if (enableCrashReporting) R.string.bug_report_settings_off else R.string.bug_report_settings_on
-                    )
+                    )*/
 
 
                 nextBtt.setOnClickListener {
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 f919721391d..49a93608c10 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,7 +10,6 @@ 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
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 bb9558b82bc..c76a218e547 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
@@ -15,8 +15,11 @@ import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.media3.common.text.Cue
 import com.fasterxml.jackson.annotation.JsonProperty
-import com.google.android.gms.cast.TextTrackStyle
-import com.google.android.gms.cast.TextTrackStyle.*
+import com.google.android.gms.cast.TextTrackStyle.EDGE_TYPE_DEPRESSED
+import com.google.android.gms.cast.TextTrackStyle.EDGE_TYPE_DROP_SHADOW
+import com.google.android.gms.cast.TextTrackStyle.EDGE_TYPE_NONE
+import com.google.android.gms.cast.TextTrackStyle.EDGE_TYPE_OUTLINE
+import com.google.android.gms.cast.TextTrackStyle.EDGE_TYPE_RAISED
 import com.jaredrummler.android.colorpicker.ColorPickerDialog
 import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
 import com.lagradost.cloudstream3.CommonActivity.onColorSelectedEvent
@@ -42,7 +45,7 @@ data class SaveChromeCaptionStyle(
     @JsonProperty("fontGenericFamily") var fontGenericFamily: Int? = null,
     @JsonProperty("backgroundColor") var backgroundColor: Int = 0x00FFFFFF, // transparent
     @JsonProperty("edgeColor") var edgeColor: Int = Color.BLACK, // BLACK
-    @JsonProperty("edgeType") var edgeType: Int = TextTrackStyle.EDGE_TYPE_OUTLINE,
+    @JsonProperty("edgeType") var edgeType: Int = EDGE_TYPE_OUTLINE,
     @JsonProperty("foregroundColor") var foregroundColor: Int = Color.WHITE,
     @JsonProperty("fontScale") var fontScale: Float = 1.05f,
     @JsonProperty("windowColor") var windowColor: Int = Color.TRANSPARENT,
@@ -99,7 +102,7 @@ class ChromecastSubtitlesFragment : Fragment() {
     }
 
     private fun onColorSelected(stuff: Pair<Int, Int>) {
-        context?.setColor(stuff.first, stuff.second)
+        setColor(stuff.first, stuff.second)
         if (hide)
             activity?.hideSystemUI()
     }
@@ -122,7 +125,7 @@ class ChromecastSubtitlesFragment : Fragment() {
         return if (color == Color.TRANSPARENT) Color.BLACK else color
     }
 
-    private fun Context.setColor(id: Int, color: Int?) {
+    private fun setColor(id: Int, color: Int?) {
         val realColor = color ?: getDefColor(id)
         when (id) {
             0 -> state.foregroundColor = realColor
@@ -135,7 +138,7 @@ class ChromecastSubtitlesFragment : Fragment() {
         updateState()
     }
 
-    private fun Context.updateState() {
+    private fun updateState() {
         //subtitle_text?.setStyle(fromSaveToStyle(state))
     }
 
@@ -173,7 +176,7 @@ class ChromecastSubtitlesFragment : Fragment() {
         fixPaddingStatusbar(binding?.subsRoot)
 
         state = getCurrentSavedStyle()
-        context?.updateState()
+        updateState()
 
         val isTvSettings = isLayout(TV or EMULATOR)
 
@@ -195,7 +198,7 @@ class ChromecastSubtitlesFragment : Fragment() {
             }
 
             this.setOnLongClickListener {
-                it.context.setColor(id, null)
+                setColor(id, null)
                 showToast(R.string.subs_default_reset_toast, Toast.LENGTH_SHORT)
                 return@setOnLongClickListener true
             }
@@ -247,13 +250,13 @@ class ChromecastSubtitlesFragment : Fragment() {
                 dismissCallback
             ) { index ->
                 state.edgeType = edgeTypes.map { it.first }[index]
-                textView.context.updateState()
+                updateState()
             }
         }
 
         binding?.subsEdgeType?.setOnLongClickListener {
             state.edgeType = defaultState.edgeType
-            it.context.updateState()
+            updateState()
             showToast(R.string.subs_default_reset_toast, Toast.LENGTH_SHORT)
             return@setOnLongClickListener true
         }
@@ -323,12 +326,12 @@ class ChromecastSubtitlesFragment : Fragment() {
                 dismissCallback
             ) { index ->
                 state.fontFamily = fontTypes.map { it.first }[index]
-                textView.context.updateState()
+                updateState()
             }
         }
-        binding?.subsFont?.setOnLongClickListener { textView ->
+        binding?.subsFont?.setOnLongClickListener { _ ->
             state.fontFamily = defaultState.fontFamily
-            textView.context.updateState()
+            updateState()
             showToast(activity, R.string.subs_default_reset_toast, Toast.LENGTH_SHORT)
             return@setOnLongClickListener true
         }
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 1466afed132..d0183e4c9a7 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
@@ -6,6 +6,8 @@ import android.content.res.Resources
 import android.graphics.Color
 import android.graphics.Typeface
 import android.os.Bundle
+import android.text.Spannable
+import android.text.SpannableString
 import android.util.DisplayMetrics
 import android.util.TypedValue
 import android.view.LayoutInflater
@@ -14,12 +16,16 @@ import android.view.ViewGroup
 import android.widget.TextView
 import android.widget.Toast
 import androidx.annotation.FontRes
+import androidx.annotation.OptIn
+import androidx.annotation.Px
 import androidx.core.content.res.ResourcesCompat
-import androidx.fragment.app.Fragment
-import androidx.preference.PreferenceManager
-import com.fasterxml.jackson.annotation.JsonProperty
+import androidx.fragment.app.DialogFragment
 import androidx.media3.common.text.Cue
+import androidx.media3.common.util.UnstableApi
 import androidx.media3.ui.CaptionStyleCompat
+import androidx.media3.ui.SubtitleView
+import androidx.preference.PreferenceManager
+import com.fasterxml.jackson.annotation.JsonProperty
 import com.jaredrummler.android.colorpicker.ColorPickerDialog
 import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
 import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
@@ -28,7 +34,7 @@ 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.ui.settings.Globals
+import com.lagradost.cloudstream3.ui.player.OutlineSpan
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
 import com.lagradost.cloudstream3.utils.DataStore.setKey
@@ -46,7 +52,7 @@ const val SUBTITLE_KEY = "subtitle_settings"
 const val SUBTITLE_AUTO_SELECT_KEY = "subs_auto_select"
 const val SUBTITLE_DOWNLOAD_KEY = "subs_auto_download"
 
-data class SaveCaptionStyle(
+data class SaveCaptionStyle @OptIn(UnstableApi::class) constructor(
     @JsonProperty("foregroundColor") var foregroundColor: Int,
     @JsonProperty("backgroundColor") var backgroundColor: Int,
     @JsonProperty("windowColor") var windowColor: Int,
@@ -59,6 +65,8 @@ data class SaveCaptionStyle(
     @JsonProperty("elevation") var elevation: Int,
     /**in sp**/
     @JsonProperty("fixedTextSize") var fixedTextSize: Float?,
+    @Px
+    @JsonProperty("edgeSize") var edgeSize: Float? = null,
     @JsonProperty("removeCaptions") var removeCaptions: Boolean = false,
     @JsonProperty("removeBloat") var removeBloat: Boolean = true,
     /** Apply caps lock to the text **/
@@ -67,12 +75,19 @@ data class SaveCaptionStyle(
 
 const val DEF_SUBS_ELEVATION = 20
 
-@androidx.annotation.OptIn(androidx.media3.common.util.UnstableApi::class)
-class SubtitlesFragment : Fragment() {
+@OptIn(androidx.media3.common.util.UnstableApi::class)
+class SubtitlesFragment : DialogFragment() {
     companion object {
         val applyStyleEvent = Event<SaveCaptionStyle>()
 
-        fun Context.fromSaveToStyle(data: SaveCaptionStyle): CaptionStyleCompat {
+        fun setSubtitleViewStyle(view: SubtitleView?, data: SaveCaptionStyle) {
+            if (view == null) return
+            val ctx = view.context ?: return
+            val style = ctx.fromSaveToStyle(data)
+            view.setStyle(style)
+        }
+
+        private fun Context.fromSaveToStyle(data: SaveCaptionStyle): CaptionStyleCompat {
             return CaptionStyleCompat(
                 data.foregroundColor,
                 data.backgroundColor,
@@ -99,6 +114,7 @@ class SubtitlesFragment : Fragment() {
         fun push(activity: Activity?, hide: Boolean = true) {
             activity.navigate(R.id.global_to_navigation_subtitles, Bundle().apply {
                 putBoolean("hide", hide)
+                putBoolean("popFragment", true)
             })
         }
 
@@ -118,15 +134,15 @@ class SubtitlesFragment : Fragment() {
 
         fun getCurrentSavedStyle(): SaveCaptionStyle {
             return getKey(SUBTITLE_KEY) ?: SaveCaptionStyle(
-                getDefColor(0),
-                getDefColor(2),
-                getDefColor(3),
-                CaptionStyleCompat.EDGE_TYPE_OUTLINE,
-                getDefColor(1),
-                null,
-                null,
-                DEF_SUBS_ELEVATION,
-                null,
+                foregroundColor = getDefColor(0),
+                backgroundColor = getDefColor(2),
+                windowColor = getDefColor(3),
+                edgeType = CaptionStyleCompat.EDGE_TYPE_OUTLINE,
+                edgeColor = getDefColor(1),
+                typeface = null,
+                typefaceFilePath = null,
+                elevation = DEF_SUBS_ELEVATION,
+                fixedTextSize = null,
             )
         }
 
@@ -167,7 +183,7 @@ class SubtitlesFragment : Fragment() {
             activity?.hideSystemUI()
     }
 
-    private fun onDialogDismissed(id: Int) {
+    private fun onDialogDismissed(@Suppress("UNUSED_PARAMETER") id: Int) {
         if (hide)
             activity?.hideSystemUI()
     }
@@ -186,9 +202,19 @@ class SubtitlesFragment : Fragment() {
     }
 
     private fun Context.updateState() {
-        binding?.subtitleText?.setStyle(fromSaveToStyle(state))
         val text = getString(R.string.subtitles_example_text)
-        val fixedText = if (state.upperCase) text.uppercase() else text
+        val fixedText = SpannableString.valueOf(if (state.upperCase) text.uppercase() else text)
+
+        state.edgeSize?.let { size ->
+            fixedText.setSpan(
+                OutlineSpan(size),
+                0,
+                fixedText.length,
+                Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
+            )
+        }
+
+        setSubtitleViewStyle(binding?.subtitleText, state)
         binding?.subtitleText?.setCues(
             listOf(
                 Cue.Builder()
@@ -240,9 +266,19 @@ class SubtitlesFragment : Fragment() {
         onColorSelectedEvent -= ::onColorSelected
     }
 
+    override fun onStart() {
+        super.onStart()
+        dialog?.window?.setWindowAnimations(R.style.DialogFullscreen)
+    }
+
+    override fun getTheme(): Int {
+        return R.style.DialogFullscreen
+    }
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         hide = arguments?.getBoolean("hide") ?: true
+        val popFragment = arguments?.getBoolean("popFragment") ?: false
         onColorSelectedEvent += ::onColorSelected
         onDialogDismissedEvent += ::onDialogDismissed
         binding?.subsImportText?.text = getString(R.string.subs_import_text).format(
@@ -292,20 +328,13 @@ class SubtitlesFragment : Fragment() {
 
             subsSubtitleElevation.setFocusableInTv()
             subsSubtitleElevation.setOnClickListener { textView ->
-                val suffix = "dp"
+                // tbh this should not be a dialog if it has so many values
                 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"),
-                )
+                    0 to textView.context.getString(R.string.none)
+                ) + (1..30).map { x ->
+                    val i = x * 10
+                    i to "${i}dp"
+                }
 
                 //showBottomDialog
                 activity?.showDialog(
@@ -332,26 +361,16 @@ class SubtitlesFragment : Fragment() {
             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)
-                    ),
+                    CaptionStyleCompat.EDGE_TYPE_NONE to
+                            textView.context.getString(R.string.subtitles_none),
+                    CaptionStyleCompat.EDGE_TYPE_OUTLINE to
+                            textView.context.getString(R.string.subtitles_outline),
+                    CaptionStyleCompat.EDGE_TYPE_DEPRESSED to
+                            textView.context.getString(R.string.subtitles_depressed),
+                    CaptionStyleCompat.EDGE_TYPE_DROP_SHADOW to
+                            textView.context.getString(R.string.subtitles_shadow),
+                    CaptionStyleCompat.EDGE_TYPE_RAISED to
+                            textView.context.getString(R.string.subtitles_raised),
                 )
 
                 //showBottomDialog
@@ -376,42 +395,9 @@ class SubtitlesFragment : Fragment() {
 
             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"),
-                )
+                    null to textView.context.getString(R.string.normal),
+                ) + (6..60).map { i -> i.toFloat() to "${i}sp" }
 
                 //showBottomDialog
                 activity?.showDialog(
@@ -426,6 +412,25 @@ class SubtitlesFragment : Fragment() {
                 }
             }
 
+            subsEdgeSize.setFocusableInTv()
+            subsEdgeSize.setOnClickListener { textView ->
+                val fontSizes = listOf(
+                    null to textView.context.getString(R.string.normal),
+                ) + (1..60).map { i -> i.toFloat() to "${i}px" }
+
+                //showBottomDialog
+                activity?.showDialog(
+                    fontSizes.map { it.second },
+                    fontSizes.map { it.first }.indexOf(state.edgeSize),
+                    (textView as TextView).text.toString(),
+                    false,
+                    dismissCallback
+                ) { index ->
+                    state.edgeSize = fontSizes.map { it.first }[index]
+                    textView.context.updateState()
+                }
+            }
+
             subtitlesRemoveBloat.isChecked = state.removeBloat
             subtitlesRemoveBloat.setOnCheckedChangeListener { _, b ->
                 state.removeBloat = b
@@ -448,6 +453,13 @@ class SubtitlesFragment : Fragment() {
                 return@setOnLongClickListener true
             }
 
+            subsEdgeSize.setOnLongClickListener { _ ->
+                state.edgeSize = null
+                context?.updateState()
+                showToast(activity, R.string.subs_default_reset_toast, Toast.LENGTH_SHORT)
+                return@setOnLongClickListener true
+            }
+
             //Fetch current value from preference
             context?.let { ctx ->
                 subtitlesFilterSubLang.isChecked =
@@ -467,21 +479,21 @@ class SubtitlesFragment : Fragment() {
             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"),
+                    null to textView.context.getString(R.string.normal),
+                    R.font.trebuchet_ms to "Trebuchet MS",
+                    R.font.netflix_sans to "Netflix Sans",
+                    R.font.google_sans to "Google Sans",
+                    R.font.open_sans to "Open Sans",
+                    R.font.futura to "Futura",
+                    R.font.consola to "Consola",
+                    R.font.gotham to "Gotham",
+                    R.font.lucida_grande to "Lucida Grande",
+                    R.font.stix_general to "STIX General",
+                    R.font.times_new_roman to "Times New Roman",
+                    R.font.verdana to "Verdana",
+                    R.font.ubuntu_regular to "Ubuntu",
+                    R.font.comic_sans to "Comic Sans",
+                    R.font.poppins_regular to "Poppins",
                 )
                 val savedFontTypes = textView.context.getSavedFonts()
 
@@ -578,14 +590,22 @@ class SubtitlesFragment : Fragment() {
             }
 
             cancelBtt.setOnClickListener {
-                activity?.popCurrentPage()
+                if (popFragment) {
+                    activity?.popCurrentPage()
+                } else {
+                    dismiss()
+                }
             }
 
             applyBtt.setOnClickListener {
                 it.context.saveStyle(state)
                 applyStyleEvent.invoke(state)
                 it.context.fromSaveToStyle(state)
-                activity?.popCurrentPage()
+                if (popFragment) {
+                    activity?.popCurrentPage()
+                } else {
+                    dismiss()
+                }
             }
         }
     }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/AniSkip.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/AniSkip.kt
index e9b69c5b013..820a01f9f40 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/AniSkip.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/AniSkip.kt
@@ -7,7 +7,6 @@ import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.LoadResponse.Companion.getMalId
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.ui.result.ResultEpisode
-import com.lagradost.cloudstream3.ui.result.txt
 import java.lang.Long.min
 
 object EpisodeSkip {
@@ -83,7 +82,7 @@ object EpisodeSkip {
                         startMs = start,
                         endMs = end
                     )
-                }?.let { list ->
+                }.let { list ->
                     out.addAll(list)
                 }
             }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/AppContextUtils.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/AppContextUtils.kt
index f0aae7bc035..34096f76a16 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/AppContextUtils.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/AppContextUtils.kt
@@ -6,7 +6,10 @@ import android.app.Activity
 import android.app.Activity.RESULT_CANCELED
 import android.app.NotificationChannel
 import android.app.NotificationManager
-import android.content.*
+import android.content.ContentValues
+import android.content.Context
+import android.content.DialogInterface
+import android.content.Intent
 import android.content.pm.PackageManager
 import android.database.Cursor
 import android.media.AudioAttributes
@@ -14,9 +17,14 @@ import android.media.AudioFocusRequest
 import android.media.AudioManager
 import android.media.tv.TvContract.Channels.COLUMN_INTERNAL_PROVIDER_ID
 import android.net.ConnectivityManager
+import android.net.Network
 import android.net.NetworkCapabilities
 import android.net.Uri
-import android.os.*
+import android.os.Build
+import android.os.Environment
+import android.os.Handler
+import android.os.Looper
+import android.os.ParcelFileDescriptor
 import android.provider.MediaStore
 import android.text.Spanned
 import android.util.Log
@@ -29,7 +37,6 @@ import androidx.activity.result.contract.ActivityResultContracts
 import androidx.annotation.RequiresApi
 import androidx.annotation.WorkerThread
 import androidx.appcompat.app.AlertDialog
-import androidx.core.content.ContextCompat
 import androidx.core.text.HtmlCompat
 import androidx.core.text.toSpanned
 import androidx.core.widget.ContentLoadingProgressBar
@@ -40,25 +47,35 @@ import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import androidx.tvprovider.media.tv.*
+import androidx.tvprovider.media.tv.PreviewChannelHelper
+import androidx.tvprovider.media.tv.TvContractCompat
+import androidx.tvprovider.media.tv.WatchNextProgram
 import androidx.tvprovider.media.tv.WatchNextProgram.fromCursor
 import androidx.viewpager2.widget.ViewPager2
-import com.fasterxml.jackson.module.kotlin.readValue
 import com.google.android.gms.cast.framework.CastContext
 import com.google.android.gms.cast.framework.CastState
 import com.google.android.gms.common.ConnectionResult
 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.APIHolder.apis
+import com.lagradost.cloudstream3.AcraApplication.Companion.getActivity
+import com.lagradost.cloudstream3.AllLanguagesName
 import com.lagradost.cloudstream3.CommonActivity.activity
 import com.lagradost.cloudstream3.CommonActivity.showToast
+import com.lagradost.cloudstream3.DubStatus
+import com.lagradost.cloudstream3.HomePageList
+import com.lagradost.cloudstream3.LoadResponse
+import com.lagradost.cloudstream3.MainAPI
 import com.lagradost.cloudstream3.MainActivity.Companion.afterRepositoryLoadedEvent
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.SearchResponse
+import com.lagradost.cloudstream3.TvType
+import com.lagradost.cloudstream3.isMovieType
 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.AccountManager.Companion.APP_STRING_RESUME_WATCHING
 import com.lagradost.cloudstream3.syncproviders.providers.Kitsu
 import com.lagradost.cloudstream3.ui.WebviewFragment
 import com.lagradost.cloudstream3.ui.player.SubtitleData
@@ -76,9 +93,15 @@ import com.lagradost.cloudstream3.utils.UIHelper.navigate
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import okhttp3.Cache
-import java.io.*
+import java.io.File
+import java.io.FileNotFoundException
+import java.io.FileOutputStream
+import java.io.InputStream
+import java.io.OutputStream
 import java.net.URL
 import java.net.URLDecoder
+import java.util.concurrent.Executor
+import java.util.concurrent.Executors
 
 object AppContextUtils {
     fun RecyclerView.setMaxViewPoolSize(maxViewTypeId: Int, maxPoolSize: Int) {
@@ -105,7 +128,7 @@ object AppContextUtils {
         this?.window?.setWindowAnimations(-1)
         this?.show()
         Handler(Looper.getMainLooper()).postDelayed({
-            this?.window?.setWindowAnimations(R.style.Animation_Design_BottomSheetDialog)
+            this?.window?.setWindowAnimations(com.google.android.material.R.style.Animation_Design_BottomSheetDialog)
         }, 200)
     }
 
@@ -161,7 +184,7 @@ object AppContextUtils {
             .setTitle(title)
             .setPosterArtUri(Uri.parse(card.posterUrl))
             .setIntentUri(Uri.parse(card.id?.let {
-                "$appStringResumeWatching://$it"
+                "$APP_STRING_RESUME_WATCHING://$it"
             } ?: card.url))
             .setInternalProviderId(card.url)
             .setLastEngagementTimeUtcMillis(
@@ -646,7 +669,7 @@ object AppContextUtils {
         url: String,
         fallbackWebview: Boolean = false,
         fragment: Fragment? = null,
-    ) {
+    ) = (this.getActivity() ?: activity)?.runOnUiThread {
         try {
             val intent = Intent(Intent.ACTION_VIEW)
             intent.data = Uri.parse(url)
@@ -665,10 +688,7 @@ object AppContextUtils {
                         openWebView(fragment, url)
                     }
                 }.launch(intent)
-            } else {
-                ContextCompat.startActivity(this, intent, null)
-            }
-
+            } else this.startActivity(intent)
         } catch (e: Exception) {
             logError(e)
             if (fallbackWebview) {
@@ -678,9 +698,17 @@ object AppContextUtils {
     }
 
     fun Context.isNetworkAvailable(): Boolean {
-        val manager = this.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
-        val activeNetworkInfo = manager.activeNetworkInfo
-        return activeNetworkInfo != null && activeNetworkInfo.isConnected || manager.allNetworkInfo?.any { it.isConnected } ?: false
+        val connectivityManager =
+            getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            val network = connectivityManager.activeNetwork ?: return false
+            val networkCapabilities =
+                connectivityManager.getNetworkCapabilities(network) ?: return false
+            networkCapabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
+        } else {
+            @Suppress("DEPRECATION")
+            connectivityManager.activeNetworkInfo?.isConnected == true
+        }
     }
 
     fun splitQuery(url: URL): Map<String, String> {
@@ -748,15 +776,17 @@ object AppContextUtils {
     fun loadResult(
         url: String,
         apiName: String,
+        name : String,
         startAction: Int = 0,
         startValue: Int = 0
     ) {
-        (activity as FragmentActivity?)?.loadResult(url, apiName, startAction, startValue)
+        (activity as FragmentActivity?)?.loadResult(url, apiName, name, startAction, startValue)
     }
 
     fun FragmentActivity.loadResult(
         url: String,
         apiName: String,
+        name : String,
         startAction: Int = 0,
         startValue: Int = 0
     ) {
@@ -772,7 +802,7 @@ object AppContextUtils {
             // viewModelStore.clear()
             this.navigate(
                 getResultsId(),
-                ResultFragment.newInstance(url, apiName, startAction, startValue)
+                ResultFragment.newInstance(url, apiName, name, startAction, startValue)
             )
         }
     }
@@ -801,12 +831,18 @@ object AppContextUtils {
     }
 
     fun Activity.requestLocalAudioFocus(focusRequest: AudioFocusRequest?) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && focusRequest != null) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            if (focusRequest == null) {
+                Log.e("TAG", "focusRequest was null")
+                return
+            }
+
             val audioManager = getSystemService(Context.AUDIO_SERVICE) as AudioManager
             audioManager.requestAudioFocus(focusRequest)
         } else {
             val audioManager: AudioManager =
                 getSystemService(Context.AUDIO_SERVICE) as AudioManager
+            @Suppress("DEPRECATION")
             audioManager.requestAudioFocus(
                 null,
                 AudioManager.STREAM_MUSIC,
@@ -838,20 +874,26 @@ object AppContextUtils {
         val isCastApiAvailable =
             GoogleApiAvailability.getInstance()
                 .isGooglePlayServicesAvailable(applicationContext) == ConnectionResult.SUCCESS
+
         try {
-            applicationContext?.let { CastContext.getSharedInstance(it) }
+            applicationContext?.let {
+                val task = CastContext.getSharedInstance(it) { it.run() }
+                task.result
+            }
         } catch (e: Exception) {
             println(e)
-            // track non-fatal
+            // Track non-fatal
             return false
         }
+
         return isCastApiAvailable
     }
 
     fun Context.isConnectedToChromecast(): Boolean {
         if (isCastApiAvailable()) {
-            val castContext = CastContext.getSharedInstance(this)
-            if (castContext.castState == CastState.CONNECTED) {
+            val executor: Executor = Executors.newSingleThreadExecutor()
+            val castContext = CastContext.getSharedInstance(this, executor)
+            if (castContext.result.castState == CastState.CONNECTED) {
                 return true
             }
         }
@@ -964,16 +1006,16 @@ object AppContextUtils {
     }
 
     fun Context.isUsingMobileData(): Boolean {
-        val conManager = getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
-        val networkInfo = conManager.allNetworks
-        return networkInfo.any {
-            conManager.getNetworkCapabilities(it)
-                ?.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) == true
-        } &&
-                !networkInfo.any {
-                    conManager.getNetworkCapabilities(it)
-                        ?.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) == true
-                }
+        val connectionManager = getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            val activeNetwork: Network? = connectionManager.activeNetwork
+            val networkCapabilities = connectionManager.getNetworkCapabilities(activeNetwork)
+            networkCapabilities?.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) == true &&
+                    !networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI)
+        } else {
+            @Suppress("DEPRECATION")
+            connectionManager.activeNetworkInfo?.type == ConnectivityManager.TYPE_MOBILE
+        }
     }
 
 
@@ -1014,9 +1056,7 @@ object AppContextUtils {
                 }
                 build()
             }
-        } else {
-            null
-        }
+        } else null
         return currentAudioFocusRequest
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/BackPressedCallbackHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/BackPressedCallbackHelper.kt
new file mode 100644
index 00000000000..9f77597b084
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/BackPressedCallbackHelper.kt
@@ -0,0 +1,37 @@
+package com.lagradost.cloudstream3.utils
+
+import androidx.activity.ComponentActivity
+import androidx.activity.OnBackPressedCallback
+import java.util.WeakHashMap
+
+object BackPressedCallbackHelper {
+    private val backPressedCallbacks = WeakHashMap<ComponentActivity, MutableMap<String, OnBackPressedCallback>>()
+
+    fun ComponentActivity.attachBackPressedCallback(id: String, callback: () -> Unit) {
+        val callbackMap = backPressedCallbacks.getOrPut(this) { mutableMapOf() }
+
+        if (callbackMap.containsKey(id)) return
+
+        val newCallback = object : OnBackPressedCallback(true) {
+            override fun handleOnBackPressed() {
+                callback.invoke()
+            }
+        }
+        callbackMap[id] = newCallback
+
+        onBackPressedDispatcher.addCallback(this, newCallback)
+    }
+
+    fun ComponentActivity.detachBackPressedCallback(id: String) {
+        val callbackMap = backPressedCallbacks[this] ?: return
+
+        callbackMap[id]?.let { callback ->
+            callback.isEnabled = false
+            callbackMap.remove(id)
+        }
+
+        if (callbackMap.isEmpty()) {
+            backPressedCallbacks.remove(this)
+        }
+    }
+}
\ No newline at end of file
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 1d23e5037cb..9bc00a99203 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/BackupUtils.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/BackupUtils.kt
@@ -7,7 +7,9 @@ import android.widget.Toast
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.annotation.WorkerThread
+import androidx.core.net.toUri
 import androidx.fragment.app.FragmentActivity
+import androidx.preference.PreferenceManager
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.module.kotlin.readValue
 import com.lagradost.cloudstream3.AcraApplication.Companion.getActivity
@@ -27,7 +29,6 @@ import com.lagradost.cloudstream3.syncproviders.providers.MALApi.Companion.MAL_U
 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.syncproviders.providers.SubDlApi.Companion.SUBDL_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
@@ -35,8 +36,14 @@ import com.lagradost.cloudstream3.utils.DataStore.getSharedPrefs
 import com.lagradost.cloudstream3.utils.DataStore.mapper
 import com.lagradost.cloudstream3.utils.UIHelper.checkWrite
 import com.lagradost.cloudstream3.utils.UIHelper.requestRW
+import com.lagradost.cloudstream3.utils.VideoDownloadManager.StreamData
+import com.lagradost.cloudstream3.utils.VideoDownloadManager.getBasePath
 import com.lagradost.cloudstream3.utils.VideoDownloadManager.setupStream
+import com.lagradost.safefile.MediaFileContentType
+import com.lagradost.safefile.SafeFile
 import okhttp3.internal.closeQuietly
+import java.io.File
+import java.io.IOException
 import java.io.OutputStream
 import java.io.PrintWriter
 import java.lang.System.currentTimeMillis
@@ -67,11 +74,14 @@ object BackupUtils {
         OPEN_SUBTITLES_USER_KEY,
         SUBDL_SUBTITLES_USER_KEY,
 
-        DOWNLOAD_EPISODE_CACHE,
-
         "biometric_key", // can lock down users if backup is shared on a incompatible device
         "nginx_user", // Nginx user key
-        "download_path_key" // No access rights after restore data from backup
+
+        // No access rights after restore data from backup
+        "download_path_key",
+        "download_path_key_visual",
+        "backup_path_key",
+        "backup_dir_path_key"
     )
 
     /** false if key should not be contained in backup */
@@ -83,12 +93,12 @@ object BackupUtils {
 
     // Kinda hack, but I couldn't think of a better way
     data class BackupVars(
-        @JsonProperty("_Bool") val _Bool: Map<String, Boolean>?,
-        @JsonProperty("_Int") val _Int: Map<String, Int>?,
-        @JsonProperty("_String") val _String: Map<String, String>?,
-        @JsonProperty("_Float") val _Float: Map<String, Float>?,
-        @JsonProperty("_Long") val _Long: Map<String, Long>?,
-        @JsonProperty("_StringSet") val _StringSet: Map<String, Set<String>?>?,
+        @JsonProperty("_Bool") val bool: Map<String, Boolean>?,
+        @JsonProperty("_Int") val int: Map<String, Int>?,
+        @JsonProperty("_String") val string: Map<String, String>?,
+        @JsonProperty("_Float") val float: Map<String, Float>?,
+        @JsonProperty("_Long") val long: Map<String, Long>?,
+        @JsonProperty("_StringSet") val stringSet: Map<String, Set<String>?>?,
     )
 
     data class BackupFile(
@@ -136,21 +146,21 @@ object BackupUtils {
     ) {
         if (context == null) return
         if (restoreSettings) {
-            context.restoreMap(backupFile.settings._Bool, true)
-            context.restoreMap(backupFile.settings._Int, true)
-            context.restoreMap(backupFile.settings._String, true)
-            context.restoreMap(backupFile.settings._Float, true)
-            context.restoreMap(backupFile.settings._Long, true)
-            context.restoreMap(backupFile.settings._StringSet, true)
+            context.restoreMap(backupFile.settings.bool, true)
+            context.restoreMap(backupFile.settings.int, true)
+            context.restoreMap(backupFile.settings.string, true)
+            context.restoreMap(backupFile.settings.float, true)
+            context.restoreMap(backupFile.settings.long, true)
+            context.restoreMap(backupFile.settings.stringSet, true)
         }
 
         if (restoreDataStore) {
-            context.restoreMap(backupFile.datastore._Bool)
-            context.restoreMap(backupFile.datastore._Int)
-            context.restoreMap(backupFile.datastore._String)
-            context.restoreMap(backupFile.datastore._Float)
-            context.restoreMap(backupFile.datastore._Long)
-            context.restoreMap(backupFile.datastore._StringSet)
+            context.restoreMap(backupFile.datastore.bool)
+            context.restoreMap(backupFile.datastore.int)
+            context.restoreMap(backupFile.datastore.string)
+            context.restoreMap(backupFile.datastore.float)
+            context.restoreMap(backupFile.datastore.long)
+            context.restoreMap(backupFile.datastore.stringSet)
         }
     }
 
@@ -168,10 +178,9 @@ object BackupUtils {
             }
 
             val date = SimpleDateFormat("yyyy_MM_dd_HH_mm").format(Date(currentTimeMillis()))
-            val ext = "txt"
             val displayName = "CS3_Backup_${date}"
             val backupFile = getBackup(context)
-            val stream = setupStream(context, displayName, null, ext, false)
+            val stream = setupBackupStream(context, displayName)
 
             fileStream = stream.openNew()
             printStream = PrintWriter(fileStream)
@@ -197,6 +206,18 @@ object BackupUtils {
         }
     }
 
+    @Throws(IOException::class)
+    private fun setupBackupStream(context: Context, name: String, ext: String = "txt"): StreamData {
+        return setupStream(
+            baseFile = getCurrentBackupDir(context).first ?: getDefaultBackupDir(context)
+            ?: throw IOException("Bad config"),
+            name,
+            folder = null,
+            extension = ext,
+            tryResume = false
+        )
+    }
+
     fun FragmentActivity.setUpBackup() {
         try {
             restoreFileSelector =
@@ -266,4 +287,27 @@ object BackupUtils {
         }
         editor.apply()
     }
-}
\ No newline at end of file
+
+    /**
+     * Copy of [VideoDownloadManager.basePathToFile], [VideoDownloadManager.getDefaultDir] and [VideoDownloadManager.getBasePath]
+     * modded for backup specific paths
+     * */
+
+    fun getDefaultBackupDir(context: Context): SafeFile? {
+        return SafeFile.fromMedia(context, MediaFileContentType.Downloads)
+    }
+
+    fun getCurrentBackupDir(context: Context): Pair<SafeFile?, String?> {
+        val settingsManager = PreferenceManager.getDefaultSharedPreferences(context)
+        val basePathSetting = settingsManager.getString(context.getString(R.string.backup_path_key), null)
+        return baseBackupPathToFile(context, basePathSetting) to basePathSetting
+    }
+
+    private fun baseBackupPathToFile(context: Context, path: String?): SafeFile? {
+        return when {
+            path.isNullOrBlank() -> getDefaultBackupDir(context)
+            path.startsWith("content://") -> SafeFile.fromUri(context, path.toUri())
+            else -> SafeFile.fromFilePath(context, path)
+        }
+    }
+}
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 19c817b91b5..b5192aae287 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/DataStore.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/DataStore.kt
@@ -56,14 +56,25 @@ data class Editor(
 ) {
     /** Always remember to call apply after */
     fun<T> setKeyRaw(path: String, value: T) {
-        when (value) {
-            is Boolean -> editor.putBoolean(path, value)
-            is Int -> editor.putInt(path, value)
-            is String -> editor.putString(path, value)
-            is Float -> editor.putFloat(path, value)
-            is Long -> editor.putLong(path, value)
-            (value as? Set<String> != null) -> editor.putStringSet(path, value as Set<String>)
+        @Suppress("UNCHECKED_CAST")
+        if (isStringSet(value)) {
+            editor.putStringSet(path, value as Set<String>)
+        } else {
+            when (value) {
+                is Boolean -> editor.putBoolean(path, value)
+                is Int -> editor.putInt(path, value)
+                is String -> editor.putString(path, value)
+                is Float -> editor.putFloat(path, value)
+                is Long -> editor.putLong(path, value)
+            }
+        }
+    }
+
+    private fun isStringSet(value: Any?) : Boolean {
+        if (value is Set<*>) {
+            return value.filterIsInstance<String>().size == value.size
         }
+        return false
     }
 
     fun apply() {
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 43124a531b1..650502dcaba 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/DataStoreHelper.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/DataStoreHelper.kt
@@ -2,8 +2,8 @@ package com.lagradost.cloudstream3.utils
 
 import android.content.Context
 import com.fasterxml.jackson.annotation.JsonProperty
-import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.APIHolder.unixTimeMS
+import com.lagradost.cloudstream3.AcraApplication
 import com.lagradost.cloudstream3.AcraApplication.Companion.context
 import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
 import com.lagradost.cloudstream3.AcraApplication.Companion.getKeys
@@ -11,13 +11,23 @@ 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.DubStatus
+import com.lagradost.cloudstream3.EpisodeResponse
+import com.lagradost.cloudstream3.MainActivity
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.SearchQuality
+import com.lagradost.cloudstream3.SearchResponse
+import com.lagradost.cloudstream3.TvType
 import com.lagradost.cloudstream3.syncproviders.AccountManager
 import com.lagradost.cloudstream3.syncproviders.SyncAPI
 import com.lagradost.cloudstream3.ui.WatchType
 import com.lagradost.cloudstream3.ui.library.ListSorting
-import com.lagradost.cloudstream3.ui.result.UiImage
+import com.lagradost.cloudstream3.ui.result.EpisodeSortType
 import com.lagradost.cloudstream3.ui.result.VideoWatchState
 import com.lagradost.cloudstream3.utils.AppContextUtils.filterProviderByPreferredMedia
+import java.util.Calendar
+import java.util.Date
+import java.util.GregorianCalendar
 import kotlin.reflect.KClass
 import kotlin.reflect.KProperty
 
@@ -33,6 +43,7 @@ const val RESULT_RESUME_WATCHING_HAS_MIGRATED = "result_resume_watching_migrated
 const val RESULT_EPISODE = "result_episode"
 const val RESULT_SEASON = "result_season"
 const val RESULT_DUB = "result_dub"
+const val KEY_RESULT_SORT = "result_sort"
 
 
 class UserPreferenceDelegate<T : Any>(
@@ -110,6 +121,12 @@ object DataStoreHelper {
     var playBackSpeed : Float by UserPreferenceDelegate("playback_speed", 1.0f)
     var resizeMode : Int by UserPreferenceDelegate("resize_mode", 0)
     var librarySortingMode : Int by UserPreferenceDelegate("library_sorting_mode", ListSorting.AlphabeticalA.ordinal)
+    private var _resultsSortingMode : Int by UserPreferenceDelegate("results_sorting_mode", EpisodeSortType.NUMBER_ASC.ordinal)
+    var resultsSortingMode : EpisodeSortType
+        get() = EpisodeSortType.entries.getOrNull(_resultsSortingMode) ?: EpisodeSortType.NUMBER_ASC
+        set(value) {
+            _resultsSortingMode = value.ordinal
+        }
 
     data class Account(
         @JsonProperty("keyIndex")
@@ -123,10 +140,7 @@ object DataStoreHelper {
         @JsonProperty("lockPin")
         val lockPin: String? = null,
     ) {
-        val image: UiImage
-            get() = customImage?.let { UiImage.Image(it) } ?: UiImage.Drawable(
-                profileImages.getOrNull(defaultImageIndex) ?: profileImages.first()
-            )
+        val image get() = customImage?.let { UiImage.Image(it) } ?: profileImages.getOrNull(defaultImageIndex)?.let { UiImage.Drawable(it) } ?: UiImage.Drawable(profileImages.first())
     }
 
     const val TAG = "data_store_helper"
@@ -181,6 +195,19 @@ object DataStoreHelper {
         }
     }
 
+    /** Gets the current selected account (or default), may return null if context is null and the user is using the default account */
+    fun getCurrentAccount(): Account? {
+        return (context?.let {
+            getAccounts(it)
+        } ?: accounts.toList()).firstNotNullOfOrNull { account ->
+            if (account.keyIndex == selectedKeyIndex) {
+                account
+            } else {
+                null
+            }
+        }
+    }
+
     data class PosDur(
         @JsonProperty("position") val position: Long,
         @JsonProperty("duration") val duration: Long
@@ -195,6 +222,8 @@ object DataStoreHelper {
         return this
     }
 
+    fun Int.toYear() : Date = GregorianCalendar.getInstance().also { it.set(Calendar.YEAR, this) }.time
+
     /**
      * Used to display notifications on new episodes and posters in library.
      **/
@@ -242,7 +271,7 @@ object DataStoreHelper {
                 null,
                 null,
                 latestUpdatedTime,
-                apiName, type, posterUrl, posterHeaders, quality, this.id, plot = this.plot, rating = this.rating, tags = this.tags
+                apiName, type, posterUrl, posterHeaders, quality, year?.toYear(), this.id, plot = this.plot, rating = this.rating, tags = this.tags
             )
         }
     }
@@ -273,7 +302,7 @@ object DataStoreHelper {
                 null,
                 null,
                 latestUpdatedTime,
-                apiName, type, posterUrl, posterHeaders, quality, this.id, plot = this.plot, rating = this.rating, tags = this.tags
+                apiName, type, posterUrl, posterHeaders, quality, year?.toYear(), this.id, plot = this.plot, rating = this.rating, tags = this.tags
             )
         }
     }
@@ -304,7 +333,7 @@ object DataStoreHelper {
                 null,
                 null,
                 latestUpdatedTime,
-                apiName, type, posterUrl, posterHeaders, quality, this.id, plot = this.plot, rating = this.rating, tags = this.tags
+                apiName, type, posterUrl, posterHeaders, quality, year?.toYear(), this.id, plot = this.plot, rating = this.rating, tags = this.tags
             )
         }
     }
@@ -585,4 +614,4 @@ object DataStoreHelper {
             getKey("${idPrefix}_sync", id.toString())
         }
     }
-}
\ No newline at end of file
+}
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 421e4420499..4eeb4e5da43 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/DownloadFileWorkManager.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/DownloadFileWorkManager.kt
@@ -2,12 +2,13 @@ package com.lagradost.cloudstream3.utils
 
 import android.app.Notification
 import android.content.Context
+import android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC
+import android.os.Build.VERSION.SDK_INT
 import androidx.work.CoroutineWorker
 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
@@ -94,7 +95,10 @@ class DownloadFileWorkManager(val context: Context, private val workerParams: Wo
 
     private fun handleNotification(id: Int, notification: Notification) {
         main {
-            setForegroundAsync(ForegroundInfo(id, notification))
+            if (SDK_INT >= 29)
+            setForegroundAsync(ForegroundInfo(id, notification, FOREGROUND_SERVICE_TYPE_DATA_SYNC))
+            else setForegroundAsync(ForegroundInfo(id, notification))
+
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/GlideApp.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/GlideApp.kt
deleted file mode 100644
index 38d3fe9efc6..00000000000
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/GlideApp.kt
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.lagradost.cloudstream3.utils
-
-import android.annotation.SuppressLint
-import android.content.Context
-import com.bumptech.glide.Glide
-import com.bumptech.glide.GlideBuilder
-import com.bumptech.glide.Registry
-import com.bumptech.glide.annotation.GlideModule
-import com.bumptech.glide.integration.okhttp3.OkHttpUrlLoader
-import com.bumptech.glide.load.engine.DiskCacheStrategy
-import com.bumptech.glide.load.engine.cache.InternalCacheDiskCacheFactory
-import com.bumptech.glide.load.model.GlideUrl
-import com.bumptech.glide.module.AppGlideModule
-import com.bumptech.glide.request.RequestOptions
-import com.bumptech.glide.signature.ObjectKey
-import com.lagradost.cloudstream3.USER_AGENT
-import com.lagradost.cloudstream3.network.DdosGuardKiller
-import com.lagradost.cloudstream3.network.initClient
-import com.lagradost.nicehttp.Requests
-import java.io.InputStream
-
-@GlideModule
-class GlideModule : AppGlideModule() {
-    @SuppressLint("CheckResult")
-    override fun applyOptions(context: Context, builder: GlideBuilder) {
-        super.applyOptions(context, builder)
-        builder.apply {
-            RequestOptions()
-                .diskCacheStrategy(DiskCacheStrategy.ALL)
-                .signature(ObjectKey(System.currentTimeMillis().toShort()))
-        }.setDiskCache {
-            // Possible to make this a setting in the future.
-            val memoryCacheSizeBytes: Long = 1024 * 1024 * 100 // 100mb
-            InternalCacheDiskCacheFactory(context, memoryCacheSizeBytes).build()
-        }
-    }
-
-    // Needed for DOH
-    // https://stackoverflow.com/a/61634041
-    override fun registerComponents(context: Context, glide: Glide, registry: Registry) {
-        val client =
-            Requests().apply {
-                defaultHeaders = mapOf("user-agent" to USER_AGENT)
-            }.initClient(context)
-                .newBuilder()
-                .addInterceptor(DdosGuardKiller(false))
-                .build()
-
-        registry.replace(
-            GlideUrl::class.java,
-            InputStream::class.java,
-            OkHttpUrlLoader.Factory(client)
-        )
-        super.registerComponents(context, glide, registry)
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/ImageModuleCoil.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/ImageModuleCoil.kt
new file mode 100644
index 00000000000..61f10d5ddf5
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/ImageModuleCoil.kt
@@ -0,0 +1,164 @@
+package com.lagradost.cloudstream3.utils
+
+import android.graphics.Bitmap
+import android.graphics.drawable.Drawable
+import android.net.Uri
+import android.util.Log
+import android.widget.ImageView
+import androidx.annotation.DrawableRes
+import coil3.EventListener
+import coil3.Extras
+import coil3.ImageLoader
+import coil3.PlatformContext
+import coil3.SingletonImageLoader
+import coil3.disk.DiskCache
+import coil3.load
+import coil3.memory.MemoryCache
+import coil3.network.NetworkHeaders
+import coil3.network.httpHeaders
+import coil3.network.okhttp.OkHttpNetworkFetcherFactory
+import coil3.request.CachePolicy
+import coil3.request.ErrorResult
+import coil3.request.ImageRequest
+import coil3.request.SuccessResult
+import coil3.request.allowHardware
+import coil3.request.crossfade
+import com.lagradost.cloudstream3.USER_AGENT
+import com.lagradost.cloudstream3.network.buildDefaultClient
+import okhttp3.HttpUrl
+import okio.Path.Companion.toOkioPath
+import java.io.File
+import java.nio.ByteBuffer
+
+object ImageLoader {
+
+    private const val TAG = "CoilImgLoader"
+
+    internal fun buildImageLoader(context: PlatformContext): ImageLoader {
+        val okHttpClient = buildDefaultClient(context)
+
+        return ImageLoader.Builder(context)
+            .crossfade(250)
+            /** !Only use default placeholders and errors, if not using this instance for local
+             * image buttons because when animating this will appear or in more cases **/
+            //.placeholder { getImageFromDrawable(context, R.drawable.x) }
+            //.error { getImageFromDrawable(context, R.drawable.x) }
+            .allowHardware(false) // SDK_INT >= 28, cant use hardware bitmaps for Palette Builder
+            .memoryCache {
+                MemoryCache.Builder()
+                    .maxSizePercent(context, 0.1) // Use 10 % of the app's available memory for caching
+                    .build()
+            }
+            .diskCache {
+                DiskCache.Builder()
+                    .directory(context.cacheDir.resolve("cs3_image_cache").toOkioPath())
+                    .maxSizeBytes(256 * 1024 * 1024) // 256 MB
+                    .maxSizePercent(0.04) // Use 4 % of the device's storage space for disk caching
+                    .build()
+            }
+            .diskCachePolicy(CachePolicy.ENABLED)
+            .networkCachePolicy(CachePolicy.ENABLED)
+            /** Pass interceptors with care, unnecessary passing tokens to servers
+            or image hosting services causes unauthorized exceptions **/
+            .components { add(OkHttpNetworkFetcherFactory(callFactory = { okHttpClient })) }
+            .eventListener(object : EventListener() {
+                override fun onStart(request: ImageRequest) {
+                    super.onStart(request)
+                    Log.i(TAG, "Loading Image ${request.data}")
+                }
+
+                override fun onSuccess(request: ImageRequest, result: SuccessResult) {
+                    super.onSuccess(request, result)
+                    Log.d(TAG, "Image Loading successful")
+                }
+
+                override fun onError(request: ImageRequest, result: ErrorResult) {
+                    super.onError(request, result)
+                    Log.e(TAG, "Error loading image: ${result.throwable}")
+                }
+            })
+            .build()
+    }
+
+    /** we use coil's built in loader with our global synchronized instance, this way we achieve
+    latest and complete functionality as well as stability **/
+    private fun ImageView.loadImageInternal(
+        imageData: Any?,
+        headers: Map<String, String>? = null,
+        builder: ImageRequest.Builder.() -> Unit = {} // for placeholder, error & transformations
+    ) {
+        // clear image to avoid loading & flickering issue at fast scrolling (e.g, an image recycler)
+        this.load(null)
+
+        // Use Coil's built-in load method but with our custom module
+        this.load(imageData, SingletonImageLoader.get(context)) {
+            this.httpHeaders(NetworkHeaders.Builder().also { headerBuilder ->
+                headerBuilder.add("User-Agent", USER_AGENT)
+                headers?.forEach { (key, value) ->
+                    headerBuilder.add(key,value)
+                }
+            }.build())
+
+            builder() // if passed
+        }
+    }
+
+    /** TYPE_SAFE_LOADERS **/
+    fun ImageView.loadImage(
+        imageData: UiImage?,
+        builder: ImageRequest.Builder.() -> Unit = {}
+    ) = when(imageData) {
+        is UiImage.Image -> loadImageInternal(imageData = imageData.url, headers = imageData.headers, builder = builder)
+        is UiImage.Bitmap -> loadImageInternal(imageData = imageData.bitmap, builder = builder)
+        is UiImage.Drawable -> loadImageInternal(imageData = imageData.resId, builder = builder)
+        null -> loadImageInternal(null, builder = builder)
+    }
+
+    fun ImageView.loadImage(
+        imageData: String?,
+        headers: Map<String, String>? = null,
+        builder: ImageRequest.Builder.() -> Unit = {}
+    ) = loadImageInternal(imageData = imageData, headers = headers, builder = builder)
+
+    fun ImageView.loadImage(
+        imageData: Uri?,
+        headers: Map<String, String>? = null,
+        builder: ImageRequest.Builder.() -> Unit = {}
+    ) = loadImageInternal(imageData = imageData,headers = headers, builder = builder)
+
+    fun ImageView.loadImage(
+        imageData: HttpUrl?,
+        headers: Map<String, String>? = null,
+        builder: ImageRequest.Builder.() -> Unit = {}
+    ) = loadImageInternal(imageData = imageData, headers = headers, builder = builder)
+
+    fun ImageView.loadImage(
+        imageData: File?,
+        builder: ImageRequest.Builder.() -> Unit = {}
+    ) = loadImageInternal(imageData = imageData, builder = builder)
+
+    fun ImageView.loadImage(
+        @DrawableRes imageData: Int?,
+        builder: ImageRequest.Builder.() -> Unit = {}
+    ) = loadImageInternal(imageData = imageData, builder = builder)
+
+    fun ImageView.loadImage(
+        imageData: Drawable?,
+        builder: ImageRequest.Builder.() -> Unit = {}
+    ) = loadImageInternal(imageData = imageData, builder = builder)
+
+    fun ImageView.loadImage(
+        imageData: Bitmap?,
+        builder: ImageRequest.Builder.() -> Unit = {}
+    ) = loadImageInternal(imageData = imageData, builder = builder)
+
+    fun ImageView.loadImage(
+        imageData: ByteArray?,
+        builder: ImageRequest.Builder.() -> Unit = {}
+    ) = loadImageInternal(imageData = imageData, builder = builder)
+
+    fun ImageView.loadImage(
+        imageData: ByteBuffer?,
+        builder: ImageRequest.Builder.() -> Unit = {}
+    ) = loadImageInternal(imageData = imageData, builder = builder)
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/ImageUtil.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/ImageUtil.kt
new file mode 100644
index 00000000000..1f90b920d0c
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/ImageUtil.kt
@@ -0,0 +1,44 @@
+package com.lagradost.cloudstream3.utils
+
+import android.content.Context
+import android.graphics.Bitmap
+import android.graphics.Canvas
+import android.graphics.drawable.BitmapDrawable
+import android.graphics.drawable.Drawable
+import androidx.annotation.DrawableRes
+import androidx.core.content.ContextCompat
+import coil3.Image
+import coil3.asImage
+import coil3.request.ImageRequest
+
+/// Type safe any image, because THIS IS NOT PYTHON
+sealed class UiImage {
+    data class Image(
+        val url: String,
+        val headers: Map<String, String>? = null
+    ) : UiImage()
+
+    data class Drawable(@DrawableRes val resId: Int) : UiImage()
+    data class Bitmap(val bitmap: android.graphics.Bitmap) : UiImage()
+}
+
+fun getImageFromDrawable(context: Context, drawableRes: Int): Image? {
+    return ContextCompat.getDrawable(context, drawableRes)?.asImage()
+}
+
+fun drawableToBitmap(drawable: Drawable): Bitmap? {
+    return when (drawable) {
+        is BitmapDrawable -> drawable.bitmap
+        else -> {
+            val bitmap = Bitmap.createBitmap(
+                drawable.intrinsicWidth,
+                drawable.intrinsicHeight,
+                Bitmap.Config.ARGB_8888
+            )
+            val canvas = Canvas(bitmap)
+            drawable.setBounds(0, 0, canvas.width, canvas.height)
+            drawable.draw(canvas)
+            bitmap
+        }
+    }
+}
\ 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 2585557133d..b870a203346 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/InAppUpdater.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/InAppUpdater.kt
@@ -24,6 +24,7 @@ import okio.sink
 import java.io.File
 import android.text.TextUtils
 import com.lagradost.cloudstream3.MainActivity.Companion.deleteFileOnExit
+import com.lagradost.cloudstream3.services.PackageInstallerService
 import com.lagradost.cloudstream3.utils.AppContextUtils.setDefaultFocus
 import java.io.BufferedReader
 import java.io.IOException
@@ -35,23 +36,23 @@ class InAppUpdater {
         const val GITHUB_USER_NAME = "3a4oT"
         const val GITHUB_REPO = "cloudstream"
 
-        const val LOG_TAG = "InAppUpdater"
+        private const val LOG_TAG = "InAppUpdater"
 
         // === IN APP UPDATER ===
         data class GithubAsset(
             @JsonProperty("name") val name: String,
             @JsonProperty("size") val size: Int, // Size bytes
-            @JsonProperty("browser_download_url") val browser_download_url: String, // download link
-            @JsonProperty("content_type") val content_type: String, // application/vnd.android.package-archive
+            @JsonProperty("browser_download_url") val browserDownloadUrl: String, // download link
+            @JsonProperty("content_type") val contentType: String, // application/vnd.android.package-archive
         )
 
         data class GithubRelease(
-            @JsonProperty("tag_name") val tag_name: String, // Version code
+            @JsonProperty("tag_name") val tagName: String, // Version code
             @JsonProperty("body") val body: String, // Desc
             @JsonProperty("assets") val assets: List<GithubAsset>,
-            @JsonProperty("target_commitish") val target_commitish: String, // branch
+            @JsonProperty("target_commitish") val targetCommitish: String, // branch
             @JsonProperty("prerelease") val prerelease: Boolean,
-            @JsonProperty("node_id") val node_id: String //Node Id
+            @JsonProperty("node_id") val nodeId: String //Node Id
         )
 
         data class GithubObject(
@@ -61,7 +62,7 @@ class InAppUpdater {
         )
 
         data class GithubTag(
-            @JsonProperty("object") val github_object: GithubObject,
+            @JsonProperty("object") val githubObject: GithubObject,
         )
 
         data class Update(
@@ -114,7 +115,7 @@ class InAppUpdater {
                 response.filter { rel ->
                     !rel.prerelease
                 }.sortedWith(compareBy { release ->
-                    release.assets.firstOrNull { it.content_type == "application/vnd.android.package-archive" }?.name?.let { it1 ->
+                    release.assets.firstOrNull { it.contentType == "application/vnd.android.package-archive" }?.name?.let { it1 ->
                             versionRegex.find(
                                 it1
                             )?.groupValues?.let {
@@ -134,7 +135,7 @@ class InAppUpdater {
             foundAsset?.name?.let { assetName ->
                 val foundVersion = versionRegex.find(assetName)
                 val shouldUpdate =
-                    if (foundAsset.browser_download_url != "" && foundVersion != null) currentVersion?.versionName?.let { versionName ->
+                    if (foundAsset.browserDownloadUrl != "" && foundVersion != null) currentVersion?.versionName?.let { versionName ->
                         versionRegexLocal.find(versionName)?.groupValues?.let {
                             it[3].toInt() * 100_000_000 + it[4].toInt() * 10_000 + it[5].toInt()
                         }
@@ -146,10 +147,10 @@ class InAppUpdater {
                 return if (foundVersion != null) {
                     Update(
                         shouldUpdate,
-                        foundAsset.browser_download_url,
+                        foundAsset.browserDownloadUrl,
                         foundVersion.groupValues[2],
                         found.body,
-                        found.node_id
+                        found.nodeId
                     )
                 } else {
                     Update(false, null, null, null, null)
@@ -168,33 +169,33 @@ class InAppUpdater {
 
             val found =
                 response.lastOrNull { rel ->
-                    rel.prerelease || rel.tag_name == "pre-release"
+                    rel.prerelease || rel.tagName == "pre-release"
                 }
             val foundAsset = found?.assets?.filter { it ->
-                it.content_type == "application/vnd.android.package-archive"
+                it.contentType == "application/vnd.android.package-archive"
             }?.getOrNull(0)
 
             val tagResponse =
                 parseJson<GithubTag>(app.get(tagUrl, headers = headers).text)
 
-            Log.d(LOG_TAG, "Fetched GitHub tag: ${tagResponse.github_object.sha.take(7)}")
+            Log.d(LOG_TAG, "Fetched GitHub tag: ${tagResponse.githubObject.sha.take(7)}")
 
             val shouldUpdate =
                 (getString(R.string.commit_hash)
                     .trim { c -> c.isWhitespace() }
                     .take(7)
                         !=
-                        tagResponse.github_object.sha
+                        tagResponse.githubObject.sha
                             .trim { c -> c.isWhitespace() }
                             .take(7))
 
             return if (foundAsset != null) {
                 Update(
                     shouldUpdate,
-                    foundAsset.browser_download_url,
-                    tagResponse.github_object.sha.take(10),
+                    foundAsset.browserDownloadUrl,
+                    tagResponse.githubObject.sha.take(10),
                     found.body,
-                    found.node_id
+                    found.nodeId
                 )
             } else {
                 Update(false, null, null, null, null)
@@ -331,7 +332,7 @@ class InAppUpdater {
                                     when (currentInstaller) {
                                         // New method
                                         0 -> {
-                                            val intent = PackageInstallerService.getIntent(
+                                            val intent = PackageInstallerService.Companion.getIntent(
                                                 context,
                                                 update.updateURL
                                             )
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/IntentHelpers.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/IntentHelpers.kt
new file mode 100644
index 00000000000..d37d8aad49d
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/IntentHelpers.kt
@@ -0,0 +1,24 @@
+package com.lagradost.cloudstream3.utils
+
+import android.annotation.SuppressLint
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.os.Build
+
+inline fun <reified T> Intent.getSafeParcelableExtra(key: String): T? =
+    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU)
+        @Suppress("DEPRECATION")
+        getParcelableExtra(key) else getParcelableExtra(key, T::class.java)
+
+@SuppressLint("UnspecifiedRegisterReceiverFlag")
+fun Context.registerBroadcastReceiver(receiver: BroadcastReceiver, actionFilter: IntentFilter) {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+        // Register receiver with the context with flag to indicate internal usage
+        registerReceiver(receiver, actionFilter, Context.RECEIVER_NOT_EXPORTED)
+    } else {
+        // For older versions, no special export flag is needed
+        registerReceiver(receiver, actionFilter)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/PackageInstaller.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/PackageInstaller.kt
index bc81a5b9f22..4be0dd56c30 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/PackageInstaller.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/PackageInstaller.kt
@@ -1,5 +1,6 @@
 package com.lagradost.cloudstream3.utils
 
+import android.annotation.SuppressLint
 import android.app.PendingIntent
 import android.content.BroadcastReceiver
 import android.content.Context
@@ -8,16 +9,17 @@ import android.content.IntentFilter
 import android.content.IntentSender
 import android.content.pm.PackageInstaller
 import android.os.Build
+import android.util.Log
 import android.widget.Toast
+import com.lagradost.cloudstream3.AcraApplication.Companion.context
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.mvvm.logError
-import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
+import com.lagradost.cloudstream3.services.PackageInstallerService
 import com.lagradost.cloudstream3.utils.Coroutines.main
 import java.io.InputStream
 
 const val INSTALL_ACTION = "ApkInstaller.INSTALL_ACTION"
 
-
 class ApkInstaller(private val service: PackageInstallerService) {
 
     companion object {
@@ -25,6 +27,8 @@ class ApkInstaller(private val service: PackageInstallerService) {
          * Used for postponed installations
          **/
         var delayedInstaller: DelayedInstaller? = null
+        private var isReceiverRegistered = false
+        private const val TAG = "ApkInstaller"
     }
 
     inner class DelayedInstaller(
@@ -36,6 +40,7 @@ class ApkInstaller(private val service: PackageInstallerService) {
                 session.commit(intent)
                 true
             } catch (e: Exception) {
+                logError(e)
                 false
             }.also { delayedInstaller = null }
         }
@@ -51,13 +56,14 @@ class ApkInstaller(private val service: PackageInstallerService) {
     }
 
     private val installActionReceiver = object : BroadcastReceiver() {
+        @SuppressLint("UnsafeIntentLaunch")
         override fun onReceive(context: Context, intent: Intent) {
             when (intent.getIntExtra(
                 PackageInstaller.EXTRA_STATUS,
                 PackageInstaller.STATUS_FAILURE
             )) {
                 PackageInstaller.STATUS_PENDING_USER_ACTION -> {
-                    val userAction = intent.getParcelableExtra<Intent>(Intent.EXTRA_INTENT)
+                    val userAction = intent.getSafeParcelableExtra<Intent>(Intent.EXTRA_INTENT)
                     userAction?.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
                     context.startActivity(userAction)
                 }
@@ -104,12 +110,20 @@ class ApkInstaller(private val service: PackageInstallerService) {
                     inputStream.close()
                 }
 
+            // We must create an explicit intent or it will fail on Android 15+
+            val installIntent = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) { 
+                Intent(service, PackageInstallerService::class.java)
+                    .setAction(INSTALL_ACTION) 
+            } else Intent(INSTALL_ACTION) 
+
+            val installFlags = when {
+                Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE -> PendingIntent.FLAG_MUTABLE
+                Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> PendingIntent.FLAG_IMMUTABLE
+                else -> 0
+            }
 
             val intentSender = PendingIntent.getBroadcast(
-                service,
-                activeSession,
-                Intent(INSTALL_ACTION),
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) PendingIntent.FLAG_MUTABLE else 0,
+                service, activeSession, installIntent, installFlags
             ).intentSender
 
             // Use delayed installations on android 13 and only if "allow from unknown sources" is enabled
@@ -141,8 +155,30 @@ class ApkInstaller(private val service: PackageInstallerService) {
     }
 
     init {
-        service.registerReceiver(installActionReceiver, IntentFilter(INSTALL_ACTION))
-        service.receivers.add(installActionReceiver)
+        // Might be dangerous
+        registerInstallActionReceiver()
     }
-}
 
+    private fun registerInstallActionReceiver() {
+        if (!isReceiverRegistered) {
+            val intentFilter = IntentFilter().apply {
+                addAction(INSTALL_ACTION)
+            }
+            Log.d(TAG, "Registering install action event receiver")
+            context?.registerBroadcastReceiver(installActionReceiver, intentFilter)
+            isReceiverRegistered = true
+        }
+    }
+
+    fun unregisterInstallActionReceiver() {
+        if (isReceiverRegistered) {
+            Log.d(TAG, "Unregistering install action event receiver")
+            try {
+                context?.unregisterReceiver(installActionReceiver)
+            } catch (e: Exception) {
+                logError(e)
+            }
+            isReceiverRegistered = false
+        }
+    }
+}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/PowerManagerAPI.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/PowerManagerAPI.kt
index 27609730c28..0d7a8abc4a1 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/PowerManagerAPI.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/PowerManagerAPI.kt
@@ -4,8 +4,7 @@ import android.content.ActivityNotFoundException
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
-import android.os.Build
-import android.os.Bundle
+import android.os.Build.VERSION.SDK_INT
 import android.os.PowerManager
 import android.provider.Settings
 import android.util.Log
@@ -17,13 +16,13 @@ import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.ui.settings.Globals.PHONE
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
 
-const val packageName = BuildConfig.APPLICATION_ID
-const val TAG = "PowerManagerAPI"
+private const val PACKAGE_NAME = BuildConfig.APPLICATION_ID
+private const val TAG = "PowerManagerAPI"
 
 object BatteryOptimizationChecker {
 
     fun isAppRestricted(context: Context?): Boolean {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && context != null) {
+        if (SDK_INT >= 23 && context != null) {
             val powerManager = context.getSystemService(Context.POWER_SERVICE) as PowerManager
             return !powerManager.isIgnoringBatteryOptimizations(context.packageName)
         }
@@ -33,29 +32,25 @@ object BatteryOptimizationChecker {
 
     fun openBatteryOptimizationSettings(context: Context) {
         if (shouldShowBatteryOptimizationDialog(context)) {
-            showBatteryOptimizationDialog(context)
+            context.showBatteryOptimizationDialog()
         }
     }
 
-    fun showBatteryOptimizationDialog(context: Context) {
-        val settingsManager = PreferenceManager.getDefaultSharedPreferences(context)
+    fun Context.showBatteryOptimizationDialog() {
+        val settingsManager = PreferenceManager.getDefaultSharedPreferences(this)
 
         try {
-            context.let {
-                AlertDialog.Builder(it)
-                    .setTitle(R.string.battery_dialog_title)
-                    .setIcon(R.drawable.ic_battery)
-                    .setMessage(R.string.battery_dialog_message)
-                    .setPositiveButton(R.string.ok) { _, _ ->
-                        intentOpenAppInfo(it)
-                    }
-                    .setNegativeButton(R.string.cancel) { _, _ ->
-                        settingsManager.edit()
-                            .putBoolean(context.getString(R.string.battery_optimisation_key), false)
-                            .apply()
-                    }
-                    .show()
-            }
+            AlertDialog.Builder(this)
+                .setTitle(R.string.battery_dialog_title)
+                .setIcon(R.drawable.ic_battery)
+                .setMessage(R.string.battery_dialog_message)
+                .setPositiveButton(R.string.ok) { _, _ -> showRequestIgnoreBatteryOptDialog() }
+                .setNegativeButton(R.string.cancel) { _, _ ->
+                    settingsManager.edit()
+                        .putBoolean(getString(R.string.battery_optimisation_key), false)
+                        .apply()
+                }
+                .show()
         } catch (t: Throwable) {
             Log.e(TAG, "Error showing battery optimization dialog", t)
         }
@@ -68,14 +63,15 @@ object BatteryOptimizationChecker {
         return isRestricted && isOptimizedNotShown && isLayout(PHONE)
     }
 
-    private fun intentOpenAppInfo(context: Context) {
-        val intent = Intent()
+    private fun Context.showRequestIgnoreBatteryOptDialog() {
         try {
-            intent.setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
-                .setData(Uri.fromParts("package", packageName, null))
-            context.startActivity(intent, Bundle())
+            val intent = Intent().apply {
+                action =  Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS
+                data = Uri.parse("package:$PACKAGE_NAME")
+            }
+            startActivity(intent)
         } catch (t: Throwable) {
-            Log.e(TAG, "Unable to invoke any intent", t)
+            Log.e(TAG, "Unable to invoke APP_DETAILS intent", t)
             if (t is ActivityNotFoundException) {
                 showToast("Exception: Activity Not Found")
             } else {
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 70edf80c749..18013147342 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/SingleSelectionHelper.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/SingleSelectionHelper.kt
@@ -24,9 +24,9 @@ import com.lagradost.cloudstream3.databinding.OptionsPopupTvBinding
 import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
+import com.lagradost.cloudstream3.utils.ImageLoader.loadImage
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
 import com.lagradost.cloudstream3.utils.UIHelper.popupMenuNoIconsAndNoStringRes
-import com.lagradost.cloudstream3.utils.UIHelper.setImage
 
 object SingleSelectionHelper {
     fun Activity?.showOptionSelectStringRes(
@@ -79,7 +79,7 @@ object SingleSelectionHelper {
 
             binding.imageView.apply {
                 isGone = poster.isNullOrEmpty()
-                setImage(poster)
+                loadImage(poster)
             }
         } else {
             view?.popupMenuNoIconsAndNoStringRes(options.mapIndexed { index, s ->
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/SnackbarHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/SnackbarHelper.kt
new file mode 100644
index 00000000000..b43b51c7425
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/SnackbarHelper.kt
@@ -0,0 +1,83 @@
+package com.lagradost.cloudstream3.utils
+
+import android.app.Activity
+import android.view.View
+import androidx.annotation.MainThread
+import androidx.annotation.StringRes
+import com.google.android.material.snackbar.Snackbar
+import com.lagradost.api.Log
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.mvvm.logError
+import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute
+
+object SnackbarHelper {
+
+    private const val TAG = "COMPACT"
+    private var currentSnackbar: Snackbar? = null
+
+    @MainThread
+    fun showSnackbar(
+        act: Activity?,
+        message: UiText,
+        duration: Int = Snackbar.LENGTH_SHORT,
+        actionText: UiText? = null,
+        actionCallback: (() -> Unit)? = null
+    ) {
+        if (act == null) return
+        showSnackbar(act, message.asString(act), duration,
+            actionText?.asString(act), actionCallback)
+    }
+
+    @MainThread
+    fun showSnackbar(
+        act: Activity?,
+        @StringRes message: Int,
+        duration: Int = Snackbar.LENGTH_SHORT,
+        @StringRes actionText: Int? = null,
+        actionCallback: (() -> Unit)? = null
+    ) {
+        if (act == null) return
+        showSnackbar(act, act.getString(message), duration,
+            actionText?.let { act.getString(it) }, actionCallback)
+    }
+
+    @MainThread
+    fun showSnackbar(
+        act: Activity?,
+        message: String?,
+        duration: Int = Snackbar.LENGTH_SHORT,
+        actionText: String? = null,
+        actionCallback: (() -> Unit)? = null
+    ) {
+        if (act == null || message == null) {
+            Log.w(TAG, "Invalid showSnackbar: act = $act, message = $message")
+            return
+        }
+        Log.i(TAG, "showSnackbar: $message")
+
+        try {
+            currentSnackbar?.dismiss()
+        } catch (e: Exception) {
+            logError(e)
+        }
+
+        try {
+            val parentView = act.findViewById<View>(android.R.id.content)
+            val snackbar = Snackbar.make(parentView, message, duration)
+
+            actionCallback?.let {
+                snackbar.setAction(actionText) { actionCallback.invoke() }
+            }
+
+            snackbar.show()
+            currentSnackbar = snackbar
+
+            snackbar.setBackgroundTint(act.colorFromAttribute(R.attr.primaryBlackBackground))
+            snackbar.setTextColor(act.colorFromAttribute(R.attr.textColor))
+            snackbar.setActionTextColor(act.colorFromAttribute(R.attr.colorPrimary))
+
+        } catch (e: Exception) {
+            logError(e)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/SubtitleUtils.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/SubtitleUtils.kt
new file mode 100644
index 00000000000..66a6e156c76
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/SubtitleUtils.kt
@@ -0,0 +1,56 @@
+package com.lagradost.cloudstream3.utils
+
+import android.content.Context
+import com.lagradost.api.Log
+import com.lagradost.cloudstream3.utils.VideoDownloadManager.getFolder
+import com.lagradost.safefile.SafeFile
+
+object SubtitleUtils {
+
+    // Only these files are allowed, so no videos as subtitles
+    private val allowedExtensions = listOf(
+        ".vtt", ".srt", ".txt", ".ass",
+        ".ttml", ".sbv", ".dfxp"
+    )
+
+    fun deleteMatchingSubtitles(context: Context, info: VideoDownloadManager.DownloadedFileInfo) {
+        val relative = info.relativePath
+        val display = info.displayName
+        val cleanDisplay = cleanDisplayName(display)
+
+        getFolder(context, relative, info.basePath)?.forEach { (name, uri) ->
+            if (isMatchingSubtitle(name, display, cleanDisplay)) {
+                val subtitleFile = SafeFile.fromUri(context, uri)
+                if (subtitleFile == null || subtitleFile.delete() != true) {
+                    Log.e("SubtitleDeletion", "Failed to delete subtitle file: ${subtitleFile?.name()}")
+                }
+            }
+        }
+    }
+
+    /**
+     * @param name the file name of the subtitle
+     * @param display the file name of the video
+     * @param cleanDisplay the cleanDisplayName of the video file name
+     */
+    fun isMatchingSubtitle(
+        name: String,
+        display: String,
+        cleanDisplay: String
+    ): Boolean {
+        // Check if the file has a valid subtitle extension
+        val hasValidExtension = allowedExtensions.any { name.contains(it, ignoreCase = true) }
+
+        // We can't have the exact same file as a subtitle
+        val isNotDisplayName = !name.equals(display, ignoreCase = true)
+
+        // Check if the file name starts with a cleaned version of the display name
+        val startsWithCleanDisplay = cleanDisplayName(name).startsWith(cleanDisplay, ignoreCase = true)
+
+        return hasValidExtension && isNotDisplayName && startsWithCleanDisplay
+    }
+
+    fun cleanDisplayName(name: String): String {
+        return name.substringBeforeLast('.').trim()
+    }
+}
\ No newline at end of file
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 71d3a1eff01..351e77c8d72 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/SyncUtil.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/SyncUtil.kt
@@ -73,8 +73,8 @@ object SyncUtil {
             val response = app.get(url, cacheTime = 1, cacheUnit = TimeUnit.DAYS).text
             val mapped = parseJson<MalSyncPage?>(response)
 
-            val overrideMal = mapped?.malId ?: mapped?.Mal?.id ?: mapped?.Anilist?.malId
-            val overrideAnilist = mapped?.aniId ?: mapped?.Anilist?.id
+            val overrideMal = mapped?.malId ?: mapped?.mal?.id ?: mapped?.anilist?.malId
+            val overrideAnilist = mapped?.aniId ?: mapped?.anilist?.id
 
             if (overrideMal != null) {
                 return overrideMal.toString() to overrideAnilist?.toString()
@@ -135,8 +135,8 @@ object SyncUtil {
         @JsonProperty("createdAt") val createdAt: String?,
         @JsonProperty("updatedAt") val updatedAt: String?,
         @JsonProperty("deletedAt") val deletedAt: String?,
-        @JsonProperty("Mal") val Mal: Mal?,
-        @JsonProperty("Anilist") val Anilist: Anilist?,
+        @JsonProperty("Mal") val mal: Mal?,
+        @JsonProperty("Anilist") val anilist: Anilist?,
         @JsonProperty("malUrl") val malUrl: String?
     )
 
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 5e2b2bc1d99..049f92fb4cc 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/TestingUtils.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/TestingUtils.kt
@@ -4,6 +4,7 @@ import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.mvvm.logError
 import kotlinx.coroutines.*
 import org.junit.Assert
+import kotlin.random.Random
 
 object TestingUtils {
     open class TestResult(val success: Boolean) {
@@ -280,8 +281,8 @@ object TestingUtils {
 
                     // Test Search Results
                     val searchQueries =
-                        // Use the first 3 home page results as queries since they are guaranteed to exist
-                        (homePageList.take(3).map { it.name } +
+                        // Use the random 3 home page results as queries since they are guaranteed to exist
+                        (homePageList.shuffled(Random).take(3).map { it.name.split(" ").first() } +
                                 // If home page is sparse then use generic search queries
                                 listOf("over", "iron", "guy")).take(3)
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/UiText.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/TextUtil.kt
similarity index 63%
rename from app/src/main/java/com/lagradost/cloudstream3/ui/result/UiText.kt
rename to app/src/main/java/com/lagradost/cloudstream3/utils/TextUtil.kt
index 709199430be..4f3a747374b 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/UiText.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/TextUtil.kt
@@ -1,17 +1,13 @@
-package com.lagradost.cloudstream3.ui.result
+package com.lagradost.cloudstream3.utils
 
 import android.content.Context
-import android.graphics.Bitmap
 import android.util.Log
-import android.widget.ImageView
 import android.widget.TextView
-import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.utils.AppContextUtils.html
-import com.lagradost.cloudstream3.utils.UIHelper.setImage
 
 sealed class UiText {
     companion object {
@@ -77,71 +73,6 @@ sealed class UiText {
     }
 }
 
-sealed class UiImage {
-    data class Image(
-        val url: String,
-        val headers: Map<String, String>? = null,
-        @DrawableRes val errorDrawable: Int? = null
-    ) : UiImage()
-
-    data class Drawable(@DrawableRes val resId: Int) : UiImage()
-    data class Bitmap(val bitmap: android.graphics.Bitmap) : UiImage()
-}
-
-fun ImageView?.setImage(value: UiImage?, fadeIn: Boolean = true) {
-    when (value) {
-        is UiImage.Image -> setImageImage(value, fadeIn)
-        is UiImage.Drawable -> setImageDrawable(value)
-        is UiImage.Bitmap -> setImageBitmap(value)
-        null -> {
-            this?.isVisible = false
-        }
-    }
-}
-
-fun ImageView?.setImageImage(value: UiImage.Image, fadeIn: Boolean = true) {
-    if (this == null) return
-    this.isVisible = setImage(value.url, value.headers, value.errorDrawable, fadeIn)
-}
-
-fun ImageView?.setImageDrawable(value: UiImage.Drawable) {
-    if (this == null) return
-    this.isVisible = true
-    this.setImage(UiImage.Drawable(value.resId))
-}
-
-fun ImageView?.setImageBitmap(value: UiImage.Bitmap) {
-    if (this == null) return
-    this.isVisible = true
-    this.setImageBitmap(value.bitmap)
-}
-
-@JvmName("imgNull")
-fun img(
-    url: String?,
-    headers: Map<String, String>? = null,
-    @DrawableRes errorDrawable: Int? = null
-): UiImage? {
-    if (url.isNullOrBlank()) return null
-    return UiImage.Image(url, headers, errorDrawable)
-}
-
-fun img(
-    url: String,
-    headers: Map<String, String>? = null,
-    @DrawableRes errorDrawable: Int? = null
-): UiImage {
-    return UiImage.Image(url, headers, errorDrawable)
-}
-
-fun img(@DrawableRes drawable: Int): UiImage {
-    return UiImage.Drawable(drawable)
-}
-
-fun img(bitmap: Bitmap): UiImage {
-    return UiImage.Bitmap(bitmap)
-}
-
 fun txt(value: String): UiText {
     return UiText.DynamicString(value)
 }
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 8670de53feb..de5314fe022 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/UIHelper.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/UIHelper.kt
@@ -8,29 +8,29 @@ import android.app.Dialog
 import android.content.ClipData
 import android.content.ClipboardManager
 import android.content.Context
+import android.content.Intent
 import android.content.pm.PackageManager
 import android.content.res.Configuration
 import android.content.res.Resources
 import android.graphics.Bitmap
 import android.graphics.Color
-import android.graphics.drawable.Drawable
 import android.os.Build
 import android.os.Bundle
-import android.os.Handler
-import android.os.Looper
 import android.os.TransactionTooLargeException
 import android.util.Log
-import android.view.*
+import android.view.Gravity
+import android.view.MenuItem
+import android.view.View
+import android.view.ViewGroup
 import android.view.ViewGroup.MarginLayoutParams
+import android.view.WindowInsets
+import android.view.WindowManager
 import android.view.inputmethod.InputMethodManager
-import android.widget.ImageView
 import android.widget.ListAdapter
 import android.widget.ListView
 import android.widget.Toast.LENGTH_LONG
 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
@@ -40,7 +40,6 @@ import androidx.core.content.ContextCompat
 import androidx.core.content.getSystemService
 import androidx.core.graphics.alpha
 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
@@ -50,33 +49,26 @@ import androidx.core.view.marginTop
 import androidx.core.view.updateLayoutParams
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
+import androidx.navigation.NavOptions
 import androidx.navigation.fragment.NavHostFragment
 import androidx.palette.graphics.Palette
 import androidx.preference.PreferenceManager
-import com.bumptech.glide.load.DataSource
-import com.bumptech.glide.load.engine.DiskCacheStrategy
-import com.bumptech.glide.load.engine.GlideException
-import com.bumptech.glide.load.model.GlideUrl
-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.appbar.AppBarLayout
 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.AcraApplication.Companion.context
+import com.lagradost.cloudstream3.CommonActivity
 import com.lagradost.cloudstream3.CommonActivity.activity
 import com.lagradost.cloudstream3.CommonActivity.showToast
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.mvvm.logError
-import com.lagradost.cloudstream3.ui.result.UiImage
-import com.lagradost.cloudstream3.ui.result.UiText
-import com.lagradost.cloudstream3.ui.result.txt
 import com.lagradost.cloudstream3.ui.settings.Globals
 import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
-import jp.wasabeef.glide.transformations.BlurTransformation
+import com.lagradost.cloudstream3.utils.Coroutines.main
+import com.lagradost.cloudstream3.utils.UIHelper.navigate
+import kotlinx.coroutines.delay
 import kotlin.math.roundToInt
 
 object UIHelper {
@@ -227,17 +219,65 @@ object UIHelper {
         }
     }
 
-    fun Activity?.navigate(@IdRes navigation: Int, arguments: Bundle? = null) {
+    fun Activity?.navigate(
+        navigationId: Int,
+        args: Bundle? = null,
+        navOptions: NavOptions? = null // To control nav graph & manage back stack
+    ) {
+        val tag = "NavComponent"
+        if (this is FragmentActivity) {
+            try {
+                runOnUiThread {
+                    // Navigate using navigation ID
+                    val navHostFragment =
+                        supportFragmentManager.findFragmentById(R.id.nav_host_fragment) as? NavHostFragment
+                    Log.i(tag, "Navigating to fragment: $navigationId")
+                    navHostFragment?.navController?.navigate(navigationId, args, navOptions)
+                }
+            } catch (t: Throwable) {
+                logError(t)
+            }
+        }
+    }
+
+    // Open activities from an activity outside the nav graph
+    fun Context.openActivity(activity: Class<*>, args: Bundle? = null) {
+        val tag = "NavComponent"
         try {
-            if (this is FragmentActivity) {
-                val navHostFragment = supportFragmentManager.findFragmentById(R.id.nav_host_fragment) as? NavHostFragment?
-                navHostFragment?.navController?.navigate(navigation, arguments)
+            val intent = Intent(this, activity)
+            if (args != null) {
+                intent.putExtras(args)
             }
+            Log.i(tag, "Navigating to Activity: ${activity.simpleName}")
+            startActivity(intent)
         } catch (t: Throwable) {
             logError(t)
         }
     }
 
+    fun FragmentActivity.popCurrentPage() {
+        // Use the main looper handler to post actions on the main thread
+        main {
+            // Post the back press action to the main thread handler to ensure it executes
+            // after any currently pending UI updates or fragment transactions.
+            if (!supportFragmentManager.isStateSaved) {
+                // Get the top fragment from the back stack
+                Log.d("popFragment", "Destroying Fragment")
+                // If the state is not saved, it's safe to perform the back press action.
+                onBackPressedDispatcher.onBackPressed()
+            } else {
+                // If the state is saved, retry the back press action after a slight delay.
+                // This gives the FragmentManager time to complete any ongoing state-saving
+                // operations or transactions, ensuring that we do not encounter an IllegalStateException.
+                delay(100)
+                if (!supportFragmentManager.isStateSaved) {
+                    Log.d("popFragment", "Destroying after delay")
+                    onBackPressedDispatcher.onBackPressed()
+                }
+            }
+        }
+    }
+
     @ColorInt
     fun Context.getResourceColor(@AttrRes resource: Int, alphaFactor: Float = 1f): Int {
         val typedArray = obtainStyledAttributes(intArrayOf(resource))
@@ -266,172 +306,6 @@ 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,
-            radius,
-            sample,
-            colorCallback
-        )
-        return true
-    }
-
-    fun ImageView?.setImage(
-        uiImage: UiImage?,
-        @DrawableRes
-        errorImageDrawable: Int? = null,
-        fadeIn: Boolean = true,
-        radius: Int = 0,
-        sample: Int = 3,
-        colorCallback: ((Palette) -> Unit)? = null,
-    ): Boolean {
-        if (this == null || uiImage == null) return false
-
-        val (glideImage, identifier) =
-            (uiImage as? UiImage.Drawable)?.resId?.let {
-                it to it.toString()
-            } ?: (uiImage as? UiImage.Image)?.let { image ->
-                GlideUrl(image.url) { image.headers ?: emptyMap() } to image.url
-            } ?: return false
-
-        return try {
-            var builder = com.bumptech.glide.Glide.with(this)
-                .load(glideImage)
-                .skipMemoryCache(true)
-                .diskCacheStrategy(DiskCacheStrategy.ALL).let { req ->
-                    if (fadeIn)
-                        req.transition(DrawableTransitionOptions.withCrossFade())
-                    else req
-                }
-
-            if (radius > 0) {
-                builder = builder.apply(bitmapTransform(BlurTransformation(radius, sample)))
-            }
-
-            if (colorCallback != null) {
-                builder = builder.listener(object : RequestListener<Drawable> {
-
-                    override fun onResourceReady(
-                        resource: Drawable,
-                        model: Any,
-                        target: Target<Drawable>?,
-                        dataSource: DataSource,
-                        isFirstResource: Boolean
-                    ): Boolean {
-                        resource.toBitmapOrNull()
-                            ?.let { bitmap ->
-                                createPaletteAsync(
-                                    identifier,
-                                    bitmap,
-                                    colorCallback
-                                )
-                            }
-                        return false
-                    }
-
-                    override fun onLoadFailed(
-                        e: GlideException?,
-                        model: Any?,
-                        target: Target<Drawable>,
-                        isFirstResource: Boolean
-                    ): Boolean {
-                        return false
-                    }
-                })
-            }
-
-            val res = if (errorImageDrawable != null)
-                builder.error(errorImageDrawable).into(this)
-            else
-                builder.into(this)
-            res.clearOnDetach()
-
-            true
-        } catch (e: Exception) {
-            logError(e)
-            false
-        }
-    }
-
-    fun ImageView?.setImageBlur(
-        url: String?,
-        radius: Int,
-        sample: Int = 3,
-        headers: Map<String, String>? = null
-    ) {
-        if (this == null || url.isNullOrBlank()) return
-        try {
-            val res = com.bumptech.glide.Glide.with(this)
-                .load(GlideUrl(url) { headers ?: emptyMap() })
-                .apply(bitmapTransform(BlurTransformation(radius, sample)))
-                .transition(
-                    DrawableTransitionOptions.withCrossFade()
-                )
-                .skipMemoryCache(true)
-                .diskCacheStrategy(DiskCacheStrategy.ALL)
-                .into(this)
-            res.clearOnDetach()
-        } catch (e: Exception) {
-            logError(e)
-        }
-    }
-
     fun adjustAlpha(@ColorInt color: Int, factor: Float): Int {
         val alpha = (Color.alpha(color) * factor).roundToInt()
         val red = Color.red(color)
@@ -472,30 +346,10 @@ object UIHelper {
                             // Hide the nav bar and status bar
                             or View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
                             or View.SYSTEM_UI_FLAG_FULLSCREEN
-                    )
+                    ) // FIXME this should be replaced
           //}
     }
 
-    fun FragmentActivity.popCurrentPage() {
-        // Post the back press action to the main thread handler to ensure it executes
-        // after any currently pending UI updates or fragment transactions.
-        Handler(Looper.getMainLooper()).post {
-            // Check if the FragmentManager state is saved. If it is, we cannot perform
-            // fragment transactions safely because the state may be inconsistent.
-            if (!supportFragmentManager.isStateSaved) {
-                // If the state is not saved, it's safe to perform the back press action.
-                this.onBackPressedDispatcher.onBackPressed()
-            } else {
-                // If the state is saved, retry the back press action after a slight delay.
-                // This gives the FragmentManager time to complete any ongoing state-saving
-                // operations or transactions, ensuring that we do not encounter an IllegalStateException.
-                Handler(Looper.getMainLooper()).postDelayed({
-                    this.onBackPressedDispatcher.onBackPressed()
-                }, 100)
-            }
-        }
-    }
-
     fun Context.getStatusBarHeight(): Int {
         if (isLayout(Globals.TV or EMULATOR)) {
             return 0
@@ -553,7 +407,7 @@ object UIHelper {
         return result
     }
 
-    fun Context?.IsBottomLayout(): Boolean {
+    fun Context?.isBottomLayout(): Boolean {
         if (this == null) return true
         val settingsManager = PreferenceManager.getDefaultSharedPreferences(this)
         return settingsManager.getBoolean(getString(R.string.bottom_title_key), true)
@@ -576,8 +430,8 @@ object UIHelper {
         } else {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
                 window.insetsController?.show(WindowInsets.Type.statusBars())
-
             } else {
+                @Suppress("DEPRECATION")
                 window.clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN)
             }
 
@@ -595,8 +449,9 @@ object UIHelper {
             WindowInsetsControllerCompat(window, View(this)).show(WindowInsetsCompat.Type.systemBars())
 
         } else {*/ /** WINDOW COMPAT IS BUGGY DUE TO FU*KED UP PLAYER AND TRAILERS **/
-            window.decorView.systemUiVisibility =
-                (View.SYSTEM_UI_FLAG_LAYOUT_STABLE or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN)
+        @Suppress("DEPRECATION")
+        window.decorView.systemUiVisibility =
+            (View.SYSTEM_UI_FLAG_LAYOUT_STABLE or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN) // FIXME this should be replaced
         //}
 
         changeStatusBarState(isLayout(EMULATOR))
@@ -618,7 +473,14 @@ object UIHelper {
     fun Context.hasPIPPermission(): Boolean {
         val appOps =
             getSystemService(Context.APP_OPS_SERVICE) as AppOpsManager
-        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            appOps.unsafeCheckOpNoThrow(
+                AppOpsManager.OPSTR_PICTURE_IN_PICTURE,
+                android.os.Process.myUid(),
+                packageName
+            ) == AppOpsManager.MODE_ALLOWED
+        } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            @Suppress("DEPRECATION")
             appOps.checkOpNoThrow(
                 AppOpsManager.OPSTR_PICTURE_IN_PICTURE,
                 android.os.Process.myUid(),
@@ -663,7 +525,7 @@ object UIHelper {
         onMenuItemClick: MenuItem.() -> Unit,
     ): PopupMenu {
         val ctw = ContextThemeWrapper(context, R.style.PopupMenu)
-        val popup = PopupMenu(ctw, this, Gravity.NO_GRAVITY, R.attr.actionOverflowMenuStyle, 0)
+        val popup = PopupMenu(ctw, this, Gravity.NO_GRAVITY, androidx.appcompat.R.attr.actionOverflowMenuStyle, 0)
 
         items.forEach { (id, stringRes) ->
             popup.menu.add(0, id, 0, stringRes)
@@ -687,7 +549,7 @@ object UIHelper {
         onMenuItemClick: MenuItem.() -> Unit,
     ): PopupMenu {
         val ctw = ContextThemeWrapper(context, R.style.PopupMenu)
-        val popup = PopupMenu(ctw, this, Gravity.NO_GRAVITY, R.attr.actionOverflowMenuStyle, 0)
+        val popup = PopupMenu(ctw, this, Gravity.NO_GRAVITY, androidx.appcompat.R.attr.actionOverflowMenuStyle, 0)
 
         items.forEach { (id, string) ->
             popup.menu.add(0, id, 0, 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 197bacc6629..6b913940257 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/VideoDownloadManager.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/VideoDownloadManager.kt
@@ -1,24 +1,39 @@
 package com.lagradost.cloudstream3.utils
 
+import android.Manifest
 import android.app.Notification
 import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.app.PendingIntent
+import android.app.Service
 import android.content.*
+import android.content.pm.PackageManager
+import android.content.pm.ServiceInfo
+import android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC
 import android.graphics.Bitmap
 import android.net.Uri
 import android.os.Build
+import android.os.Build.VERSION.SDK_INT
+import android.util.Log
 import androidx.annotation.DrawableRes
+import androidx.core.app.ActivityCompat
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
+import androidx.core.app.PendingIntentCompat
+import androidx.core.graphics.drawable.toBitmap
 import androidx.core.net.toUri
 import androidx.preference.PreferenceManager
 import androidx.work.Data
 import androidx.work.ExistingWorkPolicy
 import androidx.work.OneTimeWorkRequest
 import androidx.work.WorkManager
-import com.bumptech.glide.Glide
-import com.bumptech.glide.load.model.GlideUrl
+import coil3.Extras
+import coil3.ImageLoader
+import coil3.SingletonImageLoader
+import coil3.asDrawable
+import coil3.request.ImageRequest
+import coil3.request.SuccessResult
+import coil3.request.allowHardware
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.APIHolder.getApiFromNameNull
 import com.lagradost.cloudstream3.AcraApplication.Companion.removeKey
@@ -29,32 +44,37 @@ 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.launchSafe
 import com.lagradost.cloudstream3.mvvm.logError
+import com.lagradost.cloudstream3.services.PackageInstallerService.Companion.UPDATE_NOTIFICATION_ID
 import com.lagradost.cloudstream3.services.VideoDownloadService
 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.removeKey
+import com.lagradost.cloudstream3.utils.SubtitleUtils.deleteMatchingSubtitles
 import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute
 import com.lagradost.safefile.MediaFileContentType
 import com.lagradost.safefile.SafeFile
+import com.lagradost.safefile.closeQuietly
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withContext
-import okhttp3.internal.closeQuietly
 import java.io.Closeable
 import java.io.File
 import java.io.IOException
 import java.io.OutputStream
-import java.lang.IllegalArgumentException
 import java.util.*
 
 const val DOWNLOAD_CHANNEL_ID = "cloudstream3.general"
@@ -65,6 +85,7 @@ object VideoDownloadManager {
     var maxConcurrentDownloads = 3
     var maxConcurrentConnections = 3
     private var currentDownloads = mutableListOf<Int>()
+    const val TAG = "VDM"
 
     private const val USER_AGENT =
         "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/116.0.0.0 Safari/537.36"
@@ -190,6 +211,7 @@ object VideoDownloadManager {
     val downloadQueue = LinkedList<DownloadResumePackage>()
 
     private var hasCreatedNotChanel = false
+
     private fun Context.createNotificationChannel() {
         hasCreatedNotChanel = true
         // Create the NotificationChannel, but only on API 26+ because
@@ -225,15 +247,26 @@ object VideoDownloadManager {
                 return cachedBitmaps[url]
             }
 
-            val bitmap = Glide.with(this)
-                .asBitmap()
-                .load(GlideUrl(url) { headers ?: emptyMap() })
-                .submit(720, 720)
-                .get()
+            val imageLoader = SingletonImageLoader.get(this)
+
+            val request = ImageRequest.Builder(this)
+                .data(url)
+                .apply {
+                    headers?.forEach { (key, value) ->
+                        extras[Extras.Key<String>(key)] = value
+                    }
+                }
+                .build()
+
+            val bitmap = runBlocking {
+                val result = imageLoader.execute(request)
+                (result as? SuccessResult)?.image?.asDrawable(applicationContext.resources)?.toBitmap()
+            }
 
-            if (bitmap != null) {
-                cachedBitmaps[url] = bitmap
+            bitmap?.let {
+                cachedBitmaps[url] = it
             }
+
             return bitmap
         } catch (e: Exception) {
             logError(e)
@@ -289,12 +322,8 @@ object VideoDownloadManager {
                     data = source.toUri()
                     flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
                 }
-                val pendingIntent: PendingIntent =
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                        PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_IMMUTABLE)
-                    } else {
-                        PendingIntent.getActivity(context, 0, intent, 0)
-                    }
+                val pendingIntent =
+                    PendingIntentCompat.getActivity(context, 0, intent, 0, false)
                 builder.setContentIntent(pendingIntent)
             }
 
@@ -314,7 +343,7 @@ object VideoDownloadManager {
             }
             val downloadFormat = context.getString(R.string.download_format)
 
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            if (SDK_INT >= Build.VERSION_CODES.O) {
                 if (ep.poster != null) {
                     val poster = withContext(Dispatchers.IO) {
                         context.getImageBitmapFromUrl(ep.poster)
@@ -408,7 +437,7 @@ object VideoDownloadManager {
                 builder.setContentText(txt)
             }
 
-            if ((state == DownloadType.IsDownloading || state == DownloadType.IsPaused) && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            if ((state == DownloadType.IsDownloading || state == DownloadType.IsPaused) && SDK_INT >= Build.VERSION_CODES.O) {
                 val actionTypes: MutableList<DownloadActionType> = ArrayList()
                 // INIT
                 if (state == DownloadType.IsDownloading) {
@@ -466,6 +495,13 @@ object VideoDownloadManager {
             notificationCallback(ep.id, notification)
             with(NotificationManagerCompat.from(context)) {
                 // notificationId is a unique int for each notification that you must define
+                if (ActivityCompat.checkSelfPermission(
+                        context,
+                        Manifest.permission.POST_NOTIFICATIONS
+                    ) != PackageManager.PERMISSION_GRANTED
+                ) {
+                    return null
+                }
                 notify(ep.id, notification)
             }
             return notification
@@ -475,10 +511,10 @@ object VideoDownloadManager {
         }
     }
 
-    private const val reservedChars = "|\\?*<\":>+[]/\'"
+    private const val RESERVED_CHARS = "|\\?*<\":>+[]/\'"
     fun sanitizeFilename(name: String, removeSpaces: Boolean = false): String {
         var tempName = name
-        for (c in reservedChars) {
+        for (c in RESERVED_CHARS) {
             tempName = tempName.replace(c, ' ')
         }
         if (removeSpaces) tempName = tempName.replace(" ", "")
@@ -495,7 +531,9 @@ object VideoDownloadManager {
         basePath: String?
     ): List<Pair<String, Uri>>? {
         val base = basePathToFile(context, basePath)
-        val folder = base?.gotoDirectory(relativePath, false) ?: return null
+        val folder =
+            base?.gotoDirectory(relativePath, createMissingDirectories = false) ?: return null
+        
         //if (folder.isDirectory() != false) return null
 
         return folder.listFiles()
@@ -528,7 +566,7 @@ object VideoDownloadManager {
         }
 
         fun delete(): Boolean {
-            return file.delete()
+            return file.delete() == true
         }
 
         val resume: Boolean get() = fileLength > 0L
@@ -569,7 +607,8 @@ object VideoDownloadManager {
     ): StreamData {
         val displayName = getDisplayName(name, extension)
 
-        val subDir = baseFile.gotoDirectoryOrThrow(folder)
+        val subDir = baseFile.gotoDirectory(folder, createMissingDirectories = true)
+            ?: throw IOException("Cant create directory")
         val foundFile = subDir.findFile(displayName)
 
         val (file, fileLength) = if (foundFile == null || foundFile.exists() != true) {
@@ -843,6 +882,7 @@ object VideoDownloadManager {
         val downloadLength: Long?,
         val chuckSize: Long,
         val bufferSize: Int,
+        val isResumed : Boolean,
     ) {
         val size get() = chuckStartByte.size
 
@@ -931,7 +971,6 @@ object VideoDownloadManager {
             }
             return false
         }
-
     }
 
     @Throws
@@ -951,20 +990,74 @@ object VideoDownloadManager {
         // 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
+        val headRequest = app.head(url = url, headers = headers, referer = referer, verify = false)
+        var contentLength = headRequest.size
         if (contentLength != null && contentLength <= 0) contentLength = null
 
+        val hasRangeSupport = when(headRequest.headers["Accept-Ranges"]?.lowercase()?.trim()) {
+            // server has stated it has no support
+            "none" -> false
+            // server has stated it has support
+            "bytes" -> true
+            // if null or undefined (as bytes is the only range unit formally defined)
+            // If the get request returns partial content we support range
+            else -> {
+                headRequest.headers["Accept-Ranges"]?.let { range->
+                    Log.v(TAG, "Unknown Accept-Ranges tag: $range")
+                }
+                // as we don't poll the body this should be fine
+                val getRequest = app.get(
+                    url,
+                    headers = headers + mapOf(
+                        "Range" to "bytes=0-${
+                            // we don't want to request more than the actual file
+                            // but also more than 0 bytes
+                            contentLength?.let { max ->
+                                minOf(maxOf(max-1L,3L),1023L)
+                            } ?: 1023L
+                        }"
+                    ),
+                    referer = referer,
+                    verify = false
+                )
+                // if head request did not work then we can just look for the size here too
+                // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Range
+                if (contentLength == null) {
+                    contentLength = getRequest.headers["Content-Range"]?.trim()?.lowercase()?.let { range ->
+                        // we only support "bytes" unit
+                        if (range.startsWith("bytes")) {
+                            // may be '*' if unknown
+                            range.substringAfter("/").toLongOrNull()
+                        }
+                        else {
+                            Log.v(TAG, "Unknown Content-Range unit: $range")
+                            null
+                        }
+                    }
+                }
+
+                // supports range if status is partial content https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/206
+                getRequest.code == 206
+            }
+        }
+
+        Log.d(TAG, "Starting stream with url=$url, startByte=$startByte, contentLength=$contentLength, hasRangeSupport=$hasRangeSupport")
+
         var downloadLength: Long? = null
-        var totalLength: Long? = null
 
-        val ranges = if (contentLength == null || contentLength < maximumSmallSize) {
+        val ranges = if (!hasRangeSupport) {
+            // is the equivalent of [0..EOF] as we cant resume, nor can parallelize it
+            downloadLength = contentLength
+            LongArray(1) { 0 }
+        } else if (contentLength == null || contentLength < maximumSmallSize) {
+            if (contentLength != null) {
+                downloadLength = contentLength - startByte
+            }
             // 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
@@ -980,9 +1073,11 @@ object VideoDownloadManager {
             referer = referer,
             chuckStartByte = ranges,
             downloadLength = downloadLength,
-            totalLength = totalLength,
+            totalLength = contentLength,
             chuckSize = chuckSize,
-            bufferSize = bufferSize
+            bufferSize = bufferSize,
+            // we have only resumed if we had a downloaded file and we can resume
+            isResumed = startByte > 0 && hasRangeSupport
         )
     }
 
@@ -1053,7 +1148,7 @@ object VideoDownloadManager {
             if (baseFile == null) return@withContext DOWNLOAD_BAD_CONFIG
 
             // set up the download file
-            val stream = setupStream(baseFile, name, folder, extension, tryResume)
+            var stream = setupStream(baseFile, name, folder, extension, tryResume)
 
             fileStream = stream.open()
 
@@ -1078,6 +1173,7 @@ object VideoDownloadManager {
                 )
             )
 
+            // too short file, treat it as a invalid link
             if (items.totalLength != null && items.totalLength < minimumSize) {
                 fileStream.closeQuietly()
                 metadata.onDelete()
@@ -1085,6 +1181,16 @@ object VideoDownloadManager {
                 return@withContext DOWNLOAD_INVALID_INPUT
             }
 
+            // if we have an output stream that cant be resumed then we delete the entire file
+            // and set up the stream again
+            if (!items.isResumed && stream.startAt > 0) {
+                fileStream.closeQuietly()
+                stream.delete()
+                metadata.setResumeLength(0)
+                stream = setupStream(baseFile, name, folder, extension, false)
+                fileStream = stream.open()
+            }
+
             metadata.totalBytes = items.totalLength
             metadata.type = DownloadType.IsDownloading
             metadata.setDownloadFileInfoTemplate(
@@ -1490,7 +1596,7 @@ object VideoDownloadManager {
         return when {
             path.isNullOrBlank() -> getDefaultDir(context)
             path.startsWith("content://") -> SafeFile.fromUri(context, path.toUri())
-            else -> SafeFile.fromFile(context, File(path))
+            else -> SafeFile.fromFilePath(context, path)
         }
     }
 
@@ -1630,7 +1736,7 @@ object VideoDownloadManager {
     ) {
         if (!(currentDownloads.size < maxConcurrentDownloads && downloadQueue.size > 0)) return
 
-        val pkg = downloadQueue.removeFirst()
+        val pkg = downloadQueue.removeAt(0)
         val item = pkg.item
         val id = item.ep.id
         if (currentDownloads.contains(id)) { // IF IT IS ALREADY DOWNLOADING, RESUME IT
@@ -1699,17 +1805,16 @@ object VideoDownloadManager {
      }
  */
     fun getDownloadFileInfoAndUpdateSettings(context: Context, id: Int): DownloadedFileInfoResult? =
-        getDownloadFileInfo(context, id, removeKeys = true)
+        getDownloadFileInfo(context, id)
 
     private fun DownloadedFileInfo.toFile(context: Context): SafeFile? {
-        return basePathToFile(context, this.basePath)?.gotoDirectory(relativePath)
+        return basePathToFile(context, this.basePath)?.gotoDirectory(relativePath, createMissingDirectories = false)
             ?.findFile(displayName)
     }
 
     private fun getDownloadFileInfo(
         context: Context,
         id: Int,
-        removeKeys: Boolean = false
     ): DownloadedFileInfoResult? {
         try {
             val info =
@@ -1733,7 +1838,37 @@ object VideoDownloadManager {
         }
     }
 
-    fun deleteFileAndUpdateSettings(context: Context, id: Int): Boolean {
+    fun deleteFilesAndUpdateSettings(
+        context: Context,
+        ids: Set<Int>,
+        scope: CoroutineScope,
+        onComplete: (Set<Int>) -> Unit = {}
+    ) {
+        scope.launchSafe(Dispatchers.IO) {
+            val deleteJobs = ids.map { id ->
+                async {
+                    id to deleteFileAndUpdateSettings(context, id)
+                }
+            }
+            val results = deleteJobs.awaitAll()
+
+            val (successfulResults, failedResults) = results.partition { it.second }
+            val successfulIds = successfulResults.map { it.first }.toSet()
+
+            if (failedResults.isNotEmpty()) {
+                failedResults.forEach { (id, _) ->
+                    // TODO show a toast if some failed?
+                    Log.e("FileDeletion", "Failed to delete file with ID: $id")
+                }
+            } else {
+                Log.i("FileDeletion", "All files deleted successfully")
+            }
+
+            onComplete.invoke(successfulIds)
+        }
+    }
+
+    private fun deleteFileAndUpdateSettings(context: Context, id: Int): Boolean {
         val success = deleteFile(context, id)
         if (success) context.removeKey(KEY_DOWNLOAD_INFO, id.toString())
         return success
@@ -1759,11 +1894,17 @@ object VideoDownloadManager {
     private fun deleteFile(context: Context, id: Int): Boolean {
         val info =
             context.getKey<DownloadedFileInfo>(KEY_DOWNLOAD_INFO, id.toString()) ?: return false
+        val file = info.toFile(context)
+
         downloadEvent.invoke(id to DownloadActionType.Stop)
         downloadProgressEvent.invoke(Triple(id, 0, 0))
         downloadStatusEvent.invoke(id to DownloadType.IsStopped)
         downloadDeleteEvent.invoke(id)
-        return info.toFile(context)?.delete() ?: false
+
+        val isFileDeleted = file?.delete() == true || file?.exists() == false
+        if (isFileDeleted) deleteMatchingSubtitles(context, info)
+
+        return isFileDeleted
     }
 
     fun getDownloadResumePackage(context: Context, id: Int): DownloadResumePackage? {
@@ -1885,4 +2026,4 @@ object VideoDownloadManager {
         @JsonProperty("ep") val ep: DownloadEpisodeMetadata,
         @JsonProperty("links") val links: List<ExtractorLink>
     )
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/widget/FlowLayout.kt b/app/src/main/java/com/lagradost/cloudstream3/widget/FlowLayout.kt
index d4725d53e64..624370032e3 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/widget/FlowLayout.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/widget/FlowLayout.kt
@@ -4,6 +4,7 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.util.AttributeSet
 import android.view.ViewGroup
+import androidx.core.view.isVisible
 import androidx.core.view.marginEnd
 import com.lagradost.cloudstream3.R
 import kotlin.math.max
@@ -19,7 +20,7 @@ class FlowLayout : ViewGroup {
     @SuppressLint("CustomViewStyleable")
     internal constructor(c: Context, attrs: AttributeSet?) : super(c, attrs) {
         val t = c.obtainStyledAttributes(attrs, R.styleable.FlowLayout_Layout)
-        itemSpacing = t.getDimensionPixelSize(R.styleable.FlowLayout_Layout_itemSpacing, 0);
+        itemSpacing = t.getDimensionPixelSize(R.styleable.FlowLayout_Layout_itemSpacing, 0)
         t.recycle()
     }
 
@@ -32,10 +33,12 @@ class FlowLayout : ViewGroup {
         val childCount = this.childCount
         for (i in 0 until childCount) {
             val child = getChildAt(i)
+            if (!child.isVisible) {
+                continue
+            }
             measureChild(child, widthMeasureSpec, heightMeasureSpec)
             val childWidth = child.measuredWidth
             val childHeight = child.measuredHeight
-            currentHeight = max(currentHeight, currentChildHookPointy + childHeight)
 
             //check if child can be placed in the current row, else go to next line
             if (currentChildHookPointx + childWidth - child.marginEnd - child.paddingEnd > realWidth) {
@@ -44,8 +47,10 @@ class FlowLayout : ViewGroup {
 
                 //reset for new line
                 currentChildHookPointx = 0
-                currentChildHookPointy += childHeight
+                currentChildHookPointy += childHeight + itemSpacing
             }
+
+            currentHeight = max(currentHeight, currentChildHookPointy + childHeight)
             val nextChildHookPointx =
                 currentChildHookPointx + childWidth + if (childWidth == 0) 0 else itemSpacing
 
diff --git a/app/src/main/res/anim/nav_enter_anim.xml b/app/src/main/res/anim/nav_enter_anim.xml
deleted file mode 100644
index 84fa9e97816..00000000000
--- a/app/src/main/res/anim/nav_enter_anim.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <alpha
-            android:interpolator="@android:anim/linear_interpolator"
-            android:duration="@integer/config_navAnimTime"
-            android:fromAlpha="0.0"
-            android:toAlpha="1.0"/>
-</set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/nav_exit_anim.xml b/app/src/main/res/anim/nav_exit_anim.xml
deleted file mode 100644
index 97065514711..00000000000
--- a/app/src/main/res/anim/nav_exit_anim.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <alpha
-            android:interpolator="@android:anim/linear_interpolator"
-            android:duration="@integer/config_navAnimTime"
-            android:fromAlpha="1.0"
-            android:toAlpha="0.0"/>
-</set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/nav_pop_enter.xml b/app/src/main/res/anim/nav_pop_enter.xml
deleted file mode 100644
index 84fa9e97816..00000000000
--- a/app/src/main/res/anim/nav_pop_enter.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <alpha
-            android:interpolator="@android:anim/linear_interpolator"
-            android:duration="@integer/config_navAnimTime"
-            android:fromAlpha="0.0"
-            android:toAlpha="1.0"/>
-</set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/nav_pop_exit.xml b/app/src/main/res/anim/nav_pop_exit.xml
deleted file mode 100644
index 97065514711..00000000000
--- a/app/src/main/res/anim/nav_pop_exit.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <alpha
-            android:interpolator="@android:anim/linear_interpolator"
-            android:duration="@integer/config_navAnimTime"
-            android:fromAlpha="1.0"
-            android:toAlpha="0.0"/>
-</set>
\ No newline at end of file
diff --git a/app/src/main/res/color/color_primary_transparent.xml b/app/src/main/res/color/color_primary_transparent.xml
new file mode 100644
index 00000000000..e6d1f8c9ebb
--- /dev/null
+++ b/app/src/main/res/color/color_primary_transparent.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/colorPrimary" android:alpha="0.2"  />
+</selector>
diff --git a/app/src/main/res/color/item_select_color.xml b/app/src/main/res/color/item_select_color.xml
index 3d69c540bad..208afb18bf4 100644
--- a/app/src/main/res/color/item_select_color.xml
+++ b/app/src/main/res/color/item_select_color.xml
@@ -3,5 +3,5 @@
     <item android:color="?attr/colorPrimary" android:state_checked="true"/>
     <item android:color="?attr/colorPrimary" android:state_focused="true"/>
     <item android:color="?attr/colorPrimary" android:state_selected="true"/>
-    <item android:color="?attr/grayTextColor" android:state_checked="false"/>
-</selector>
\ No newline at end of file
+    <item android:color="?attr/textColor" android:state_checked="false"/>
+</selector>
diff --git a/app/src/main/res/color/toggle_selector.xml b/app/src/main/res/color/toggle_selector.xml
index 9bb16931e3f..a7c826044c3 100644
--- a/app/src/main/res/color/toggle_selector.xml
+++ b/app/src/main/res/color/toggle_selector.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_checked="true" android:color="?attr/colorControlActivated"/>
+    <item android:state_checked="true" android:color="?attr/colorPrimaryDark"/>
     <item android:color="?attr/grayTextColor"/>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/baseline_downloading_24.xml b/app/src/main/res/drawable/baseline_downloading_24.xml
new file mode 100644
index 00000000000..c6fd08a380e
--- /dev/null
+++ b/app/src/main/res/drawable/baseline_downloading_24.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M18.32,4.26C16.84,3.05 15.01,2.25 13,2.05v2.02c1.46,0.18 2.79,0.76 3.9,1.62L18.32,4.26zM19.93,11h2.02c-0.2,-2.01 -1,-3.84 -2.21,-5.32L18.31,7.1C19.17,8.21 19.75,9.54 19.93,11zM18.31,16.9l1.43,1.43c1.21,-1.48 2.01,-3.32 2.21,-5.32h-2.02C19.75,14.46 19.17,15.79 18.31,16.9zM13,19.93v2.02c2.01,-0.2 3.84,-1 5.32,-2.21l-1.43,-1.43C15.79,19.17 14.46,19.75 13,19.93zM13,12V7h-2v5H7l5,5l5,-5H13zM11,19.93v2.02c-5.05,-0.5 -9,-4.76 -9,-9.95s3.95,-9.45 9,-9.95v2.02C7.05,4.56 4,7.92 4,12S7.05,19.44 11,19.93z"/>
+    
+</vector>
diff --git a/app/src/main/res/drawable/home_icon_filled_24.xml b/app/src/main/res/drawable/home_icon_filled_24.xml
new file mode 100644
index 00000000000..303b6a10c05
--- /dev/null
+++ b/app/src/main/res/drawable/home_icon_filled_24.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:pathData="M160,840v-480l320,-240 320,240v480L560,840v-280L400,560v280L160,840Z"
+      android:fillColor="#e8eaed"/>
+</vector>
diff --git a/app/src/main/res/drawable/home_icon_outline_24.xml b/app/src/main/res/drawable/home_icon_outline_24.xml
new file mode 100644
index 00000000000..2d5f93a674d
--- /dev/null
+++ b/app/src/main/res/drawable/home_icon_outline_24.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:pathData="M240,760h120v-240h240v240h120v-360L480,220 240,400v360ZM160,840v-480l320,-240 320,240v480L520,840v-240h-80v240L160,840ZM480,490Z"
+      android:fillColor="#e8eaed"/>
+</vector>
diff --git a/app/src/main/res/drawable/home_icon_selector.xml b/app/src/main/res/drawable/home_icon_selector.xml
new file mode 100644
index 00000000000..2280cdd09d5
--- /dev/null
+++ b/app/src/main/res/drawable/home_icon_selector.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/home_icon_filled_24" android:state_checked="true"/>
+    <item android:drawable="@drawable/home_icon_filled_24" android:state_focused="true"/>
+    <item android:drawable="@drawable/home_icon_outline_24"/>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_baseline_equalizer_24.xml b/app/src/main/res/drawable/ic_baseline_equalizer_24.xml
new file mode 100644
index 00000000000..cd20ad156ac
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_equalizer_24.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:pathData="M160,800v-320h160v320L160,800ZM400,800v-640h160v640L400,800ZM640,800v-440h160v440L640,800Z"
+      android:fillColor="#5f6368"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_baseline_exit_24.xml b/app/src/main/res/drawable/ic_baseline_exit_24.xml
new file mode 100644
index 00000000000..bf421c227be
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_exit_24.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M17,7l-1.41,1.41L18.17,11H8v2h10.17l-2.58,2.58L17,17l5,-5zM4,5h8V3H4c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h8v-2H4V5z"/>
+    
+</vector>
diff --git a/app/src/main/res/drawable/ic_baseline_folder_open_24.xml b/app/src/main/res/drawable/ic_baseline_folder_open_24.xml
new file mode 100644
index 00000000000..6e130c3c948
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_folder_open_24.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M20,6h-8l-2,-2L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,8c0,-1.1 -0.9,-2 -2,-2zM20,18L4,18L4,8h16v10z"/>
+    
+</vector>
diff --git a/app/src/main/res/drawable/ic_baseline_replay_24.xml b/app/src/main/res/drawable/ic_baseline_replay_24.xml
new file mode 100644
index 00000000000..e247aa9243a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_replay_24.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:pathData="M12,5V2.21c0,-0.45 -0.54,-0.67 -0.85,-0.35l-3.8,3.79c-0.2,0.2 -0.2,0.51 0,0.71l3.79,3.79c0.32,0.31 0.86,0.09 0.86,-0.36V7c3.73,0 6.68,3.42 5.86,7.29 -0.47,2.27 -2.31,4.1 -4.57,4.57 -3.57,0.75 -6.75,-1.7 -7.23,-5.01 -0.07,-0.48 -0.49,-0.85 -0.98,-0.85 -0.6,0 -1.08,0.53 -1,1.13 0.62,4.39 4.8,7.64 9.53,6.72 3.12,-0.61 5.63,-3.12 6.24,-6.24C20.84,9.48 16.94,5 12,5z"
+      android:fillColor="#e8eaed"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_baseline_restart_24.xml b/app/src/main/res/drawable/ic_baseline_restart_24.xml
new file mode 100644
index 00000000000..aed3a562c44
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_restart_24.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:pathData="M440,838q-121,-15 -200.5,-105.5T160,520q0,-66 26,-126.5T260,288l57,57q-38,34 -57.5,79T240,520q0,88 56,155.5T440,758v80ZM520,838v-80q87,-16 143.5,-83T720,520q0,-100 -70,-170t-170,-70h-3l44,44 -56,56 -140,-140 140,-140 56,56 -44,44h3q134,0 227,93t93,227q0,121 -79.5,211.5T520,838Z"
+      android:fillColor="#e8eaed"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_baseline_skip_next_24_big.xml b/app/src/main/res/drawable/ic_baseline_skip_next_24_big.xml
new file mode 100644
index 00000000000..a8c43bbdb34
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_skip_next_24_big.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M2.775,21.225 L15.844,12 2.775,2.775ZM18.15,2.775v18.45h3.075V2.775Z"
+      android:strokeWidth="1.5375"
+      android:fillColor="#e8eaed"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_baseline_skip_next_rounded_24.xml b/app/src/main/res/drawable/ic_baseline_skip_next_rounded_24.xml
new file mode 100644
index 00000000000..452c4dd9969
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_skip_next_rounded_24.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:pathData="M7.58,16.89l5.77,-4.07c0.56,-0.4 0.56,-1.24 0,-1.63L7.58,7.11C6.91,6.65 6,7.12 6,7.93v8.14c0,0.81 0.91,1.28 1.58,0.82zM16,7v10c0,0.55 0.45,1 1,1s1,-0.45 1,-1V7c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1z"
+      android:fillColor="#e8eaed"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_filled_notifications_24dp.xml b/app/src/main/res/drawable/ic_filled_notifications_24dp.xml
new file mode 100644
index 00000000000..ed46f973da7
--- /dev/null
+++ b/app/src/main/res/drawable/ic_filled_notifications_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:pathData="M160,760v-80h80v-280q0,-83 50,-147.5T420,168v-28q0,-25 17.5,-42.5T480,80q25,0 42.5,17.5T540,140v28q80,20 130,84.5T720,400v280h80v80L160,760ZM480,880q-33,0 -56.5,-23.5T400,800h160q0,33 -23.5,56.5T480,880Z"
+      android:fillColor="#e8eaed"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_notifications_24dp.xml b/app/src/main/res/drawable/ic_outline_notifications_24dp.xml
new file mode 100644
index 00000000000..928ad0864a4
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_notifications_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:pathData="M160,760v-80h80v-280q0,-83 50,-147.5T420,168v-28q0,-25 17.5,-42.5T480,80q25,0 42.5,17.5T540,140v28q80,20 130,84.5T720,400v280h80v80L160,760ZM480,460ZM480,880q-33,0 -56.5,-23.5T400,800h160q0,33 -23.5,56.5T480,880ZM320,680h320v-280q0,-66 -47,-113t-113,-47q-66,0 -113,47t-47,113v280Z"
+      android:fillColor="#e8eaed"/>
+</vector>
diff --git a/app/src/main/res/drawable/library_icon_filled.xml b/app/src/main/res/drawable/library_icon_filled.xml
new file mode 100644
index 00000000000..eba49782c87
--- /dev/null
+++ b/app/src/main/res/drawable/library_icon_filled.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/white">
+  <path
+      android:pathData="M160,800q-33,0 -56.5,-23.5T80,720v-480q0,-33 23.5,-56.5T160,160h240l80,80h320q33,0 56.5,23.5T880,320L160,320v400l96,-320h684L837,743q-8,26 -29.5,41.5T760,800L160,800Z"
+      android:fillColor="@android:color/white"/>
+</vector>
diff --git a/app/src/main/res/drawable/library_icon_selector.xml b/app/src/main/res/drawable/library_icon_selector.xml
new file mode 100644
index 00000000000..9c6495bea03
--- /dev/null
+++ b/app/src/main/res/drawable/library_icon_selector.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/library_icon_filled" android:state_checked="true"/>
+    <item android:drawable="@drawable/library_icon_filled" android:state_focused="true"/>
+    <item android:drawable="@drawable/library_icon"/>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/notifications_icon_selector.xml b/app/src/main/res/drawable/notifications_icon_selector.xml
new file mode 100644
index 00000000000..9226029a440
--- /dev/null
+++ b/app/src/main/res/drawable/notifications_icon_selector.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/ic_filled_notifications_24dp" android:state_checked="true"/>
+    <item android:drawable="@drawable/ic_filled_notifications_24dp" android:state_focused="true"/>
+    <item android:drawable="@drawable/ic_outline_notifications_24dp"/>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/outline_big_20.xml b/app/src/main/res/drawable/outline_big_20.xml
new file mode 100644
index 00000000000..7faf8a889e1
--- /dev/null
+++ b/app/src/main/res/drawable/outline_big_20.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+    <stroke android:width="2dp"
+            android:color="?attr/white"/>
+    <corners
+            android:bottomLeftRadius="20dp"
+            android:bottomRightRadius="20dp"
+            android:topLeftRadius="20dp"
+            android:topRightRadius="20dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/outline_drawable_round_20.xml b/app/src/main/res/drawable/outline_drawable_round_20.xml
new file mode 100644
index 00000000000..a2e8253b733
--- /dev/null
+++ b/app/src/main/res/drawable/outline_drawable_round_20.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_big_20"/> <!-- focused -->
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/preview_seekbar_24.xml b/app/src/main/res/drawable/preview_seekbar_24.xml
new file mode 100644
index 00000000000..657f6247002
--- /dev/null
+++ b/app/src/main/res/drawable/preview_seekbar_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/white">
+  <path
+      android:pathData="m480,540 l240,-160 -240,-160v320ZM508,760h224q-7,26 -24,42t-44,20L228,875q-33,5 -59.5,-15.5T138,806L85,369q-4,-33 16,-59t53,-30l46,-6v80l-36,5 54,437 290,-36ZM360,680q-33,0 -56.5,-23.5T280,600v-440q0,-33 23.5,-56.5T360,80h440q33,0 56.5,23.5T880,160v440q0,33 -23.5,56.5T800,680L360,680ZM360,600h440v-440L360,160v440ZM580,380ZM218,796Z"
+      android:fillColor="@android:color/white"/>
+</vector>
diff --git a/app/src/main/res/drawable/settings_icon_filled.xml b/app/src/main/res/drawable/settings_icon_filled.xml
new file mode 100644
index 00000000000..1d31bb7d024
--- /dev/null
+++ b/app/src/main/res/drawable/settings_icon_filled.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:pathData="m370,880 l-16,-128q-13,-5 -24.5,-12T307,725l-119,50L78,585l103,-78q-1,-7 -1,-13.5v-27q0,-6.5 1,-13.5L78,375l110,-190 119,50q11,-8 23,-15t24,-12l16,-128h220l16,128q13,5 24.5,12t22.5,15l119,-50 110,190 -103,78q1,7 1,13.5v27q0,6.5 -2,13.5l103,78 -110,190 -118,-50q-11,8 -23,15t-24,12L590,880L370,880ZM482,620q58,0 99,-41t41,-99q0,-58 -41,-99t-99,-41q-59,0 -99.5,41T342,480q0,58 40.5,99t99.5,41Z"
+      android:fillColor="#e8eaed"/>
+</vector>
diff --git a/app/src/main/res/drawable/settings_icon_outline.xml b/app/src/main/res/drawable/settings_icon_outline.xml
new file mode 100644
index 00000000000..bdc9e98d38b
--- /dev/null
+++ b/app/src/main/res/drawable/settings_icon_outline.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:pathData="m370,880 l-16,-128q-13,-5 -24.5,-12T307,725l-119,50L78,585l103,-78q-1,-7 -1,-13.5v-27q0,-6.5 1,-13.5L78,375l110,-190 119,50q11,-8 23,-15t24,-12l16,-128h220l16,128q13,5 24.5,12t22.5,15l119,-50 110,190 -103,78q1,7 1,13.5v27q0,6.5 -2,13.5l103,78 -110,190 -118,-50q-11,8 -23,15t-24,12L590,880L370,880ZM440,800h79l14,-106q31,-8 57.5,-23.5T639,633l99,41 39,-68 -86,-65q5,-14 7,-29.5t2,-31.5q0,-16 -2,-31.5t-7,-29.5l86,-65 -39,-68 -99,42q-22,-23 -48.5,-38.5T533,266l-13,-106h-79l-14,106q-31,8 -57.5,23.5T321,327l-99,-41 -39,68 86,64q-5,15 -7,30t-2,32q0,16 2,31t7,30l-86,65 39,68 99,-42q22,23 48.5,38.5T427,694l13,106ZM482,620q58,0 99,-41t41,-99q0,-58 -41,-99t-99,-41q-59,0 -99.5,41T342,480q0,58 40.5,99t99.5,41ZM480,480Z"
+      android:fillColor="#e8eaed"/>
+</vector>
diff --git a/app/src/main/res/drawable/settings_icon_selector.xml b/app/src/main/res/drawable/settings_icon_selector.xml
new file mode 100644
index 00000000000..c54a9760dd4
--- /dev/null
+++ b/app/src/main/res/drawable/settings_icon_selector.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/settings_icon_filled" android:state_checked="true"/>
+    <item android:drawable="@drawable/settings_icon_filled" android:state_focused="true"/>
+    <item android:drawable="@drawable/settings_icon_outline"/>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_easter_egg_monke.xml b/app/src/main/res/layout/activity_easter_egg_monke.xml
deleted file mode 100644
index 9003cd211f7..00000000000
--- a/app/src/main/res/layout/activity_easter_egg_monke.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 The Android Open Source Project
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<androidx.constraintlayout.widget.ConstraintLayout
-    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:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".MainActivity">
-
-    <FrameLayout
-        android:id="@+id/frame"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:background="@color/black"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.0">
-
-        <ImageView
-            android:id="@+id/monke"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:scaleX="3"
-            android:scaleY="3"
-            android:visibility="gone"
-            app:srcCompat="@drawable/monke_benene"
-            tools:visibility="visible" />
-
-    </FrameLayout>
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index b62908655a3..a06e6a157c6 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -14,20 +14,21 @@
 
         <com.google.android.material.navigationrail.NavigationRailView
             android:id="@+id/nav_rail_view"
-            android:layout_width="@dimen/navbar_width"
+            android:layout_width="62dp"
             android:layout_height="match_parent"
             android:background="?attr/primaryGrayBackground"
-            app:itemIconTint="@color/item_select_color"
             android:descendantFocusability="afterDescendants"
-
+            app:itemIconTint="@color/item_select_color"
             app:itemTextColor="@color/item_select_color"
+            app:headerLayout="@layout/rail_header"
             app:labelVisibilityMode="unlabeled"
-            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:menu="@menu/bottom_nav_menu"
             app:menuGravity="center">
 
+            <include layout="@layout/rail_footer"/>
+
         </com.google.android.material.navigationrail.NavigationRailView>
         <!-- android:layout_height="65dp"
                               app:labelVisibilityMode="unlabeled"
diff --git a/app/src/main/res/layout/activity_main_tv.xml b/app/src/main/res/layout/activity_main_tv.xml
index a70a40cdb55..0003b26187d 100644
--- a/app/src/main/res/layout/activity_main_tv.xml
+++ b/app/src/main/res/layout/activity_main_tv.xml
@@ -26,19 +26,20 @@
         <com.google.android.material.navigationrail.NavigationRailView
             android:id="@+id/nav_rail_view"
             android:layout_width="62dp"
-            
             android:layout_height="match_parent"
-            android:background="?attr/primaryGrayBackground"
-            android:descendantFocusability="afterDescendants"
             app:itemIconTint="@color/item_select_color"
             app:itemTextColor="@color/item_select_color"
-
+            android:background="?attr/primaryGrayBackground"
+            android:descendantFocusability="afterDescendants"
+            app:headerLayout="@layout/rail_header"
             app:labelVisibilityMode="unlabeled"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:menu="@menu/bottom_nav_menu"
             app:menuGravity="center">
 
+            <include layout="@layout/rail_footer"/>
+
         </com.google.android.material.navigationrail.NavigationRailView>
 
         <com.google.android.material.bottomnavigation.BottomNavigationView
diff --git a/app/src/main/res/layout/add_repo_input.xml b/app/src/main/res/layout/add_repo_input.xml
index 6f6b4d5bdfa..cb4224d10b5 100644
--- a/app/src/main/res/layout/add_repo_input.xml
+++ b/app/src/main/res/layout/add_repo_input.xml
@@ -72,7 +72,7 @@
             android:inputType="text"
             android:nextFocusLeft="@id/apply_btt"
             android:nextFocusRight="@id/cancel_btt"
-            android:nextFocusDown="@id/site_url_input"
+            android:nextFocusDown="@id/repo_url_input"
             android:requiresFadingEdge="vertical"
             android:textColorHint="?attr/grayTextColor"
             tools:ignore="LabelFor" />
@@ -85,9 +85,8 @@
             android:inputType="textUri"
             android:nextFocusLeft="@id/apply_btt"
             android:nextFocusRight="@id/cancel_btt"
-
-            android:nextFocusUp="@id/site_name_input"
-            android:nextFocusDown="@id/site_lang_input"
+            android:nextFocusUp="@id/repo_name_input"
+            android:nextFocusDown="@id/apply_btt"
             android:requiresFadingEdge="vertical"
             android:textColorHint="?attr/grayTextColor"
             tools:ignore="LabelFor" />
diff --git a/app/src/main/res/layout/confirm_exit_dialog.xml b/app/src/main/res/layout/confirm_exit_dialog.xml
new file mode 100644
index 00000000000..518aaa4777d
--- /dev/null
+++ b/app/src/main/res/layout/confirm_exit_dialog.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:paddingHorizontal="16dp"
+    android:paddingVertical="8dp">
+    <CheckBox
+        android:id="@+id/checkboxDontShowAgain"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/dont_show_again" />
+</LinearLayout>
diff --git a/app/src/main/res/layout/download_child_episode.xml b/app/src/main/res/layout/download_child_episode.xml
index 4974a0276b1..e53e63d312f 100644
--- a/app/src/main/res/layout/download_child_episode.xml
+++ b/app/src/main/res/layout/download_child_episode.xml
@@ -2,10 +2,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/download_child_episode_holder"
     android:layout_width="match_parent"
-
     android:layout_height="50dp"
     android:layout_marginBottom="5dp"
     android:foreground="@drawable/outline_drawable"
@@ -18,7 +16,6 @@
 
     <androidx.core.widget.ContentLoadingProgressBar
         android:id="@+id/download_child_episode_progress"
-
         style="@android:style/Widget.Material.ProgressBar.Horizontal"
         android:layout_width="match_parent"
         android:layout_height="5dp"
@@ -56,12 +53,10 @@
                 android:layout_gravity="center_vertical"
                 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" />
@@ -78,7 +73,6 @@
                 tools:text="128MB / 237MB" />
         </LinearLayout>
 
-
         <com.lagradost.cloudstream3.ui.download.button.PieFetchButton
             android:id="@+id/download_button"
             android:layout_width="@dimen/download_size"
@@ -89,5 +83,16 @@
             android:focusable="true"
             android:nextFocusLeft="@id/download_child_episode_holder"
             android:padding="10dp" />
+
+        <CheckBox
+            android:id="@+id/delete_checkbox"
+            android:layout_width="@dimen/download_size"
+            android:layout_height="@dimen/download_size"
+            android:layout_gravity="center_vertical|end"
+            android:layout_marginStart="-50dp"
+            android:focusable="true"
+            android:nextFocusLeft="@id/download_child_episode_holder"
+            android:padding="10dp"
+            android:visibility="gone" />
     </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 a0b64ce3c23..385fb2e0bb9 100644
--- a/app/src/main/res/layout/download_header_episode.xml
+++ b/app/src/main/res/layout/download_header_episode.xml
@@ -14,6 +14,17 @@
     app:cardBackgroundColor="?attr/boxItemBackground"
     app:cardCornerRadius="@dimen/rounded_image_radius">
 
+    <androidx.core.widget.ContentLoadingProgressBar
+        android:id="@+id/download_header_episode_progress"
+        style="@android:style/Widget.Material.ProgressBar.Horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="5dp"
+        android:layout_gravity="bottom"
+        android:layout_marginBottom="-1.5dp"
+        android:progressBackgroundTint="?attr/colorPrimary"
+        android:progressTint="?attr/colorPrimary"
+        tools:progress="50" />
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -77,5 +88,16 @@
             android:focusable="true"
             android:nextFocusLeft="@id/episode_holder"
             android:padding="10dp" />
+
+        <CheckBox
+            android:id="@+id/delete_checkbox"
+            android:layout_width="@dimen/download_size"
+            android:layout_height="@dimen/download_size"
+            android:layout_gravity="center_vertical|end"
+            android:layout_marginStart="-50dp"
+            android:focusable="true"
+            android:nextFocusLeft="@id/episode_holder"
+            android:padding="10dp"
+            android:visibility="gone" />
     </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 9afaea0bac3..64ed1d7006d 100644
--- a/app/src/main/res/layout/fragment_child_downloads.xml
+++ b/app/src/main/res/layout/fragment_child_downloads.xml
@@ -7,13 +7,69 @@
     android:layout_height="match_parent"
     android:background="?attr/primaryGrayBackground"
     android:orientation="vertical"
-    tools:context=".ui.download.DownloadFragment">
+    tools:context=".ui.download.DownloadChildFragment">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@android:color/transparent">
 
+        <LinearLayout
+            android:id="@+id/download_delete_appbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:background="?attr/colorPrimary"
+            android:padding="8dp"
+            android:visibility="gone">
+
+            <ImageButton
+                android:id="@+id/btnCancel"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="?attr/selectableItemBackground"
+                android:src="@drawable/ic_baseline_close_24"
+                android:contentDescription="@string/cancel"
+                android:padding="8dp"
+                android:layout_gravity="center_vertical"
+                android:nextFocusLeft="@id/nav_rail_view"
+                app:tint="@android:color/white" />
+
+            <Button
+                android:id="@+id/btnDelete"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="?attr/selectableItemBackground"
+                android:text="@string/delete"
+                android:textColor="@android:color/white"
+                android:layout_gravity="center_vertical" />
+
+            <TextView
+                android:id="@+id/selectItemsText"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="?attr/selectableItemBackground"
+                android:text="@string/downloads_delete_select"
+                android:textColor="@android:color/white"
+                android:layout_gravity="center_vertical"
+                android:visibility="gone" />
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_weight="1" />
+
+            <Button
+                android:id="@+id/btnToggleAll"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="?attr/selectableItemBackground"
+                android:text="@string/select_all"
+                android:textColor="@android:color/white"
+                android:layout_marginEnd="8dp"
+                android:nextFocusDown="@id/download_child_list" />
+        </LinearLayout>
+
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/download_child_toolbar"
             android:layout_width="match_parent"
@@ -28,7 +84,6 @@
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/download_child_list"
-
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="?attr/primaryBlackBackground"
diff --git a/app/src/main/res/layout/fragment_downloads.xml b/app/src/main/res/layout/fragment_downloads.xml
index e98d44500cc..2879703df34 100644
--- a/app/src/main/res/layout/fragment_downloads.xml
+++ b/app/src/main/res/layout/fragment_downloads.xml
@@ -17,6 +17,62 @@
         For Scroll add to LinearLayout
         app:layout_scrollFlags="scroll|enterAlways"
         -->
+        <LinearLayout
+            android:id="@+id/download_delete_appbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:background="?attr/colorPrimary"
+            android:padding="8dp"
+            android:visibility="gone">
+
+            <ImageButton
+                android:id="@+id/btnCancel"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="?attr/selectableItemBackground"
+                android:src="@drawable/ic_baseline_close_24"
+                android:contentDescription="@string/cancel"
+                android:padding="8dp"
+                android:layout_gravity="center_vertical"
+                android:nextFocusLeft="@id/nav_rail_view"
+                app:tint="@android:color/white" />
+
+            <Button
+                android:id="@+id/btnDelete"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="?attr/selectableItemBackground"
+                android:text="@string/delete"
+                android:textColor="@android:color/white"
+                android:layout_gravity="center_vertical" />
+
+            <TextView
+                android:id="@+id/selectItemsText"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="?attr/selectableItemBackground"
+                android:text="@string/downloads_delete_select"
+                android:textColor="@android:color/white"
+                android:layout_gravity="center_vertical"
+                android:visibility="gone" />
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_weight="1" />
+
+            <Button
+                android:id="@+id/btnToggleAll"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="?attr/selectableItemBackground"
+                android:text="@string/select_all"
+                android:textColor="@android:color/white"
+                android:layout_marginEnd="8dp"
+                android:nextFocusDown="@id/download_list" />
+        </LinearLayout>
+
         <LinearLayout
             android:id="@+id/download_storage_appbar"
             android:layout_width="match_parent"
@@ -137,7 +193,7 @@
         android:background="?attr/primaryBlackBackground"
         android:descendantFocusability="afterDescendants"
         android:nextFocusLeft="@id/nav_rail_view"
-        android:tag = "@string/tv_no_focus_tag"
+        android:tag="@string/tv_no_focus_tag"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"
         tools:listitem="@layout/download_header_episode" />
 
@@ -154,11 +210,11 @@
 
     <!--
     <ProgressBar
-            android:visibility="visible"
-            tools:visibility="gone"
-            android:id="@+id/download_loading"
-            android:layout_gravity="center"
-            android:layout_width="50dp" android:layout_height="50dp">
+        android:visibility="visible"
+        tools:visibility="gone"
+        android:id="@+id/download_loading"
+        android:layout_gravity="center"
+        android:layout_width="50dp" android:layout_height="50dp">
     </ProgressBar>-->
 
     <com.facebook.shimmer.ShimmerFrameLayout
@@ -182,15 +238,10 @@
             android:orientation="vertical">
 
             <include layout="@layout/loading_downloads" />
-
             <include layout="@layout/loading_downloads" />
-
             <include layout="@layout/loading_downloads" />
-
             <include layout="@layout/loading_downloads" />
-
             <include layout="@layout/loading_downloads" />
-
             <include layout="@layout/loading_downloads" />
         </LinearLayout>
     </com.facebook.shimmer.ShimmerFrameLayout>
@@ -201,24 +252,24 @@
         android:orientation="vertical"
         android:layout_gravity="bottom|end">
 
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/open_local_video_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        style="?attr/floatingActionButtonSmallStyle"
-        android:backgroundTint="?attr/primaryGrayBackground"
-        android:src="@drawable/netflix_play"
-        android:layout_marginEnd="16dp"
-        android:tooltipText="@string/open_local_video"
-        android:layout_gravity="bottom|end"
-        android:contentDescription="@string/open_local_video" />
-
-    <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
-        android:id="@+id/download_stream_button"
-        style="@style/ExtendedFloatingActionButton"
-        android:text="@string/stream"
-        android:textColor="?attr/textColor"
-        app:icon="@drawable/ic_network_stream"
-        android:contentDescription="@string/stream" />
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
+            android:id="@+id/open_local_video_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            style="?attr/floatingActionButtonSmallStyle"
+            android:backgroundTint="?attr/primaryGrayBackground"
+            android:src="@drawable/netflix_play"
+            android:layout_marginEnd="16dp"
+            android:tooltipText="@string/open_local_video"
+            android:layout_gravity="bottom|end"
+            android:contentDescription="@string/open_local_video" />
+
+        <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
+            android:id="@+id/download_stream_button"
+            style="@style/ExtendedFloatingActionButton"
+            android:text="@string/stream"
+            android:textColor="?attr/textColor"
+            app:icon="@drawable/ic_network_stream"
+            android:contentDescription="@string/stream" />
     </LinearLayout>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_easter_egg_monke.xml b/app/src/main/res/layout/fragment_easter_egg_monke.xml
new file mode 100644
index 00000000000..8440d40cebd
--- /dev/null
+++ b/app/src/main/res/layout/fragment_easter_egg_monke.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/frame">
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/monke"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        tools:visibility="visible" />
+
+</FrameLayout>
\ No newline at end of file
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 2c15ca2d4ec..caebef0d707 100644
--- a/app/src/main/res/layout/fragment_home_head_tv.xml
+++ b/app/src/main/res/layout/fragment_home_head_tv.xml
@@ -44,9 +44,11 @@
                 android:layout_marginEnd="0dp"
                 android:background="@drawable/player_button_tv_attr_no_bg"
                 android:gravity="center_vertical"
-                android:nextFocusLeft="@id/nav_rail_view"
+                android:nextFocusLeft="@id/home_preview_play_btt"
                 android:nextFocusRight="@id/home_preview_search_button"
-                android:nextFocusDown="@id/home_preview_play_btt" />
+                android:nextFocusDown="@id/home_preview_play_btt" >
+                <requestFocus />
+            </com.google.android.material.button.MaterialButton>
 
             <ImageView
                 android:id="@+id/home_preview_search_button"
diff --git a/app/src/main/res/layout/fragment_home_tv.xml b/app/src/main/res/layout/fragment_home_tv.xml
index 86ef884e051..fe24e7175d1 100644
--- a/app/src/main/res/layout/fragment_home_tv.xml
+++ b/app/src/main/res/layout/fragment_home_tv.xml
@@ -114,7 +114,9 @@
                 android:gravity="center_vertical"
                 android:nextFocusLeft="@id/nav_rail_view"
                 android:nextFocusRight="@id/home_preview_search_button"
-                android:nextFocusDown="@id/home_preview_play_btt" />
+                android:nextFocusDown="@id/home_preview_play_btt" >
+            <requestFocus />
+            </com.google.android.material.button.MaterialButton>
 
             <ImageView
                 android:id="@+id/home_preview_search_button"
@@ -134,6 +136,7 @@
                 app:tint="@color/player_on_button_tv_attr" />
 
             <ImageView
+                android:visibility="gone"
                 android:id="@+id/home_switch_account"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/fragment_player_tv.xml b/app/src/main/res/layout/fragment_player_tv.xml
index 07cbb3c3075..3c0ac05e35e 100644
--- a/app/src/main/res/layout/fragment_player_tv.xml
+++ b/app/src/main/res/layout/fragment_player_tv.xml
@@ -68,7 +68,9 @@
             android:layout_height="wrap_content"
             android:layout_margin="5dp"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
+            app:layout_constraintTop_toTopOf="parent"
+            android:visibility="gone"
+            tools:visibility="visible">
 
             <ImageView
                 android:layout_width="30dp"
@@ -82,12 +84,11 @@
                 android:id="@+id/player_loading_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:focusable="true"
-                android:focusableInTouchMode="true"
+                android:clickable="false"
+                android:focusable="false"
+                android:focusableInTouchMode="false"
                 android:nextFocusRight="@id/overlay_loading_skip_button"
                 android:nextFocusDown="@id/overlay_loading_skip_button" />
         </FrameLayout>
diff --git a/app/src/main/res/layout/fragment_result.xml b/app/src/main/res/layout/fragment_result.xml
index 22d2e52f193..623131111fa 100644
--- a/app/src/main/res/layout/fragment_result.xml
+++ b/app/src/main/res/layout/fragment_result.xml
@@ -360,14 +360,14 @@
 
                                 <com.google.android.material.button.MaterialButton
                                     android:id="@+id/result_meta_site"
-                                    android:layout_gravity="center_vertical"
                                     style="@style/SmallBlackButton"
+                                    android:layout_gravity="center_vertical"
                                     tools:text="Gogoanime" />
 
                                 <com.google.android.material.button.MaterialButton
                                     android:id="@+id/result_meta_content_rating"
-                                    android:layout_gravity="center_vertical"
                                     style="@style/SmallBlackButton"
+                                    android:layout_gravity="center_vertical"
                                     tools:text="PG-13" />
 
                                 <TextView
@@ -409,8 +409,8 @@
                                     android:layout_width="match_parent"
                                     android:layout_height="wrap_content"
                                     android:ellipsize="end"
-                                    android:maxLines="10"
                                     android:foreground="@drawable/outline_drawable"
+                                    android:maxLines="10"
                                     android:nextFocusUp="@id/result_back"
                                     android:nextFocusDown="@id/result_bookmark_Button"
                                     android:paddingTop="5dp"
@@ -733,19 +733,20 @@
                             android:layout_height="wrap_content"
                             android:orientation="vertical">
 
-                            <LinearLayout
+                            <com.lagradost.cloudstream3.widget.FlowLayout
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 android:layout_marginBottom="10dp"
                                 android:gravity="center_vertical"
-                                android:orientation="horizontal">
+                                android:orientation="horizontal"
+                                app:itemSpacing="10dp">
 
                                 <com.google.android.material.button.MaterialButton
                                     android:id="@+id/result_season_button"
                                     style="@style/MultiSelectButton"
                                     android:layout_gravity="center_vertical"
-                                    android:layout_marginStart="0dp"
-                                    android:layout_marginEnd="10dp"
+                                    android:layout_marginTop="10dp"
+                                    android:layout_marginBottom="10dp"
                                     android:drawableEnd="@drawable/ic_baseline_keyboard_arrow_down_24"
                                     android:nextFocusLeft="@id/result_episode_select"
                                     android:nextFocusRight="@id/result_episode_select"
@@ -761,8 +762,8 @@
                                     android:id="@+id/result_episode_select"
                                     style="@style/MultiSelectButton"
                                     android:layout_gravity="center_vertical"
-                                    android:layout_marginStart="0dp"
-                                    android:layout_marginEnd="10dp"
+                                    android:layout_marginTop="10dp"
+                                    android:layout_marginBottom="10dp"
                                     android:drawableEnd="@drawable/ic_baseline_keyboard_arrow_down_24"
                                     android:nextFocusLeft="@id/result_season_button"
                                     android:nextFocusRight="@id/result_season_button"
@@ -778,8 +779,8 @@
                                     android:id="@+id/result_dub_select"
                                     style="@style/MultiSelectButton"
                                     android:layout_gravity="center_vertical"
-                                    android:layout_marginStart="0dp"
-                                    android:layout_marginEnd="10dp"
+                                    android:layout_marginTop="10dp"
+                                    android:layout_marginBottom="10dp"
                                     android:drawableEnd="@drawable/ic_baseline_keyboard_arrow_down_24"
                                     android:nextFocusLeft="@id/result_season_button"
                                     android:nextFocusRight="@id/result_season_button"
@@ -788,7 +789,23 @@
                                     android:paddingStart="10dp"
                                     android:paddingEnd="5dp"
                                     android:visibility="gone"
-                                    tools:text="Dubbed"
+                                    tools:text="Dubbed1"
+                                    tools:visibility="visible" />
+
+
+                                <com.google.android.material.button.MaterialButton
+                                    android:id="@+id/result_sort_button"
+                                    style="@style/MultiSelectButton"
+                                    android:layout_gravity="center_vertical"
+                                    android:layout_marginTop="10dp"
+                                    android:layout_marginBottom="10dp"
+                                    android:nextFocusLeft="@id/result_dub_select"
+                                    android:nextFocusUp="@id/result_description"
+                                    android:nextFocusDown="@id/result_episodes"
+                                    android:paddingStart="10dp"
+                                    android:paddingEnd="5dp"
+                                    android:text="Sort"
+                                    android:visibility="gone"
                                     tools:visibility="visible" />
 
                                 <TextView
@@ -796,13 +813,15 @@
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:layout_gravity="center_vertical"
+                                    android:layout_marginTop="10dp"
+                                    android:layout_marginBottom="10dp"
                                     android:paddingTop="10dp"
                                     android:paddingBottom="10dp"
                                     android:textColor="?attr/textColor"
                                     android:textSize="17sp"
                                     android:textStyle="normal"
                                     tools:text="8 Episodes" />
-                            </LinearLayout>
+                            </com.lagradost.cloudstream3.widget.FlowLayout>
 
 
                             <!--TODO add next airing-->
diff --git a/app/src/main/res/layout/fragment_result_swipe.xml b/app/src/main/res/layout/fragment_result_swipe.xml
index bb8a5c102bd..6ef95681185 100644
--- a/app/src/main/res/layout/fragment_result_swipe.xml
+++ b/app/src/main/res/layout/fragment_result_swipe.xml
@@ -45,7 +45,6 @@
                     android:focusable="false"
                     android:layout_gravity="center"
                     android:orientation="horizontal"
-                    android:paddingTop="5dp"
                     android:requiresFadingEdge="horizontal"
                     app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
                     tools:itemCount="2"
diff --git a/app/src/main/res/layout/fragment_result_tv.xml b/app/src/main/res/layout/fragment_result_tv.xml
index 893c19ff8ca..c09843ff077 100644
--- a/app/src/main/res/layout/fragment_result_tv.xml
+++ b/app/src/main/res/layout/fragment_result_tv.xml
@@ -91,15 +91,13 @@ https://developer.android.com/design/ui/tv/samples/jet-fit
             android:layout_gravity="center"
             android:alpha="0.8"
             android:scaleType="matrix"
-            tools:src="@drawable/profile_bg_dark_blue" >
-        </com.lagradost.cloudstream3.utils.PercentageCropImageView>
+            tools:src="@drawable/profile_bg_dark_blue" />
 
         <ImageView
             android:layout_width="match_parent"
             android:layout_height="120dp"
             android:layout_gravity="bottom"
-            android:src="@drawable/background_shadow">
-        </ImageView>
+            android:src="@drawable/background_shadow" />
     </FrameLayout>
 
     <LinearLayout
@@ -163,8 +161,8 @@ https://developer.android.com/design/ui/tv/samples/jet-fit
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:layout_marginTop="225dp">
+                android:layout_marginTop="225dp"
+                android:orientation="vertical">
 
                 <TextView
                     android:id="@+id/result_title"
@@ -187,8 +185,8 @@ https://developer.android.com/design/ui/tv/samples/jet-fit
                     android:textSize="17sp"
                     android:textStyle="normal"
                     android:visibility="gone"
-                    tools:visibility="visible"
-                    tools:text="8 Episodes" />
+                    tools:text="8 Episodes"
+                    tools:visibility="visible" />
 
                 <LinearLayout
                     android:id="@+id/result_next_airing_holder"
@@ -201,11 +199,11 @@ https://developer.android.com/design/ui/tv/samples/jet-fit
                         android:id="@+id/result_next_airing"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_marginEnd="5dp"
                         android:gravity="start"
                         android:textColor="?attr/grayTextColor"
                         android:textSize="17sp"
                         android:textStyle="normal"
-                        android:layout_marginEnd="5dp"
                         tools:text="Season 2 Episode 1022 will be released in" />
 
                     <TextView
@@ -219,40 +217,44 @@ https://developer.android.com/design/ui/tv/samples/jet-fit
                         tools:text="5d 3h 30m" />
                 </LinearLayout>
 
-                    <LinearLayout
-                        android:id="@+id/result_resume_progress_holder"
+                <LinearLayout
+                    android:id="@+id/result_resume_progress_holder"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="10dp"
+                    android:orientation="horizontal"
+                    android:visibility="gone"
+                    tools:visibility="visible">
+
+                    <!--https://github.com/material-components/material-components-android/blob/master/docs/components/ProgressIndicator.md-->
+                    <com.google.android.material.progressindicator.LinearProgressIndicator
+                        android:id="@+id/result_resume_series_progress"
+
+                        style="@style/RoundProgressbar"
+
+                        android:layout_width="100dp"
+                        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:scrollbarStyle="outsideInset"
+                        tools:ignore="RtlSymmetry"
+                        tools:progress="25"
+                        tools:visibility="visible" />
+
+                    <TextView
+                        android:id="@+id/result_resume_series_progress_text"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginBottom="10dp"
-                        android:orientation="horizontal"
-                        android:visibility="gone"
-                        tools:visibility="visible">
-
-                        <com.google.android.material.progressindicator.LinearProgressIndicator
-                            android:id="@+id/result_resume_series_progress"
-                            app:trackCornerRadius="50dp"
-                            android:layout_width="100dp"
-                            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"
-                            tools:progress="50"
-                            tools:visibility="visible"
-                            tools:ignore="RtlSymmetry" />
-
-                        <TextView
-                            android:id="@+id/result_resume_series_progress_text"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:maxLines="1"
-                            android:textColor="?attr/grayTextColor"
-                            tools:ignore="RtlSymmetry"
-                            tools:text="69m remaining" />
-                    </LinearLayout>
+                        android:maxLines="1"
+                        android:textColor="?attr/grayTextColor"
+                        tools:ignore="RtlSymmetry"
+                        tools:text="69m remaining" />
+                </LinearLayout>
             </LinearLayout>
 
             <LinearLayout
@@ -265,24 +267,23 @@ https://developer.android.com/design/ui/tv/samples/jet-fit
                 android:orientation="horizontal">
 
                 <LinearLayout
+                    android:id="@+id/result_play_movie"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="8dp"
-                    android:id="@+id/result_play_movie"
                     android:orientation="vertical"
                     android:visibility="gone"
                     tools:visibility="visible">
 
                     <com.google.android.material.button.MaterialButton
                         android:id="@+id/result_play_movie_button"
-                        android:focusable="true"
                         style="@style/ResultSmallButtonTV"
-                        app:iconPadding="0dp"
-                        app:icon="@drawable/ic_baseline_play_arrow_24"
+                        android:focusable="true"
                         android:nextFocusUp="@id/result_play_movie_button"
                         android:nextFocusDown="@id/result_description"
-                        android:tag="@string/tv_no_focus_tag">
-                    </com.google.android.material.button.MaterialButton>
+                        android:tag="@string/tv_no_focus_tag"
+                        app:icon="@drawable/ic_baseline_play_arrow_24"
+                        app:iconPadding="0dp" />
 
                     <TextView
                         android:id="@+id/result_play_movie_text"
@@ -292,24 +293,23 @@ https://developer.android.com/design/ui/tv/samples/jet-fit
                 </LinearLayout>
 
                 <LinearLayout
+                    android:id="@+id/result_play_series"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="8dp"
-                    android:id="@+id/result_play_series"
+                    android:orientation="vertical"
                     android:visibility="gone"
-                    tools:visibility="visible"
-                    android:orientation="vertical">
+                    tools:visibility="visible">
 
                     <com.google.android.material.button.MaterialButton
                         android:id="@+id/result_play_series_button"
-                        android:focusable="true"
                         style="@style/ResultSmallButtonTV"
-                        app:iconPadding="0dp"
-                        app:icon="@drawable/ic_baseline_play_arrow_24"
+                        android:focusable="true"
                         android:nextFocusUp="@id/result_play_series_button"
                         android:nextFocusDown="@id/result_description"
-                        android:tag="@string/tv_no_focus_tag">
-                    </com.google.android.material.button.MaterialButton>
+                        android:tag="@string/tv_no_focus_tag"
+                        app:icon="@drawable/ic_baseline_play_arrow_24"
+                        app:iconPadding="0dp" />
 
                     <TextView
                         android:id="@+id/result_play_series_text"
@@ -329,14 +329,13 @@ https://developer.android.com/design/ui/tv/samples/jet-fit
 
                     <com.google.android.material.button.MaterialButton
                         android:id="@+id/result_resume_series_button"
-                        android:focusable="true"
                         style="@style/ResultSmallButtonTV"
-                        app:iconPadding="0dp"
-                        app:icon="@drawable/ic_baseline_resume_arrow2"
+                        android:focusable="true"
                         android:nextFocusUp="@id/result_resume_series_button"
                         android:nextFocusDown="@id/result_description"
-                        android:tag="@string/tv_no_focus_tag">
-                    </com.google.android.material.button.MaterialButton>
+                        android:tag="@string/tv_no_focus_tag"
+                        app:icon="@drawable/ic_baseline_resume_arrow2"
+                        app:iconPadding="0dp" />
 
                     <TextView
                         android:id="@+id/result_resume_series_text"
@@ -350,18 +349,19 @@ https://developer.android.com/design/ui/tv/samples/jet-fit
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="8dp"
-                    android:orientation="vertical">
+                    android:orientation="vertical"
+                    android:visibility="gone"
+                    tools:visibility="visible">
 
                     <com.google.android.material.button.MaterialButton
                         android:id="@+id/result_play_trailer_button"
-                        android:focusable="true"
                         style="@style/ResultSmallButtonTV"
-                        app:iconPadding="0dp"
-                        app:icon="@drawable/ic_baseline_film_roll_24"
+                        android:focusable="true"
                         android:nextFocusUp="@id/result_play_trailer_button"
                         android:nextFocusDown="@id/result_description"
-                        android:tag="@string/tv_no_focus_tag">
-                    </com.google.android.material.button.MaterialButton>
+                        android:tag="@string/tv_no_focus_tag"
+                        app:icon="@drawable/ic_baseline_film_roll_24"
+                        app:iconPadding="0dp" />
 
                     <TextView
                         android:id="@+id/result_play_trailer_text"
@@ -379,14 +379,13 @@ https://developer.android.com/design/ui/tv/samples/jet-fit
 
                     <com.google.android.material.button.MaterialButton
                         android:id="@+id/result_bookmark_Button"
-                        android:focusable="true"
                         style="@style/ResultSmallButtonTV"
-                        app:iconPadding="0dp"
-                        app:icon="@drawable/outline_bookmark_add_24"
+                        android:focusable="true"
                         android:nextFocusUp="@id/result_bookmark_Button"
                         android:nextFocusDown="@id/result_description"
-                        android:tag="@string/tv_no_focus_tag">
-                    </com.google.android.material.button.MaterialButton>
+                        android:tag="@string/tv_no_focus_tag"
+                        app:icon="@drawable/outline_bookmark_add_24"
+                        app:iconPadding="0dp" />
 
                     <TextView
                         android:id="@+id/result_bookmark_text"
@@ -404,14 +403,13 @@ https://developer.android.com/design/ui/tv/samples/jet-fit
 
                     <com.google.android.material.button.MaterialButton
                         android:id="@+id/result_favorite_Button"
-                        android:focusable="true"
                         style="@style/ResultSmallButtonTV"
-                        app:iconPadding="0dp"
-                        app:icon="@drawable/ic_baseline_favorite_border_24"
+                        android:focusable="true"
                         android:nextFocusUp="@id/result_favorite_Button"
                         android:nextFocusDown="@id/result_description"
-                        android:tag="@string/tv_no_focus_tag">
-                    </com.google.android.material.button.MaterialButton>
+                        android:tag="@string/tv_no_focus_tag"
+                        app:icon="@drawable/ic_baseline_favorite_border_24"
+                        app:iconPadding="0dp" />
 
                     <TextView
                         android:id="@+id/result_favorite_Text"
@@ -421,22 +419,21 @@ https://developer.android.com/design/ui/tv/samples/jet-fit
                 </LinearLayout>
 
                 <LinearLayout
+                    android:id="@+id/result_subscribe"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="8dp"
-                    android:id="@+id/result_subscribe"
                     android:orientation="vertical">
 
                     <com.google.android.material.button.MaterialButton
                         android:id="@+id/result_subscribe_Button"
-                        android:focusable="true"
                         style="@style/ResultSmallButtonTV"
-                        app:iconPadding="0dp"
-                        app:icon="@drawable/baseline_notifications_none_24"
+                        android:focusable="true"
                         android:nextFocusUp="@id/result_subscribe_Button"
                         android:nextFocusDown="@id/result_description"
-                        android:tag="@string/tv_no_focus_tag">
-                    </com.google.android.material.button.MaterialButton>
+                        android:tag="@string/tv_no_focus_tag"
+                        app:icon="@drawable/baseline_notifications_none_24"
+                        app:iconPadding="0dp" />
 
                     <TextView
                         android:id="@+id/result_subscribe_text"
@@ -446,22 +443,21 @@ https://developer.android.com/design/ui/tv/samples/jet-fit
                 </LinearLayout>
 
                 <LinearLayout
+                    android:id="@+id/result_search"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="8dp"
-                    android:id="@+id/result_search"
                     android:orientation="vertical">
 
                     <com.google.android.material.button.MaterialButton
                         android:id="@+id/result_search_Button"
-                        android:focusable="true"
                         style="@style/ResultSmallButtonTV"
-                        app:iconPadding="0dp"
-                        app:icon="@drawable/search_icon"
+                        android:focusable="true"
                         android:nextFocusUp="@id/result_search_Button"
                         android:nextFocusDown="@id/result_description"
-                        android:tag="@string/tv_no_focus_tag">
-                    </com.google.android.material.button.MaterialButton>
+                        android:tag="@string/tv_no_focus_tag"
+                        app:icon="@drawable/search_icon"
+                        app:iconPadding="0dp" />
 
                     <TextView
                         android:id="@+id/result_search_text"
@@ -471,25 +467,24 @@ https://developer.android.com/design/ui/tv/samples/jet-fit
                 </LinearLayout>
 
                 <LinearLayout
+                    android:id="@+id/result_episodes_show"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="8dp"
-                    android:id="@+id/result_episodes_show"
+                    android:orientation="vertical"
                     android:visibility="gone"
-                    tools:visibility="visible"
-                    android:orientation="vertical">
+                    tools:visibility="visible">
 
                     <com.google.android.material.button.MaterialButton
                         android:id="@+id/result_episodes_show_button"
-                        android:focusable="true"
                         style="@style/ResultSmallButtonTV"
-                        app:iconPadding="0dp"
-                        app:icon="@drawable/ic_baseline_sort_24"
-                        android:nextFocusUp="@id/result_episodes_show_button"
+                        android:focusable="true"
                         android:nextFocusRight="@id/redirect_to_episodes"
+                        android:nextFocusUp="@id/result_episodes_show_button"
                         android:nextFocusDown="@id/result_description"
-                        android:tag="@string/tv_no_focus_tag">
-                    </com.google.android.material.button.MaterialButton>
+                        android:tag="@string/tv_no_focus_tag"
+                        app:icon="@drawable/ic_baseline_sort_24"
+                        app:iconPadding="0dp" />
 
                     <TextView
                         android:id="@+id/result_episodes_show_text"
@@ -502,9 +497,9 @@ https://developer.android.com/design/ui/tv/samples/jet-fit
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal"
                 android:layout_marginTop="10dp"
-                android:baselineAligned="false">
+                android:baselineAligned="false"
+                android:orientation="horizontal">
 
                 <LinearLayout
                     android:id="@+id/right_layout"
@@ -526,14 +521,14 @@ https://developer.android.com/design/ui/tv/samples/jet-fit
 
                         <com.google.android.material.button.MaterialButton
                             android:id="@+id/result_meta_site"
-                            android:layout_gravity="center_vertical"
                             style="@style/SmallWhiteButton"
+                            android:layout_gravity="center_vertical"
                             tools:text="Gogoanime" />
 
                         <com.google.android.material.button.MaterialButton
                             android:id="@+id/result_meta_content_rating"
-                            android:layout_gravity="center_vertical"
                             style="@style/SmallWhiteButton"
+                            android:layout_gravity="center_vertical"
                             android:focusable="false"
                             tools:text="PG-13" />
 
@@ -570,9 +565,9 @@ https://developer.android.com/design/ui/tv/samples/jet-fit
                         android:layout_height="wrap_content"
                         android:ellipsize="end"
                         android:fadingEdgeLength="30dp"
+                        android:focusable="true"
                         android:foreground="@drawable/outline_drawable"
                         android:maxLines="7"
-                        android:focusable="true"
                         android:nextFocusUp="@id/result_play_parent"
                         android:nextFocusDown="@id/result_cast_items"
                         android:padding="5dp"
@@ -617,14 +612,14 @@ https://developer.android.com/design/ui/tv/samples/jet-fit
                 android:textColor="?attr/textColor"
                 android:textSize="20sp"
                 android:textStyle="bold"
-                tools:visibility="visible"
-                android:visibility="gone" />
+                android:visibility="gone"
+                tools:visibility="visible" />
 
             <LinearLayout
                 android:id="@+id/result_recommendations_holder"
-                android:descendantFocusability="afterDescendants"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:descendantFocusability="afterDescendants"
                 android:orientation="horizontal"
                 android:paddingTop="10dp"
                 android:paddingBottom="10dp">
@@ -634,9 +629,9 @@ https://developer.android.com/design/ui/tv/samples/jet-fit
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="10dp"
+                    android:descendantFocusability="afterDescendants"
                     android:nextFocusUp="@id/result_cast_items"
                     android:nextFocusDown="@id/result_recommendations_list"
-                    android:descendantFocusability="afterDescendants"
                     android:orientation="horizontal"
                     app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
                     tools:itemCount="2"
@@ -1042,19 +1037,19 @@ https://developer.android.com/design/ui/tv/samples/jet-fit
                         android:layout_height="wrap_content"
                         android:orientation="vertical">
 
-                    <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_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" />
+                        <View
+                            android:id="@+id/redirect_to_play"
+                            android:layout_width="1dp"
+                            android:layout_height="1dp"
+                            android:focusable="true"
+                            android:focusableInTouchMode="true" />
                     </LinearLayout>
                 </LinearLayout>
             </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_setup_layout.xml b/app/src/main/res/layout/fragment_setup_layout.xml
index e14170e3ffc..a742c27b5b7 100644
--- a/app/src/main/res/layout/fragment_setup_layout.xml
+++ b/app/src/main/res/layout/fragment_setup_layout.xml
@@ -6,44 +6,46 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="20dp"
-        android:orientation="horizontal">
-
-        <LinearLayout
+    <!--
+        <FrameLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_gravity="center"
-            android:layout_marginHorizontal="50dp"
-            android:orientation="vertical">
+            android:layout_height="wrap_content"
+            android:layout_margin="20dp"
+            android:orientation="horizontal">
 
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:text="@string/crash_reporting_title"
-                android:textSize="18sp" />
 
-            <TextView
-                android:id="@+id/crash_reporting_text"
+            <LinearLayout
                 android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_gravity="center"
+                android:layout_marginHorizontal="50dp"
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:text="@string/crash_reporting_title"
+                    android:textSize="18sp" />
+
+                <TextView
+                    android:id="@+id/crash_reporting_text"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:text="@string/bug_report_settings_off" />
+            </LinearLayout>
+
+
+            <androidx.appcompat.widget.SwitchCompat
+                android:id="@+id/acra_switch"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:gravity="center"
-                android:text="@string/bug_report_settings_off" />
-        </LinearLayout>
-
-
-        <androidx.appcompat.widget.SwitchCompat
-            android:id="@+id/acra_switch"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="end|center_vertical"
-            android:checked="true">
+                android:layout_gravity="end|center_vertical"
+                android:checked="true">
 
-        </androidx.appcompat.widget.SwitchCompat>
-    </FrameLayout>
+            </androidx.appcompat.widget.SwitchCompat>
+        </FrameLayout>-->
 
     <TextView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/item_logcat.xml b/app/src/main/res/layout/item_logcat.xml
new file mode 100644
index 00000000000..1ffe46a20c6
--- /dev/null
+++ b/app/src/main/res/layout/item_logcat.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout 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:padding="8dp">
+
+    <TextView
+        android:id="@+id/log_text"
+        android:textSize="14sp"
+        android:textColor="?attr/textColor"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:focusable="true"
+        android:nextFocusRight="@id/save_btt"
+        tools:text="Test" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/logcat.xml b/app/src/main/res/layout/logcat.xml
index 5cbb3f53cc8..4d0e8b6101e 100644
--- a/app/src/main/res/layout/logcat.xml
+++ b/app/src/main/res/layout/logcat.xml
@@ -1,80 +1,65 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
-    <ScrollView
-        android:layout_marginBottom="60dp"
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/logcat_recycler_view"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:nextFocusRight="@id/save_btt">
-
-        <TextView
-            android:id="@+id/text1"
-            android:padding="15dp"
-            android:textSize="15sp"
-            android:textColor="?attr/textColor"
-            android:layout_width="match_parent"
-            android:layout_rowWeight="1"
-            tools:text="Test"
-            android:layout_height="wrap_content"/>
-    </ScrollView>
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:layout_marginBottom="60dp"
+        tools:listitem="@layout/item_logcat" />
 
     <HorizontalScrollView
-            android:scrollbars="none"
-            android:id="@+id/apply_btt_holder"
-            android:layout_gravity="bottom"
-            android:gravity="bottom|end"
-            android:layout_marginTop="-60dp"
-            android:layout_width="match_parent"
-            android:layout_height="60dp">
+        android:id="@+id/apply_btt_holder"
+        android:scrollbars="none"
+        android:gravity="bottom|end"
+        android:layout_gravity="bottom"
+        android:layout_marginTop="-60dp"
+        android:layout_width="match_parent"
+        android:layout_height="60dp">
 
         <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:orientation="horizontal">
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:orientation="horizontal">
 
             <com.google.android.material.button.MaterialButton
-                    android:nextFocusRight="@id/copy_btt"
-                    android:id="@+id/save_btt"
-
-                    style="@style/WhiteButton"
-                    android:layout_gravity="center_vertical|end"
-                    android:text="@string/sort_save"
-                    android:layout_width="wrap_content" />
+                android:id="@+id/save_btt"
+                android:text="@string/sort_save"
+                android:layout_gravity="center_vertical|end"
+                android:layout_width="wrap_content"
+                android:nextFocusRight="@id/copy_btt"
+                style="@style/WhiteButton" />
 
             <com.google.android.material.button.MaterialButton
-                    android:nextFocusLeft="@id/save_btt"
-                    android:nextFocusRight="@id/clear_btt"
-                    android:id="@+id/copy_btt"
-
-                    style="@style/BlackButton"
-                    android:layout_gravity="center_vertical|end"
-                    android:text="@string/sort_copy"
-                    android:layout_width="wrap_content" />
-
+                android:id="@+id/copy_btt"
+                android:text="@string/sort_copy"
+                android:layout_gravity="center_vertical|end"
+                android:layout_width="wrap_content"
+                android:nextFocusLeft="@id/save_btt"
+                android:nextFocusRight="@id/clear_btt"
+                style="@style/BlackButton" />
 
             <com.google.android.material.button.MaterialButton
-                    android:nextFocusRight="@id/close_btt"
-                    android:nextFocusLeft="@id/copy_btt"
-
-                    style="@style/BlackButton"
-                    android:layout_gravity="center_vertical|end"
-                    android:text="@string/sort_clear"
-                    android:id="@+id/clear_btt"
-                    android:layout_width="wrap_content" />
+                android:id="@+id/clear_btt"
+                android:text="@string/sort_clear"
+                android:layout_gravity="center_vertical|end"
+                android:layout_width="wrap_content"
+                android:nextFocusRight="@id/close_btt"
+                android:nextFocusLeft="@id/copy_btt"
+                style="@style/BlackButton" />
 
             <com.google.android.material.button.MaterialButton
-                    android:nextFocusLeft="@id/clear_btt"
-                    android:id="@+id/close_btt"
-
-                    style="@style/BlackButton"
-                    android:layout_gravity="center_vertical|end"
-                    android:text="@string/sort_close"
-                    android:layout_width="wrap_content" />
+                android:id="@+id/close_btt"
+                android:text="@string/sort_close"
+                android:layout_gravity="center_vertical|end"
+                android:layout_width="wrap_content"
+                android:nextFocusLeft="@id/clear_btt"
+                style="@style/BlackButton" />
         </LinearLayout>
     </HorizontalScrollView>
-
-</LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/player_custom_layout.xml b/app/src/main/res/layout/player_custom_layout.xml
index 83be8832958..009b08e48a7 100644
--- a/app/src/main/res/layout/player_custom_layout.xml
+++ b/app/src/main/res/layout/player_custom_layout.xml
@@ -47,6 +47,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
+
         <View
             android:id="@+id/shadow_overlay"
             android:layout_width="match_parent"
@@ -84,6 +85,8 @@
                 style="@style/SmallBlackButton"
                 android:text="@string/filler" />
         </FrameLayout>
+
+
         <!-- atm this is useless, however it might be used for PIP one day? -->
         <ImageView
             android:id="@+id/player_fullscreen"
@@ -168,32 +171,113 @@
                         app:layout_constraintRight_toRightOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />-->
 
-                <FrameLayout
+                <LinearLayout
                     android:id="@+id/player_go_back_holder"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_width="70dp"
+                    android:layout_height="70dp"
                     android:layout_margin="5dp"
                     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" />
+                    <LinearLayout
+                        android:id="@+id/player_go_back_root"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:orientation="vertical">
 
-                    <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>
+                        <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"
+                            android:nextFocusLeft="@id/player_go_back"
+                            android:nextFocusRight="@id/player_restart"
+                            android:nextFocusUp="@id/player_go_back"
+                            android:nextFocusDown="@id/player_pause_play"
+                            android:padding="20dp"
+                            android:src="@drawable/ic_baseline_arrow_back_24"
+                            android:tag="@string/tv_no_focus_tag"
+                            app:tint="@android:color/white" />
+
+                        <TextView
+                            android:id="@+id/player_go_back_text"
+                            style="@style/ResultMarqueeButtonText"
+                            android:text="@string/go_back_img_des"
+                            android:visibility="gone" />
+
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:id="@+id/player_restart_root"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="40dp"
+                        android:layout_marginEnd="10dp"
+                        android:orientation="vertical"
+                        android:visibility="gone">
+
+                        <ImageView
+                            android:id="@+id/player_restart"
+                            android:layout_width="30dp"
+                            android:layout_height="30dp"
+                            android:layout_gravity="center"
+                            android:background="@drawable/video_tap_button_always_white"
+                            android:clickable="true"
+                            android:contentDescription="@string/restart"
+                            android:focusable="true"
+                            android:nextFocusLeft="@id/player_go_back"
+                            android:nextFocusRight="@id/player_go_forward"
+                            android:nextFocusUp="@id/player_restart"
+                            android:nextFocusDown="@id/player_pause_play"
+                            android:src="@drawable/ic_baseline_replay_24"
+                            android:tag="@string/tv_no_focus_tag"
+                            app:tint="@android:color/white" />
+
+                        <TextView
+                            android:id="@+id/player_restart_text"
+                            style="@style/ResultMarqueeButtonText"
+                            android:text="@string/restart" />
+
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:id="@+id/player_go_forward_root"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="80dp"
+                        android:layout_marginEnd="10dp"
+                        android:orientation="vertical"
+                        android:visibility="gone">
+
+                        <ImageView
+                            android:id="@+id/player_go_forward"
+                            android:layout_width="30dp"
+                            android:layout_height="30dp"
+                            android:layout_gravity="center"
+                            android:background="@drawable/video_tap_button_always_white"
+                            android:clickable="true"
+                            android:contentDescription="@string/next_episode"
+                            android:focusable="true"
+                            android:nextFocusLeft="@id/player_restart"
+                            android:nextFocusRight="@id/player_go_forward"
+                            android:nextFocusUp="@id/player_go_forward"
+                            android:nextFocusDown="@id/player_pause_play"
+                            android:src="@drawable/ic_baseline_skip_next_rounded_24"
+                            android:tag="@string/tv_no_focus_tag"
+                            app:tint="@android:color/white" />
+
+                        <TextView
+                            android:id="@+id/player_go_forward_text"
+                            style="@style/ResultMarqueeButtonText"
+                            android:text="@string/next_episode" />
+
+                    </LinearLayout>
+
+                </LinearLayout>
 
 
             </FrameLayout>
@@ -217,6 +301,8 @@
                 app:layout_constraintTop_toTopOf="parent"
                 tools:visibility="visible" />
 
+
+
             <!-- This nested layout is necessary because of buffering and clicking-->
 
             <androidx.constraintlayout.widget.ConstraintLayout
@@ -257,13 +343,13 @@
                         tools:text="10" />
 
                     <ImageButton
-                        android:id="@id/exo_rew"
+                        android:id="@+id/player_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:nextFocusLeft="@id/player_rew"
                         android:nextFocusUp="@id/player_go_back"
                         android:nextFocusDown="@id/player_lock"
                         android:padding="10dp"
@@ -290,9 +376,9 @@
                         android:layout_height="70dp"
                         android:layout_gravity="center"
                         android:background="@drawable/video_tap_button"
-                        android:nextFocusLeft="@id/exo_rew"
+                        android:nextFocusLeft="@id/player_rew"
 
-                        android:nextFocusRight="@id/exo_ffwd"
+                        android:nextFocusRight="@id/player_ffwd"
 
                         android:nextFocusUp="@id/player_go_back"
                         android:nextFocusDown="@id/player_lock"
@@ -325,13 +411,13 @@
                         tools:text="10" />
 
                     <ImageButton
-                        android:id="@id/exo_ffwd"
+                        android:id="@+id/player_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:nextFocusRight="@id/player_rew"
                         android:nextFocusUp="@id/player_go_back"
                         android:nextFocusDown="@id/player_lock"
                         android:padding="10dp"
@@ -341,15 +427,94 @@
                         app:tint="@color/white"
                         tools:ignore="ContentDescription" />
                 </FrameLayout>
+
+                <LinearLayout
+                    android:id="@+id/download_both_header"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent">
+
+                    <FrameLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent">
+
+                        <ImageView
+                            android:id="@+id/download_header_toggle"
+                            android:layout_width="40dp"
+                            android:layout_height="40dp"
+                            android:layout_gravity="center_vertical|end"
+                            android:layout_marginEnd="60dp"
+                            android:background="@drawable/video_tap_button_always_white"
+                            android:padding="10dp"
+                            android:src="@drawable/baseline_downloading_24"
+                            app:tint="@color/white">
+
+                        </ImageView>
+
+                        <androidx.cardview.widget.CardView
+                            android:id="@+id/download_header"
+                            android:layout_width="200dp"
+                            android:layout_height="80dp"
+                            android:layout_gravity="end|center_vertical"
+                            android:layout_margin="10dp"
+                            android:elevation="10dp"
+                            app:cardBackgroundColor="@color/darkBar"
+                            app:cardCornerRadius="@dimen/rounded_image_radius">
+
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="match_parent"
+                                android:layout_margin="10dp"
+                                android:gravity="end|center_vertical"
+                                android:orientation="vertical">
+
+                                <TextView
+                                    android:id="@+id/download_header_toggle_text"
+                                    style="@style/ResultMarqueeButtonText"
+                                    android:layout_marginTop="5dp"
+                                    android:text="@string/torrent_singular"
+                                    android:visibility="gone" />
+
+                                <TextView
+                                    android:id="@+id/downloaded_progress_text"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:textColor="@color/white"
+                                    tools:text="10MB / 20MB" />
+
+                                <TextView
+                                    android:id="@+id/downloaded_progress_speed_text"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:textColor="@color/white"
+                                    tools:text="10MB/s - 12 seeders" />
+
+                                <com.google.android.material.progressindicator.LinearProgressIndicator
+                                    android:id="@+id/downloaded_progress"
+                                    style="@style/RoundProgressbar"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginTop="5dp"
+                                    android:indeterminate="false"
+                                    android:indeterminateTint="?attr/colorPrimary"
+                                    android:progressBackgroundTint="?attr/colorPrimary"
+                                    android:progressTint="?attr/colorPrimary"
+                                    tools:progress="20" />
+
+                            </LinearLayout>
+                        </androidx.cardview.widget.CardView>
+                    </FrameLayout>
+
+                </LinearLayout>
             </androidx.constraintlayout.widget.ConstraintLayout>
 
+
             <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:layout_marginTop="60dp"
+                android:layout_marginEnd="100dp"
                 android:backgroundTint="@color/skipOpTransparent"
                 android:maxLines="1"
                 android:padding="10dp"
@@ -436,9 +601,9 @@
                     android:id="@+id/player_video_bar"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    tools:visibility="visible"
                     android:layoutDirection="ltr"
-                    android:orientation="horizontal">
+                    android:orientation="horizontal"
+                    tools:visibility="visible">
 
                     <TextView
                         android:id="@id/exo_position"
@@ -533,10 +698,10 @@
                         android:textColor="@android:color/white"
                         android:textSize="14sp"
                         android:textStyle="normal"
+                        android:visibility="gone"
                         app:layout_constraintBaseline_toBaselineOf="@id/exo_position"
                         app:layout_constraintEnd_toEndOf="parent"
-                        tools:text="-23:20"
-                        android:visibility="gone"/>
+                        tools:text="-23:20" />
 
                 </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -626,7 +791,7 @@
                                 android:nextFocusLeft="@id/player_sources_btt"
                                 android:nextFocusRight="@id/player_skip_op"
                                 android:text="@string/tracks"
-                                app:icon="@drawable/ic_baseline_playlist_play_24" />
+                                app:icon="@drawable/ic_baseline_equalizer_24" />
 
                             <com.google.android.material.button.MaterialButton
                                 android:id="@+id/player_skip_op"
@@ -641,10 +806,10 @@
                                 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>
@@ -740,6 +905,7 @@
             </RelativeLayout>
         </LinearLayout>
 
+
         <!--
             <ImageView
                     android:padding="15dp"
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 d8406b35afd..9403cc4f407 100644
--- a/app/src/main/res/layout/player_custom_layout_tv.xml
+++ b/app/src/main/res/layout/player_custom_layout_tv.xml
@@ -210,7 +210,7 @@
                 android:backgroundTint="@color/skipOpTransparent"
                 android:maxLines="1"
                 android:nextFocusLeft="@id/player_pause_play"
-                android:nextFocusUp="@id/player_go_back"
+                android:nextFocusUp="@id/player_restart"
                 android:nextFocusDown="@id/player_pause_play"
                 android:padding="10dp"
                 android:textColor="@color/white"
@@ -231,16 +231,20 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="80dp"
+                    android:layout_marginStart="32dp"
                     android:layout_marginTop="20dp"
                     android:layout_marginEnd="32dp"
                     android:orientation="vertical">
 
                     <TextView
+                        android:maxLines="2"
                         android:id="@+id/player_video_title"
-                        android:layout_width="match_parent"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_gravity="end"
                         android:gravity="end"
+                        android:maxWidth="600dp"
+                        android:textAlignment="viewEnd"
                         android:textColor="@color/white"
                         android:textSize="16sp"
                         android:textStyle="bold"
@@ -248,9 +252,12 @@
 
                     <TextView
                         android:id="@+id/player_video_title_rez"
-                        android:layout_width="match_parent"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_gravity="end"
                         android:gravity="end"
+                        android:maxWidth="600dp"
+                        android:textAlignment="viewEnd"
                         android:textColor="@color/white"
                         android:textSize="16sp"
                         tools:text="1920x1080" />
@@ -281,33 +288,201 @@
                         app:layout_constraintRight_toRightOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />-->
 
-                <FrameLayout
+                <LinearLayout
                     android:id="@+id/player_go_back_holder"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_margin="5dp"
+                    android:layout_marginStart="17dp"
+                    android:layout_marginEnd="17dp"
+                    android:orientation="horizontal"
                     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" />
+                    <LinearLayout
+                        android:id="@+id/player_go_back_root"
+                        android:layout_width="60dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="20dp"
+                        android:orientation="vertical">
 
-                    <ImageView
-                        android:id="@+id/player_go_back"
-                        android:layout_width="70dp"
+                        <ImageView
+                            android:id="@+id/player_go_back"
+                            android:layout_width="30dp"
+                            android:layout_height="30dp"
+                            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"
+                            android:nextFocusLeft="@id/player_go_back"
+                            android:nextFocusRight="@id/player_restart"
+                            android:nextFocusUp="@id/player_go_back"
+                            android:nextFocusDown="@id/player_pause_play"
+                            android:src="@drawable/ic_baseline_arrow_back_24"
+                            android:tag="@string/tv_no_focus_tag"
+                            app:tint="@android:color/white" />
+
+                        <TextView
+                            android:id="@+id/player_go_back_text"
+                            style="@style/ResultMarqueeButtonText"
+                            android:layout_marginTop="5dp"
+                            android:text="@string/go_back_img_des"
+                            android:visibility="invisible"
+                            tools:visibility="visible" />
+
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:id="@+id/player_restart_root"
+                        android:layout_width="60dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="20dp"
+                        android:orientation="vertical">
+
+                        <ImageView
+                            android:id="@+id/player_restart"
+                            android:layout_width="30dp"
+                            android:layout_height="30dp"
+                            android:layout_gravity="center"
+                            android:background="@drawable/video_tap_button_always_white"
+                            android:clickable="true"
+                            android:contentDescription="@string/restart"
+                            android:focusable="true"
+                            android:nextFocusLeft="@id/player_go_back"
+                            android:nextFocusRight="@id/player_go_forward"
+                            android:nextFocusUp="@id/player_restart"
+                            android:nextFocusDown="@id/player_pause_play"
+                            android:src="@drawable/ic_baseline_replay_24"
+                            android:tag="@string/tv_no_focus_tag"
+                            app:tint="@android:color/white" />
+
+                        <TextView
+                            android:id="@+id/player_restart_text"
+                            style="@style/ResultMarqueeButtonText"
+                            android:layout_marginTop="5dp"
+                            android:text="@string/restart"
+                            android:visibility="invisible"
+                            tools:visibility="visible" />
+
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:id="@+id/player_go_forward_root"
+                        android:layout_width="60dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="20dp"
+                        android:orientation="vertical">
+
+                        <ImageView
+                            android:id="@+id/player_go_forward"
+                            android:layout_width="30dp"
+                            android:layout_height="30dp"
+                            android:layout_gravity="center"
+                            android:background="@drawable/video_tap_button_always_white"
+                            android:clickable="true"
+                            android:contentDescription="@string/next_episode"
+                            android:focusable="true"
+                            android:nextFocusLeft="@id/player_restart"
+                            android:nextFocusRight="@id/download_header_toggle"
+                            android:nextFocusUp="@id/player_go_forward"
+                            android:nextFocusDown="@id/player_pause_play"
+                            android:src="@drawable/ic_baseline_skip_next_rounded_24"
+                            android:tag="@string/tv_no_focus_tag"
+                            app:tint="@android:color/white" />
+
+                        <TextView
+                            android:id="@+id/player_go_forward_text"
+                            style="@style/ResultMarqueeButtonText"
+                            android:layout_marginTop="5dp"
+                            android:text="@string/next_episode"
+                            android:visibility="invisible"
+                            tools:visibility="visible" />
+
+                    </LinearLayout>
+
+
+                    <LinearLayout
+                        android:id="@+id/download_both_header"
+                        android:layout_width="60dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="20dp"
+                        android:layout_marginEnd="10dp"
+                        android:orientation="vertical">
+
+                        <ImageView
+                            android:id="@+id/download_header_toggle"
+                            android:layout_width="30dp"
+                            android:layout_height="30dp"
+                            android:layout_gravity="center"
+                            android:background="@drawable/video_tap_button_always_white"
+                            android:clickable="true"
+                            android:contentDescription="@string/torrent_singular"
+                            android:focusable="true"
+                            android:nextFocusLeft="@id/player_go_forward"
+                            android:nextFocusRight="@id/download_header_toggle"
+                            android:nextFocusUp="@id/download_header_toggle"
+                            android:nextFocusDown="@id/player_pause_play"
+                            android:src="@drawable/baseline_downloading_24"
+                            android:tag="@string/tv_no_focus_tag"
+                            app:tint="@android:color/white" />
+
+                        <TextView
+                            android:id="@+id/download_header_toggle_text"
+                            style="@style/ResultMarqueeButtonText"
+                            android:layout_marginTop="5dp"
+                            android:text="@string/torrent_singular"
+                            android:visibility="invisible"
+                            tools:visibility="visible" />
+
+                    </LinearLayout>
+
+                    <androidx.cardview.widget.CardView
+                        android:id="@+id/download_header"
+                        android:layout_width="200dp"
                         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"
-                        android:tag="@string/tv_no_focus_tag" />
-                </FrameLayout>
+                        android:layout_gravity="end|center_vertical"
+                        android:layout_marginTop="5dp"
+                        android:elevation="10dp"
+                        app:cardBackgroundColor="@color/darkBar"
+                        app:cardCornerRadius="@dimen/rounded_image_radius">
+
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:layout_margin="10dp"
+                            android:gravity="end|center_vertical"
+                            android:orientation="vertical">
+
+                            <TextView
+                                android:id="@+id/downloaded_progress_text"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:textColor="@color/white"
+                                tools:text="10MB / 20MB" />
+
+                            <TextView
+                                android:id="@+id/downloaded_progress_speed_text"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:textColor="@color/white"
+                                tools:text="10MB/s - 12 seeders" />
+
+                            <com.google.android.material.progressindicator.LinearProgressIndicator
+                                android:id="@+id/downloaded_progress"
+                                style="@style/RoundProgressbar"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="5dp"
+                                android:indeterminate="false"
+                                android:indeterminateTint="?attr/colorPrimary"
+                                android:progressBackgroundTint="?attr/colorPrimary"
+                                android:progressTint="?attr/colorPrimary"
+                                tools:progress="20" />
+
+                        </LinearLayout>
+                    </androidx.cardview.widget.CardView>
+
+                </LinearLayout>
             </FrameLayout>
 
 
@@ -352,13 +527,13 @@
                         tools:text="10" />
 
                     <ImageButton
-                        android:id="@id/exo_rew"
+                        android:id="@id/player_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:nextFocusLeft="@id/player_rew"
                         android:nextFocusUp="@id/player_go_back"
                         android:nextFocusDown="@id/player_pause_play"
                         android:padding="10dp"
@@ -394,13 +569,13 @@
                         tools:text="10" />
 
                     <ImageButton
-                        android:id="@id/exo_ffwd"
+                        android:id="@id/player_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:nextFocusRight="@id/player_rew"
                         android:nextFocusUp="@id/player_go_back"
                         android:nextFocusDown="@id/player_pause_play"
                         android:padding="10dp"
@@ -509,6 +684,7 @@
                     android:layout_height="wrap_content"
                     android:layoutDirection="ltr"
                     android:orientation="horizontal">
+
                     <ImageView
                         android:id="@+id/player_pause_play"
 
@@ -520,14 +696,14 @@
                         android:focusable="true"
                         android:focusableInTouchMode="true"
                         android:nextFocusUp="@id/skip_chapter_button"
-                        android:nextFocusDown="@id/player_skip_op"
+                        android:nextFocusDown="@id/player_lock_holder"
                         android:src="@drawable/netflix_pause"
 
                         android:tag="@string/tv_no_focus_tag"
-                        app:tint="@color/player_button_tv"
-                        tools:ignore="ContentDescription"
                         app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintStart_toStartOf="parent" />
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:tint="@color/player_button_tv"
+                        tools:ignore="ContentDescription" />
 
                     <TextView
                         android:id="@id/exo_position"
@@ -618,10 +794,10 @@
                         android:textColor="@android:color/white"
                         android:textSize="14sp"
                         android:textStyle="normal"
+                        android:visibility="gone"
                         app:layout_constraintBaseline_toBaselineOf="@id/exo_position"
                         app:layout_constraintEnd_toEndOf="parent"
-                        tools:text="-23:20"
-                        android:visibility="gone"/>
+                        tools:text="-23:20" />
                 </androidx.constraintlayout.widget.ConstraintLayout>
 
 
@@ -656,7 +832,7 @@
                         <com.google.android.material.button.MaterialButton
                             android:id="@+id/player_rotate_btt"
                             style="@style/VideoButton"
-                            android:visibility="gone"/>
+                            android:visibility="gone" />
 
                         <com.google.android.material.button.MaterialButton
                             android:id="@+id/player_skip_op"
@@ -672,12 +848,13 @@
                             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" />
+                            android:visibility="gone"
+                            app:icon="@drawable/ic_baseline_skip_next_24"
+                            tools:visibility="visible" />
 
                         <com.google.android.material.button.MaterialButton
                             android:id="@+id/player_resize_btt"
@@ -732,7 +909,7 @@
                             android:nextFocusRight="@id/player_skip_op"
                             android:nextFocusUp="@id/player_pause_play"
                             android:text="@string/tracks"
-                            app:icon="@drawable/ic_baseline_playlist_play_24" />
+                            app:icon="@drawable/ic_baseline_equalizer_24" />
                     </LinearLayout>
                 </HorizontalScrollView>
             </LinearLayout>
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 6bf8006b756..9568d6caf04 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
@@ -67,8 +67,8 @@
                 android:layout_rowWeight="1"
                 android:background="?attr/primaryBlackBackground"
                 android:listSelector="@drawable/outline_drawable_forced"
-                android:nextFocusUp="@id/profiles_click_settings"
                 android:nextFocusRight="@id/sort_subtitles"
+                android:nextFocusUp="@id/profiles_click_settings"
                 android:nextFocusDown="@id/apply_btt"
                 android:requiresFadingEdge="vertical"
                 tools:layout_height="100dp"
@@ -90,21 +90,18 @@
                 android:orientation="horizontal"
                 tools:ignore="UseCompoundDrawables">
 
-                <LinearLayout
-                    android:id="@+id/subtitles_click_settings"
+                <RelativeLayout
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_rowWeight="1"
+                    android:layout_height="match_parent"
                     android:layout_marginTop="10dp"
-                    android:focusable="true"
-                    android:foreground="@drawable/outline_drawable_forced"
-                    android:orientation="horizontal"
-                    android:paddingTop="10dp"
-                    android:paddingBottom="10dp">
+                    android:orientation="horizontal">
 
                     <TextView
+                        android:id="@+id/subtitles_text"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_alignParentStart="true"
+                        android:paddingVertical="10dp"
                         android:paddingStart="?android:attr/listPreferredItemPaddingStart"
                         android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
                         android:text="@string/pick_subtitle"
@@ -116,12 +113,33 @@
                         android:id="@+id/subtitles_encoding_format"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_centerVertical="true"
                         android:layout_gravity="center"
-                        android:gravity="center"
+                        android:layout_toStartOf="@+id/subtitle_settings_btt"
+                        android:layout_toEndOf="@id/subtitles_text"
+                        android:focusable="true"
+                        android:foreground="@drawable/outline_drawable_forced"
+                        android:gravity="start"
+                        android:maxLines="1"
+                        android:paddingHorizontal="10dp"
+                        android:paddingVertical="10dp"
                         android:textColor="?attr/textColor"
                         android:textSize="15sp"
                         tools:text="Thai (TIS 620-2533/ISO 8859-11)" />
-                </LinearLayout>
+
+                    <ImageView
+                        android:id="@+id/subtitle_settings_btt"
+                        android:layout_width="wrap_content"
+                        android:layout_height="44dp"
+                        android:layout_alignParentEnd="true"
+                        android:layout_centerVertical="true"
+                        android:layout_gravity="center"
+                        android:contentDescription="@string/subtitles_settings"
+                        android:foreground="@drawable/outline_drawable_forced"
+                        android:paddingHorizontal="10dp"
+                        android:paddingVertical="10dp"
+                        android:src="@drawable/ic_outline_settings_24" />
+                </RelativeLayout>
 
                 <ImageView
                     android:layout_width="25dp"
@@ -129,7 +147,6 @@
                     android:layout_gravity="end|center_vertical"
                     android:layout_marginTop="0dp"
                     android:layout_marginEnd="10dp"
-
                     android:contentDescription="@string/home_change_provider_img_des"
                     android:src="@drawable/ic_outline_settings_24"
                     android:visibility="gone" />
@@ -142,9 +159,9 @@
                 android:layout_rowWeight="1"
                 android:background="?attr/primaryBlackBackground"
                 android:listSelector="@drawable/outline_drawable_forced"
-                android:nextFocusUp="@id/subtitles_click_settings"
                 android:nextFocusLeft="@id/sort_providers"
                 android:nextFocusRight="@id/apply_btt"
+                android:nextFocusUp="@id/subtitles_click_settings"
                 android:nextFocusDown="@id/apply_btt"
                 android:requiresFadingEdge="vertical"
                 tools:layout_height="200dp"
diff --git a/app/src/main/res/layout/rail_footer.xml b/app/src/main/res/layout/rail_footer.xml
new file mode 100644
index 00000000000..137d126929c
--- /dev/null
+++ b/app/src/main/res/layout/rail_footer.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/nav_footer_root"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:padding="1dp"
+    android:layout_marginBottom="10dp"
+    android:visibility="gone"
+    tools:visibility="visible"
+    android:layout_gravity="bottom|center_horizontal"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <androidx.cardview.widget.CardView
+        android:id="@+id/nav_footer_profile_card"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:background="@color/transparent"
+        app:cardCornerRadius="20dp"
+        android:focusable="true"
+        android:foreground="@drawable/outline_drawable_round_20">
+
+        <ImageView
+            android:id="@+id/nav_footer_profile_pic"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:scaleType="centerCrop"
+            tools:src="@drawable/profile_bg_orange"
+            android:contentDescription="@string/account"/>
+
+    </androidx.cardview.widget.CardView>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/rail_header.xml b/app/src/main/res/layout/rail_header.xml
new file mode 100644
index 00000000000..8868b57befe
--- /dev/null
+++ b/app/src/main/res/layout/rail_header.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:padding="1dp"
+    android:visibility="gone"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+        <ImageView
+            android:id="@+id/nav_header_notification"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            app:itemIconTint="@color/item_select_color"
+            android:focusable="true"
+            android:nextFocusRight="@id/home_preview_play_btt"
+            android:src="@drawable/notifications_icon_selector"
+            android:contentDescription="@string/account"
+            app:tint="@color/item_select_color" />
+
+</LinearLayout>
\ 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 e5a6881a6ed..935beac1a7e 100644
--- a/app/src/main/res/layout/result_episode_large.xml
+++ b/app/src/main/res/layout/result_episode_large.xml
@@ -44,7 +44,7 @@
                     android:nextFocusRight="@id/download_button"
                     android:scaleType="centerCrop"
                     tools:src="@drawable/example_poster"
-                    tools:visibility="invisible"/>
+                    tools:visibility="invisible" />
 
                 <ImageView
                     android:id="@+id/episode_play_icon"
@@ -53,7 +53,7 @@
                     android:layout_gravity="center"
                     android:contentDescription="@string/play_episode"
                     android:src="@drawable/play_button"
-                    tools:visibility="invisible"/>
+                    tools:visibility="invisible" />
 
                 <ImageView
                     android:id="@+id/episode_upcoming_icon"
@@ -106,12 +106,29 @@
                         tools:text="1. Jobless" />
                 </LinearLayout>
 
-                <TextView
-                    android:id="@+id/episode_rating"
+                <LinearLayout
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textColor="?attr/grayTextColor"
-                    tools:text="Rated: 8.8" />
+                    android:layout_gravity="start"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:id="@+id/episode_rating"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="10dp"
+                        android:textColor="?attr/grayTextColor"
+                        tools:text="Rated: 8.8" />
+
+                    <TextView
+                        android:id="@+id/episode_runtime"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="10dp"
+                        android:textColor="?attr/grayTextColor"
+                        tools:text="80min" />
+
+                </LinearLayout>
 
                 <TextView
                     android:id="@+id/episode_date"
@@ -119,6 +136,7 @@
                     android:layout_height="wrap_content"
                     android:textColor="?attr/grayTextColor"
                     tools:text="15 Apr 2024" />
+
             </LinearLayout>
 
             <com.lagradost.cloudstream3.ui.download.button.PieFetchButton
diff --git a/app/src/main/res/layout/result_mini_image.xml b/app/src/main/res/layout/result_mini_image.xml
index 703279853af..52ab943dc2a 100644
--- a/app/src/main/res/layout/result_mini_image.xml
+++ b/app/src/main/res/layout/result_mini_image.xml
@@ -2,9 +2,10 @@
 <ImageView 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="35dp"
-        android:layout_height="35dp"
+        android:layout_width="25dp"
+        android:layout_height="25dp"
         android:layout_gravity="center"
+        android:gravity="center"
         tools:src="@drawable/ic_anilist_icon"
         android:background="?android:attr/selectableItemBackgroundBorderless"
         app:tint="?attr/white">
diff --git a/app/src/main/res/layout/subtitle_offset.xml b/app/src/main/res/layout/subtitle_offset.xml
index d5e303b6f39..6741de807cb 100644
--- a/app/src/main/res/layout/subtitle_offset.xml
+++ b/app/src/main/res/layout/subtitle_offset.xml
@@ -2,129 +2,181 @@
 <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="300dp"
+    android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:orientation="horizontal">
 
-    <TextView
-        style="@style/WatchHeaderText"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_margin="0dp"
-        android:paddingTop="10dp"
-        android:text="@string/subtitle_offset_title" />
-
-    <TextView
-        android:id="@+id/subtitle_offset_sub_title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:textColor="?attr/grayTextColor"
-        tools:text="@string/subtitle_offset_extra_hint_none_format" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+    <FrameLayout
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
         android:orientation="horizontal">
 
-        <ImageView
-            android:id="@+id/subtitle_offset_subtract_more"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_gravity="center"
-            android:layout_weight="1"
-            android:background="?android:attr/selectableItemBackgroundBorderless"
-            android:focusable="true"
-            android:nextFocusRight="@id/subtitle_offset_subtract"
-            android:padding="10dp"
-            android:src="@drawable/ic_baseline_keyboard_arrow_left_24"
-            app:tint="?attr/white"
-            tools:ignore="ContentDescription" />
-
-        <ImageView
-            android:id="@+id/subtitle_offset_subtract"
+        <TextView
+            android:id="@+id/no_subtitles_loaded_notice"
             android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_gravity="center"
-            android:layout_weight="1"
-            android:background="?android:attr/selectableItemBackgroundBorderless"
-            android:focusable="true"
-            android:nextFocusLeft="@id/subtitle_offset_subtract_more"
-            android:padding="10dp"
-            android:src="@drawable/baseline_remove_24"
-            app:tint="?attr/white"
-            tools:ignore="ContentDescription" />
-
-        <EditText
-            android:id="@+id/subtitle_offset_input"
-            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_weight="20"
-            android:hint="@string/subtitle_offset_hint"
-            android:inputType="numberSigned"
-            tools:ignore="LabelFor" />
-
-        <ImageView
-            android:id="@+id/subtitle_offset_add"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
             android:layout_gravity="center"
-            android:layout_weight="1"
-            android:background="?android:attr/selectableItemBackgroundBorderless"
-            android:focusable="true"
-            android:nextFocusRight="@id/subtitle_offset_add_more"
-            android:padding="10dp"
-            android:src="@drawable/ic_baseline_add_24"
-            app:tint="?attr/white"
-            tools:ignore="ContentDescription" />
-
-        <ImageView
-            android:id="@+id/subtitle_offset_add_more"
-            android:layout_width="wrap_content"
+            android:textSize="18sp"
+            android:textStyle="italic"
+            android:alpha="0.7"
+            android:text="@string/no_subtitles_loaded">
+        </TextView>
+
+        <androidx.recyclerview.widget.RecyclerView
+            tools:visibility="gone"
+            android:id="@+id/subtitle_offset_recyclerview"
+            android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:paddingVertical="10dp"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+            tools:listitem="@layout/subtitle_offset_item">
+
+        </androidx.recyclerview.widget.RecyclerView>
+    </FrameLayout>
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="410dp"
+            android:layout_height="0dp"
             android:layout_gravity="center"
             android:layout_weight="1"
-            android:background="?android:attr/selectableItemBackgroundBorderless"
-            android:focusable="true"
-            android:nextFocusLeft="@id/subtitle_offset_add"
-            android:nextFocusDown="@id/apply_btt"
-            android:padding="10dp"
-            android:src="@drawable/ic_baseline_keyboard_arrow_right_24"
-            app:tint="?attr/white"
-            tools:ignore="ContentDescription" />
-    </LinearLayout>
+            android:gravity="center"
+            android:orientation="vertical">
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="60dp"
-        android:layout_gravity="bottom"
-        android:gravity="bottom|end"
-        android:orientation="horizontal">
+            <TextView
+                style="@style/WatchHeaderText"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_margin="0dp"
+                android:paddingTop="10dp"
+                android:text="@string/subtitle_offset_title" />
 
-        <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:text="@string/sort_apply"
-            android:visibility="visible">
+            <TextView
+                android:id="@+id/subtitle_offset_sub_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:textColor="?attr/grayTextColor"
+                tools:text="@string/subtitle_offset_extra_hint_none_format" />
 
-            <requestFocus />
-        </com.google.android.material.button.MaterialButton>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
 
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/reset_btt"
-            style="@style/BlackButton"
-            android:layout_width="wrap_content"
-            android:layout_gravity="center_vertical|end"
-            android:text="@string/reset_btn" />
+                <ImageView
+                    android:id="@+id/subtitle_offset_subtract_more"
+                    android:layout_width="44dp"
+                    android:layout_height="44dp"
+                    android:layout_gravity="center"
+                    android:layout_marginStart="10dp"
+                    android:layout_marginEnd="10dp"
+                    android:background="?android:attr/selectableItemBackgroundBorderless"
+                    android:focusable="true"
+                    android:nextFocusRight="@id/subtitle_offset_subtract"
+                    android:padding="10dp"
+                    android:src="@drawable/ic_baseline_keyboard_arrow_left_24"
+                    app:tint="?attr/white"
+                    tools:ignore="ContentDescription" />
+
+                <ImageView
+                    android:id="@+id/subtitle_offset_subtract"
+                    android:layout_width="44dp"
+                    android:layout_height="44dp"
+                    android:layout_gravity="center"
+                    android:layout_marginEnd="10dp"
+                    android:background="?android:attr/selectableItemBackgroundBorderless"
+                    android:focusable="true"
+                    android:nextFocusLeft="@id/subtitle_offset_subtract_more"
+                    android:padding="10dp"
+                    android:src="@drawable/baseline_remove_24"
+                    app:tint="?attr/white"
+                    tools:ignore="ContentDescription" />
+
+                <EditText
+                    android:id="@+id/subtitle_offset_input"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:autofillHints="no"
+                    android:gravity="center"
+                    android:hint="@string/subtitle_offset_hint"
+                    android:inputType="numberSigned"
+                    tools:ignore="LabelFor" />
+
+                <ImageView
+                    android:id="@+id/subtitle_offset_add"
+                    android:layout_width="44dp"
+                    android:layout_height="44dp"
+                    android:layout_gravity="center"
+                    android:layout_marginStart="10dp"
+                    android:background="?android:attr/selectableItemBackgroundBorderless"
+                    android:focusable="true"
+                    android:nextFocusRight="@id/subtitle_offset_add_more"
+                    android:padding="10dp"
+                    android:src="@drawable/ic_baseline_add_24"
+                    app:tint="?attr/white"
+                    tools:ignore="ContentDescription" />
+
+                <ImageView
+                    android:id="@+id/subtitle_offset_add_more"
+                    android:layout_width="44dp"
+                    android:layout_height="44dp"
+                    android:layout_gravity="center"
+                    android:layout_marginStart="10dp"
+                    android:layout_marginEnd="10dp"
+                    android:background="?android:attr/selectableItemBackgroundBorderless"
+                    android:focusable="true"
+                    android:nextFocusLeft="@id/subtitle_offset_add"
+                    android:nextFocusDown="@id/apply_btt"
+                    android:padding="10dp"
+
+                    android:src="@drawable/ic_baseline_keyboard_arrow_right_24"
+                    app:tint="?attr/white"
+                    tools:ignore="ContentDescription" />
+            </LinearLayout>
+
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="60dp"
+            android:layout_gravity="bottom"
+            android:gravity="bottom|end"
+            android:orientation="horizontal">
+
+            <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:text="@string/sort_apply"
+                android:visibility="visible">
+
+                <requestFocus />
+            </com.google.android.material.button.MaterialButton>
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/reset_btt"
+                style="@style/BlackButton"
+                android:layout_width="wrap_content"
+                android:layout_gravity="center_vertical|end"
+                android:text="@string/reset_btn" />
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/cancel_btt"
+                style="@style/BlackButton"
+                android:layout_width="wrap_content"
+                android:layout_gravity="center_vertical|end"
+                android:text="@string/sort_cancel" />
+        </LinearLayout>
 
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/cancel_btt"
-            style="@style/BlackButton"
-            android:layout_width="wrap_content"
-            android:layout_gravity="center_vertical|end"
-            android:text="@string/sort_cancel" />
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/subtitle_offset_item.xml b/app/src/main/res/layout/subtitle_offset_item.xml
new file mode 100644
index 00000000000..bc78a83dab3
--- /dev/null
+++ b/app/src/main/res/layout/subtitle_offset_item.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    android:background="?attr/selectableItemBackground"
+    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:orientation="vertical">
+
+    <TextView
+        android:id="@+id/subtitle_text"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="2dp"
+        android:ellipsize="end"
+        android:lineSpacingMultiplier="1.1"
+        android:paddingHorizontal="10dp"
+        android:paddingVertical="6dp"
+        android:textSize="18sp"
+        android:textStyle="bold"
+        tools:text="Long testing subtitle line 1\nSubtitle line 2" />
+
+
+    <androidx.core.widget.ContentLoadingProgressBar
+        android:id="@+id/subtitle_progress"
+        style="@android:style/Widget.Material.ProgressBar.Horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="5dp"
+        android:layout_gravity="bottom"
+        android:max="1000"
+        android:progressBackgroundTint="?attr/white"
+        android:progressTint="?attr/white"
+        android:visibility="gone"
+        tools:progress="50"
+        tools:visibility="visible" />
+
+</LinearLayout>
+
diff --git a/app/src/main/res/layout/subtitle_settings.xml b/app/src/main/res/layout/subtitle_settings.xml
index 8b3f5b2f806..bb8e2c2e4f0 100644
--- a/app/src/main/res/layout/subtitle_settings.xml
+++ b/app/src/main/res/layout/subtitle_settings.xml
@@ -109,9 +109,20 @@
             android:nextFocusRight="@id/cancel_btt"
 
             android:nextFocusUp="@id/subs_window_color"
-            android:nextFocusDown="@id/subs_subtitle_elevation"
+            android:nextFocusDown="@id/subs_edge_size"
             android:text="@string/subs_edge_type" />
 
+
+        <TextView
+            android:id="@+id/subs_edge_size"
+            style="@style/SettingsItem"
+            android:nextFocusLeft="@id/apply_btt"
+            android:nextFocusRight="@id/cancel_btt"
+
+            android:nextFocusUp="@id/subs_edge_type"
+            android:nextFocusDown="@id/subs_subtitle_elevation"
+            android:text="@string/subs_edge_size" />
+
         <TextView
             android:id="@+id/subs_subtitle_elevation"
             style="@style/SettingsItem"
@@ -153,6 +164,7 @@
             android:nextFocusUp="@id/subs_download_languages"
             android:nextFocusDown="@id/subtitles_remove_captions"
             android:text="@string/subtitles_remove_bloat"
+            app:trackTint="@color/toggle_selector"
             app:drawableEndCompat="@null" />
 
         <com.google.android.material.switchmaterial.SwitchMaterial
@@ -166,6 +178,7 @@
             android:nextFocusUp="@id/subtitles_remove_bloat"
             android:nextFocusDown="@id/subtitles_filter_sub_lang"
             android:text="@string/subtitles_remove_captions"
+            app:trackTint="@color/toggle_selector"
             app:drawableEndCompat="@null" />
 
         <com.google.android.material.switchmaterial.SwitchMaterial
@@ -179,6 +192,7 @@
             android:nextFocusUp="@id/subtitles_remove_captions"
             android:nextFocusDown="@id/subtitles_uppercase"
             android:text="@string/subtitles_filter_lang"
+            app:trackTint="@color/toggle_selector"
             app:drawableEndCompat="@null" />
 
         <com.google.android.material.switchmaterial.SwitchMaterial
@@ -192,6 +206,7 @@
             android:nextFocusUp="@id/subtitles_filter_sub_lang"
             android:nextFocusDown="@id/apply_btt"
             android:text="@string/uppercase_all_subtitles"
+            app:trackTint="@color/toggle_selector"
             app:drawableEndCompat="@null" />
 
         <TextView
diff --git a/app/src/main/res/layout/subtitle_settings_dialog.xml b/app/src/main/res/layout/subtitle_settings_dialog.xml
new file mode 100644
index 00000000000..c2cb223ada7
--- /dev/null
+++ b/app/src/main/res/layout/subtitle_settings_dialog.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <androidx.fragment.app.FragmentContainerView
+        android:id="@+id/subtitle_fragment_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/trailer_custom_layout.xml b/app/src/main/res/layout/trailer_custom_layout.xml
index 59104ca7884..16240134e38 100644
--- a/app/src/main/res/layout/trailer_custom_layout.xml
+++ b/app/src/main/res/layout/trailer_custom_layout.xml
@@ -135,36 +135,113 @@
                 app:layout_constraintRight_toRightOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />-->
 
-        <FrameLayout
+        <LinearLayout
             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"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="20dp"
             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" />
+            <LinearLayout
+                android:id="@+id/player_go_back_root"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="10dp"
+                android:orientation="vertical">
 
-            <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>
+                <ImageView
+                    android:id="@+id/player_go_back"
+                    android:layout_width="30dp"
+                    android:layout_height="30dp"
+                    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"
+                    android:nextFocusLeft="@id/player_go_back"
+                    android:nextFocusRight="@id/player_restart"
+                    android:nextFocusUp="@id/player_go_back"
+                    android:nextFocusDown="@id/player_pause_play"
+                    android:src="@drawable/ic_baseline_arrow_back_24"
+                    android:tag="@string/tv_no_focus_tag"
+                    app:tint="@android:color/white" />
+
+                <TextView
+                    android:id="@+id/player_go_back_text"
+                    style="@style/ResultMarqueeButtonText"
+                    android:text="@string/go_back_img_des"
+                    android:visibility="gone" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/player_restart_root"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="40dp"
+                android:layout_marginEnd="10dp"
+                android:orientation="vertical">
+
+                <ImageView
+                    android:id="@+id/player_restart"
+                    android:layout_width="30dp"
+                    android:layout_height="30dp"
+                    android:layout_gravity="center"
+                    android:background="@drawable/video_tap_button_always_white"
+                    android:clickable="true"
+                    android:contentDescription="@string/restart"
+                    android:focusable="true"
+                    android:nextFocusLeft="@id/player_go_back"
+                    android:nextFocusRight="@id/player_go_forward"
+                    android:nextFocusUp="@id/player_restart"
+                    android:nextFocusDown="@id/player_pause_play"
+                    android:src="@drawable/ic_baseline_replay_24"
+                    android:tag="@string/tv_no_focus_tag"
+                    app:tint="@android:color/white" />
+
+                <TextView
+                    android:id="@+id/player_restart_text"
+                    style="@style/ResultMarqueeButtonText"
+                    android:text="@string/restart"
+                    android:visibility="gone" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/player_go_forward_root"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="80dp"
+                android:layout_marginEnd="10dp"
+                android:orientation="vertical">
+
+                <ImageView
+                    android:id="@+id/player_go_forward"
+                    android:layout_width="30dp"
+                    android:layout_height="30dp"
+                    android:layout_gravity="center"
+                    android:background="@drawable/video_tap_button_always_white"
+                    android:clickable="true"
+                    android:contentDescription="@string/next_episode"
+                    android:focusable="true"
+                    android:nextFocusLeft="@id/player_restart"
+                    android:nextFocusRight="@id/player_go_forward"
+                    android:nextFocusUp="@id/player_go_forward"
+                    android:nextFocusDown="@id/player_pause_play"
+                    android:src="@drawable/ic_baseline_skip_next_rounded_24"
+                    android:tag="@string/tv_no_focus_tag"
+                    app:tint="@android:color/white" />
+
+                <TextView
+                    android:id="@+id/player_go_forward_text"
+                    style="@style/ResultMarqueeButtonText"
+                    android:text="@string/next_episode"
+                    android:visibility="gone" />
+
+            </LinearLayout>
+
+        </LinearLayout>
     </FrameLayout>
 
 
@@ -249,13 +326,13 @@
                     tools:text="10" />
 
                 <ImageButton
-                    android:id="@id/exo_rew"
+                    android:id="@id/player_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:nextFocusLeft="@id/player_rew"
                     android:nextFocusUp="@id/player_go_back"
                     android:nextFocusDown="@id/player_lock"
                     android:padding="10dp"
@@ -282,9 +359,9 @@
                     android:layout_height="70dp"
                     android:layout_gravity="center"
                     android:background="@drawable/video_tap_button"
-                    android:nextFocusLeft="@id/exo_rew"
+                    android:nextFocusLeft="@id/player_rew"
 
-                    android:nextFocusRight="@id/exo_ffwd"
+                    android:nextFocusRight="@id/player_ffwd"
 
                     android:nextFocusUp="@id/player_go_back"
                     android:nextFocusDown="@id/player_lock"
@@ -317,13 +394,13 @@
                     tools:text="10" />
 
                 <ImageButton
-                    android:id="@id/exo_ffwd"
+                    android:id="@id/player_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:nextFocusRight="@id/player_rew"
                     android:nextFocusUp="@id/player_go_back"
                     android:nextFocusDown="@id/player_lock"
                     android:padding="10dp"
@@ -333,6 +410,86 @@
                     app:tint="@color/white"
                     tools:ignore="ContentDescription" />
             </FrameLayout>
+
+            <LinearLayout
+                android:visibility="gone"
+                android:id="@+id/download_both_header"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <FrameLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent">
+
+                    <ImageView
+                        android:id="@+id/download_header_toggle"
+                        android:layout_width="40dp"
+                        android:layout_height="40dp"
+                        android:layout_gravity="center_vertical|end"
+                        android:layout_marginEnd="60dp"
+                        android:background="@drawable/video_tap_button_always_white"
+                        android:padding="10dp"
+                        android:src="@drawable/baseline_downloading_24"
+                        app:tint="@color/white">
+
+                    </ImageView>
+
+                    <androidx.cardview.widget.CardView
+                        android:id="@+id/download_header"
+                        android:layout_width="200dp"
+                        android:layout_height="80dp"
+                        android:layout_gravity="end|center_vertical"
+                        android:layout_margin="10dp"
+                        android:elevation="10dp"
+                        app:cardBackgroundColor="@color/darkBar"
+                        app:cardCornerRadius="@dimen/rounded_image_radius">
+
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:layout_margin="10dp"
+                            android:gravity="end|center_vertical"
+                            android:orientation="vertical">
+
+                            <TextView
+                                android:id="@+id/download_header_toggle_text"
+                                style="@style/ResultMarqueeButtonText"
+                                android:layout_marginTop="5dp"
+                                android:text="@string/torrent_singular"
+                                android:visibility="gone" />
+
+                            <TextView
+                                android:id="@+id/downloaded_progress_text"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:textColor="@color/white"
+                                tools:text="10MB / 20MB" />
+
+                            <TextView
+                                android:id="@+id/downloaded_progress_speed_text"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:textColor="@color/white"
+                                tools:text="10MB/s - 12 seeders" />
+
+                            <com.google.android.material.progressindicator.LinearProgressIndicator
+                                android:id="@+id/downloaded_progress"
+                                style="@style/RoundProgressbar"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="5dp"
+                                android:indeterminate="false"
+                                android:indeterminateTint="?attr/colorPrimary"
+                                android:progressBackgroundTint="?attr/colorPrimary"
+                                android:progressTint="?attr/colorPrimary"
+                                tools:progress="20" />
+
+                        </LinearLayout>
+                    </androidx.cardview.widget.CardView>
+                </FrameLayout>
+
+            </LinearLayout>
+
         </androidx.constraintlayout.widget.ConstraintLayout>
 
         <LinearLayout
@@ -520,10 +677,10 @@
                     android:textColor="@android:color/white"
                     android:textSize="14sp"
                     android:textStyle="normal"
+                    android:visibility="gone"
                     app:layout_constraintBaseline_toBaselineOf="@id/exo_position"
                     app:layout_constraintEnd_toEndOf="@id/player_fullscreen"
-                    tools:text="-23:20"
-                    android:visibility="gone"/>
+                    tools:text="-23:20" />
 
                 <ImageView
                     android:id="@+id/player_fullscreen"
@@ -555,7 +712,7 @@
 
                     <com.google.android.material.button.MaterialButton
                         android:id="@+id/player_rotate_btt"
-                        style="@style/VideoButton"/>
+                        style="@style/VideoButton" />
 
                     <com.google.android.material.button.MaterialButton
                         android:id="@+id/player_lock"
diff --git a/app/src/main/res/layout/tvtypes_chips.xml b/app/src/main/res/layout/tvtypes_chips.xml
index ee792602483..c1eee9685c5 100644
--- a/app/src/main/res/layout/tvtypes_chips.xml
+++ b/app/src/main/res/layout/tvtypes_chips.xml
@@ -55,6 +55,12 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/livestreams" />
+    <com.google.android.material.chip.Chip
+        android:id="@+id/home_select_torrents"
+        style="@style/ChipFilled"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/torrent" />
     <com.google.android.material.chip.Chip
         android:id="@+id/home_select_nsfw"
         style="@style/ChipFilled"
diff --git a/app/src/main/res/menu/bottom_nav_menu.xml b/app/src/main/res/menu/bottom_nav_menu.xml
index 830b004aec5..0d139179a9e 100644
--- a/app/src/main/res/menu/bottom_nav_menu.xml
+++ b/app/src/main/res/menu/bottom_nav_menu.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:id="@+id/navigation_home"
-        android:icon="@drawable/home_alt"
-        android:title="@string/title_home" />
-    <item
-        android:id="@+id/navigation_search"
-        android:icon="@drawable/search_icon"
-        android:title="@string/title_search" />
-    <item
-        android:id="@+id/navigation_library"
-        android:icon="@drawable/library_icon"
-        android:title="@string/library" />
-    <item
-        android:id="@+id/navigation_downloads"
-        android:icon="@drawable/netflix_download"
-        android:title="@string/title_downloads" />
-    <item
-        android:id="@+id/navigation_settings"
-        android:icon="@drawable/ic_outline_settings_24"
-        android:title="@string/title_settings" />
+        <item
+            android:id="@+id/navigation_home"
+            android:icon="@drawable/home_icon_selector"
+            android:title="@string/title_home" />
+        <item
+            android:id="@+id/navigation_search"
+            android:icon="@drawable/search_icon"
+            android:title="@string/title_search" />
+        <item
+            android:id="@+id/navigation_library"
+            android:icon="@drawable/library_icon_selector"
+            android:title="@string/library" />
+        <item
+            android:id="@+id/navigation_downloads"
+            android:icon="@drawable/netflix_download"
+            android:title="@string/title_downloads" />
+        <item
+            android:id="@+id/navigation_settings"
+            android:icon="@drawable/settings_icon_selector"
+            android:title="@string/title_settings" />
 </menu>
\ 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 fafb6968293..784fc515e8f 100644
--- a/app/src/main/res/navigation/mobile_navigation.xml
+++ b/app/src/main/res/navigation/mobile_navigation.xml
@@ -43,6 +43,9 @@
         <argument
             android:name="apiName"
             app:argType="string" />
+        <argument
+            android:name="name"
+            app:argType="string" />
         <argument
             android:name="startAction"
             android:defaultValue="0"
@@ -181,7 +184,15 @@
         app:enterAnim="@anim/enter_anim"
         app:exitAnim="@anim/exit_anim"
         app:popEnterAnim="@anim/enter_anim"
-        app:popExitAnim="@anim/exit_anim" />
+        app:popExitAnim="@anim/exit_anim" >
+        <action
+            android:id="@+id/action_navigation_settings_general_to_easterEggMonkeFragment"
+            app:destination="@id/easterEggMonkeFragment"
+            app:enterAnim="@anim/go_right"
+            app:exitAnim="@anim/go_left"
+            app:popEnterAnim="@anim/go_right"
+            app:popExitAnim="@anim/go_left" />
+    </fragment>
 
     <fragment
         android:id="@+id/navigation_settings_extensions"
@@ -658,4 +669,16 @@
         app:popEnterAnim="@anim/enter_anim"
         app:popExitAnim="@anim/exit_anim"
         tools:layout="@layout/fragment_setup_media" />
+
+    <activity
+        android:id="@+id/accountSelectActivity"
+        android:name="com.lagradost.cloudstream3.ui.account.AccountSelectActivity"
+        android:label="AccountSelectActivity"
+        tools:layout="@layout/activity_account_select" />
+
+    <fragment
+        android:id="@+id/easterEggMonkeFragment"
+        android:name="com.lagradost.cloudstream3.ui.EasterEggMonkeFragment"
+        tools:layout="@layout/fragment_easter_egg_monke"
+        android:label="EasterEggMonkeFragment" />
 </navigation>
diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml
new file mode 100644
index 00000000000..e528c276901
--- /dev/null
+++ b/app/src/main/res/values-az/strings.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="cast_format" formatted="true">Oyunçu heyəti: %s</string>
+    <string name="next_episode_format" formatted="true">Bölüm %d bu tarixdə yayımlanacaq</string>
+    <string name="next_episode_time_day_format" formatted="true">%1$dg%2$ds%3$dd</string>
+    <string name="next_episode_time_min_format" formatted="true">%dd</string>
+    <string name="result_poster_img_des">Poster</string>
+    <string name="home_main_poster_img_des">Əsas Afişa</string>
+    <string name="episode_poster_img_des">Bölüm Afişası</string>
+    <string name="home_next_random_img_des">Sonrakı Təsadüfi</string>
+    <string name="go_back_img_des">Geri get</string>
+    <string name="play_from_beginning_img_des">Əvvəldən oynat</string>
+    <string name="home_change_provider_img_des">Provayderi dəyişdir</string>
+    <string name="preview_background_img_des">Arxaplana ilkin baxış keçir</string>
+    <string name="rated_format" formatted="true">Xal: %.1f</string>
+    <string name="new_update_format" formatted="true">Yeniləmə mövcuddur!\n%1$s -&gt; %2$s</string>
+    <string name="title_home">Ana səhifə</string>
+    <string name="title_search">Axtar</string>
+    <string name="title_downloads">Yükləmələr</string>
+    <string name="no_data">Məlumat yoxdur</string>
+    <string name="episode_more_options_des">Daha çox seçimlər</string>
+    <string name="next_episode">Sonrakı bölüm</string>
+    <string name="result_tags">Janrlar</string>
+    <string name="result_share">Paylaş</string>
+    <string name="result_open_in_browser">Brauzerdə aç</string>
+    <string name="browser">Brauzer</string>
+    <string name="skip_loading">Yükləməni keç</string>
+    <string name="loading">Yüklənir…</string>
+    <string name="type_watching">İzlənir</string>
+    <string name="type_on_hold">Gözləmədə</string>
+    <string name="type_dropped">Yarıda dayandırıldı</string>
+    <string name="type_plan_to_watch">İzləməyə planlandı</string>
+    <string name="type_re_watching">Yenidən izlənilir</string>
+    <string name="play_movie_button">Filmi oynat</string>
+    <string name="play_trailer_button">Fraqmanı Oynat</string>
+    <string name="play_livestream_button">Canlı Yayını oynat</string>
+    <string name="pick_source">Mənbələr</string>
+    <string name="pick_subtitle">Altyazılar</string>
+    <string name="reload_error">Yenidən bağlanmaya cəhd edin…</string>
+    <string name="go_back">Geri dön</string>
+    <string name="play_episode">Bölümü oynat</string>
+    <string name="downloaded">Yükləndi</string>
+    <string name="download_paused">Yükləmə dayandırıldı</string>
+    <string name="download_started">Yükləmə başladıldı</string>
+    <string name="download_failed">Yükləmə uğursuz oldu</string>
+    <string name="download_canceled">Yükləmə ləğv edildi</string>
+    <string name="downloads_delete_select">Silinəcək faylları seçin</string>
+    <string name="downloads_empty">Hal-hazırda heç bir yükləmə yoxdur.</string>
+    <string name="app_dub_sub_episode_text_format" formatted="true">%1$s Böl. %2$d</string>
+    <string name="duration_format" formatted="true">%d dəqiqə</string>
+    <string name="next_episode_time_hour_format" formatted="true">%1$ds %2$dd</string>
+    <string name="next_season_episode_format" formatted="true">Sezon %1$d Bölüm %2$d bu tarixdə yayımlanacaq</string>
+    <string name="search_poster_img_des">Afişa</string>
+    <string name="player_speed_text_format" formatted="true">Sürət (%.2fx)</string>
+    <string name="app_name">CloudStream</string>
+    <string name="play_with_app_name">CloudStream ilə oynat</string>
+    <string name="type_completed">Tamamlandı</string>
+    <string name="title_settings">Parametrlər</string>
+    <string name="search_hint">Axtar…</string>
+    <string name="download">Yüklə</string>
+    <string name="downloading">Yüklənir</string>
+    <string name="download_done">Yükləmə bitdi</string>
+    <string name="torrent_plot">Açıqlama</string>
+    <string name="player_size_settings_des">Qara sərhədləri, kənarları sil</string>
+    <string name="torrent_no_plot">Açıqlama Tapılmadı</string>
+    <string name="picture_in_picture">Şəkil içində şəkil</string>
+    <string name="player_size_settings">Pleyeri yenidən ölçüləndirmə düyməsini</string>
+    <string name="player_subtitles_settings">Subtitrlər</string>
+    <string name="player_subtitles_settings_des">Pleyerin subtitr parametrləri</string>
+    <string name="chromecast_subtitles_settings">Chromecast Subtitrləri</string>
+    <string name="chromecast_subtitles_settings_des">Chromecast subtitr parametrləri</string>
+    <string name="eigengraumode_settings">Pleyer oynadılma sürəti</string>
+    <string name="settings_info">Məlumat</string>
+    <string name="category_updates">Yeniləmələr və Ehtiyat Nüsxələmə</string>
+    <string name="pref_filter_search_quality">Seçilmiş video keyfiyyətini axtarış nəticələrində gizlət</string>
+    <string name="double_tap_to_pause_settings_des">Dayandırma üçün videonun ortasına iki dəfə toxunun</string>
+    <string name="use_system_brightness_settings">Sistem parlaqlığından istifadə et</string>
+    <string name="restore_settings">Ehtiyat nüsxədən məlumatları bərpa et</string>
+    <string name="backup_settings">Məlumatları ehtiyata nüsxələ</string>
+    <string name="backup_frequency">Ehtiyat nüsxələmə sıxlığı</string>
+    <string name="restore_success">Ehtiyat nüsxələmə faylı yükləndi</string>
+    <string name="restore_failed_format" formatted="true">%s faylından məlumatları bərpa etmək mümkün olmadı</string>
+    <string name="backup_success">Məlumat ehtiyata nüsxələndi</string>
+    <string name="backup_failed">Yaddaş icazəsi yoxdur. Zəhmət olmasa, yenidən yoxlayın.</string>
+    <string name="backup_failed_error_format">%s ehtiyata nüsxələnirkən xəta baş verdi</string>
+    <string name="search">Axtar</string>
+    <string name="library">Kitabxana</string>
+    <string name="category_account">Hesablar və Təhlükəsizlik</string>
+    <string name="advanced_search">Təkmilləşdirilmiş Axtarış</string>
+    <string name="bug_report_settings_on">Məlumat göndərmə</string>
+    <string name="show_trailers_settings">Treylerləri göstər</string>
+    <string name="kitsu_settings">Kitsu afişalarını, posterlərini göstər</string>
+    <string name="copy_link_toast">Link mübadilə buferinə nüsxələndi</string>
+    <string name="subs_default_reset_toast">Standart dəyərlərə sıfırla</string>
+    <string name="acra_report_toast">Üzr istəyirik, tətbiqdə xəta baş verdi. Gizli xəta hesabatı tərtibatçılara göndəriləcək</string>
+    <string name="season">Sezon</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/array.xml b/app/src/main/res/values-es/array.xml
index 05d49f98650..fddd832a583 100644
--- a/app/src/main/res/values-es/array.xml
+++ b/app/src/main/res/values-es/array.xml
@@ -152,32 +152,6 @@
         <item>@string/show_title_key</item>
     </array>
 
-    <array name="episode_long_click_options">
-        <item>@string/episode_action_chromecast_episode</item>
-        <item>@string/episode_action_chromecast_mirror</item>
-        <item>@string/episode_action_play_in_app</item>
-        <item>@string/episode_action_play_in_format</item>
-        <item>@string/episode_action_play_in_browser</item>
-        <item>@string/episode_action_copy_link</item>
-        <item>@string/episode_action_auto_download</item>
-        <item>@string/episode_action_download_mirror</item>
-        <item>@string/episode_action_download_subtitle</item>
-        <item>@string/episode_action_reload_links</item>
-    </array>
-
-    <array name="episode_long_click_options_values">
-        <item>4</item>
-        <item>5</item>
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-        <item>9</item>
-        <item>6</item>
-        <item>7</item>
-        <item>13</item>
-        <item>8</item>
-    </array>
-
     <array name="app_layout">
         <item>@string/automatic</item>
         <item>@string/phone_layout</item>
@@ -247,6 +221,7 @@
         <item>Gris</item>
         <item>Amoled</item>
         <item>Destello</item>
+        <item>Sistema</item>
         <item>Material You</item>
     </string-array>
     <string-array name="themes_names_values">
@@ -254,6 +229,7 @@
         <item>Black</item>
         <item>Amoled</item>
         <item>Light</item>
+        <item>System</item>
         <item>Monet</item>
     </string-array>
 
diff --git a/app/src/main/res/values-pl/array.xml b/app/src/main/res/values-pl/array.xml
index 9f76f423722..45a8e56e134 100644
--- a/app/src/main/res/values-pl/array.xml
+++ b/app/src/main/res/values-pl/array.xml
@@ -161,32 +161,6 @@
         <item>@string/show_title_key</item>
     </array>
 
-    <array name="episode_long_click_options">
-        <item>@string/episode_action_chromecast_episode</item>
-        <item>@string/episode_action_chromecast_mirror</item>
-        <item>@string/episode_action_play_in_app</item>
-        <item>@string/episode_action_play_in_format</item>
-        <item>@string/episode_action_play_in_browser</item>
-        <item>@string/episode_action_copy_link</item>
-        <item>@string/episode_action_auto_download</item>
-        <item>@string/episode_action_download_mirror</item>
-        <item>@string/episode_action_download_subtitle</item>
-        <item>@string/episode_action_reload_links</item>
-    </array>
-
-    <array name="episode_long_click_options_values">
-        <item>4</item>
-        <item>5</item>
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-        <item>9</item>
-        <item>6</item>
-        <item>7</item>
-        <item>13</item>
-        <item>8</item>
-    </array>
-
     <array name="app_layout">
         <item>@string/automatic</item>
         <item>@string/phone_layout</item>
@@ -256,6 +230,7 @@
         <item>Szary</item>
         <item>Amoled</item>
         <item>Flashbang</item>
+        <item>System</item>
         <item>Material You</item>
     </string-array>
     <string-array name="themes_names_values">
@@ -263,6 +238,7 @@
         <item>Black</item>
         <item>Amoled</item>
         <item>Light</item>
+        <item>System</item>
         <item>Monet</item>
     </string-array>
 
diff --git a/app/src/main/res/values-tr/array.xml b/app/src/main/res/values-tr/array.xml
index 5c723f724ea..ee2deedb210 100644
--- a/app/src/main/res/values-tr/array.xml
+++ b/app/src/main/res/values-tr/array.xml
@@ -22,6 +22,8 @@
         <item>AdGuard</item>
         <item>DNS.WATCH</item>
         <item>Quad9</item>
+        <item>DNS.SB</item>
+        <item>Canadian Shield</item>
     </array>
     <array name="dns_pref_values">
         <item>0</item>
@@ -31,22 +33,8 @@
         <item>4</item>
         <item>5</item>
         <item>6</item>
-    </array>
-
-    <array name="player_pref_names">
-        <item>@string/player_settings_play_in_app</item>
-        <item>@string/player_settings_play_in_vlc</item>
-        <item>@string/player_settings_play_in_mpv</item>
-        <item>@string/player_settings_play_in_web</item>
-        <item>@string/player_settings_play_in_browser</item>
-    </array>
-
-    <array name="player_pref_values">
-        <item>1</item>
-        <item>2</item>
-        <item>5</item>
-        <item>4</item>
-        <item>3</item>
+        <item>7</item>
+        <item>8</item>
     </array>
 
     <array name="limit_title_rez_pref_names">
@@ -187,32 +175,6 @@
         <item>@string/show_title_key</item>
     </array>
 
-    <array name="episode_long_click_options">
-        <item>@string/episode_action_chromecast_episode</item>
-        <item>@string/episode_action_chromecast_mirror</item>
-        <item>@string/episode_action_play_in_app</item>
-        <item>@string/episode_action_play_in_format</item>
-        <item>@string/episode_action_play_in_browser</item>
-        <item>@string/episode_action_copy_link</item>
-        <item>@string/episode_action_auto_download</item>
-        <item>@string/episode_action_download_mirror</item>
-        <item>@string/episode_action_download_subtitle</item>
-        <item>@string/episode_action_reload_links</item>
-    </array>
-
-    <array name="episode_long_click_options_values">
-        <item>4</item>
-        <item>5</item>
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-        <item>9</item>
-        <item>6</item>
-        <item>7</item>
-        <item>13</item>
-        <item>8</item>
-    </array>
-
     <array name="app_layout">
         <item>@string/automatic</item>
         <item>@string/phone_layout</item>
@@ -281,6 +243,7 @@
         <item>Gri</item>
         <item>Amoled</item>
         <item>Flaş Bombası</item>
+        <item>Sistem</item>
         <item>Material You</item>
     </string-array>
     <string-array name="themes_names_values">
@@ -288,6 +251,7 @@
         <item>Black</item>
         <item>Amoled</item>
         <item>Light</item>
+        <item>System</item>
         <item>Monet</item>
     </string-array>
 
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index f5770e86b7c..22863c859c2 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -7,7 +7,7 @@
     <string name="go_back_img_des">Назад</string>
     <string name="rated_format" formatted="true">Рейтинг: %.1f</string>
     <string name="cast_format" formatted="true">Актори: %s</string>
-    <string name="next_episode_format" formatted="true">Епізод %d вийде через</string>
+    <string name="next_episode_format" formatted="true">%d епізод вийде через</string>
     <string name="result_poster_img_des">Poster</string>
     <string name="app_dub_sub_episode_text_format" formatted="true">%1$s Еп. %2$d</string>
     <string name="next_episode_time_day_format" formatted="true">%1$dд %2$dгод %3$dхв</string>
@@ -15,7 +15,7 @@
     <string name="next_episode_time_min_format" formatted="true">%dхв</string>
     <string name="home_main_poster_img_des">Головний постер</string>
     <string name="home_next_random_img_des">Наступний випадковий</string>
-    <string name="preview_background_img_des">Попередній перегляд фону</string>
+    <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%1$s –&gt; %2$s</string>
@@ -54,7 +54,7 @@
     <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="action_add_to_bookmarks">Змінити стан перегляду</string>
     <string name="sort_apply">Застосувати</string>
     <string name="sort_copy">Скопіювати</string>
     <string name="sort_close">Закрити</string>
@@ -80,15 +80,15 @@
     <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="player_size_settings_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">Швидкість відтворення</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="autoplay_next_settings_des">Відтворювати наступний епізод після закінчення поточного</string>
     <string name="title_home">Головна</string>
     <string name="app_name">CloudStream</string>
     <string name="filler" formatted="true">Філер</string>
@@ -114,7 +114,7 @@
     <string name="filter_bookmarks">Фільтр закладок</string>
     <string name="sort_clear">Очистити</string>
     <string name="subtitles_settings">Налаштування субтитрів</string>
-    <string name="subs_background_color">Колір фону</string>
+    <string name="subs_background_color">Колір тла</string>
     <string name="subs_subtitle_elevation">Висота субтитрів</string>
     <string name="subs_text_color">Колір тексту</string>
     <string name="subs_outline_color">Колір контуру</string>
@@ -131,7 +131,7 @@
     <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_pause_settings_des">Двічі натисніть посередині, щоб призупинити відтворення відео</string>
     <string name="use_system_brightness_settings">Використовувати яскравість системи</string>
     <string name="episode_sync_settings">Оновлювати прогрес перегляду</string>
     <string name="restore_settings">Відновлення даних з резервної копії</string>
@@ -144,7 +144,7 @@
     <string name="category_updates">Оновлення та резервне копіювання</string>
     <string name="settings_info">Інформація</string>
     <string name="advanced_search">Розширений пошук</string>
-    <string name="advanced_search_des">Надає результати пошуку, розділені за постачальниками</string>
+    <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>
@@ -153,7 +153,7 @@
     <string name="automatic_plugin_download">Автоматичне завантаження плагінів</string>
     <string name="updates_settings">Показувати оновлення застосунку</string>
     <string name="redo_setup_process">Повторний процес налаштування</string>
-    <string name="uprereleases_settings_des">Пошук лише попередніх оновлень, а не повних релізів</string>
+    <string name="uprereleases_settings_des">Шукати лише попередні оновлення замість повних випусків</string>
     <string name="apk_installer_settings">Встановлювач APK</string>
     <string name="github">Github</string>
     <string name="lightnovel">Застосунок для легких новел від тих же розробників</string>
@@ -175,7 +175,7 @@
     <string name="resume">Відновити</string>
     <string name="go_back_30">-30</string>
     <string name="delete_message" formatted="true">Це назавжди видалить %s
-\nВи впевнені\?</string>
+\nВи впевнені?</string>
     <string name="resume_time_left" formatted="true">%dхв
 \nзалишилося</string>
     <string name="status_ongoing">Триває</string>
@@ -184,7 +184,7 @@
     <string name="duration">Тривалість</string>
     <string name="queued">у черзі</string>
     <string name="no_subtitles">Без субтитрів</string>
-    <string name="action_default">За замовчуванням</string>
+    <string name="action_default">Типово</string>
     <string name="free_storage">Вільно</string>
     <string name="used_storage">Зайнято</string>
     <string name="app_storage">Застосунок</string>
@@ -219,19 +219,19 @@
     <string name="show_title">Заголовок</string>
     <string name="poster_ui_settings">Перемикання елементів інтерфейсу на постері</string>
     <string name="no_update_found">Оновлення не знайдено</string>
-    <string name="double_tap_to_seek_settings_des">Двічі торкніться праворуч або ліворуч, щоб перемотати відео вперед або назад</string>
-    <string name="use_system_brightness_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="episode_sync_settings_des">Автоматична синхронізація прогресу поточного епізоду</string>
+    <string name="episode_sync_settings_des">Автоматично синхронізувати прогрес поточного епізоду</string>
     <string name="backup_failed">Відсутні дозволи на зберігання. Будь ласка, спробуйте ще раз.</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>
+    <string name="apk_installer_settings_des">Деякі телефони не підтримують новий встановлювач пакунків. Спробуйте стару версію, якщо оновлення не встановлюються.</string>
     <string name="discord">Приєднуйтесь до Discord</string>
     <string name="benene_des">Дано бананів</string>
     <string name="year">Рік</string>
@@ -243,12 +243,11 @@
     <string name="no_episodes_found">Епізодів не знайдено</string>
     <string name="pause">Пауза</string>
     <string name="season">Сезон</string>
-    <string name="status">Статус</string>
+    <string name="status">Стан</string>
     <string name="site">Сайт</string>
     <string name="video_aspect_ratio_resize">Змінити розмір</string>
     <string name="synopsis">Короткий зміст</string>
     <string name="movies">Фільми</string>
-    <string name="episode_action_copy_link">Скопіювати посилання</string>
     <string name="episode_action_reload_links">Перезавантажити посилання</string>
     <string name="documentaries">Документальні фільми</string>
     <string name="nsfw">NSFW</string>
@@ -257,7 +256,6 @@
     <string name="torrent_singular">Торент</string>
     <string name="show_hd">Мітка якості</string>
     <string name="nsfw_singular">NSFW</string>
-    <string name="episode_action_play_in_browser">Переглянути в браузері</string>
     <string name="unexpected_error">Несподівана помилка плеєра</string>
     <string name="storage_error">Помилка завантаження, перевірте дозволи на зберігання</string>
     <string name="episode_action_chromecast_episode">Епізод Chromecast</string>
@@ -276,7 +274,7 @@
     <string name="pref_category_gestures">Жести</string>
     <string name="pref_category_player_features">Особливості плеєра</string>
     <string name="pref_category_subtitles">Субтитри</string>
-    <string name="pref_category_defaults">За замовчуванням</string>
+    <string name="pref_category_defaults">Типово</string>
     <string name="pref_category_looks">Вигляд</string>
     <string name="pref_category_ui_features">Особливості</string>
     <string name="category_general">Загальне</string>
@@ -320,7 +318,7 @@
     <string name="recommended">Рекомендовано</string>
     <string name="player_load_subtitles_online">Завантажити з інтернету</string>
     <string name="downloaded_file">Завантажений файл</string>
-    <string name="actor_main">Головна</string>
+    <string name="actor_main">Головний</string>
     <string name="home_source">Джерело</string>
     <string name="home_random">Випадковий</string>
     <string name="coming_soon">Скоро буде…</string>
@@ -368,7 +366,7 @@
     <string name="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_total_episodes_none">/??</string>
     <string name="sync_score">Оцінений</string>
     <string name="player_load_subtitles">Завантажити з файлу</string>
     <string name="max">Макс.</string>
@@ -377,7 +375,7 @@
     <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_supporting">Другорядний</string>
     <string name="actor_background">Фон</string>
     <string name="quality_blueray">Blu-ray</string>
     <string name="subtitles_remove_captions">Видаляти закриті титри з субтитрів</string>
@@ -408,8 +406,8 @@
     <string name="setup_done">Готово</string>
     <string name="extensions">Розширення</string>
     <string name="add_repository">Додати репозиторій</string>
-    <string name="repository_name_hint">Назва репозиторію</string>
-    <string name="repository_url_hint">URL-адреса репозиторію</string>
+    <string name="repository_name_hint">Назва репозиторію (необов\'язково)</string>
+    <string name="repository_url_hint">URL-адреса репозиторію або короткий код</string>
     <string name="plugin_loaded">Плагін завантажено</string>
     <string name="plugin_downloaded">Плагін завантажено</string>
     <string name="plugin_load_fail" formatted="true">Не вдалося завантажити %s</string>
@@ -425,9 +423,9 @@
     <string name="plugins_disabled" formatted="true">Вимкнено: %d</string>
     <string name="plugins_not_downloaded" formatted="true">Не завантажено: %d</string>
     <string name="plugins_updated" formatted="true">Оновлено %d плагіни</string>
-    <string name="blank_repo_message">За замовчуванням у CloudStream не встановлено жодного сайту. Вам потрібно встановити сайти з репозиторіїв.
+    <string name="blank_repo_message">Типово у CloudStream не встановлено жодного сайту. Вам потрібно встановити сайти з репозиторіїв.
 \n
-\nПриєднуйтесь до нашого Discord або шукайте в Інтернеті.</string>
+\nПриєднуйтесь до нашого Discord або шукайте в інтернеті.</string>
     <string name="view_public_repositories_button">Переглянути репозиторії спільноти</string>
     <string name="view_public_repositories_button_short">Публічний список</string>
     <string name="uppercase_all_subtitles">Усі субтитри у верхньому регістрі</string>
@@ -438,17 +436,13 @@
     <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_status">Стан</string>
     <string name="extension_size">Розмір</string>
     <string name="extension_types">Підтримується</string>
     <string name="extension_language">Мова</string>
     <string name="extension_install_first">Спочатку встановіть розширення</string>
     <string name="hls_playlist">Список відтворення HLS</string>
     <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">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>
@@ -458,10 +452,10 @@
     <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="confirm_exit_dialog">Ви впевнені що хочете вийти?</string>
     <string name="yes">Так</string>
     <string name="no">Ні</string>
     <string name="update_notification_installing">Встановлення оновлення застосунку…</string>
@@ -509,7 +503,7 @@
     <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="restart">Перезапустити</string>
     <string name="test_log">Журнал</string>
     <string name="start">Почати</string>
     <string name="stop">Зупинити</string>
@@ -556,7 +550,7 @@
 \n
 \n%s
 \n
-\nВсе одно хочете додати цей елемент, замінити наявні чи скасувати дію\?</string>
+\nВсе одно хочете додати цей елемент, замінити наявні чи скасувати дію?</string>
     <string name="duplicate_title">Знайдено потенційний дублікат</string>
     <string name="lock_profile">Розблокувати профіль</string>
     <string name="action_add_to_favorites">Додати до обраного</string>
@@ -596,8 +590,8 @@
     <string name="subscribe_tooltip">Сповіщення про новий епізод</string>
     <string name="password_pin_authentication_title">Автентифікація паролем/PIN-кодом</string>
     <string name="biometric_authentication_title">Розблокувати CloudStream</string>
-    <string name="biometric_setting">Блокування за допомогою біометрії</string>
-    <string name="biometric_setting_summary">Розблокуйте застосунок за допомогою відбитка пальця, Face ID, PIN-коду, графічного ключа та пароля.</string>
+    <string name="biometric_setting">Біометричне блокування</string>
+    <string name="biometric_setting_summary">Розблоковуйте застосунок за допомогою відбитка пальця, Face ID, PIN-коду, графічного ключа та пароля.</string>
     <string name="biometric_warning">Резервне копіювання даних CloudStream виконано. Хоча ймовірність цього дуже низька, всі пристрої можуть вести себе по-різному. У рідкісних випадках, коли ви не можете отримати доступ до застосунку, повністю очистіть дані застосунку та відновіть їх з резервної копії. Просимо вибачення за незручності, пов \'язані з цим.</string>
     <string name="biometric_unsupported">Біометрична автентифікація не підтримується на цьому пристрої</string>
     <string name="biometric_prompt_description">Після кількох невдалих спроб підказка закриється. Просто перезапустіть застосунок, щоб спробувати ще раз.</string>
@@ -620,8 +614,7 @@
     <string name="reset_btn">Скинути</string>
     <string name="episode_upcoming_format" formatted="true">Наступний через %s</string>
     <string name="next_season_episode_format" formatted="true">%1$d сезон %2$d епізод вийде через</string>
-    <string name="player_settings_play_in_fcast">Fcast</string>
-    <string name="player_settings_select_cast_device">Виберіть пристрій для трансляції</string>
+    <string name="player_settings_select_cast_device">Оберіть пристрій для трансляції</string>
     <string name="episode_action_cast_mirror">Трансляція через дзеркало</string>
     <string name="cs3wiki">CloudStream Wiki</string>
     <string name="pref_category_security">Безпека</string>
@@ -634,4 +627,51 @@
     <string name="device_pin_counter_text">Термін дії коду закінчується через %1$dхв %2$dс</string>
     <string name="auth_locally">Автентифікація по місцю</string>
     <string name="dismiss">Відхилити</string>
-</resources>
+    <string name="hide_player_control_names_key" translatable="false">hide_player_control_names_key</string>
+    <string name="play_from_beginning_img_des">Відтворювати з початку</string>
+    <string name="test_warning">Попередження</string>
+    <string name="delete_plugin">Видалити розширення</string>
+    <string name="downloads_empty">Наразі завантажень немає.</string>
+    <string name="hide_player_control_names">Приховувати назви елемнтів керування у плеєрі</string>
+    <string name="open_local_video">Відкрити локальне відео</string>
+    <string name="sort_release_date_new">Дата випуску (від нових до старих)</string>
+    <string name="sort_release_date_old">Дата випуску (від старих до нових)</string>
+    <string name="downloads_delete_select">Оберіть елементи для видалення</string>
+    <string name="select_all">Обрати все</string>
+    <string name="deselect_all">Скасувати вибір</string>
+    <string name="delete_format" formatted="true">Видалити (%1$d | %2$s)</string>
+    <string name="delete_message_series_episodes" formatted="true">Ви впевнені, що хочете назавжди видалити наступні епізоди \"%1$s\"?
+\n
+\n%2$s</string>
+    <string name="delete_message_series_section" formatted="true">Ви також назавжди видалите всі епізоди в наступному серіалі:
+\n
+\n%s</string>
+    <string name="offline_file">Доступно для перегляду в автономному режимі</string>
+    <string name="delete_files">Видалити файли</string>
+    <string name="delete_message_multiple" formatted="true">Ви впевнені, що хочете назавжди видалити наступні елементи?
+\n
+\n%s</string>
+    <string name="delete_message_series_only" formatted="true">Ви впевнені, що хочете назавжди видалити всі епізоди в наступному серіалі?
+\n
+\n%s</string>
+    <string name="preview_seekbar">Попередній перегляд повзунка</string>
+    <string name="preview_seekbar_desc">Ввімкнути мініатюру попереднього перегляду на повзунку</string>
+    <string name="no_subtitles_loaded">Субтитри ще не завантажено</string>
+    <string name="confirm_before_exiting_title">Підтвердити перед виходом</string>
+    <string name="show">Показувати</string>
+    <string name="confirm_before_exiting_desc">Показувати діалог перед виходом із застосунку</string>
+    <string name="dont_show">Не показувати</string>
+    <string name="backup_path_title">Розташування теки резервної копії</string>
+    <string name="custom">Власний</string>
+    <string name="torrent_info">Це відео є торрентом, це означає, що ваша активність у відео може бути відстежена.\nПереконайтеся, що ви розумієте, що таке торрент, перш ніж продовжити.</string>
+    <string name="subs_edge_size">Розмір кромки</string>
+    <string name="audio_singluar">Аудіо</string>
+    <string name="podcast_singluar">Подкаст</string>
+    <string name="unsupported_error">Непідтримувана помилка</string>
+    <string name="encoding_error">Помилка кодування</string>
+    <string name="player_load_one_subtitle_online">Завантажити перші доступні</string>
+    <string name="torrent_preferred_media">Увімкніть торрент у Налаштуваннях/Постачальниках/Переважних носіях</string>
+    <string name="torrent_not_accepted">Торрент не приймається</string>
+    <string name="software_decoding">Програмне декодування</string>
+    <string name="software_decoding_desc">Програмне декодування дозволяє програвачу відтворювати відеофайли, які не підтримуються вашим телефоном, але може призвести до затримки або нестабільного відтворення у високій роздільній здатності</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-vi/array.xml b/app/src/main/res/values-vi/array.xml
index aac94100ebf..c6ff1c4e28a 100644
--- a/app/src/main/res/values-vi/array.xml
+++ b/app/src/main/res/values-vi/array.xml
@@ -153,32 +153,6 @@
         <item>@string/show_title_key</item>
     </array>
 
-    <array name="episode_long_click_options">
-        <item>@string/episode_action_chromecast_episode</item>
-        <item>@string/episode_action_chromecast_mirror</item>
-        <item>@string/episode_action_play_in_app</item>
-        <item>@string/episode_action_play_in_format</item>
-        <item>@string/episode_action_play_in_browser</item>
-        <item>@string/episode_action_copy_link</item>
-        <item>@string/episode_action_auto_download</item>
-        <item>@string/episode_action_download_mirror</item>
-        <item>@string/episode_action_download_subtitle</item>
-        <item>@string/episode_action_reload_links</item>
-    </array>
-
-    <array name="episode_long_click_options_values">
-        <item>4</item>
-        <item>5</item>
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-        <item>9</item>
-        <item>6</item>
-        <item>7</item>
-        <item>13</item>
-        <item>8</item>
-    </array>
-
     <array name="app_layout">
         <item>@string/automatic</item>
         <item>@string/phone_layout</item>
@@ -248,6 +222,7 @@
         <item>Xám</item>
         <item>Amoled</item>
         <item>Sáng</item>
+        <item>Hệ thống</item>
         <item>Material You</item>
     </string-array>
     <string-array name="themes_names_values">
@@ -255,6 +230,7 @@
         <item>Black</item>
         <item>Amoled</item>
         <item>Light</item>
+        <item>System</item>
         <item>Monet</item>
     </string-array>
 
diff --git a/app/src/main/res/values/array.xml b/app/src/main/res/values/array.xml
index 3be125101b9..f59e7f27e36 100644
--- a/app/src/main/res/values/array.xml
+++ b/app/src/main/res/values/array.xml
@@ -22,6 +22,8 @@
         <item>AdGuard</item>
         <item>DNS.WATCH</item>
         <item>Quad9</item>
+        <item>DNS.SB</item>
+        <item>Canadian Shield</item>
     </array>
     <array name="dns_pref_values">
         <item>0</item>
@@ -31,6 +33,8 @@
         <item>4</item>
         <item>5</item>
         <item>6</item>
+        <item>7</item>
+        <item>8</item>
     </array>
 
     <array name="apk_installer_pref">
@@ -50,22 +54,6 @@
         <item>@string/nsfw</item>
     </array>
 
-    <array name="player_pref_names">
-        <item>@string/player_settings_play_in_app</item>
-        <item>@string/player_settings_play_in_vlc</item>
-        <item>@string/player_settings_play_in_mpv</item>
-        <item>@string/player_settings_play_in_web</item>
-        <item>@string/player_settings_play_in_browser</item>
-    </array>
-
-    <array name="player_pref_values">
-        <item>1</item>
-        <item>2</item>
-        <item>5</item>
-        <item>4</item>
-        <item>3</item>
-    </array>
-
     <array name="limit_title_rez_pref_names">
         <item>@string/resolution_and_title</item>
         <item>@string/title</item>
@@ -224,32 +212,6 @@
         <item>@string/show_title_key</item>
     </array>
 
-    <array name="episode_long_click_options">
-        <item>@string/episode_action_chromecast_episode</item>
-        <item>@string/episode_action_chromecast_mirror</item>
-        <item>@string/episode_action_play_in_app</item>
-        <item>@string/episode_action_play_in_format</item>
-        <item>@string/episode_action_play_in_browser</item>
-        <item>@string/episode_action_copy_link</item>
-        <item>@string/episode_action_auto_download</item>
-        <item>@string/episode_action_download_mirror</item>
-        <item>@string/episode_action_download_subtitle</item>
-        <item>@string/episode_action_reload_links</item>
-    </array>
-
-    <array name="episode_long_click_options_values">
-        <item>4</item>
-        <item>5</item>
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-        <item>9</item>
-        <item>6</item>
-        <item>7</item>
-        <item>13</item>
-        <item>8</item>
-    </array>
-
     <array name="app_layout">
         <item>@string/automatic</item>
         <item>@string/phone_layout</item>
@@ -264,6 +226,29 @@
         <item>2</item>
     </array>
 
+    <array name="software_decoding_switch">
+        <item>@string/automatic</item>
+        <item>@string/yes</item>
+        <item>@string/no</item>
+    </array>
+
+    <array name="software_decoding_switch_values">
+        <item>-1</item>
+        <item>0</item>
+        <item>1</item>
+    </array>
+
+    <array name="confirm_exit">
+        <item>@string/automatic</item>
+        <item>@string/show</item>
+        <item>@string/dont_show</item>
+    </array>
+    <array name="confirm_exit_values">
+        <item>-1</item>
+        <item>0</item>
+        <item>1</item>
+    </array>
+
     <string-array name="themes_overlay_names">
         <item>Normal</item>
         <item>Dandelion Yellow</item>
@@ -318,6 +303,7 @@
         <item>Gray</item>
         <item>Amoled</item>
         <item>Flashbang</item>
+        <item>System</item>
         <item>Material You</item>
     </string-array>
     <string-array name="themes_names_values">
@@ -325,6 +311,7 @@
         <item>Black</item>
         <item>Amoled</item>
         <item>Light</item>
+        <item>System</item>
         <item>Monet</item>
     </string-array>
 
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index a37dfad21fe..f63308b6129 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -89,4 +89,4 @@
     <color name="colorTestPass">#48E484</color>
     <color name="colorTestFail">#ea596e</color>
     <color name="colorTestWarning">#FF9800</color>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0e3f788fe84..9c32c0e8d78 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -17,7 +17,7 @@
     <string name="subtitle_settings_chromecast_key" translatable="false">subtitle_settings_chromecast_key</string>
     <string name="quality_pref_key" translatable="false">quality_pref_key</string>
     <string name="quality_pref_mobile_data_key" translatable="false">quality_pref_mobile_data_key</string>
-    <string name="player_pref_key" translatable="false">player_pref_key</string>
+    <string name="player_default_key" translatable="false">player_default_key</string>
     <string name="prefer_limit_title_key" translatable="false">prefer_limit_title_key</string>
     <string name="prefer_limit_title_rez_key" translatable="false">prefer_limit_title_rez_key</string>
     <string name="apk_installer_key" translatable="false">apk_installer_key</string>
@@ -46,6 +46,7 @@
     <string name="dns_key" translatable="false">dns_key</string>
     <string name="jsdelivr_proxy_key" translatable="false">jsdelivr_proxy_key</string>
     <string name="download_path_key" translatable="false">download_path_key</string>
+    <string name="download_path_key_visual" translatable="false">download_path_key_visual</string>
     <string name="app_name_download_path" translatable="false">Cloudstream</string>
     <string name="app_layout_key" translatable="false">app_layout_key</string>
     <string name="primary_color_key" translatable="false">primary_color_key</string>
@@ -96,6 +97,7 @@
     <string name="home_next_random_img_des">Next Random</string>
     <string name="episode_play_img_des" translatable="false">@string/play_episode</string>
     <string name="go_back_img_des">Go back</string>
+    <string name="play_from_beginning_img_des">Play from the Beginning</string>
     <string name="change_providers_img_des" translatable="false">@string/home_change_provider_img_des</string>
     <string name="home_change_provider_img_des">Change Provider</string>
     <string name="preview_background_img_des">Preview Background</string>
@@ -134,6 +136,7 @@
     <string name="play_trailer_button">Play Trailer</string>
     <string name="play_livestream_button">Play Livestream</string>
     <string name="play_torrent_button">Stream Torrent</string>
+    <string name="torrent_info">This video is a Torrent, this means that your video activity can be tracked.\nMake sure you understand Torrenting before continuing.</string>
     <string name="pick_source">Sources</string>
     <string name="pick_subtitle">Subtitles</string>
     <string name="reload_error">Retry connection…</string>
@@ -149,7 +152,11 @@
     <string name="download_canceled">Download Canceled</string>
     <string name="download_done">Download Done</string>
     <string name="download_format" translatable="false">%s - %s</string>
+    <string name="downloads_delete_select">Select Items to Delete</string>
     <string name="downloads_empty">There are currently no downloads.</string>
+    <string name="offline_file">Available for watching offline</string>
+    <string name="select_all">Select All</string>
+    <string name="deselect_all">Deselect All</string>
     <string name="update_started">Update Started</string>
     <string name="stream">Network stream</string>
     <string name="open_local_video">Open local video</string>
@@ -299,8 +306,10 @@
     <string name="season_short">S</string>
     <string name="episode_short">E</string>
     <string name="no_episodes_found">No Episodes found</string>
-    <string name="delete_file">Delete File</string>
     <string name="delete">Delete</string>
+    <string name="delete_file">Delete File</string>
+    <string name="delete_files">Delete Files</string>
+    <string name="delete_format" formatted="true">Delete (%1$d | %2$s)</string>
     <string name="cancel">Cancel</string>
     <string name="pause">Pause</string>
     <string name="start">Start</string>
@@ -311,6 +320,10 @@
     <string name="go_back_30">-30</string>
     <string name="go_forward_30">+30</string>
     <string name="delete_message" formatted="true">This will permanently delete %s\nAre you sure?</string>
+    <string name="delete_message_multiple" formatted="true">Are you sure you want to permanently delete the following items?\n\n%s</string>
+    <string name="delete_message_series_episodes" formatted="true">Are you sure you want to permanently delete the following episodes in %1$s?\n\n%2$s</string>
+    <string name="delete_message_series_section" formatted="true">You will also permanently delete all episodes in the following series:\n\n%s</string>
+    <string name="delete_message_series_only" formatted="true">Are you sure you want to permanently delete all episodes in the following series?\n\n%s</string>
     <string name="resume_time_left" formatted="true">%dm\nremaining</string>
     <string name="resume_remaining" formatted="true">%s\nremaining</string>
     <string name="status_ongoing">Ongoing</string>
@@ -360,9 +373,13 @@
     <string name="music_singlar">Music</string>
     <string name="audio_book_singular">Audio Book</string>
     <string name="custom_media_singluar">Media</string>
+    <string name="audio_singluar">Audio</string>
+    <string name="podcast_singluar">Podcast</string>
     <string name="source_error">Source error</string>
     <string name="remote_error">Remote error</string>
     <string name="render_error">Renderer error</string>
+    <string name="encoding_error">Encoding error</string>
+    <string name="unsupported_error">Unsupported error</string>
     <string name="unexpected_error">Unexpected player error</string>
     <string name="storage_error">Download error, check storage permissions</string>
     <string name="episode_action_chromecast_episode">Chromecast episode</string>
@@ -370,8 +387,6 @@
     <string name="episode_action_cast_mirror">Cast mirror</string>
     <string name="episode_action_play_in_app">Play in app</string>
     <string name="episode_action_play_in_format">Play in %s</string>
-    <string name="episode_action_play_in_browser">Play in browser</string>
-    <string name="episode_action_copy_link">Copy link</string>
     <string name="episode_action_auto_download">Auto download</string>
     <string name="episode_action_download_mirror">Download mirror</string>
     <string name="episode_action_reload_links">Reload links</string>
@@ -549,6 +564,7 @@
     <string name="player_loaded_subtitles" formatted="true">Loaded %s</string>
     <string name="player_load_subtitles">Load from file</string>
     <string name="player_load_subtitles_online">Load from Internet</string>
+    <string name="player_load_one_subtitle_online">Load first available</string>
     <string name="downloaded_file">Downloaded file</string>
     <string name="actor_main">Main</string>
     <string name="actor_supporting">Supporting</string>
@@ -599,8 +615,8 @@
     <string name="setup_done">Done</string>
     <string name="extensions">Extensions</string>
     <string name="add_repository">Add repository</string>
-    <string name="repository_name_hint">Repository name</string>
-    <string name="repository_url_hint">Repository URL</string>
+    <string name="repository_name_hint">Repository name (Optional)</string>
+    <string name="repository_url_hint">Repository URL or Shortcode</string>
     <string name="plugin_loaded">Plugin Loaded</string>
     <string name="plugin_downloaded">Plugin Downloaded</string>
     <string name="plugin_deleted">Plugin Deleted</string>
@@ -651,11 +667,6 @@
     <string name="hls_playlist">HLS Playlist</string>
     <string name="player_pref">Preferred video player</string>
     <string name="player_settings_play_in_app">Internal player</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">Web Video Cast</string>
-    <string name="player_settings_play_in_fcast">Fcast</string>
-    <string name="player_settings_play_in_browser">Web browser</string>
     <string name="player_settings_select_cast_device">Select cast device</string>
     <string name="app_not_found_error">App not found</string>
     <string name="all_languages_preference">All Languages</string>
@@ -683,11 +694,9 @@
     <string name="open_downloaded_repo">Open repository</string>
     <string name="battery_dialog_title">Disable Battery optimization</string>
     <string name="battery_dialog_message">To ensure uninterrupted downloads and notifications for subscribed
-        TV shows, CloudStream needs permission to run in background. By pressing "OK", you\'ll be directed to App info.
-        There, scroll to 𝘼𝙥𝙥 𝙗𝙖𝙩𝙩𝙚𝙧𝙮 𝙪𝙨𝙖𝙜𝙚 and set battery usage to 𝙐𝙣𝙧𝙚𝙨𝙩𝙧𝙞𝙘𝙩𝙚𝙙. Please note, this permission
-        does not mean CS3 will drain your battery. It will only operate in the background when necessary, such as
-        when receiving notifications or downloading videos from official extensions. If you choose to cancel,
-        you can adjust this setting later in 𝙂𝙚𝙣𝙚𝙧𝙖𝙡 𝙎𝙚𝙩𝙩𝙞𝙣𝙜𝙨.</string>
+        TV shows, CloudStream needs permission to run in background. By pressing "OK", you\'ll be shown a request dialog.
+        Please press \'Allow\'.\n\nPlease note, this permission does not mean CS3 will drain your battery. It will only operate in the background when necessary, such as
+        when receiving notifications or downloading videos from official extensions.</string>
     <string name="battery_optimisation_key" translatable="false">battery_optimisation</string>
     <string name="app_unrestricted_toast">App battery usage is already set to unrestricted</string>
     <string name="app_info_intent_error">Unable to open CloudStream\'s App info.</string>
@@ -705,6 +714,15 @@
     <string name="sort_updated_old">Updated (Old to New)</string>
     <string name="sort_alphabetical_a">Alphabetical (A to Z)</string>
     <string name="sort_alphabetical_z">Alphabetical (Z to A)</string>
+    <string name="sort_episodes_number_asc">Episode (Ascending)</string>
+    <string name="sort_episodes_number_desc">Episode (Descending)</string>
+    <string name="sort_episodes_rating_high_low">Rating (Highest)</string>
+    <string name="sort_episodes_rating_low_high">Rating (Lowest)</string>
+    <string name="sort_episodes_date_newest">Air Date (Newest)</string>
+    <string name="sort_episodes_date_oldest">Air Date (Oldest)</string>
+   <string name="sort_button_episode">Ep %s</string>
+    <string name="sort_button_rating">Rating %s</string>
+    <string name="sort_button_date">Date %s</string>
     <string name="select_library">Select Library</string>
     <string name="open_with">Open with</string>
     <string name="empty_library_no_accounts_message">Your library is empty :(
@@ -796,4 +814,36 @@
     <string name="device_pin_error_message">Can\'t get the device PIN code, try local authentication</string>
     <string name="device_pin_expired_message">PIN code is now expired !</string>
     <string name="device_pin_counter_text">Code expires in %1$dm %2$ds</string>
-</resources>
\ No newline at end of file
+    <string name="sort_release_date_new">Release Date (New to Old)</string>
+    <string name="sort_release_date_old">Release Date (Old to New)</string>
+    <string name="hide_player_control_names_key" translatable="false">hide_player_control_names_key</string>
+    <string name="hide_player_control_names">Hide names of the player\'s controls</string>
+    <string name="preview_seekbar_key" translatable="false">preview_seekbar_key</string>
+    <string name="preview_seekbar">Seekbar preview</string>
+    <string name="preview_seekbar_desc">Enable preview thumbnail on seekbar</string>
+    <string name="no_subtitles_loaded">No subtitles loaded yet</string>
+    <string name="backup_path_key" translatable="false">backup_path_key</string>
+    <string name="backup_path_title">Backup folder location</string>
+    <string name="backup_dir_key" translatable="false">backup_dir_key</string>
+    <string name="custom">Custom</string>
+    <!--confirm exit dialog-->
+    <string name="confirm_before_exiting_title">Confirm before exiting</string>
+    <string name="confirm_before_exiting_desc">Show dialog before exiting the app</string>
+    <string name="confirm_exit_key" translatable="false">confirm_exit_key</string>
+    <!--confirm exit dialog-->
+    <string name="show">Show</string>
+    <string name="dont_show">Don\'t Show</string>
+    <string name="subs_edge_size">Edge Size</string>
+    <string name="torrent_preferred_media">Enable torrent in Settings/Providers/Preferred media</string>
+    <string name="torrent_not_accepted">Not accepted torrent</string>
+    <string name="software_decoding_key" translatable="false">software_decoding_key2</string>
+    <string name="software_decoding">Software decoding</string>
+    <string name="software_decoding_desc">Software decoding enables the player to play video files not supported by your phone, but may cause laggy or unstable playback on high resolution</string>
+    <string name="update_plugins">Update Plugins</string>
+    <!--Manual Update Button-->
+    <string name="update_plugins_manually">Update plugins manually!!</string>
+    <string name="manual_update_plugins_key" translatable="false">manual_update_plugins</string>
+    <string name="starting_plugin_update_manually">Starting plugin update process!</string>
+    <string name="plugins_updated_manually">Successfully updated %d plugin(s)!</string>
+    <string name="no_plugins_updated_manually">No plugins were updated.</string>
+</resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index db006670011..d7bf78cdf3b 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,10 +1,13 @@
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. Material3 -->
     <style name="AppTheme" parent="Theme.Material3.Dark.NoActionBar">
         <item name="android:windowBackground">@drawable/splash_background</item>
         <item name="android:navigationBarColor">?attr/primaryBlackBackground</item>
         <item name="android:colorEdgeEffect">?attr/textColor</item>
 
+        <!-- Opt out of edgeToEdge enforcement in >= Android 15 -->
+        <!-- However this will be deprecated in future (ETA ~ 1.6 years) -->
+        <item name="android:windowOptOutEdgeToEdgeEnforcement" tools:targetApi="35">true</item>
         <!--<item name="android:navigationBarColor">@color/darkBackground</item>-->
         <item name="android:statusBarColor">?attr/iconGrayBackground</item>
 
@@ -99,6 +102,12 @@
         <item name="chipMinTouchTargetSize">0dp</item>
     </style>
 
+    <style name="RoundProgressbar">
+        <item name="indicatorTrackGapSize">0dp</item>
+        <item name="trackStopIndicatorSize">0dp</item>
+        <item name="trackColor">@color/color_primary_transparent</item>
+    </style>
+
     <style name="ChipFilledSemiTransparent" parent="@style/ChipFilled">
         <item name="chipBackgroundColor">@color/transparent</item>
         <item name="chipSurfaceColor">@color/white_attr_20</item>
@@ -392,7 +401,7 @@
         <!--    Needed for leanback fuckery    -->
         <item name="android:colorAccent">@color/colorPrimaryLavender</item>
     </style>
-    
+
     <style name="customRatingBar" parent="@style/Widget.AppCompat.RatingBar">
 
         <item name="android:progressDrawable">@drawable/abc_ratingbar_indicator_material</item>
@@ -515,6 +524,15 @@
         <item name="android:windowBackground">@color/transparent</item>
     </style>
 
+    <style name="DialogFullscreen">
+        <item name="android:windowEnterAnimation">@anim/enter_anim</item>
+        <item name="android:windowExitAnimation">@anim/exit_anim</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">match_parent</item>
+        <item name="android:windowActionBar">false</item>
+        <item name="android:windowNoTitle">true</item>
+    </style>
+
     <style name="AlertDialogCustomBlack" parent="Theme.AppCompat.Dialog.Alert">
         <item name="android:windowBackground">?attr/primaryBlackBackground</item>
         <item name="android:layout_width">match_parent</item>
diff --git a/app/src/main/res/xml/settings_general.xml b/app/src/main/res/xml/settings_general.xml
index 853bbda19db..4ddc54f33c3 100644
--- a/app/src/main/res/xml/settings_general.xml
+++ b/app/src/main/res/xml/settings_general.xml
@@ -6,8 +6,6 @@
         android:title="@string/app_language"
         android:icon="@drawable/ic_baseline_language_24" />
 
-
-
     <Preference
             android:key="@string/legal_notice_key"
             android:title="@string/legal_notice"
diff --git a/app/src/main/res/xml/settings_player.xml b/app/src/main/res/xml/settings_player.xml
index 5d5b11d0539..b88cf5161b2 100644
--- a/app/src/main/res/xml/settings_player.xml
+++ b/app/src/main/res/xml/settings_player.xml
@@ -9,25 +9,23 @@
         app:defaultValue="true"
         app:key="@string/episode_sync_enabled_key" />
 
-    <PreferenceCategory
-        android:title="@string/pref_category_defaults">
-<!--        <Preference-->
-<!--            android:icon="@drawable/ic_baseline_hd_24"-->
-<!--            android:key="@string/quality_pref_key"-->
-<!--            android:title="@string/watch_quality_pref" />-->
-<!--        <Preference-->
-<!--            android:icon="@drawable/ic_baseline_hd_24"-->
-<!--            android:key="@string/quality_pref_mobile_data_key"-->
-<!--            android:title="@string/watch_quality_pref_data" />-->
+    <PreferenceCategory android:title="@string/pref_category_defaults">
+        <!--        <Preference-->
+        <!--            android:icon="@drawable/ic_baseline_hd_24"-->
+        <!--            android:key="@string/quality_pref_key"-->
+        <!--            android:title="@string/watch_quality_pref" />-->
+        <!--        <Preference-->
+        <!--            android:icon="@drawable/ic_baseline_hd_24"-->
+        <!--            android:key="@string/quality_pref_mobile_data_key"-->
+        <!--            android:title="@string/watch_quality_pref_data" />-->
 
         <Preference
             android:icon="@drawable/netflix_play"
-            android:key="@string/player_pref_key"
+            android:key="@string/player_default_key"
             android:title="@string/player_pref" />
     </PreferenceCategory>
 
-    <PreferenceCategory
-        android:title="@string/pref_category_player_layout">
+    <PreferenceCategory android:title="@string/pref_category_player_layout">
         <Preference
             android:icon="@drawable/ic_baseline_text_format_24"
             android:key="@string/prefer_limit_title_key"
@@ -37,10 +35,14 @@
             android:icon="@drawable/ic_baseline_text_format_24"
             android:key="@string/prefer_limit_title_rez_key"
             android:title="@string/limit_title_rez" />
+        <SwitchPreference
+            android:defaultValue="false"
+            android:icon="@drawable/ic_baseline_text_format_24"
+            android:key="@string/hide_player_control_names_key"
+            android:title="@string/hide_player_control_names" />
     </PreferenceCategory>
 
-    <PreferenceCategory
-        android:title="@string/pref_category_subtitles">
+    <PreferenceCategory android:title="@string/pref_category_subtitles">
         <Preference
             android:icon="@drawable/ic_outline_subtitles_24"
             android:key="@string/subtitle_settings_key"
@@ -54,8 +56,7 @@
     </PreferenceCategory>
 
 
-    <PreferenceCategory
-        android:title="@string/pref_category_player_features">
+    <PreferenceCategory android:title="@string/pref_category_player_features">
         <SwitchPreference
             android:icon="@drawable/ic_baseline_picture_in_picture_alt_24"
             android:summary="@string/picture_in_picture_des"
@@ -82,24 +83,36 @@
             app:key="@string/autoplay_next_key" />
         <SwitchPreference
             android:icon="@drawable/ic_baseline_skip_next_24"
+            android:summary="@string/enable_skip_op_from_database_des"
             android:title="@string/video_skip_op"
             app:defaultValue="true"
-            android:summary="@string/enable_skip_op_from_database_des"
             app:key="@string/enable_skip_op_from_database" />
         <SwitchPreference
             android:icon="@drawable/screen_rotation"
+            android:summary="@string/rotate_video_desc"
             android:title="@string/rotate_video"
             app:defaultValue="false"
-            android:summary="@string/rotate_video_desc"
             app:key="@string/rotate_video_key" />
         <SwitchPreference
             android:icon="@drawable/screen_rotation"
+            android:summary="@string/auto_rotate_video_desc"
             android:title="@string/auto_rotate_video"
             app:defaultValue="false"
-            android:summary="@string/auto_rotate_video_desc"
             app:key="@string/auto_rotate_video_key" />
+        <SwitchPreference
+            android:icon="@drawable/preview_seekbar_24"
+            android:summary="@string/preview_seekbar_desc"
+            android:title="@string/preview_seekbar"
+            app:defaultValue="true"
+            app:key="@string/preview_seekbar_key" />
+        <Preference
+            android:icon="@drawable/ic_baseline_extension_24"
+            android:summary="@string/software_decoding_desc"
+            android:title="@string/software_decoding"
+            app:defaultValue="true"
+            app:key="@string/software_decoding_key" />
     </PreferenceCategory>
-    
+
     <PreferenceCategory
         android:title="@string/pref_category_gestures"
         app:key="@string/pref_category_gestures_key">
@@ -141,8 +154,7 @@
             app:showSeekBarValue="true" />
     </PreferenceCategory>
 
-    <PreferenceCategory
-        android:title="@string/pref_category_cache">
+    <PreferenceCategory android:title="@string/pref_category_cache">
         <Preference
             android:icon="@drawable/ic_baseline_storage_24"
             android:key="@string/video_buffer_disk_key"
@@ -167,13 +179,13 @@
             android:title="@string/video_buffer_clear_settings" />
     </PreferenceCategory>
     <PreferenceCategory
-        android:title="@string/pref_category_android_tv"
-        android:key="@string/pref_category_android_tv_key" >
+        android:key="@string/pref_category_android_tv_key"
+        android:title="@string/pref_category_android_tv">
         <SeekBarPreference
             android:defaultValue="10"
             android:max="60"
-            android:title="@string/android_tv_interface_on_seek_settings"
             android:summary="@string/android_tv_interface_on_seek_settings_summary"
+            android:title="@string/android_tv_interface_on_seek_settings"
             app:adjustable="true"
             app:defaultValue="30"
             app:icon="@drawable/go_forward_30"
@@ -184,8 +196,8 @@
         <SeekBarPreference
             android:defaultValue="10"
             android:max="60"
-            android:title="@string/android_tv_interface_off_seek_settings"
             android:summary="@string/android_tv_interface_off_seek_settings_summary"
+            android:title="@string/android_tv_interface_off_seek_settings"
             app:adjustable="true"
             app:defaultValue="10"
             app:icon="@drawable/go_forward_30"
diff --git a/app/src/main/res/xml/settings_ui.xml b/app/src/main/res/xml/settings_ui.xml
index 0d9115a10ba..a5d368c4c0d 100644
--- a/app/src/main/res/xml/settings_ui.xml
+++ b/app/src/main/res/xml/settings_ui.xml
@@ -57,6 +57,11 @@
                 android:title="@string/random_button_settings"
                 android:summary="@string/random_button_settings_desc"
                 app:defaultValue="false" />
+        <Preference
+            android:icon="@drawable/ic_baseline_exit_24"
+            android:key="@string/confirm_exit_key"
+            android:title="@string/confirm_before_exiting_title"
+            android:summary="@string/confirm_before_exiting_desc" />
         <Preference
             android:icon="@drawable/ic_baseline_filter_list_24"
             android:key="@string/pref_filter_search_quality_key"
diff --git a/app/src/main/res/xml/settings_updates.xml b/app/src/main/res/xml/settings_updates.xml
index 102f8ee4bdb..2c2de04318c 100644
--- a/app/src/main/res/xml/settings_updates.xml
+++ b/app/src/main/res/xml/settings_updates.xml
@@ -46,6 +46,11 @@
             android:icon="@drawable/baseline_restore_page_24"
             android:key="@string/restore_key"
             android:title="@string/restore_settings" />
+
+        <Preference
+            android:icon="@drawable/ic_baseline_folder_open_24"
+            android:key="@string/backup_path_key"
+            android:title="@string/backup_path_title" />
     </PreferenceCategory>
 
     <PreferenceCategory
@@ -61,6 +66,12 @@
             android:key="@string/auto_download_plugins_key"
             android:title="@string/automatic_plugin_download"
             android:summary="@string/automatic_plugin_download_summary" />
+
+        <Preference
+            android:icon="@drawable/ic_baseline_extension_24"
+            android:key="@string/manual_update_plugins_key"
+            android:title="@string/update_plugins"
+            android:summary="@string/update_plugins_manually"/>
     </PreferenceCategory>
 
     <PreferenceCategory
@@ -73,12 +84,12 @@
             android:icon="@drawable/ic_baseline_construction_24"
             android:title="@string/redo_setup_process"
             app:key="@string/redo_setup_key" />
-        <SwitchPreference
+        <!--<SwitchPreference
             android:defaultValue="true"
             android:icon="@drawable/ic_baseline_bug_report_24"
             android:key="acra.disable"
             android:summaryOff="@string/bug_report_settings_off"
             android:summaryOn="@string/bug_report_settings_on"
-            android:title="@string/pref_disable_acra" />
+            android:title="@string/pref_disable_acra" />-->
     </PreferenceCategory>
 </PreferenceScreen>
diff --git a/app/src/release/res/drawable-v24/ic_banner_background.xml b/app/src/release/res/drawable-v24/ic_banner_background.xml
deleted file mode 100644
index 7b05b711181..00000000000
--- a/app/src/release/res/drawable-v24/ic_banner_background.xml
+++ /dev/null
@@ -1,169 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="320dp"
-    android:height="180dp"
-    android:viewportWidth="320"
-    android:viewportHeight="180">
-  <group android:scaleX="0.6666667"
-      android:scaleY="0.6666667"
-      android:translateX="53.333332"
-      android:translateY="30">
-    <group android:scaleX="0.35277516"
-        android:scaleY="0.35277516"
-        android:translateX="5.879586E-4">
-      <path
-          android:strokeWidth="1"
-          android:pathData="M-20.09,-10.91h949.79v534.26h-949.79z"
-          android:fillColor="#121212"
-          android:strokeColor="#fff"/>
-      <path
-              android:pathData="M273.68,250.58a18.79,18.79 0,0 0,-5.64 0.86,26.56 26.56,0 0,0 -24.73,-21.51 40.83,40.83 0,0 0,-68.95 -13.08A32.07,32.07 0,0 0,132 247.24a30.92,30.92 0,0 0,0.18 3.35H132a18.9,18.9 0,0 0,0 37.8H273.68a18.9,18.9 0,0 0,0 -37.8Z">
-        <aapt:attr name="android:fillColor">
-          <gradient
-                  android:startY="245.72"
-                  android:startX="113.12"
-                  android:endY="245.72"
-                  android:endX="292.58"
-                  android:type="linear">
-            <item android:offset="0" android:color="#FF5D49EA"/>
-            <item android:offset="0.45" android:color="#FF452FE4"/>
-            <item android:offset="1" android:color="#FF2309DB"/>
-          </gradient>
-        </aapt:attr>
-      </path>
-      <path
-              android:pathData="M248.76,234.41c0,-1.22 0,-2.42 -0.09,-3.63a27,27 0,0 0,-5.36 -0.85,40.83 40.83,0 0,0 -68.95,-13.08A32.07,32.07 0,0 0,132 247.24a30.92,30.92 0,0 0,0.18 3.35H132a18.9,18.9 0,0 0,0 37.8H228.5A81.75,81.75 0,0 0,248.76 234.41Z">
-        <aapt:attr name="android:fillColor">
-          <gradient
-                  android:startY="245.72"
-                  android:startX="113.12"
-                  android:endY="245.72"
-                  android:endX="248.76"
-                  android:type="linear">
-            <item android:offset="0" android:color="#FF4F6DFB"/>
-            <item android:offset="0.6" android:color="#FF3559E7"/>
-            <item android:offset="1" android:color="#FF2149D8"/>
-          </gradient>
-        </aapt:attr>
-      </path>
-      <path
-              android:pathData="M174.36,216.85A32.07,32.07 0,0 0,132 247.24a30.92,30.92 0,0 0,0.18 3.35H132a18.89,18.89 0,0 0,-1.18 37.74A81.53,81.53 0,0 0,210 206.83c0,-1.15 0,-2.29 -0.09,-3.43a41.33,41.33 0,0 0,-5 -0.33A40.71,40.71 0,0 0,174.36 216.85Z">
-        <aapt:attr name="android:fillColor">
-          <gradient
-                  android:startY="245.69"
-                  android:startX="113.12"
-                  android:endY="245.69"
-                  android:endX="210.03"
-                  android:type="linear">
-            <item android:offset="0" android:color="#FF56B6FE"/>
-            <item android:offset="0.61" android:color="#FF599CFA"/>
-            <item android:offset="1" android:color="#FF5C89F7"/>
-          </gradient>
-        </aapt:attr>
-      </path>
-
-      <path
-              android:pathData="M358.81,285q-13.53,0 -22.64,-9.1t-9,-22.72q0,-13.62 9,-22.64 9,-9.18 22.64,-9.19 13.79,0 22.38,10l-5.62,5.44a20.82,20.82 0,0 0,-16.76 -7.91,23 23,0 0,0 -16.94,6.81q-6.72,6.72 -6.72,17.53t6.72,17.53a23,23 0,0 0,16.94 6.81q10.63,0 18.46,-8.94l5.7,5.53a29.57,29.57 0,0 1,-10.63 8A32.44,32.44 0,0 1,358.81 285Z"
-              android:fillColor="#2e24ff"/>
-      <path
-              android:pathData="M397.78,222.69v60.93H390V222.69Z"
-              android:fillColor="#2e24ff"/>
-      <path
-              android:pathData="M404.5,262.77q0,-9.61 6,-15.91a20.6,20.6 0,0 1,15.41 -6.3,20.31 20.31,0 0,1 15.31,6.3 21.87,21.87 0,0 1,6.13 15.91q0,9.71 -6.13,15.92A20.3,20.3 0,0 1,426 285a20.6,20.6 0,0 1,-15.41 -6.29Q404.5,272.39 404.5,262.77ZM412.33,262.77a15.31,15.31 0,0 0,3.91 10.9,13.38 13.38,0 0,0 19.41,0 17,17 0,0 0,0 -21.7,13.18 13.18,0 0,0 -19.41,0A15.18,15.18 0,0 0,412.33 262.77Z"
-              android:fillColor="#2e24ff"/>
-      <path
-              android:pathData="M490.7,283.62h-7.48v-5.78h-0.35a13.86,13.86 0,0 1,-5.48 5.1,15.77 15.77,0 0,1 -7.7,2q-7.67,0 -11.79,-4.38t-4.13,-12.47v-26.2h7.83v25.69q0.25,10.22 10.3,10.22a9.81,9.81 0,0 0,7.83 -3.79,13.7 13.7,0 0,0 3.14,-9.06V241.93h7.83Z"
-              android:fillColor="#2e24ff"/>
-      <path
-              android:pathData="M517.25,285a18.34,18.34 0,0 1,-14 -6.46,24.34 24.34,0 0,1 0,-31.49 18.35,18.35 0,0 1,14 -6.47,18.07 18.07,0 0,1 8.39,2 14.84,14.84 0,0 1,5.83 5.19h0.34l-0.34,-5.78L531.47,222.69h7.82v60.93h-7.48v-5.78h-0.34a14.84,14.84 0,0 1,-5.83 5.19A18.07,18.07 0,0 1,517.25 285ZM518.53,277.86a12,12 0,0 0,9.45 -4.17q3.82,-4.17 3.83,-10.9A15.54,15.54 0,0 0,528 252a12.05,12.05 0,0 0,-9.45 -4.26,12.19 12.19,0 0,0 -9.44,4.26 15.5,15.5 0,0 0,-3.83 10.8,15.32 15.32,0 0,0 3.83,10.81A12.19,12.19 0,0 0,518.53 277.84Z"
-              android:fillColor="#2e24ff"/>
-      <path
-              android:pathData="M587.8,267.33a15.91,15.91 0,0 1,-5.87 12.88A22.43,22.43 0,0 1,567.46 285a21.39,21.39 0,0 1,-13.36 -4.42,22.65 22.65,0 0,1 -8,-12.08l7.49,-3.07a19.3,19.3 0,0 0,2.13 4.94,15.72 15.72,0 0,0 3.19,3.78 14.25,14.25 0,0 0,4 2.47,12.26 12.26,0 0,0 4.68,0.9 13.47,13.47 0,0 0,8.76 -2.77,9 9,0 0,0 3.41,-7.36 8.8,8.8 0,0 0,-2.81 -6.55q-2.64,-2.64 -9.87,-5.11 -7.32,-2.64 -9.11,-3.57 -9.69,-4.94 -9.7,-14.55a14.84,14.84 0,0 1,5.37 -11.49A19.53,19.53 0,0 1,567 221.33a20.5,20.5 0,0 1,12.09 3.58,16.67 16.67,0 0,1 6.8,8.76l-7.31,3.06a10.84,10.84 0,0 0,-4 -5.65,13.1 13.1,0 0,0 -15.11,0.28 7.41,7.41 0,0 0,-3.15 6.19,7.14 7.14,0 0,0 2.47,5.42q2.73,2.29 11.83,5.42 9.27,3.17 13.23,7.72A16.53,16.53 0,0 1,587.8 267.33Z"
-              android:fillColor="#5252ff"/>
-      <path
-              android:pathData="M610.26,284.3a11.88,11.88 0,0 1,-8.46 -3.15c-2.25,-2.09 -3.4,-5 -3.45,-8.76V249.07H591v-7.14h7.32V229.16h7.83v12.77h10.21v7.14H606.18v20.77c0,2.78 0.54,4.66 1.61,5.66a5.27,5.27 0,0 0,3.66 1.48,7.9 7.9,0 0,0 1.83,-0.21 9,9 0,0 0,1.66 -0.55l2.47,7A21.23,21.23 0,0 1,610.26 284.3Z"
-              android:fillColor="#5252ff"/>
-      <path
-              android:pathData="M631.71,283.62h-7.83V241.93h7.48v6.8h0.35a11.31,11.31 0,0 1,4.89 -5.66,13.66 13.66,0 0,1 7.27,-2.34 14.7,14.7 0,0 1,5.79 1l-2.38,7.57a12.93,12.93 0,0 0,-4.6 -0.6,10.11 10.11,0 0,0 -7.7,3.58 12,12 0,0 0,-3.27 8.34Z"
-              android:fillColor="#5252ff"/>
-      <path
-              android:pathData="M670.93,285a19.93,19.93 0,0 1,-15.14 -6.29q-6,-6.3 -6,-15.92a22.65,22.65 0,0 1,5.79 -15.87,19.15 19.15,0 0,1 14.8,-6.34q9.29,0 14.77,6t5.49,16.81l-0.09,0.85L657.83,264.24a13.56,13.56 0,0 0,4.08 9.87,13.06 13.06,0 0,0 9.36,3.75q7.49,0 11.75,-7.49l7,3.4a20.69,20.69 0,0 1,-7.78 8.25A21.51,21.51 0,0 1,670.93 285ZM658.42,257.77h23.92a10.43,10.43 0,0 0,-3.53 -7.19,12.38 12.38,0 0,0 -8.56,-2.85 11.34,11.34 0,0 0,-7.61 2.72A13.09,13.09 0,0 0,658.42 257.75Z"
-              android:fillColor="#5252ff"/>
-      <path
-              android:pathData="M714.08,240.56q8.67,0 13.7,4.64c3.34,3.1 5,7.33 5,12.72v25.7h-7.49v-5.78H725Q720.11,285 712,285a16.83,16.83 0,0 1,-11.53 -4.08,13 13,0 0,1 -4.63,-10.21 12.38,12.38 0,0 1,4.89 -10.3q4.89,-3.83 13.06,-3.83a23.16,23.16 0,0 1,11.49 2.55v-1.78a8.9,8.9 0,0 0,-3.24 -6.94,11.08 11.08,0 0,0 -7.57,-2.85 12,12 0,0 0,-10.38 5.53l-6.89,-4.34Q702.93,240.57 714.08,240.56ZM704,270.86a6.24,6.24 0,0 0,2.59 5.1,9.57 9.57,0 0,0 6.09,2.05 12.5,12.5 0,0 0,8.81 -3.66,11.47 11.47,0 0,0 3.87,-8.6q-3.66,-2.88 -10.21,-2.89a13.22,13.22 0,0 0,-8 2.3A6.81,6.81 0,0 0,704 270.86Z"
-              android:fillColor="#5252ff"/>
-      <path
-              android:pathData="M749.47,283.62h-7.82V241.93h7.48v5.78h0.34a14,14 0,0 1,5.49 -5.1,15.06 15.06,0 0,1 7.36,-2.05 15.22,15.22 0,0 1,8.09 2.13,12.56 12.56,0 0,1 5.1,5.87q5.19,-8 14.39,-8 7.23,0 11.14,4.43T805,257.58v26h-7.83V258.77q0,-5.86 -2.13,-8.46t-7.15,-2.6a9.35,9.35 0,0 0,-7.57 3.83,14 14,0 0,0 -3.06,9v23.06h-7.83V258.77q0,-5.86 -2.13,-8.46t-7.15,-2.6a9.35,9.35 0,0 0,-7.57 3.83,14 14,0 0,0 -3.07,9Z"
-              android:fillColor="#5252ff"/>
-      <path
-          android:pathData="M-13.76,555.76c10.3,-20.89 58.91,-113.94 157.31,-139.7C261.3,385.24 405.9,462.43 469.89,613.28">
-        <aapt:attr name="android:fillColor">
-          <gradient
-                  android:startY="252.3"
-                  android:startX="194.11"
-                  android:endY="252.3"
-                  android:endX="373.57"
-                  android:type="linear">
-            <item android:offset="0" android:color="#FF5D49EA"/>
-            <item android:offset="0.45" android:color="#FF452FE4"/>
-            <item android:offset="1" android:color="#FF2309DB"/>
-          </gradient>
-        </aapt:attr>
-      </path>
-      <path
-          android:pathData="M318.2,592.15c52.89,-55.46 139,-131.3 263,-187.83 223.69,-102 495.29,-119.94 515.35,-62.21 13,37.39 -73.5,124.43 -496.69,339.65">
-        <aapt:attr name="android:fillColor">
-          <gradient
-                  android:startX="400.11"
-                  android:endX="900"
-                  android:type="linear">
-            <item android:offset="0" android:color="#FF5D49EA"/>
-            <item android:offset="0.45" android:color="#FF452FE4"/>
-            <item android:offset="1" android:color="#FF2309DB"/>
-          </gradient>
-        </aapt:attr>
-      </path>
-      <path
-          android:pathData="M-57.58,195c206.91,86.6 494,-219.13 453.91,-347.48C353.52,-289.67 -103.15,-353.41 -203.15,-176 -265.5,-65.35 -189.57,139.73 -57.58,195Z">
-        <aapt:attr name="android:fillColor">
-          <gradient
-                  android:startY="252.3"
-                  android:startX="-100"
-                  android:endY="252.3"
-                  android:endX="373.57"
-                  android:type="linear">
-            <item android:offset="0" android:color="#FF5D49EA"/>
-            <item android:offset="0.45" android:color="#FF452FE4"/>
-            <item android:offset="1" android:color="#FF2309DB"/>
-          </gradient>
-        </aapt:attr>
-      </path>
-      <path
-          android:pathData="M698.42,648.89C625.71,546 764,320.79 920.68,218.45c46.61,-30.44 110.17,-72 164.35,-50.08 102.25,41.28 158.19,303.22 28.17,446.08C996.65,742.52 762.64,739.78 698.42,648.89Z">
-        <aapt:attr name="android:fillColor">
-          <gradient
-                  android:startX="700.11"
-                  android:endX="900.57"
-                  android:type="linear">
-            <item android:offset="0" android:color="#FF5D49EA"/>
-            <item android:offset="0.45" android:color="#FF452FE4"/>
-            <item android:offset="1" android:color="#FF2309DB"/>
-          </gradient>
-        </aapt:attr>
-      </path>
-      <path
-          android:pathData="M339.91,-42.46a246.52,141.46 0,1 0,493.04 0a246.52,141.46 0,1 0,-493.04 0z">
-        <aapt:attr name="android:fillColor">
-          <gradient
-                  android:startX="400.11"
-                  android:endX="800.57"
-                  android:type="linear">
-            <item android:offset="0" android:color="#FF5D49EA"/>
-            <item android:offset="0.45" android:color="#FF452FE4"/>
-            <item android:offset="1" android:color="#FF2309DB"/>
-          </gradient>
-        </aapt:attr>
-      </path>
-    </group>
-  </group>
-</vector>
diff --git a/app/src/release/res/mipmap-anydpi-v26/ic_banner.xml b/app/src/release/res/mipmap-anydpi-v26/ic_banner.xml
deleted file mode 100644
index 47b7fed5964..00000000000
--- a/app/src/release/res/mipmap-anydpi-v26/ic_banner.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_banner_background"/>
-</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/release/res/mipmap-xhdpi/ic_banner.png b/app/src/release/res/mipmap-xhdpi/ic_banner.png
deleted file mode 100644
index d1b9bdfb859..00000000000
Binary files a/app/src/release/res/mipmap-xhdpi/ic_banner.png and /dev/null differ
diff --git a/build.gradle.kts b/build.gradle.kts
index 34f141b4fd4..8ef47fa5774 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,11 +5,11 @@ buildscript {
     }
 
     dependencies {
-        classpath("com.android.tools.build:gradle:8.2.2")
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23")
-        classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.9.10")
+        classpath(libs.gradle)
+        classpath(libs.jetbrains.kotlin.gradle.plugin)
+        classpath(libs.dokka.gradle.plugin)
         // Universal build config
-        classpath("com.codingfeline.buildkonfig:buildkonfig-gradle-plugin:0.15.1")
+        classpath(libs.buildkonfig.gradle.plugin)
     }
 }
 
@@ -17,13 +17,7 @@ allprojects {
     repositories {
         google()
         mavenCentral()
+        mavenLocal()
+        maven("https://jitpack.io")
     }
-}
-
-plugins {
-    id("com.google.devtools.ksp") version "1.9.22-1.0.17" apply false
-}
-
-//tasks.register<Delete>("clean") {
-//    delete(rootProject.layout.buildDirectory)
-//}
+}
\ No newline at end of file
diff --git a/docs/.gitignore b/docs/.gitignore
new file mode 100644
index 00000000000..42afabfd2ab
--- /dev/null
+++ b/docs/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/docs/build.gradle.kts b/docs/build.gradle.kts
new file mode 100644
index 00000000000..203b938181e
--- /dev/null
+++ b/docs/build.gradle.kts
@@ -0,0 +1,13 @@
+plugins {
+    kotlin("jvm")
+    id("org.jetbrains.dokka")
+}
+
+dependencies {
+    dokka(project(":app:"))
+    dokka(project(":library:"))
+}
+
+dokka {
+    moduleName = "Cloudstream"
+}
\ No newline at end of file
diff --git a/fastlane/metadata/android/apc/short_description.txt b/fastlane/metadata/android/apc/short_description.txt
index 7806089478a..a71e8b0f5f5 100644
--- a/fastlane/metadata/android/apc/short_description.txt
+++ b/fastlane/metadata/android/apc/short_description.txt
@@ -1 +1 @@
-عملو ستريم للأفلاف والمسلسلات والأنمي.
+عملو ستريم للأفلام والمسلسلات والأنمي.
diff --git a/fastlane/metadata/android/bg/changelogs/2.txt b/fastlane/metadata/android/bg/changelogs/2.txt
new file mode 100644
index 00000000000..8502a92bfc4
--- /dev/null
+++ b/fastlane/metadata/android/bg/changelogs/2.txt
@@ -0,0 +1 @@
+- Добавен е Changelog!
diff --git a/fastlane/metadata/android/es-AR/changelogs/2.txt b/fastlane/metadata/android/es-AR/changelogs/2.txt
new file mode 100644
index 00000000000..0952cf63e2d
--- /dev/null
+++ b/fastlane/metadata/android/es-AR/changelogs/2.txt
@@ -0,0 +1 @@
+- Changelog añadido!
diff --git a/fastlane/metadata/android/es-AR/short_description.txt b/fastlane/metadata/android/es-AR/short_description.txt
index dffeaf4198b..849ac4afd89 100644
--- a/fastlane/metadata/android/es-AR/short_description.txt
+++ b/fastlane/metadata/android/es-AR/short_description.txt
@@ -1 +1 @@
-Mirá y descarga Películas, Series y Anime
+Mirá y descarga Películas, Series y Anime.
diff --git a/fastlane/metadata/android/es-AR/title.txt b/fastlane/metadata/android/es-AR/title.txt
new file mode 100644
index 00000000000..dde89d58fcf
--- /dev/null
+++ b/fastlane/metadata/android/es-AR/title.txt
@@ -0,0 +1 @@
+CloudStream
diff --git a/fastlane/metadata/android/fa-IR/changelogs/2.txt b/fastlane/metadata/android/fa-IR/changelogs/2.txt
new file mode 100644
index 00000000000..db3556d8c3f
--- /dev/null
+++ b/fastlane/metadata/android/fa-IR/changelogs/2.txt
@@ -0,0 +1 @@
+- تغییرات اضافه شد!
diff --git a/fastlane/metadata/android/fa-IR/full_description.txt b/fastlane/metadata/android/fa-IR/full_description.txt
new file mode 100644
index 00000000000..bba2b8fa808
--- /dev/null
+++ b/fastlane/metadata/android/fa-IR/full_description.txt
@@ -0,0 +1,6 @@
+CloudStream-3 به شما امکان می دهد فیلم ها، سریال های تلویزیونی و انیمه ها را پخش و دانلود کنید.
+این برنامه بدون هیچ گونه تبلیغات و تجزیه و تحلیل ارائه می‌شود و
+از چندین سایت تریلر و فیلم و موارد دیگر پشتیبانی می‌کند به عنوان مثال :
+نشانک‌ها
+دانلود زیرنویس
+پشتیبانی از کروم کست
diff --git a/fastlane/metadata/android/fa-IR/short_description.txt b/fastlane/metadata/android/fa-IR/short_description.txt
new file mode 100644
index 00000000000..bb1da9a981c
--- /dev/null
+++ b/fastlane/metadata/android/fa-IR/short_description.txt
@@ -0,0 +1 @@
+فیلم‌ها، سریال‌های تلویزیونی و انیمه‌ها را پخش و دانلود کنید.
diff --git a/fastlane/metadata/android/fa-IR/title.txt b/fastlane/metadata/android/fa-IR/title.txt
new file mode 100644
index 00000000000..dde89d58fcf
--- /dev/null
+++ b/fastlane/metadata/android/fa-IR/title.txt
@@ -0,0 +1 @@
+CloudStream
diff --git a/fastlane/metadata/android/mk-MK/full_description.txt b/fastlane/metadata/android/mk-MK/full_description.txt
index b49c1683bbb..988078cbaca 100644
--- a/fastlane/metadata/android/mk-MK/full_description.txt
+++ b/fastlane/metadata/android/mk-MK/full_description.txt
@@ -1,8 +1,10 @@
-CloudStream-3 ви дозволува да гледате и превземате филмови, телевизиски серии и аниме. Апликацијата нема реклами и аналитика. Таа поддржува повеќе страници за трејлери, филмови и многу повеќе.
-Апликацијата вклучува:
+CloudStream-3 овозможува пренос и преземање филмови, ТВ-серии и аниме.
 
-Обележувачи (Bookmarks)
+Апликацијата доаѓа без никакви реклами и аналитика и
+поддржува повеќе страници за трејлери и филмови, и повеќе, на пр.
 
-Превземање на преводи
+Обележувачи
+
+Преземања на титлови
 
 Поддршка за Chromecast
diff --git a/fastlane/metadata/android/mk-MK/short_description.txt b/fastlane/metadata/android/mk-MK/short_description.txt
index d2e0d4dd0dc..5b0d86e2325 100644
--- a/fastlane/metadata/android/mk-MK/short_description.txt
+++ b/fastlane/metadata/android/mk-MK/short_description.txt
@@ -1 +1 @@
-Гледање и превземање на филмови, серии и аниме
+Гледај и преземај филмови, ТВ серии и аниме.
diff --git a/fastlane/metadata/android/sk/changelogs/2.txt b/fastlane/metadata/android/sk/changelogs/2.txt
new file mode 100644
index 00000000000..0a6ce499ae7
--- /dev/null
+++ b/fastlane/metadata/android/sk/changelogs/2.txt
@@ -0,0 +1 @@
+- Zoznam zmien pridaný!
diff --git a/fastlane/metadata/android/sk/full_description.txt b/fastlane/metadata/android/sk/full_description.txt
new file mode 100644
index 00000000000..48f73cbff70
--- /dev/null
+++ b/fastlane/metadata/android/sk/full_description.txt
@@ -0,0 +1,10 @@
+CloudStream-3 vám umožní streamovať sťahovať filmy, TV série a Anime.
+
+Aplikácia prichádza bez akýchkoľvek reklám a analýz a
+podporuje viaceré prívesy a filmové stránky a ďalšie, napr.
+
+Aktuality
+
+Prenosy titulkov
+
+Podpora Chromecast
diff --git a/fastlane/metadata/android/sk/short_description.txt b/fastlane/metadata/android/sk/short_description.txt
new file mode 100644
index 00000000000..8fa4c9955cb
--- /dev/null
+++ b/fastlane/metadata/android/sk/short_description.txt
@@ -0,0 +1 @@
+Stream a sťahovanie filmov, televízny seriálov a anime.
diff --git a/fastlane/metadata/android/sk/title.txt b/fastlane/metadata/android/sk/title.txt
new file mode 100644
index 00000000000..dde89d58fcf
--- /dev/null
+++ b/fastlane/metadata/android/sk/title.txt
@@ -0,0 +1 @@
+CloudStream
diff --git a/fastlane/metadata/android/tr-TR/short_description.txt b/fastlane/metadata/android/tr-TR/short_description.txt
index de36b445d49..aad392eccf9 100644
--- a/fastlane/metadata/android/tr-TR/short_description.txt
+++ b/fastlane/metadata/android/tr-TR/short_description.txt
@@ -1 +1 @@
-Film, dizi ve anime akışı yap ve indir.
+Filmleri, TV dizilerini ve animeleri yayınlayın ve indirin.
diff --git a/fastlane/metadata/android/vi/title.txt b/fastlane/metadata/android/vi/title.txt
index 0afff90c8d5..dde89d58fcf 100644
--- a/fastlane/metadata/android/vi/title.txt
+++ b/fastlane/metadata/android/vi/title.txt
@@ -1 +1 @@
-double_tap_seek_time_key2
+CloudStream
diff --git a/gradle.properties b/gradle.properties
index 6a873a6a7d5..80d525834c1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -19,5 +19,11 @@ android.useAndroidX=true
 # android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
-android.nonTransitiveRClass=false
-android.nonFinalResIds=false
\ No newline at end of file
+android.nonTransitiveRClass=true
+
+org.gradle.caching=true
+org.gradle.configuration-cache=true
+
+# Dokka Gradle plugin V1 is deprecated, and will be removed in Dokka version 2.1.0
+org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
+org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
new file mode 100644
index 00000000000..9bb6d0a83be
--- /dev/null
+++ b/gradle/libs.versions.toml
@@ -0,0 +1,118 @@
+[versions]
+acraCore = "5.12.0"
+appcompat = "1.7.0"
+biometric = "1.4.0-alpha02"
+buildkonfigGradlePlugin = "0.15.2"
+coil = "3.1.0"
+colorpicker = "1.1.0"
+conscryptAndroid = "2.5.2"
+constraintlayout = "2.2.0"
+coreKtx = "1.15.0"
+desugar_jdk_libs_nio = "2.1.4"
+dokkaGradlePlugin = "2.0.0"
+espressoCore = "3.6.1"
+fuzzywuzzy = "1.4.0"
+gradle = "8.8.0"
+jacksonModuleKotlin = "2.13.1"
+json = "20250107"
+junit = "4.13.2"
+junitKtx = "1.2.1"
+junitVersion = "1.2.1"
+juniversalchardet = "2.5.0"
+kotlinGradlePluginVersion = "2.1.10"
+kotlinxCoroutinesCore = "1.10.1"
+lifecycleLivedataKtx = "2.8.7"
+lifecycleViewmodelKtx = "2.8.7"
+material = "1.12.0"
+media3 = "1.5.1"
+navigationFragmentKtx = "2.8.6"
+navigationUiKtx = "2.8.6"
+newpipeextractor = "v0.24.4"
+nextlibMedia3 = "0.8.4"
+nicehttp = "0.4.11"
+overlappingpanels = "0.1.5"
+paletteKtx = "1.0.0"
+preferenceKtx = "1.2.1"
+previewseekbarMedia3 = "1.1.1.0"
+qrcodeKotlin = "4.2.0"
+rhino = "1.8.0"
+safefile = "0.0.8"
+shimmer = "0.5.0"
+swiperefreshlayout = "1.1.0"
+tmdbJava = "2.11.0"
+torrentserver = "7861970e038b35cd8c6918384e49caf26903e09e"
+tvprovider = "1.0.0"
+video = "1.0.0"
+workRuntime = "2.10.0"
+workRuntimeKtx = "2.10.0"
+
+jvmTarget = "1.8"
+minSdk = "21"
+compileSdk = "35"
+targetSdk = "35"
+
+[libraries]
+acra-core = { module = "ch.acra:acra-core", version.ref = "acraCore" }
+acra-toast = { module = "ch.acra:acra-toast", version.ref = "acraCore" }
+appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
+biometric = { module = "androidx.biometric:biometric", version.ref = "biometric" }
+buildkonfig-gradle-plugin = { module = "com.codingfeline.buildkonfig:buildkonfig-gradle-plugin", version.ref = "buildkonfigGradlePlugin" }
+coil = { module = "io.coil-kt.coil3:coil", version.ref = "coil" }
+coil-network-okhttp = { module = "io.coil-kt.coil3:coil-network-okhttp", version.ref = "coil" }
+colorpicker = { module = "com.jaredrummler:colorpicker", version.ref = "colorpicker" }
+conscrypt-android = { module = "org.conscrypt:conscrypt-android", version.ref = "conscryptAndroid" }
+constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "constraintlayout" }
+core = { module = "androidx.test:core" }
+core-ktx = { module = "androidx.core:core-ktx", version.ref = "coreKtx" }
+desugar_jdk_libs_nio = { module = "com.android.tools:desugar_jdk_libs_nio", version.ref = "desugar_jdk_libs_nio" }
+dokka-gradle-plugin = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "dokkaGradlePlugin" }
+espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "espressoCore" }
+ext-junit = { module = "androidx.test.ext:junit", version.ref = "junitVersion" }
+fuzzywuzzy = { module = "me.xdrop:fuzzywuzzy", version.ref = "fuzzywuzzy" }
+gradle = { module = "com.android.tools.build:gradle", version.ref = "gradle" }
+jackson-module-kotlin = { module = "com.fasterxml.jackson.module:jackson-module-kotlin", version.ref = "jacksonModuleKotlin" }
+jetbrains-kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlinGradlePluginVersion" }
+json = { module = "org.json:json", version.ref = "json" }
+junit = { module = "junit:junit", version.ref = "junit" }
+junit-ktx = { module = "androidx.test.ext:junit-ktx", version.ref = "junitKtx" }
+juniversalchardet = { module = "com.github.albfernandez:juniversalchardet", version.ref = "juniversalchardet" }
+kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinxCoroutinesCore" }
+lifecycle-livedata-ktx = { module = "androidx.lifecycle:lifecycle-livedata-ktx", version.ref = "lifecycleLivedataKtx" }
+lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "lifecycleViewmodelKtx" }
+material = { module = "com.google.android.material:material", version.ref = "material" }
+media3-cast = { module = "androidx.media3:media3-cast", version.ref = "media3" }
+media3-common = { module = "androidx.media3:media3-common", version.ref = "media3" }
+media3-datasource-okhttp = { module = "androidx.media3:media3-datasource-okhttp", version.ref = "media3" }
+media3-exoplayer = { module = "androidx.media3:media3-exoplayer", version.ref = "media3" }
+media3-exoplayer-dash = { module = "androidx.media3:media3-exoplayer-dash", version.ref = "media3" }
+media3-exoplayer-hls = { module = "androidx.media3:media3-exoplayer-hls", version.ref = "media3" }
+media3-session = { module = "androidx.media3:media3-session", version.ref = "media3" }
+media3-ui = { module = "androidx.media3:media3-ui", version.ref = "media3" }
+navigation-fragment-ktx = { module = "androidx.navigation:navigation-fragment-ktx", version.ref = "navigationFragmentKtx" }
+navigation-ui-ktx = { module = "androidx.navigation:navigation-ui-ktx", version.ref = "navigationUiKtx" }
+newpipeextractor = { module = "com.github.teamnewpipe:NewPipeExtractor", version.ref = "newpipeextractor" }
+nextlib-media3ext = { module = "com.github.anilbeesetti.nextlib:nextlib-media3ext", version.ref = "nextlibMedia3" }
+nextlib-mediainfo = { module = "com.github.anilbeesetti.nextlib:nextlib-mediainfo", version.ref = "nextlibMedia3" }
+nicehttp = { module = "com.github.Blatzar:NiceHttp", version.ref = "nicehttp" }
+overlappingpanels = { module = "com.github.discord:OverlappingPanels", version.ref = "overlappingpanels" }
+palette-ktx = { module = "androidx.palette:palette-ktx", version.ref = "paletteKtx" }
+preference-ktx = { module = "androidx.preference:preference-ktx", version.ref = "preferenceKtx" }
+previewseekbar-media3 = { module = "com.github.rubensousa:previewseekbar-media3", version.ref = "previewseekbarMedia3" }
+qrcode-kotlin = { module = "io.github.g0dkar:qrcode-kotlin", version.ref = "qrcodeKotlin" }
+rhino = { module = "org.mozilla:rhino", version.ref = "rhino" }
+quickjs = { module = "app.cash.quickjs:quickjs-android", version = "0.9.2" }
+safefile = { module = "com.github.LagradOst:SafeFile", version.ref = "safefile" }
+shimmer = { module = "com.facebook.shimmer:shimmer", version.ref = "shimmer" }
+swiperefreshlayout = { module = "androidx.swiperefreshlayout:swiperefreshlayout", version.ref = "swiperefreshlayout" }
+tmdb-java = { module = "com.uwetrottmann.tmdb2:tmdb-java", version.ref = "tmdbJava" }
+torrentserver = { module = "com.github.recloudstream:torrentserver", version.ref = "torrentserver" }
+tvprovider = { module = "androidx.tvprovider:tvprovider", version.ref = "tvprovider" }
+video = { module = "com.google.android.mediahome:video", version.ref = "video" }
+work-runtime = { module = "androidx.work:work-runtime", version.ref = "workRuntime" }
+work-runtime-ktx = { module = "androidx.work:work-runtime-ktx", version.ref = "workRuntimeKtx" }
+
+[plugins]
+
+[bundles]
+media3 = ["media3-cast", "media3-common", "media3-datasource-okhttp", "media3-exoplayer", "media3-exoplayer-dash", "media3-exoplayer-hls", "media3-session", "media3-ui"]
+nextlibMedia3 = ["nextlib-media3ext", "nextlib-mediainfo"]
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 2968a1b2455..1613324bc0b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Fri Apr 30 17:11:15 CEST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
+zipStoreBase=GRADLE_USER_HOME
\ No newline at end of file
diff --git a/jitpack.yml b/jitpack.yml
new file mode 100644
index 00000000000..74d63b9d441
--- /dev/null
+++ b/jitpack.yml
@@ -0,0 +1,2 @@
+jdk:
+  - openjdk17 # Same JDK as github workflow
diff --git a/library/.gitignore b/library/.gitignore
new file mode 100644
index 00000000000..42afabfd2ab
--- /dev/null
+++ b/library/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/library/build.gradle.kts b/library/build.gradle.kts
index 516e1ee9c1c..7a255ff2722 100644
--- a/library/build.gradle.kts
+++ b/library/build.gradle.kts
@@ -1,44 +1,45 @@
 import com.codingfeline.buildkonfig.compiler.FieldSpec
-import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+import org.jetbrains.dokka.gradle.engine.parameters.KotlinPlatform
+import org.jetbrains.dokka.gradle.engine.parameters.VisibilityModifier
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
 
 plugins {
     kotlin("multiplatform")
     id("maven-publish")
     id("com.android.library")
     id("com.codingfeline.buildkonfig")
+    id("org.jetbrains.dokka")
 }
 
+val javaTarget = JvmTarget.fromTarget(libs.versions.jvmTarget.get())
+
 kotlin {
     version = "1.0.0"
     androidTarget()
     jvm()
 
-    @OptIn(ExperimentalKotlinGradlePluginApi::class)
     compilerOptions {
         freeCompilerArgs.add("-Xexpect-actual-classes")
     }
 
     sourceSets {
         commonMain.dependencies {
-            implementation("com.github.Blatzar:NiceHttp:0.4.11") // HTTP Lib
-            implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.13.1") /* JSON Parser
-            ^ Don't Bump Jackson above 2.13.1 , Crashes on Android TV's and FireSticks that have Min API
-            Level 25 or Less. */
-            implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0")
-            implementation("me.xdrop:fuzzywuzzy:1.4.0") // Match extractors
-            implementation("org.mozilla:rhino:1.7.15") // run JavaScript
-            implementation("com.github.teamnewpipe:NewPipeExtractor:fafd471")
+            implementation(libs.nicehttp) // HTTP Lib
+            implementation(libs.jackson.module.kotlin) // JSON Parser
+            implementation(libs.kotlinx.coroutines.core)
+            implementation(libs.fuzzywuzzy) // Match Extractors
+            implementation(libs.rhino) // Run JavaScript
+            implementation(libs.newpipeextractor)
+            implementation(libs.tmdb.java) // TMDB API v3 Wrapper Made with RetroFit
         }
     }
 }
 
-repositories {
-    mavenLocal()
-    maven("https://jitpack.io")
-}
-
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-    kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString()
+tasks.withType<KotlinJvmCompile> {
+    compilerOptions {
+        jvmTarget.set(javaTarget)
+    }
 }
 
 buildkonfig {
@@ -57,22 +58,31 @@ buildkonfig {
 }
 
 android {
-    compileSdk = 34
+    compileSdk = libs.versions.compileSdk.get().toInt()
     sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
 
     defaultConfig {
-        minSdk = 21
-        targetSdk = 33
+        minSdk = libs.versions.minSdk.get().toInt()
     }
 
     // If this is the same com.lagradost.cloudstream3.R stops working
     namespace = "com.lagradost.api"
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.toVersion(javaTarget.target)
+        targetCompatibility = JavaVersion.toVersion(javaTarget.target)
+    }
+
+    @Suppress("UnstableApiUsage")
+    testOptions {
+        targetSdk = libs.versions.targetSdk.get().toInt()
+    }
+
+    lint {
+        targetSdk = libs.versions.targetSdk.get().toInt()
     }
 }
+
 publishing {
     publications {
         withType<MavenPublication> {
@@ -80,3 +90,22 @@ publishing {
         }
     }
 }
+
+dokka {
+    moduleName = "Library"
+    dokkaSourceSets {
+        configureEach {
+            analysisPlatform = KotlinPlatform.AndroidJVM
+            documentedVisibilities(
+                VisibilityModifier.Public,
+                VisibilityModifier.Protected
+            )
+
+            sourceLink {
+                localDirectory = file("..")
+                remoteUrl("https://github.com/recloudstream/cloudstream/tree/master")
+                remoteLineSuffix = "#L"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/library/src/androidMain/kotlin/com/lagradost/api/ContextHelper.android.kt b/library/src/androidMain/kotlin/com/lagradost/api/ContextHelper.android.kt
index a8472fea3d6..5e5897deb2d 100644
--- a/library/src/androidMain/kotlin/com/lagradost/api/ContextHelper.android.kt
+++ b/library/src/androidMain/kotlin/com/lagradost/api/ContextHelper.android.kt
@@ -14,7 +14,8 @@ actual fun getContext(): Any? {
 }
 
 actual fun setContext(context: WeakReference<Any>) {
-    if (context.get() is Context) {
-        ctx = context as? WeakReference<Context>
+    val actualContext = context.get() as? Context
+    if (actualContext != null) {
+        ctx = WeakReference(actualContext)
     }
 }
\ No newline at end of file
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt
index aa08cb592e3..b632e406505 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt
@@ -1,3 +1,9 @@
+@file:Suppress(
+    "UNUSED",
+    "UnusedReceiverParameter",
+    "MemberVisibilityCanBePrivate"
+)
+
 package com.lagradost.cloudstream3
 
 import com.fasterxml.jackson.annotation.JsonProperty
@@ -23,6 +29,11 @@ import kotlin.io.encoding.Base64
 import kotlin.io.encoding.ExperimentalEncodingApi
 import kotlin.math.absoluteValue
 
+/** Api has not yet been published to stable, and will cause `NoSuchMethodException` on stable */
+@MustBeDocumented // Same as java.lang.annotation.Documented
+@Retention(AnnotationRetention.SOURCE) // This is only an IDE hint, and will not be used in the runtime
+annotation class Prerelease
+
 /**
  * Defines the constant for the all languages preference, if this is set then it is
  * the equivalent of all languages being set
@@ -44,8 +55,6 @@ object APIHolder {
     val unixTimeMS: Long
         get() = System.currentTimeMillis()
 
-    private const val defProvider = 0
-
     // ConcurrentModificationException is possible!!!
     val allProviders = threadSafeListOf<MainAPI>()
 
@@ -58,6 +67,7 @@ object APIHolder {
         apiMap = null
     }
 
+    /** String extension function to Capitalize first char of string.*/
     fun String.capitalize(): String {
         return this.replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else it.toString() }
     }
@@ -220,6 +230,10 @@ object APIHolder {
         }
     }
 
+    /** Searches Anilist using title.
+     * @param title Title string of the show
+     * @return [AniSearch] data class holds search info.
+     * */
     private suspend fun searchAnilist(
         title: String?,
     ): AniSearch? {
@@ -351,15 +365,23 @@ data class MainPageRequest(
     //TODO genre selection or smth
 )
 
+/** Create [MainPageData] from url, name Strings & layout (Horizontal/Vertical) Boolean.
+ * @param url page Url string.
+ * @param name page Name string.
+ * @param horizontalImages Boolean to control item card layout.
+ * */
 fun mainPage(url: String, name: String, horizontalImages: Boolean = false): MainPageData {
     return MainPageData(name = name, data = url, horizontalImages = horizontalImages)
 }
 
+/** return list of MainPageData with url to name, make for more readable code
+ * @param elements parameter of [MainPageData] class of data*/
 fun mainPageOf(vararg elements: MainPageData): List<MainPageData> {
     return elements.toList()
 }
 
-/** return list of MainPageData with url to name, make for more readable code */
+/** return list of MainPageData with url to name, make for more readable code
+ * @param elements parameter of <String, String> map of url and name */
 fun mainPageOf(vararg elements: Pair<String, String>): List<MainPageData> {
     return elements.map { (url, name) -> MainPageData(name = name, data = url) }
 }
@@ -369,6 +391,7 @@ fun newHomePageResponse(
     list: List<SearchResponse>,
     hasNext: Boolean? = null,
 ): HomePageResponse {
+    @Suppress("DEPRECATION")
     return HomePageResponse(
         listOf(HomePageList(name, list)),
         hasNext = hasNext ?: list.isNotEmpty()
@@ -380,6 +403,7 @@ fun newHomePageResponse(
     list: List<SearchResponse>,
     hasNext: Boolean? = null,
 ): HomePageResponse {
+    @Suppress("DEPRECATION")
     return HomePageResponse(
         listOf(HomePageList(data.name, list, data.horizontalImages)),
         hasNext = hasNext ?: list.isNotEmpty()
@@ -387,10 +411,12 @@ fun newHomePageResponse(
 }
 
 fun newHomePageResponse(list: HomePageList, hasNext: Boolean? = null): HomePageResponse {
+    @Suppress("DEPRECATION")
     return HomePageResponse(listOf(list), hasNext = hasNext ?: list.list.isNotEmpty())
 }
 
 fun newHomePageResponse(list: List<HomePageList>, hasNext: Boolean? = null): HomePageResponse {
+    @Suppress("DEPRECATION")
     return HomePageResponse(list, hasNext = hasNext ?: list.any { it.list.isNotEmpty() })
 }
 
@@ -415,7 +441,10 @@ abstract class MainAPI {
         this.storedCredentials = data.credentials
     }
 
+    /** Name of the plugin that will used in UI */
     open var name = "NONE"
+
+    /** Main Url of the plugin that can be used directly in code or to be replaced using Clone site feature in settings */
     open var mainUrl = "NONE"
     open var storedCredentials: String? = null
     open var canBeOverridden: Boolean = true
@@ -523,7 +552,14 @@ abstract class MainAPI {
         throw NotImplementedError()
     }
 
-    /**Callback is fired once a link is found, will return true if method is executed successfully*/
+    /**Callback is fired once a link is found, will return true if method is executed successfully
+     * @param data dataUrl string returned from [load] function.
+     * @see newMovieLoadResponse
+     * @see newTvSeriesLoadResponse
+     * @see newLiveStreamLoadResponse
+     * @see newAnimeLoadResponse
+     * @see newTorrentLoadResponse
+     * */
     // @WorkerThread
     open suspend fun loadLinks(
         data: String,
@@ -552,10 +588,12 @@ abstract class MainAPI {
 fun base64Decode(string: String): String {
     return String(base64DecodeArray(string), Charsets.ISO_8859_1)
 }
+
 @OptIn(ExperimentalEncodingApi::class)
 fun base64DecodeArray(string: String): ByteArray {
     return Base64.decode(string)
 }
+
 @OptIn(ExperimentalEncodingApi::class)
 fun base64Encode(array: ByteArray): String {
     return Base64.encode(array)
@@ -570,8 +608,8 @@ fun MainAPI.fixUrlNull(url: String?): String? {
 
 fun MainAPI.fixUrl(url: String): String {
     if (url.startsWith("http") ||
-        // Do not fix JSON objects when passed as urls.
-        url.startsWith("{\"")
+        // Do not fix JSON objects and arrays when passed as urls.
+        url.startsWith("{\"") || url.startsWith("[")
     ) {
         return url
     }
@@ -590,14 +628,27 @@ fun MainAPI.fixUrl(url: String): String {
     }
 }
 
+/** Sort the urls based on quality
+ * @param urls Set of [ExtractorLink]
+ * */
 fun sortUrls(urls: Set<ExtractorLink>): List<ExtractorLink> {
     return urls.sortedBy { t -> -t.quality }
 }
 
+/** Capitalize the first letter of string.
+ * @param str String to be capitalized
+ * @return non-nullable String
+ * @see capitalizeStringNullable
+ * */
 fun capitalizeString(str: String): String {
     return capitalizeStringNullable(str) ?: str
 }
 
+/** Capitalize the first letter of string.
+ * @param str String to be capitalized
+ * @return nullable String
+ * @see capitalizeString
+ * */
 fun capitalizeStringNullable(str: String?): String? {
     if (str == null)
         return null
@@ -617,43 +668,59 @@ fun fixTitle(str: String): String {
 
 /**
  * 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()
+ *
  * Use like the following: rhino.evaluateString(scope, js, "JavaScript", 1, null)
  **/
 suspend fun getRhinoContext(): org.mozilla.javascript.Context {
     return Coroutines.mainWork {
         val rhino = org.mozilla.javascript.Context.enter()
         rhino.initSafeStandardObjects()
-        rhino.optimizationLevel = -1
+        rhino.setInterpretedMode(true)
         rhino
     }
 }
 
-/** https://www.imdb.com/title/tt2861424/ -> tt2861424 */
+/** https://www.imdb.com/title/tt2861424/ -> tt2861424
+ * @param url Imdb Url you need to get the Id from.
+ * @return imdb id formatted string
+ * @see imdbUrlToIdNullable
+ * */
 fun imdbUrlToId(url: String): String? {
     return Regex("/title/(tt[0-9]*)").find(url)?.groupValues?.get(1)
         ?: Regex("tt[0-9]{5,}").find(url)?.groupValues?.get(0)
 }
 
+/** https://www.imdb.com/title/tt2861424/ -> tt2861424
+ * @param url Imdb Url you need to get the Id from.
+ * @return imdb id formatted nullable string
+ * @see imdbUrlToId
+ * */
 fun imdbUrlToIdNullable(url: String?): String? {
     if (url == null) return null
     return imdbUrlToId(url)
 }
 
+/** enum class determines provider type:
+ *
+ * MetaProvider: When data is fetched from a 3rd party site like imdb
+ *
+ * DirectProvider: When all data is from the site
+ * */
 enum class ProviderType {
-    // When data is fetched from a 3rd party site like imdb
     MetaProvider,
-
-    // When all data is from the site
     DirectProvider,
 }
 
+/** enum class determines VPN status (Non, MightBeNeeded or Torrent) */
 enum class VPNStatus {
     None,
     MightBeNeeded,
     Torrent,
 }
 
+/** enum class determines Show status (Completed or Ongoing) */
 enum class ShowStatus {
     Completed,
     Ongoing,
@@ -665,6 +732,7 @@ enum class DubStatus(val id: Int) {
     Subbed(0),
 }
 
+@Suppress("UNUSED_PARAMETER")
 enum class TvType(value: Int?) {
     Movie(1),
     AnimeMovie(2),
@@ -681,52 +749,100 @@ enum class TvType(value: Int?) {
     Music(13),
     AudioBook(14),
 
-    /** Wont load the built in player, make your own interaction */
+    /** Won't load the built in player, make your own interaction */
     CustomMedia(15),
+
+    Audio(16),
+    Podcast(17),
 }
 
-public enum class AutoDownloadMode(val value: Int) {
+enum class AutoDownloadMode(val value: Int) {
     Disable(0),
     FilterByLang(1),
     All(2),
-    NsfwOnly(3)
-    ;
+    NsfwOnly(3);
 
     companion object {
         infix fun getEnum(value: Int): AutoDownloadMode? =
-            AutoDownloadMode.values().firstOrNull { it.value == value }
+            entries.firstOrNull { it.value == value }
     }
 }
 
-// IN CASE OF FUTURE ANIME MOVIE OR SMTH
+/** Extension function of [TvType] to check if the type is Movie.
+ * @return If the type is AnimeMovie, Live, Movie, Torrent returns true otherwise returns false.
+ * */
 fun TvType.isMovieType(): Boolean {
-    return this == TvType.Movie || this == TvType.AnimeMovie || this == TvType.Torrent || this == TvType.Live
+    return when (this) {
+        TvType.AnimeMovie,
+        TvType.Live,
+        TvType.Movie,
+        TvType.Torrent -> true
+
+        else -> false
+    }
 }
 
+/** Extension function of [TvType] to check if the type is Audio.
+ * @return If the type is Audio, AudioBook, Music, PodCast returns true otherwise returns false.
+ * */
+fun TvType.isAudioType(): Boolean {
+    return when (this) {
+        TvType.Audio,
+        TvType.AudioBook,
+        TvType.Music,
+        TvType.Podcast -> true
+
+        else -> false
+    }
+}
+
+/** Extension function of [TvType] to check if the type is Live stream.
+ * @return If the type is Live returns true, otherwise returns false.
+ * */
 fun TvType.isLiveStream(): Boolean {
     return this == TvType.Live
 }
 
-// returns if the type has an anime opening
+/** Extension function of [TvType] to check if the type has an Anime opening.
+ * @return If the type is Anime or OVA returns true otherwise returns false.
+ * */
 fun TvType.isAnimeOp(): Boolean {
     return this == TvType.Anime || this == TvType.OVA
 }
 
+/** Data class for the Subtitle file info.
+ * @property lang Subtitle file language.
+ * @property url Subtitle file url to download/load the file.
+ * */
 data class SubtitleFile(val lang: String, val url: String)
 
-data class HomePageResponse(
+/** Data class for the Homepage response info.
+ * @property items List of [HomePageList] items.
+ * @property hasNext if there is a next page or not.
+ * */
+data class HomePageResponse
+@Deprecated("Use newHomePageResponse method", level = DeprecationLevel.WARNING)
+constructor(
     val items: List<HomePageList>,
     val hasNext: Boolean = false
 )
 
+/** Data class for the Homepage list info.
+ * @property name name of the category shows on homepage UI.
+ * @property list list of [SearchResponse] items that will be added to the category.
+ * @property isHorizontalImages here you can control how the items' cards will be appeared on the UI (Horizontal or Vertical) cards.
+ * */
 data class HomePageList(
     val name: String,
     var list: List<SearchResponse>,
     val isHorizontalImages: Boolean = false
 )
 
+/** enum class holds search quality.
+ *
+ * [Movie release types](https://en.wikipedia.org/wiki/Pirated_movie_release_types)**/
+@Suppress("UNUSED_PARAMETER")
 enum class SearchQuality(value: Int?) {
-    //https://en.wikipedia.org/wiki/Pirated_movie_release_types
     Cam(1),
     CamRip(2),
     HdCam(3),
@@ -745,8 +861,11 @@ enum class SearchQuality(value: Int?) {
     WebRip(16)
 }
 
-/**Add anything to here if you find a site that uses some specific naming convention*/
+/** Returns [SearchQuality] from String.
+ * @param string String text that will be converted into [SearchQuality].
+ * */
 fun getQualityFromString(string: String?): SearchQuality? {
+    //Add anything to here if you find a site that uses some specific naming convention
     val check = (string ?: return null).trim().lowercase().replace(" ", "")
 
     return when (check) {
@@ -790,6 +909,42 @@ fun getQualityFromString(string: String?): SearchQuality? {
     }
 }
 
+
+/**
+ * For APIs using the mainUrl in the prefix for `MainAPI::load`,
+ * this function replaces the `scheme`, `host` and `port` from an old link to the new mainUrl.
+ *
+ * https://en.wikipedia.org/wiki/Uniform_Resource_Identifier
+ * ```text
+ *           userinfo       host      port
+ *           ┌──┴───┐ ┌──────┴──────┐ ┌┴─┐
+ *   https://john.doe@www.example.com:1234/forum/questions/?tag=networking&order=newest#:~:text=whatever
+ *   └─┬─┘   └─────────────┬─────────────┘└───────┬───────┘ └────────────┬────────────┘ └───────┬───────┘
+ *   scheme            authority                path                   query                 fragment
+ * ```
+ */
+fun MainAPI.updateUrl(url: String): String {
+    try {
+        val original = URI(url)
+        val updated = URI(mainUrl)
+
+        // URI(String scheme, String userInfo, String host, int port, String path, String query, String fragment)
+        return URI(
+            updated.scheme,
+            original.userInfo,
+            updated.host,
+            updated.port,
+            original.path,
+            original.query,
+            original.fragment
+        ).toString()
+    } catch (t: Throwable) {
+        logError(t)
+        return url
+    }
+}
+
+/** Abstract interface of SearchResponse. */
 interface SearchResponse {
     val name: String
     val url: String
@@ -801,6 +956,26 @@ interface SearchResponse {
     var quality: SearchQuality?
 }
 
+fun MainAPI.newTorrentSearchResponse(
+    name: String,
+    url: String,
+    type: TvType = TvType.Torrent,
+    fix: Boolean = true,
+    initializer: TorrentSearchResponse.() -> Unit = { },
+): TorrentSearchResponse {
+    @Suppress("DEPRECATION")
+    val builder = TorrentSearchResponse(
+        name = name,
+        url = if (fix) fixUrl(url) else url,
+        apiName = this.name,
+        type = type,
+        // The initializer will handle this
+        posterUrl = null
+    )
+    builder.initializer()
+    return builder
+}
+
 fun MainAPI.newMovieSearchResponse(
     name: String,
     url: String,
@@ -808,12 +983,31 @@ fun MainAPI.newMovieSearchResponse(
     fix: Boolean = true,
     initializer: MovieSearchResponse.() -> Unit = { },
 ): MovieSearchResponse {
+    @Suppress("DEPRECATION")
     val builder = MovieSearchResponse(name, if (fix) fixUrl(url) else url, this.name, type)
     builder.initializer()
 
     return builder
 }
 
+fun MainAPI.newLiveSearchResponse(
+    name: String,
+    url: String,
+    type: TvType = TvType.Live,
+    fix: Boolean = true,
+    initializer: LiveSearchResponse.() -> Unit = { },
+): LiveSearchResponse {
+    @Suppress("DEPRECATION")
+    val builder = LiveSearchResponse(
+        name = name,
+        url = if (fix) fixUrl(url) else url,
+        apiName = this.name,
+        type = type
+    )
+    builder.initializer()
+    return builder
+}
+
 fun MainAPI.newTvSeriesSearchResponse(
     name: String,
     url: String,
@@ -821,13 +1015,13 @@ fun MainAPI.newTvSeriesSearchResponse(
     fix: Boolean = true,
     initializer: TvSeriesSearchResponse.() -> Unit = { },
 ): TvSeriesSearchResponse {
+    @Suppress("DEPRECATION")
     val builder = TvSeriesSearchResponse(name, if (fix) fixUrl(url) else url, this.name, type)
     builder.initializer()
 
     return builder
 }
 
-
 fun MainAPI.newAnimeSearchResponse(
     name: String,
     url: String,
@@ -835,37 +1029,60 @@ fun MainAPI.newAnimeSearchResponse(
     fix: Boolean = true,
     initializer: AnimeSearchResponse.() -> Unit = { },
 ): AnimeSearchResponse {
+    @Suppress("DEPRECATION")
     val builder = AnimeSearchResponse(name, if (fix) fixUrl(url) else url, this.name, type)
     builder.initializer()
 
     return builder
 }
 
+/** Extension function that adds quality to [SearchResponse]
+ * @param quality as string
+ * */
 fun SearchResponse.addQuality(quality: String) {
     this.quality = getQualityFromString(quality)
 }
 
+/** Extension function that adds poster to [SearchResponse]
+ * @param url nullable string for poster url
+ * @param headers Optional <String, String> map of request headers
+ * */
 fun SearchResponse.addPoster(url: String?, headers: Map<String, String>? = null) {
     this.posterUrl = url
     this.posterHeaders = headers
 }
 
+/** Extension function that adds poster to [LoadResponse]
+ * @param url nullable string for poster url
+ * @param headers Optional <String, String> map of request headers
+ * */
 fun LoadResponse.addPoster(url: String?, headers: Map<String, String>? = null) {
     this.posterUrl = url
     this.posterHeaders = headers
 }
 
+/** enum class of Actor roles (Main, Supporting, Background).*/
 enum class ActorRole {
     Main,
     Supporting,
     Background,
 }
 
+/** Data class hold Actor personal information
+ * @property name Actor name.
+ * @property image Url nullable String to Actor image (Optional).
+ * */
 data class Actor(
     val name: String,
     val image: String? = null,
 )
 
+/** Data class hold Actor information
+ * @property actor [Actor] personal info, name & image.
+ * @property role [ActorRole] (Optional).
+ * @property roleString Actor role as a string (Optional).
+ * @property voiceActor Voice [Actor] personal info, can be used in case of Animation for voice actors. (Optional).
+ * */
 data class ActorData(
     val actor: Actor,
     val role: ActorRole? = null,
@@ -873,7 +1090,12 @@ data class ActorData(
     val voiceActor: Actor? = null,
 )
 
-data class AnimeSearchResponse(
+/** Data class of [SearchResponse] interface for Anime.
+ * @see newAnimeSearchResponse
+ * */
+data class AnimeSearchResponse
+@Deprecated("Use newAnimeSearchResponse", level = DeprecationLevel.WARNING)
+constructor(
     override val name: String,
     override val url: String,
     override val apiName: String,
@@ -933,7 +1155,12 @@ fun AnimeSearchResponse.addDubStatus(status: String, episodes: Int? = null) {
     }
 }
 
-data class TorrentSearchResponse(
+/** Data class of [SearchResponse] interface for Torrent.
+ * @see newTorrentSearchResponse
+ * */
+data class TorrentSearchResponse
+@Deprecated("Use newTorrentSearchResponse", level = DeprecationLevel.WARNING)
+constructor(
     override val name: String,
     override val url: String,
     override val apiName: String,
@@ -945,7 +1172,12 @@ data class TorrentSearchResponse(
     override var posterHeaders: Map<String, String>? = null,
 ) : SearchResponse
 
-data class MovieSearchResponse(
+/** Data class of [SearchResponse] interface for Movies.
+ * @see newMovieSearchResponse
+ * */
+data class MovieSearchResponse
+@Deprecated("Use newMovieSearchResponse", level = DeprecationLevel.WARNING)
+constructor(
     override val name: String,
     override val url: String,
     override val apiName: String,
@@ -955,10 +1187,15 @@ data class MovieSearchResponse(
     var year: Int? = null,
     override var id: Int? = null,
     override var quality: SearchQuality? = null,
-    override var posterHeaders: Map<String, String>? = null,
+    override var posterHeaders: Map<String, String>? = null
 ) : SearchResponse
 
-data class LiveSearchResponse(
+/** Data class of [SearchResponse] interface for Live streams.
+ * @see newLiveSearchResponse
+ * */
+data class LiveSearchResponse
+@Deprecated("Use newLiveSearchResponse", level = DeprecationLevel.WARNING)
+constructor(
     override val name: String,
     override val url: String,
     override val apiName: String,
@@ -968,31 +1205,62 @@ data class LiveSearchResponse(
     override var id: Int? = null,
     override var quality: SearchQuality? = null,
     override var posterHeaders: Map<String, String>? = null,
-    val lang: String? = null,
+    var lang: String? = null,
 ) : SearchResponse
 
-data class TvSeriesSearchResponse(
+/** Data class of [SearchResponse] interface for Tv series.
+ * @see newTvSeriesSearchResponse
+ * */
+data class TvSeriesSearchResponse
+@Deprecated("Use newTvSeriesSearchResponse", level = DeprecationLevel.WARNING)
+constructor(
     override val name: String,
     override val url: String,
     override val apiName: String,
     override var type: TvType? = null,
 
     override var posterUrl: String? = null,
-    val year: Int? = null,
-    val episodes: Int? = null,
+    var year: Int? = null,
+    var episodes: Int? = null,
     override var id: Int? = null,
     override var quality: SearchQuality? = null,
     override var posterHeaders: Map<String, String>? = null,
 ) : SearchResponse
 
+/** Data class of Trailer data.
+ * @property extractorUrl Url string of the Trailer video.
+ * @property referer Nullable string of referer to be used in network request.
+ * @property raw determines if [extractorUrl] should be used as direct Trailer video link instead of extracting it.
+ * */
 data class TrailerData(
     val extractorUrl: String,
     val referer: String?,
     val raw: Boolean,
-    //var mirros: List<ExtractorLink>,
-    //var subtitles: List<SubtitleFile> = emptyList(),
+    val headers: Map<String, String> = mapOf(),
+    // var mirrors: List<ExtractorLink>,
+    // var subtitles: List<SubtitleFile> = emptyList(),
 )
 
+/** Abstract interface of LoadResponse responses
+ * @property name Title of the media, appears on result page.
+ * @property url Url of the media.
+ * @property apiName Plugin name, appears on result page.
+ * @property type [TvType] of the media .
+ * @property posterUrl Url of the media poster, appears on Top of result page.
+ * @property year Year of the media, appears on result page.
+ * @property plot Plot of the media, appears on result page.
+ * @property rating Rating of the media, appears on result page (0-10000).
+ * @property tags Tags of the media, appears on result page.
+ * @property duration duration of the media, appears on result page.
+ * @property trailers list of the media [TrailerData], used to load trailers.
+ * @property recommendations list of the [SearchResponse] related to media, appears on result page.
+ * @property actors list of the [ActorData] casted in the media, appears on result page.
+ * @property comingSoon determines if the media is released or coming soon.
+ * @property syncData Online sync services compatible with the media.
+ * @property posterHeaders headers map used by network request to get the poster.
+ * @property backgroundPosterUrl Url of the media background poster.
+ * @property contentRating content rating of the media, appears on result page.
+ * */
 interface LoadResponse {
     var name: String
     var url: String
@@ -1110,7 +1378,8 @@ interface LoadResponse {
             addImdbId(imdbUrlToIdNullable(url))
         }
 
-        /**better to call addTrailer with mutible trailers directly instead of calling this multiple times*/
+        /**better to call addTrailer with multiple trailers directly instead of calling this multiple times*/
+        @Suppress("RedundantSuspendModifier")
         suspend fun LoadResponse.addTrailer(
             trailerUrl: String?,
             referer: String? = null,
@@ -1150,6 +1419,18 @@ interface LoadResponse {
             trailers.addAll(newTrailers.map { TrailerData(listOf(it)) })
         }*/
 
+        @Suppress("RedundantSuspendModifier")
+        suspend fun LoadResponse.addTrailer(
+            trailerUrl: String?,
+            referer: String? = null,
+            addRaw: Boolean = false,
+            headers: Map<String, String> = mapOf()
+        ) {
+            if (!isTrailersEnabled || trailerUrl.isNullOrBlank()) return
+            this.trailers.add(TrailerData(trailerUrl, referer, addRaw, headers))
+        }
+
+        @Suppress("RedundantSuspendModifier")
         suspend fun LoadResponse.addTrailer(
             trailerUrls: List<String>?,
             referer: String? = null,
@@ -1188,10 +1469,12 @@ interface LoadResponse {
             this.addSimklId(SimklSyncServices.Imdb, id)
         }
 
+        @Suppress("UNUSED_PARAMETER")
         fun LoadResponse.addTrackId(id: String?) {
             // TODO add trackt sync
         }
 
+        @Suppress("UNUSED_PARAMETER")
         fun LoadResponse.addkitsuId(id: String?) {
             // TODO add kitsu sync
         }
@@ -1224,10 +1507,10 @@ fun getDurationFromString(input: String?): Int? {
     Regex("(\\d+\\shr)|(\\d+\\shour)|(\\d+\\smin)|(\\d+\\ssec)").findAll(input).let { values ->
         var seconds = 0
         values.forEach {
-            val time_text = it.value
-            if (time_text.isNotBlank()) {
-                val time = time_text.filter { s -> s.isDigit() }.trim().toInt()
-                val scale = time_text.filter { s -> !s.isDigit() }.trim()
+            val timeText = it.value
+            if (timeText.isNotBlank()) {
+                val time = timeText.filter { s -> s.isDigit() }.trim().toInt()
+                val scale = timeText.filter { s -> !s.isDigit() }.trim()
                 //println("Scale: $scale")
                 val timeval = when (scale) {
                     "hr", "hour" -> time * 60 * 60
@@ -1253,30 +1536,88 @@ fun getDurationFromString(input: String?): Int? {
     }
     Regex("([0-9]*)m").find(cleanInput)?.groupValues?.let { values ->
         if (values.size == 2) {
-            val return_value = values[1].toIntOrNull()
-            if (return_value != null) {
-                return return_value
+            val returnValue = values[1].toIntOrNull()
+            if (returnValue != null) {
+                return returnValue
             }
         }
     }
     return null
 }
 
+/** Extension function of [LoadResponse] to check if it's Episode based.
+ * @return True if the response is [EpisodeResponse] and its type is Episode based.
+ * */
 fun LoadResponse?.isEpisodeBased(): Boolean {
     if (this == null) return false
     return this is EpisodeResponse && this.type.isEpisodeBased()
 }
 
+/** Extension function of [LoadResponse] to check if it's Anime based.
+ * @return True if the response type is Anime or OVA.
+ * @see TvType
+ * */
 fun LoadResponse?.isAnimeBased(): Boolean {
     if (this == null) return false
     return (this.type == TvType.Anime || this.type == TvType.OVA) // && (this is AnimeLoadResponse)
 }
 
+/**
+ * Extension function to determine if the [TvType] is episode-based.
+ * This function checks if the type corresponds to an episode-based format. Episode-based types will be placed
+ * in subfolders that include the sanitized title name. This check is used for other logic as well.
+ *
+ * @return true if the [TvType] is episode-based, otherwise false.
+ */
 fun TvType?.isEpisodeBased(): Boolean {
-    if (this == null) return false
-    return (this == TvType.TvSeries || this == TvType.Anime || this == TvType.AsianDrama)
+    return when (this) {
+        TvType.Anime,
+        TvType.AsianDrama,
+        TvType.Cartoon,
+        TvType.TvSeries -> true
+
+        else -> false
+    }
 }
 
+/**
+ * Extension function to get the folder prefix based on the [TvType].
+ * Non-episode-based types will return a base folder name, while episode-based types will
+ * have their files placed in subfolders using a sanitized title name.
+ *
+ * For the actual folder path, refer to `ResultViewModel2().getFolder()`, which combines
+ * the folder prefix and, if necessary, the sanitized name to a sub-folder. The folder prefix
+ * will be used in the root directory of the configured downloads directory.
+ *
+ * @return the folder prefix corresponding to the [TvType], which is used as the root directory.
+ */
+fun TvType.getFolderPrefix(): String {
+    return when (this) {
+        TvType.Anime -> "Anime"
+        TvType.AnimeMovie -> "Movies"
+        TvType.AsianDrama -> "AsianDramas"
+        TvType.Audio -> "Audio"
+        TvType.AudioBook -> "AudioBooks"
+        TvType.Cartoon -> "Cartoons"
+        TvType.CustomMedia -> "Media"
+        TvType.Documentary -> "Documentaries"
+        TvType.Live -> "LiveStreams"
+        TvType.Movie -> "Movies"
+        TvType.Music -> "Music"
+        TvType.NSFW -> "NSFW"
+        TvType.OVA -> "OVAs"
+        TvType.Others -> "Others"
+        TvType.Podcast -> "Podcasts"
+        TvType.Torrent -> "Torrents"
+        TvType.TvSeries -> "TVSeries"
+    }
+}
+
+/** Data class holds next airing Episode info.
+ * @param episode Next airing Episode number.
+ * @param unixTime Next airing Time in Unix time format.
+ * @param season Season number of next airing episode (Optional).
+ * */
 data class NextAiring(
     val episode: Int,
     val unixTime: Long,
@@ -1296,7 +1637,7 @@ data class NextAiring(
     )
 }
 
-/**
+/** Data class holds season info.
  * @param season To be mapped with episode season, not shown in UI if displaySeason is defined
  * @param name To be shown next to the season like "Season $displaySeason $name" but if displaySeason is null then "$name"
  * @param displaySeason What to be displayed next to the season name, if null then the name is the only thing shown.
@@ -1307,6 +1648,7 @@ data class SeasonData(
     val displaySeason: Int? = null, // will use season if null
 )
 
+/** Abstract interface of EpisodeResponse */
 interface EpisodeResponse {
     var showStatus: ShowStatus?
     var nextAiring: NextAiring?
@@ -1338,7 +1680,12 @@ fun EpisodeResponse.addSeasonNames(names: List<SeasonData>) {
     this.seasonNames = names.ifEmpty { null }
 }
 
-data class TorrentLoadResponse(
+/** Data class of [LoadResponse] interface for Torrent.
+ * @see newTorrentLoadResponse
+ */
+data class TorrentLoadResponse
+@Deprecated("Use newTorrentLoadResponse method", level = DeprecationLevel.WARNING)
+constructor(
     override var name: String,
     override var url: String,
     override var apiName: String,
@@ -1364,6 +1711,11 @@ data class TorrentLoadResponse(
      * Secondary constructor for backwards compatibility without contentRating.
      * Remove this constructor after there is a new stable release and extensions are updated to support contentRating.
      */
+    @Suppress("DEPRECATION")
+    @Deprecated(
+        "Use newTorrentLoadResponse method with contentRating included",
+        level = DeprecationLevel.WARNING
+    )
     constructor(
         name: String,
         url: String,
@@ -1408,7 +1760,34 @@ data class TorrentLoadResponse(
     )
 }
 
-data class AnimeLoadResponse(
+suspend fun MainAPI.newTorrentLoadResponse(
+    name: String,
+    url: String,
+    magnet: String? = null,
+    torrent: String? = null,
+    initializer: suspend TorrentLoadResponse.() -> Unit = { }
+): TorrentLoadResponse {
+    @Suppress("DEPRECATION")
+    val builder = TorrentLoadResponse(
+        name = name,
+        url = url,
+        apiName = this.name,
+        magnet = magnet,
+        torrent = torrent,
+        // The initializer will handle this
+        plot = null,
+        comingSoon = magnet.isNullOrBlank() && torrent.isNullOrBlank()
+    )
+    builder.initializer()
+    return builder
+}
+
+/** Data class of [LoadResponse] interface for Anime.
+ * @see newAnimeLoadResponse
+ * */
+data class AnimeLoadResponse
+@Deprecated("Use newAnimeLoadResponse method", level = DeprecationLevel.WARNING)
+constructor(
     var engName: String? = null,
     var japName: String? = null,
     override var name: String,
@@ -1468,6 +1847,11 @@ data class AnimeLoadResponse(
      * Secondary constructor for backwards compatibility without contentRating.
      * Remove this constructor after there is a new stable release and extensions are updated to support contentRating.
      */
+    @Suppress("DEPRECATION")
+    @Deprecated(
+        "Use newAnimeLoadResponse method with contentRating included",
+        level = DeprecationLevel.WARNING
+    )
     constructor(
         engName: String? = null,
         japName: String? = null,
@@ -1537,6 +1921,7 @@ suspend fun MainAPI.newAnimeLoadResponse(
     comingSoonIfNone: Boolean = true,
     initializer: suspend AnimeLoadResponse.() -> Unit = { },
 ): AnimeLoadResponse {
+    @Suppress("DEPRECATION")
     val builder = AnimeLoadResponse(name = name, url = url, apiName = this.name, type = type)
     builder.initializer()
     if (comingSoonIfNone) {
@@ -1550,7 +1935,12 @@ suspend fun MainAPI.newAnimeLoadResponse(
     return builder
 }
 
-data class LiveStreamLoadResponse(
+/** Data class of [LoadResponse] interface for Live streams.
+ * @see newLiveStreamLoadResponse
+ * */
+data class LiveStreamLoadResponse
+@Deprecated("Use newLiveStreamLoadResponse method", level = DeprecationLevel.WARNING)
+constructor(
     override var name: String,
     override var url: String,
     override var apiName: String,
@@ -1577,6 +1967,11 @@ data class LiveStreamLoadResponse(
      * Secondary constructor for backwards compatibility without contentRating.
      * Remove this constructor after there is a new stable release and extensions are updated to support contentRating.
      */
+    @Suppress("DEPRECATION")
+    @Deprecated(
+        "Use newLiveStreamLoadResponse method with contentRating included",
+        level = DeprecationLevel.WARNING
+    )
     constructor(
         name: String,
         url: String,
@@ -1602,7 +1997,30 @@ data class LiveStreamLoadResponse(
     )
 }
 
-data class MovieLoadResponse(
+suspend fun MainAPI.newLiveStreamLoadResponse(
+    name: String,
+    url: String,
+    dataUrl: String,
+    initializer: suspend LiveStreamLoadResponse.() -> Unit = { }
+): LiveStreamLoadResponse {
+    @Suppress("DEPRECATION")
+    val builder = LiveStreamLoadResponse(
+        name = name,
+        url = url,
+        apiName = this.name,
+        dataUrl = dataUrl,
+        comingSoon = dataUrl.isBlank()
+    )
+    builder.initializer()
+    return builder
+}
+
+/** Data class of [LoadResponse] interface for Movies.
+ * @see newMovieLoadResponse
+ * */
+data class MovieLoadResponse
+@Deprecated("Use newMovieLoadResponse method", level = DeprecationLevel.WARNING)
+constructor(
     override var name: String,
     override var url: String,
     override var apiName: String,
@@ -1629,6 +2047,11 @@ data class MovieLoadResponse(
      * Secondary constructor for backwards compatibility without contentRating.
      * Remove this constructor after there is a new stable release and extensions are updated to support contentRating.
      */
+    @Suppress("DEPRECATION")
+    @Deprecated(
+        "Use newMovieLoadResponse method with contentRating included",
+        level = DeprecationLevel.WARNING
+    )
     constructor(
         name: String,
         url: String,
@@ -1670,6 +2093,8 @@ suspend fun <T> MainAPI.newMovieLoadResponse(
         initializer = initializer
     )
     val dataUrl = data?.toJson() ?: ""
+
+    @Suppress("DEPRECATION")
     val builder = MovieLoadResponse(
         name = name,
         url = url,
@@ -1689,6 +2114,7 @@ suspend fun MainAPI.newMovieLoadResponse(
     dataUrl: String,
     initializer: suspend MovieLoadResponse.() -> Unit = { }
 ): MovieLoadResponse {
+    @Suppress("DEPRECATION")
     val builder = MovieLoadResponse(
         name = name,
         url = url,
@@ -1701,7 +2127,20 @@ suspend fun MainAPI.newMovieLoadResponse(
     return builder
 }
 
-data class Episode(
+/** Episode information that will be passed to LoadLinks function & showed on UI
+ * @property data string used as main LoadLinks fun parameter.
+ * @property name Name of the Episode.
+ * @property season Season number.
+ * @property episode Episode number.
+ * @property posterUrl URL of Episode's poster image.
+ * @property rating Episode rating.
+ * @property date Episode air date, see addDate.
+ * @property runTime Episode runtime in seconds.
+ * @see newEpisode
+ * */
+data class Episode
+@Deprecated("Use newEpisode", level = DeprecationLevel.WARNING)
+constructor(
     var data: String,
     var name: String? = null,
     var season: Int? = null,
@@ -1710,11 +2149,31 @@ data class Episode(
     var rating: Int? = null,
     var description: String? = null,
     var date: Long? = null,
-)
+    var runTime: Int? = null,
+) {
+    /**
+     * Secondary constructor for backwards compatibility without runTime.
+     *  TODO Remove this constructor after there is a new stable release and extensions are updated to support runTime.
+     */
+    @Suppress("DEPRECATION")
+    @Deprecated("Use newEpisode with runTime included", level = DeprecationLevel.WARNING)
+    constructor(
+        data: String,
+        name: String? = null,
+        season: Int? = null,
+        episode: Int? = null,
+        posterUrl: String? = null,
+        rating: Int? = null,
+        description: String? = null,
+        date: Long? = null,
+    ) : this(
+        data, name, season, episode, posterUrl, rating, description, date, null
+    )
+}
 
 fun Episode.addDate(date: String?, format: String = "yyyy-MM-dd") {
     try {
-        this.date = SimpleDateFormat(format)?.parse(date ?: return)?.time
+        this.date = SimpleDateFormat(format).parse(date ?: return)?.time
     } catch (e: Exception) {
         logError(e)
     }
@@ -1729,6 +2188,7 @@ fun MainAPI.newEpisode(
     initializer: Episode.() -> Unit = { },
     fix: Boolean = true,
 ): Episode {
+    @Suppress("DEPRECATION")
     val builder = Episode(
         data = if (fix) fixUrl(url) else url
     )
@@ -1745,6 +2205,7 @@ fun <T> MainAPI.newEpisode(
         initializer = initializer
     ) // just in case java is wack
 
+    @Suppress("DEPRECATION")
     val builder = Episode(
         data = data?.toJson() ?: throw ErrorLoadingException("invalid newEpisode")
     )
@@ -1774,7 +2235,12 @@ enum class SimklSyncServices(val originalName: String) {
     Mal("mal"),
 }
 
-data class TvSeriesLoadResponse(
+/** Data class of [LoadResponse] interface for Tv series.
+ * @see newTvSeriesLoadResponse
+ * */
+data class TvSeriesLoadResponse
+@Deprecated("Use newTvSeriesLoadResponse method", level = DeprecationLevel.WARNING)
+constructor(
     override var name: String,
     override var url: String,
     override var apiName: String,
@@ -1826,6 +2292,11 @@ data class TvSeriesLoadResponse(
      * Secondary constructor for backwards compatibility without contentRating.
      * Remove this constructor after there is a new stable release and extensions are updated to support contentRating.
      */
+    @Suppress("DEPRECATION")
+    @Deprecated(
+        "Use newTvSeriesLoadResponse method with contentRating included",
+        level = DeprecationLevel.WARNING
+    )
     constructor(
         name: String,
         url: String,
@@ -1881,6 +2352,7 @@ suspend fun MainAPI.newTvSeriesLoadResponse(
     episodes: List<Episode>,
     initializer: suspend TvSeriesLoadResponse.() -> Unit = { }
 ): TvSeriesLoadResponse {
+    @Suppress("DEPRECATION")
     val builder = TvSeriesLoadResponse(
         name = name,
         url = url,
@@ -1974,4 +2446,4 @@ enum class TrackerType {
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Cda.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Cda.kt
index 42f6eddbe4f..715e97b0892 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Cda.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Cda.kt
@@ -61,8 +61,8 @@ open class Cda: ExtractorApi() {
             .replace("_IKSDE", "")
         a = URLDecoder.decode(a, "UTF-8")
         a = a.map { char ->
-            if (32 < char.toInt() && char.toInt() < 127) {
-                return@map String.format("%c", 33 + (char.toInt() + 14) % 94)
+            if (char.code in 33..126) {
+                return@map String.format("%c", 33 + (char.code + 14) % 94)
             } else {
                 return@map char
             }
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Chillx.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Chillx.kt
index dd22efb2223..ed98914f50d 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Chillx.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Chillx.kt
@@ -1,16 +1,25 @@
 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.ErrorLoadingException
+import com.lagradost.cloudstream3.SubtitleFile
+import com.lagradost.cloudstream3.USER_AGENT
+import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
-import com.lagradost.cloudstream3.utils.M3u8Helper
-import kotlin.run
+import com.lagradost.cloudstream3.utils.INFER_TYPE
+import com.lagradost.cloudstream3.utils.Qualities
+import java.security.MessageDigest
 
-class Moviesapi : Chillx() {
-    override val name = "Moviesapi"
-    override val mainUrl = "https://w1.moviesapi.club"
+
+class Watchx : Chillx() {
+    override val name = "Watchx"
+    override val mainUrl = "https://watchx.top"
+}
+
+class Beastx : Chillx() {
+    override val name = "Beastx"
+    override val mainUrl = "https://beastx.top"
 }
 
 class Bestx : Chillx() {
@@ -18,89 +27,156 @@ class Bestx : Chillx() {
     override val mainUrl = "https://bestx.stream"
 }
 
-class Watchx : Chillx() {
-    override val name = "Watchx"
-    override val mainUrl = "https://watchx.top"
+class Playerx : Chillx() {
+    override val name = "Playerx"
+    override val mainUrl = "https://playerx.stream"
 }
 
-open class Chillx : ExtractorApi() {
-    override val name = "Chillx"
-    override val mainUrl = "https://chillx.top"
-    override val requiresReferer = true
+class Moviesapi : Chillx() {
+    override val name = "Moviesapi"
+    override val mainUrl = "https://w1.moviesapi.club"
+}
 
-    companion object {
-        private val keySource = "https://rowdy-avocado.github.io/multi-keys/"
+class AnimesagaStream : Chillx() {
+    override val name = "Animesaga"
+    override val mainUrl = "https://stream.animesaga.in"
+}
 
-        private var key: String? = null
+class Anplay : Chillx() {
+    override val name = "Anplay"
+    override val mainUrl = "https://stream.anplay.in"
+}
 
-        private suspend fun fetchKey(): String {
-            return key
-                    ?: run {
-                        val res =
-                                app.get(keySource).parsedSafe<KeysData>()
-                                        ?: throw ErrorLoadingException("Unable to get keys")
-                        key = res.keys.get(0)
-                        res.keys.get(0)
-                    }
-        }
+class Kinogeru : Chillx() {
+    override val name = "Kinoger"
+    override val mainUrl = "https://kinoger.ru"
+}
 
-        private data class KeysData(@JsonProperty("chillx") val keys: List<String>)
-    }
+class Vidxstream : Chillx() {
+    override val name = "Vidxstream"
+    override val mainUrl = "https://vidxstream.xyz"
+}
+
+class Boltx : Chillx() {
+    override val name = "Boltx"
+    override val mainUrl = "https://boltx.stream"
+}
+
+class Vectorx : Chillx() {
+    override val name = "Vectorx"
+    override val mainUrl = "https://vectorx.top"
+}
+
+class Boosterx : Chillx() {
+    override val name = "Boosterx"
+    override val mainUrl = "https://boosterx.stream"
+}
+
+
+open class Chillx : ExtractorApi() {
+    override val name = "Chillx"
+    override val mainUrl = "https://chillx.top"
+    override val requiresReferer = true
 
-    @Suppress("NAME_SHADOWING")
     override suspend fun getUrl(
         url: String,
         referer: String?,
         subtitleCallback: (SubtitleFile) -> Unit,
         callback: (ExtractorLink) -> Unit
     ) {
-        val master = Regex("""JScript[\w+]?\s*=\s*'([^']+)""").find(
-            app.get(
-                url,
-                referer = url,
-            ).text
-        )?.groupValues?.get(1)
-        val key = fetchKey()
-        val decrypt = cryptoAESHandler(master ?: "", key.toByteArray(), false)?.replace("\\", "") ?: throw ErrorLoadingException("failed to decrypt")
-        val source = Regex(""""?file"?:\s*"([^"]+)""").find(decrypt)?.groupValues?.get(1)
-        val subtitles = Regex("""subtitle"?:\s*"([^"]+)""").find(decrypt)?.groupValues?.get(1)
-        val subtitlePattern = """\[(.*?)](https?://[^\s,]+)""".toRegex()
-        val matches = subtitlePattern.findAll(subtitles ?: "")
-        val languageUrlPairs = matches.map { matchResult ->
-            val (language, url) = matchResult.destructured
-            decodeUnicodeEscape(language) to url
-        }.toList()
+        val res = app.get(url,referer=referer).toString()
+        val encodedString =
+            Regex("Encrypted\\s*=\\s*'(.*?)';").find(res)?.groupValues?.get(1)?.replace("_", "/")
+                ?.replace("-", "+")
+                ?: ""
+        val keysData = RowdyAvocadoKeys.getKeys()
+        val fetchkey = keysData.chillx.firstOrNull() ?: throw ErrorLoadingException("No Chillx key found")
+        val decoded = decodeWithKey(encodedString, fetchkey)
+        val m3u8 =Regex("""file:\s*"(.*?)"""").find(decoded)?.groupValues?.get(1) ?:""
+        val header =
+            mapOf(
+                "accept" to "*/*",
+                "accept-language" to "en-US,en;q=0.5",
+                "Origin" to mainUrl,
+                "Accept-Encoding" to "gzip, deflate, br",
+                "Connection" to "keep-alive",
+                "Sec-Fetch-Dest" to "empty",
+                "Sec-Fetch-Mode" to "cors",
+                "Sec-Fetch-Site" to "cross-site",
+                "user-agent" to USER_AGENT,
+            )
+        callback.invoke(
+            ExtractorLink(
+                name,
+                name,
+                m3u8,
+                mainUrl,
+                Qualities.P1080.value,
+                INFER_TYPE,
+                headers = header
+            )
+        )
+
+        val subtitles = extractSrtSubtitles(decoded)
 
-        languageUrlPairs.forEach{ (name, file) ->
+        subtitles.forEachIndexed { _, (language, url) ->
             subtitleCallback.invoke(
                 SubtitleFile(
-                    name,
-                    file
+                    language,
+                    url
                 )
             )
         }
-        // required
-        val headers = mapOf(
-            "Accept" to "*/*",
-            "Connection" to "keep-alive",
-            "Sec-Fetch-Dest" to "empty",
-            "Sec-Fetch-Mode" to "cors",
-            "Sec-Fetch-Site" to "cross-site",
-            "Origin" to mainUrl,
-        )
 
-        M3u8Helper.generateM3u8(
-            name,
-            source ?: return,
-            "$mainUrl/",
-            headers = headers
-        ).forEach(callback)
     }
 
-    private fun decodeUnicodeEscape(input: String): String {
-        val regex = Regex("u([0-9a-fA-F]{4})")
-        return regex.replace(input) {
-            it.groupValues[1].toInt(16).toChar().toString()
+    private fun reverseString(input: String): String {
+        return input.reversed()
+    }
+
+    private fun decodeWithKey(input: String, key: String): String {
+        // Hashing the key using SHA1 and encoding it in hex
+        val sha1 = MessageDigest.getInstance("SHA-1")
+        val keyHash = sha1.digest(key.toByteArray(Charsets.UTF_8)).joinToString("") { "%02x".format(it) }
+        println(keyHash)
+
+        val inputLength = input.length
+        val keyHashLength = keyHash.length
+        var keyIndex = 0
+        var decodedString = ""
+
+        for (index in 0 until inputLength step 2) {
+            // Extracting two characters from input, applying reverseString, converting to base 36, then back to hex
+            val reversedPair = reverseString(input.substring(index, index + 2))
+            val base36Value = Integer.parseInt(reversedPair, 36)
+            val hexValue = base36Value.toString(16)
+
+            // Reset keyIndex when it exceeds keyHashLength
+            if (keyIndex == keyHashLength) {
+                keyIndex = 0
+            }
+
+            // Get the char code of the current character in keyHash
+            val keyCharCode = keyHash[keyIndex].code
+            keyIndex++
+
+            // Subtracting keyCharCode from the hex value and appending it to the result string
+            decodedString += (Integer.parseInt(hexValue, 16) - keyCharCode).toChar()
         }
+
+        // Return the decoded string
+        return String(decodedString.toByteArray(Charsets.ISO_8859_1), Charsets.UTF_8)
     }
-}
+
+
+    private fun extractSrtSubtitles(subtitle: String): List<Pair<String, String>> {
+        // Regex to match the language and associated .srt URL properly, and stop at the next [Language] section
+        val regex = """\[([^]]+)](https?://[^\s,]+\.srt)""".toRegex()
+
+        // Process each match and return language-URL pairs
+        return regex.findAll(subtitle).map { match ->
+            val (language, url) = match.destructured
+            language.trim() to url.trim()
+        }.toList()
+    }
+}
\ No newline at end of file
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/ContentXExtractor.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/ContentXExtractor.kt
index 27a5c52a06e..13a717b6dbe 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/ContentXExtractor.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/ContentXExtractor.kt
@@ -12,53 +12,52 @@ open class ContentX : ExtractorApi() {
     override val requiresReferer = true
 
     override suspend fun getUrl(url: String, referer: String?, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
-        val ext_ref   = referer ?: ""
-        Log.d("Kekik_${this.name}", "url » ${url}")
+        val extRef   = referer ?: ""
 
-        val i_source  = app.get(url, referer=ext_ref).text
-        val i_extract = Regex("""window\.openPlayer\('([^']+)'""").find(i_source)!!.groups[1]?.value ?: throw ErrorLoadingException("i_extract is null")
+        val iSource  = app.get(url, referer=extRef).text
+        val iExtract = Regex("""window\.openPlayer\('([^']+)'""").find(iSource)!!.groups[1]?.value ?: throw ErrorLoadingException("iExtract is null")
 
-		val sub_urls = mutableSetOf<String>()
-        Regex("""\"file\":\"([^\"]+)\",\"label\":\"([^\"]+)\"""").findAll(i_source).forEach {
-            val (sub_url, sub_lang) = it.destructured
+		val subUrls = mutableSetOf<String>()
+        Regex("""\"file\":\"([^\"]+)\",\"label\":\"([^\"]+)\"""").findAll(iSource).forEach {
+            val (subUrl, subLang) = it.destructured
 
-			if (sub_url in sub_urls) { return@forEach }
- 			sub_urls.add(sub_url)
+			if (subUrl in subUrls) { return@forEach }
+ 			subUrls.add(subUrl)
 
             subtitleCallback.invoke(
                 SubtitleFile(
-                    lang = sub_lang.replace("\\u0131", "ı").replace("\\u0130", "İ").replace("\\u00fc", "ü").replace("\\u00e7", "ç"),
-                    url  = fixUrl(sub_url.replace("\\", ""))
+                    lang = subLang.replace("\\u0131", "ı").replace("\\u0130", "İ").replace("\\u00fc", "ü").replace("\\u00e7", "ç"),
+                    url  = fixUrl(subUrl.replace("\\", ""))
                 )
             )
         }
 
-        val vid_source  = app.get("${mainUrl}/source2.php?v=${i_extract}", referer=ext_ref).text
-        val vid_extract = Regex("""file\":\"([^\"]+)""").find(vid_source)!!.groups[1]?.value ?: throw ErrorLoadingException("vid_extract is null")
-        val m3u_link    = vid_extract.replace("\\", "")
+        val vidSource  = app.get("${mainUrl}/source2.php?v=${iExtract}", referer=extRef).text
+        val vidExtract = Regex("""file\":\"([^\"]+)""").find(vidSource)!!.groups[1]?.value ?: throw ErrorLoadingException("vidExtract is null")
+        val m3uLink    = vidExtract.replace("\\", "")
 
         callback.invoke(
             ExtractorLink(
                 source  = this.name,
                 name    = this.name,
-                url     = m3u_link,
+                url     = m3uLink,
                 referer = url,
                 quality = Qualities.Unknown.value,
                 isM3u8  = true
             )
         )
 
-        val i_dublaj = Regex(""",\"([^']+)\",\"Türkçe""").find(i_source)!!.groups[1]?.value
-        if (i_dublaj != null) {
-            val dublaj_source  = app.get("${mainUrl}/source2.php?v=${i_dublaj}", referer=ext_ref).text
-            val dublaj_extract = Regex("""file\":\"([^\"]+)""").find(dublaj_source)!!.groups[1]?.value ?: throw ErrorLoadingException("dublaj_extract is null")
-            val dublaj_link    = dublaj_extract.replace("\\", "")
+        val iDublaj = Regex(""",\"([^']+)\",\"Türkçe""").find(iSource)!!.groups[1]?.value
+        if (iDublaj != null) {
+            val dublajSource  = app.get("${mainUrl}/source2.php?v=${iDublaj}", referer=extRef).text
+            val dublajExtract = Regex("""file\":\"([^\"]+)""").find(dublajSource)!!.groups[1]?.value ?: throw ErrorLoadingException("dublajExtract is null")
+            val dublajLink    = dublajExtract.replace("\\", "")
 
             callback.invoke(
                 ExtractorLink(
                     source  = "${this.name} Türkçe Dublaj",
                     name    = "${this.name} Türkçe Dublaj",
-                    url     = dublaj_link,
+                    url     = dublajLink,
                     referer = url,
                     quality = Qualities.Unknown.value,
                     isM3u8  = true
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Dailymotion.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Dailymotion.kt
index 2343a92e257..6b9cf7ae7ff 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Dailymotion.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Dailymotion.kt
@@ -7,7 +7,7 @@ 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 java.net.URL
+import java.net.URI
 
 class Geodailymotion : Dailymotion() {
     override val name = "GeoDailymotion"
@@ -62,7 +62,7 @@ open class Dailymotion : ExtractorApi() {
 	}
 
     private fun getVideoId(url: String): String? {
-        val path = URL(url).path
+        val path = URI(url).path
         val id = path.substringAfter("/video/")
         if (id.matches(videoIdRegex)) {
             return id
@@ -105,4 +105,4 @@ open class Dailymotion : ExtractorApi() {
         val url: String
     )
 
-}
+}
\ No newline at end of file
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/DoodExtractor.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/DoodExtractor.kt
index 370dcaca6b2..6f14466e578 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/DoodExtractor.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/DoodExtractor.kt
@@ -1,11 +1,13 @@
 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
+import com.lagradost.cloudstream3.utils.INFER_TYPE
 import com.lagradost.cloudstream3.utils.getQualityFromName
-import kotlinx.coroutines.delay
+import java.net.URI
+import kotlin.random.Random
 
 class D0000d : DoodLaExtractor() {
     override var mainUrl = "https://d0000d.com"
@@ -58,31 +60,68 @@ class DoodYtExtractor : DoodLaExtractor() {
     override var mainUrl = "https://dood.yt"
 }
 
+class DoodLiExtractor : DoodLaExtractor() {
+    override var mainUrl = "https://dood.li"
+}
+
+class Ds2play : DoodLaExtractor() {
+    override var mainUrl = "https://ds2play.com"
+}
+
+class Ds2video : DoodLaExtractor() {
+    override var mainUrl = "https://ds2video.com"
+}
+
 open class DoodLaExtractor : ExtractorApi() {
     override var name = "DoodStream"
     override var mainUrl = "https://dood.la"
     override val requiresReferer = false
-
-    override fun getExtractorUrl(id: String): String {
-        return "$mainUrl/d/$id"
-    }
-
-    override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink>? {
-        val newUrl= url.replace(mainUrl, "https://d0000d.com")
-        val response0 = app.get(newUrl).text // html of DoodStream page to look for /pass_md5/...
-        val md5 ="https://d0000d.com"+(Regex("/pass_md5/[^']*").find(response0)?.value ?: return null)  // get https://dood.ws/pass_md5/...
-        val trueUrl = app.get(md5, referer = newUrl).text + "zUEJeL3mUN?token=" + md5.substringAfterLast("/")   //direct link to extract  (zUEJeL3mUN is random)
-        val quality = Regex("\\d{3,4}p").find(response0.substringAfter("<title>").substringBefore("</title>"))?.groupValues?.get(0)
-        return listOf(
+	
+    private val alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"
+
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
+        val embedUrl = url.replace("/d/", "/e/")
+		val req = app.get(embedUrl)
+        val host = getBaseUrl(req.url)
+        val response0 = req.text
+	val md5 = host + (Regex("/pass_md5/[^']*").find(response0)?.value ?: return)
+        val trueUrl = app.get(md5, referer = req.url).text + createHashTable() + "?token=" + md5.substringAfterLast("/")
+		
+	val quality = Regex("\\d{3,4}p")
+            .find(response0.substringAfter("<title>").substringBefore("</title>"))
+            ?.groupValues
+            ?.getOrNull(0)
+		
+	callback.invoke(
             ExtractorLink(
                 this.name,
                 this.name,
                 trueUrl,
-                mainUrl,
+                "$mainUrl/",
                 getQualityFromName(quality),
-                false
+                INFER_TYPE,
             )
-        ) // links are valid in 8h
+        )
 
     }
-}
\ No newline at end of file
+	
+private fun createHashTable(): String {
+    return buildString {
+        repeat(10) {
+            append(alphabet.random())
+        }
+    }
+}
+
+	
+private fun getBaseUrl(url: String): String {
+        return URI(url).let {
+            "${it.scheme}://${it.host}"
+        }
+    }
+}
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Filegram.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Filegram.kt
new file mode 100644
index 00000000000..df7e0337365
--- /dev/null
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Filegram.kt
@@ -0,0 +1,63 @@
+package com.lagradost.cloudstream3.extractors
+
+import com.lagradost.cloudstream3.SubtitleFile
+import com.lagradost.cloudstream3.USER_AGENT
+import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.utils.ExtractorApi
+import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.M3u8Helper
+import com.lagradost.cloudstream3.utils.fixUrl
+import com.lagradost.cloudstream3.utils.getAndUnpack
+import org.jsoup.nodes.Element
+
+open class Filegram : ExtractorApi() {
+    override val name = "Filegram"
+    override val mainUrl = "https://filegram.to"
+    override val requiresReferer = true
+
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
+        val header = mapOf(
+            "Accept" to "*/*",
+            "Accept-language" to "en-US,en;q=0.9",
+            "Origin" to mainUrl,
+            "Accept-Encoding" to "gzip, deflate, br, zstd",
+            "Connection" to "keep-alive",
+            "Sec-Fetch-Dest" to "empty",
+            "Sec-Fetch-Mode" to "cors",
+            "Sec-Fetch-Site" to "same-site",
+            "user-agent" to USER_AGENT,
+        )
+        
+        val doc = app.get(getEmbedUrl(url), referer = referer).document
+        val unpackedJs = unpackJs(doc).toString()
+		    val videoUrl = Regex("""file:\s*"([^"]+\.m3u8[^"]*)"""").find(unpackedJs)?.groupValues?.get(1)
+        if (videoUrl != null) {
+            M3u8Helper.generateM3u8(
+		this.name,
+		fixUrl(videoUrl),
+		"$mainUrl/",
+		headers = header
+	   ).forEach(callback)
+        }
+    }
+
+  private fun unpackJs(script: Element): String? {
+      return script.select("script").find { it.data().contains("eval(function(p,a,c,k,e,d)") }
+          ?.data()?.let { getAndUnpack(it) }
+  }
+	
+  private fun getEmbedUrl(url: String): String {
+     return if (!url.contains("/embed-")) {
+	   val videoId = url.substringAfter("$mainUrl/")
+	   "$mainUrl/embed-$videoId"
+     } else {
+	   url
+	}
+     }
+
+}
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Filesim.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Filesim.kt
index a1148bb81aa..847ad22a778 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Filesim.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Filesim.kt
@@ -65,14 +65,35 @@ open class Filesim : ExtractorApi() {
         subtitleCallback: (SubtitleFile) -> Unit,
         callback: (ExtractorLink) -> Unit
     ) {
-        val response = app.get(url, referer = referer)
-        val script = if (!getPacked(response.text).isNullOrEmpty()) {
+        var response = app.get(url.replace("/download/", "/e/"), referer = referer)
+        val iframe = response.document.selectFirst("iframe")
+        if (iframe != null) {
+            response = app.get(
+                iframe.attr("src"), headers = mapOf(
+                    "Accept-Language" to "en-US,en;q=0.5",
+                    "Sec-Fetch-Dest" to "iframe"
+                ), referer = response.url
+            )
+        }
+
+        var script = if (!getPacked(response.text).isNullOrEmpty()) {
             getAndUnpack(response.text)
         } else {
             response.document.selectFirst("script:containsData(sources:)")?.data()
         }
+
+         //In my case packed function is not directly available in the first response, instead it is in iframe response
+        if(script == null){
+            val iframeUrl = Regex("""<iframe src="(.*?)"""").find(response.text,0)?.groupValues?.getOrNull(1)
+            if(iframeUrl != null){
+                val iframeResponse = app.get(iframeUrl,referer=null, headers = mapOf("Accept-Language" to "en-US,en;q=0.5"))
+                script = if (!getPacked(iframeResponse.text).isNullOrEmpty()) { getAndUnpack(iframeResponse.text) } else return
+            }
+            else return
+        }
+
         val m3u8 =
-            Regex("file:\\s*\"(.*?m3u8.*?)\"").find(script ?: return)?.groupValues?.getOrNull(1)
+            Regex("file:\\s*\"(.*?m3u8.*?)\"").find(script)?.groupValues?.getOrNull(1)
         generateM3u8(
             name,
             m3u8 ?: return,
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/GDMirrorbot.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/GDMirrorbot.kt
new file mode 100644
index 00000000000..6a9ac8560f4
--- /dev/null
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/GDMirrorbot.kt
@@ -0,0 +1,63 @@
+package com.lagradost.cloudstream3.extractors
+
+import com.google.gson.JsonElement
+import com.google.gson.JsonParser
+import com.lagradost.api.Log
+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.loadExtractor
+import java.net.URI
+
+class GDMirrorbot : ExtractorApi() {
+    override var name = "GDMirrorbot"
+    override var mainUrl = "https://gdmirrorbot.nl"
+    override val requiresReferer = true
+
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
+        val host = getBaseUrl(app.get(url).url)
+        val embed = url.substringAfterLast("/")
+        val data = mapOf("sid" to embed)
+        val jsonString = app.post("$host/embedhelper.php", data = data).toString()
+        val jsonElement: JsonElement = JsonParser.parseString(jsonString)
+        if (!jsonElement.isJsonObject) {
+            Log.e("Error:", "Unexpected JSON format: Response is not a JSON object")
+            return
+        }
+        val jsonObject = jsonElement.asJsonObject
+        val siteUrls = jsonObject["siteUrls"]?.takeIf { it.isJsonObject }?.asJsonObject
+        val mresult = jsonObject["mresult"]?.takeIf { it.isJsonObject }?.asJsonObject
+        val siteFriendlyNames = jsonObject["siteFriendlyNames"]?.takeIf { it.isJsonObject }?.asJsonObject
+        if (siteUrls == null || siteFriendlyNames == null || mresult == null) {
+            return
+        }
+        val commonKeys = siteUrls.keySet().intersect(mresult.keySet())
+        commonKeys.forEach { key ->
+            val siteName = siteFriendlyNames[key]?.asString
+            if (siteName == null) {
+                Log.e("Error:", "Skipping key: $key because siteName is null")
+                return@forEach
+            }
+            val siteUrl = siteUrls[key]?.asString
+            val resultUrl = mresult[key]?.asString
+            if (siteUrl == null || resultUrl == null) {
+                Log.e("Error:", "Skipping key: $key because siteUrl or resultUrl is null")
+                return@forEach
+            }
+            val href = siteUrl + resultUrl
+            loadExtractor(href, subtitleCallback, callback)
+        }
+    }
+
+    private fun getBaseUrl(url: String): String {
+        return URI(url).let {
+            "${it.scheme}://${it.host}"
+        }
+    }
+}
\ No newline at end of file
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/GamoVideo.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/GamoVideo.kt
new file mode 100644
index 00000000000..11d3e42dc9a
--- /dev/null
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/GamoVideo.kt
@@ -0,0 +1,30 @@
+package com.lagradost.cloudstream3.extractors
+
+import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.utils.*
+
+
+open class GamoVideo : ExtractorApi() {
+    override val name = "GamoVideo"
+    override val mainUrl = "https://gamovideo.com"
+    override val requiresReferer = true
+
+    override suspend fun getUrl(
+        url: String,
+        referer: String?
+    ): List<ExtractorLink>? {
+        return app.get(url, referer = referer).document.select("script")
+            .firstOrNull { it.html().contains("sources:") }!!.html().substringAfter("file: \"")
+            .substringBefore("\",").let {
+            listOf(
+                ExtractorLink(
+                    name,
+                    name,
+                    it,
+                    url,
+                    Qualities.Unknown.value,
+                )
+            )
+        }
+    }
+}
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/HDMomPlayerExtractor.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/HDMomPlayerExtractor.kt
index 1f70ce6107d..1152cb4b131 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/HDMomPlayerExtractor.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/HDMomPlayerExtractor.kt
@@ -16,24 +16,23 @@ open class HDMomPlayer : ExtractorApi() {
     override val requiresReferer = true
 
     override suspend fun getUrl(url: String, referer: String?, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
-        val m3u_link:String?
-        val ext_ref  = referer ?: ""
-        val i_source = app.get(url, referer=ext_ref).text
+        val m3uLink:String?
+        val extRef  = referer ?: ""
+        val iSource = app.get(url, referer=extRef).text
 
-        val bePlayer = Regex("""bePlayer\('([^']+)',\s*'(\{[^\}]+\})'\);""").find(i_source)?.groupValues
+        val bePlayer = Regex("""bePlayer\('([^']+)',\s*'(\{[^\}]+\})'\);""").find(iSource)?.groupValues
         if (bePlayer != null) {
             val bePlayerPass = bePlayer.get(1)
             val bePlayerData = bePlayer.get(2)
             val encrypted    = AesHelper.cryptoAESHandler(bePlayerData, bePlayerPass.toByteArray(), false)?.replace("\\", "") ?: throw ErrorLoadingException("failed to decrypt")
-            Log.d("Kekik_${this.name}", "encrypted » ${encrypted}")
 
-            m3u_link = Regex("""video_location\":\"([^\"]+)""").find(encrypted)?.groupValues?.get(1)
+            m3uLink = Regex("""video_location\":\"([^\"]+)""").find(encrypted)?.groupValues?.get(1)
         } else {
-            m3u_link = Regex("""file:\"([^\"]+)""").find(i_source)?.groupValues?.get(1)
+            m3uLink = Regex("""file:\"([^\"]+)""").find(iSource)?.groupValues?.get(1)
 
-            val track_str = Regex("""tracks:\[([^\]]+)""").find(i_source)?.groupValues?.get(1)
-            if (track_str != null) {
-                val tracks:List<Track> = jacksonObjectMapper().readValue("[${track_str}]")
+            val trackStr = Regex("""tracks:\[([^\]]+)""").find(iSource)?.groupValues?.get(1)
+            if (trackStr != null) {
+                val tracks:List<Track> = jacksonObjectMapper().readValue("[${trackStr}]")
 
                 for (track in tracks) {
                     if (track.file == null || track.label == null) continue
@@ -53,7 +52,7 @@ open class HDMomPlayer : ExtractorApi() {
             ExtractorLink(
                 source  = this.name,
                 name    = this.name,
-                url     = m3u_link ?: throw ErrorLoadingException("m3u link not found"),
+                url     = m3uLink ?: throw ErrorLoadingException("m3u link not found"),
                 referer = url,
                 quality = Qualities.Unknown.value,
                 isM3u8  = true
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/HDPlayerSystemExtractor.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/HDPlayerSystemExtractor.kt
index 8318c3fbd3a..e3cf3aee3e8 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/HDPlayerSystemExtractor.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/HDPlayerSystemExtractor.kt
@@ -13,37 +13,36 @@ open class HDPlayerSystem : ExtractorApi() {
     override val requiresReferer = true
 
     override suspend fun getUrl(url: String, referer: String?, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
-        val ext_ref  = referer ?: ""
-        val vid_id   = if (url.contains("video/")) {
+        val extRef  = referer ?: ""
+        val vidId   = if (url.contains("video/")) {
             url.substringAfter("video/")
         } else {
             url.substringAfter("?data=")
         }
-        val post_url = "${mainUrl}/player/index.php?data=${vid_id}&do=getVideo"
-        Log.d("Kekik_${this.name}", "post_url » ${post_url}")
+        val postUrl = "${mainUrl}/player/index.php?data=${vidId}&do=getVideo"
 
         val response = app.post(
-            post_url,
+            postUrl,
             data = mapOf(
-                "hash" to vid_id,
-                "r"    to ext_ref
+                "hash" to vidId,
+                "r"    to extRef
             ),
-            referer = ext_ref,
+            referer = extRef,
             headers = mapOf(
                 "Content-Type"     to "application/x-www-form-urlencoded; charset=UTF-8",
                 "X-Requested-With" to "XMLHttpRequest"
             )
         )
 
-        val video_response = response.parsedSafe<SystemResponse>() ?: throw ErrorLoadingException("failed to parse response")
-        val m3u_link       = video_response.securedLink
+        val videoResponse = response.parsedSafe<SystemResponse>() ?: throw ErrorLoadingException("failed to parse response")
+        val m3uLink       = videoResponse.securedLink
 
         callback.invoke(
             ExtractorLink(
                 source  = this.name,
                 name    = this.name,
-                url     = m3u_link,
-                referer = ext_ref,
+                url     = m3uLink,
+                referer = extRef,
                 quality = Qualities.Unknown.value,
                 type    = INFER_TYPE
             )
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/InternetArchive.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/InternetArchive.kt
new file mode 100644
index 00000000000..e49aaed2541
--- /dev/null
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/InternetArchive.kt
@@ -0,0 +1,112 @@
+package com.lagradost.cloudstream3.extractors
+
+import com.lagradost.cloudstream3.SubtitleFile
+import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.mvvm.logError
+import com.lagradost.cloudstream3.utils.ExtractorApi
+import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.Qualities
+import com.lagradost.cloudstream3.utils.StringUtils.decodeUri
+import org.jsoup.nodes.Document
+
+open class InternetArchive : ExtractorApi() {
+    override val mainUrl = "https://archive.org"
+    override val requiresReferer = false
+    override val name = "Internet Archive"
+
+    companion object {
+        private var archivedItems: MutableMap<String, Document> = mutableMapOf()
+    }
+
+    override fun getExtractorUrl(id: String): String {
+        return "$mainUrl/details/$id"
+    }
+
+    // https://archive.org/details/the-the-infected
+    // https://archive.org/details/TheEdgeOfTheEarth
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
+        val document = archivedItems[url] ?: run {
+            try {
+                val doc = app.get(url).document
+                archivedItems[url] = doc
+                doc
+            } catch (e: Exception) {
+                logError(e)
+                return
+            }
+        }
+
+        val subtitleLinks = document.select("a[href*=\"/download/\"]").filter { element ->
+            val subtitleUrl = element.attr("href")
+            subtitleUrl.endsWith(".vtt", true) ||
+                    subtitleUrl.endsWith(".srt", true)
+        }
+
+        subtitleLinks.forEach {
+            val subtitleUrl = mainUrl + it.attr("href")
+            val fileName = subtitleUrl.substringAfterLast('/')
+            val subtitleFile = SubtitleFile(
+                lang = fileName.substringBeforeLast(".")
+                    .substringAfterLast("."),
+                url = subtitleUrl
+            )
+            subtitleCallback(subtitleFile)
+        }
+
+        val fileLinks = document.select("a[href*=\"/download/\"]").filter { element ->
+            val mediaUrl = element.attr("href")
+
+            mediaUrl.endsWith(".mp4", true) ||
+                    mediaUrl.endsWith(".mpg", true) ||
+                    mediaUrl.endsWith(".mkv", true) ||
+                    mediaUrl.endsWith(".avi", true) ||
+                    mediaUrl.endsWith(".ogv", true) ||
+                    mediaUrl.endsWith(".ogg", true) ||
+                    mediaUrl.endsWith(".mp3", true) ||
+                    mediaUrl.endsWith(".wav", true) ||
+                    mediaUrl.endsWith(".flac", true)
+        }
+
+        val select = fileLinks.ifEmpty {
+            document.head().select("meta[property=\"og:video\"]")
+        }
+
+        select.forEach {
+            val mediaUrl = when {
+                it.hasAttr("href") -> mainUrl + it.attr("href")
+                it.hasAttr("content") -> it.attr("content")
+                else -> return@forEach
+            }
+
+            val fileName = mediaUrl.substringAfterLast('/')
+            val quality = when {
+                fileName.contains("1080", true) -> Qualities.P1080.value
+                fileName.contains("720", true) -> Qualities.P720.value
+                fileName.contains("480", true) -> Qualities.P480.value
+                else -> Qualities.Unknown.value
+            }
+
+            if (mediaUrl.isNotEmpty()) {
+                val name = if (mediaUrl.count() > 1) {
+                    val fileExtension = mediaUrl.substringAfterLast(".")
+                    val fileNameCleaned = fileName.decodeUri().substringBeforeLast('.')
+                    "$fileNameCleaned ($fileExtension)"
+                } else this.name
+                callback(
+                    ExtractorLink(
+                        this.name,
+                        name,
+                        mediaUrl,
+                        "",
+                        quality
+                    )
+                )
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/LuluStream.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/LuluStream.kt
new file mode 100644
index 00000000000..4911babe48c
--- /dev/null
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/LuluStream.kt
@@ -0,0 +1,58 @@
+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.app
+import com.lagradost.cloudstream3.utils.INFER_TYPE
+import com.lagradost.cloudstream3.utils.Qualities
+
+class Lulustream1 : LuluStream() {
+    override val name = "Lulustream"
+    override val mainUrl = "https://lulustream.com"
+}
+
+class Lulustream2 : LuluStream() {
+    override val name = "Lulustream"
+    override val mainUrl = "https://kinoger.pw"
+}
+
+open class LuluStream : ExtractorApi() {
+    override val  name = "LuluStream"
+    override val mainUrl = "https://luluvdo.com"
+    override val requiresReferer = true
+
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
+        val filecode = url.substringAfterLast("/")
+        val postUrl = "$mainUrl/dl"
+        val post = app.post(
+            postUrl,
+            data = mapOf(
+                "op" to "embed",
+                "file_code" to filecode,
+                "auto" to "1",
+                "referer" to (referer ?: "")
+            )
+        ).document
+        post.selectFirst("script:containsData(vplayer)")?.data()
+            ?.let { script ->
+                Regex("file:\"(.*)\"").find(script)?.groupValues?.get(1)?.let { link ->
+                    callback(
+                        ExtractorLink(
+                            name,
+                            name,
+                            link,
+                            mainUrl,
+                            Qualities.P1080.value,
+                            type = INFER_TYPE
+                        )
+                    )
+                }
+            }
+    }
+}
\ No newline at end of file
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/MailRuExtractor.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/MailRuExtractor.kt
index ce742e97da8..07346c703bd 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/MailRuExtractor.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/MailRuExtractor.kt
@@ -13,28 +13,25 @@ open class MailRu : ExtractorApi() {
     override val requiresReferer = false
 
     override suspend fun getUrl(url: String, referer: String?, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
-        val ext_ref = referer ?: ""
-        Log.d("Kekik_${this.name}", "url » ${url}")
+        val extRef = referer ?: ""
 
-        val vid_id     = url.substringAfter("video/embed/").trim()
-        val video_req  = app.get("${mainUrl}/+/video/meta/${vid_id}", referer=url)
-        val video_key  = video_req.cookies["video_key"].toString()
-        Log.d("Kekik_${this.name}", "video_key » ${video_key}")
+        val vidId     = url.substringAfter("video/embed/").trim()
+        val videoReq  = app.get("${mainUrl}/+/video/meta/${vidId}", referer=url)
+        val videoKey  = videoReq.cookies["video_key"].toString()
 
-        val video_data = AppUtils.tryParseJson<MailRuData>(video_req.text) ?: throw ErrorLoadingException("Video not found")
+        val videoData = AppUtils.tryParseJson<MailRuData>(videoReq.text) ?: throw ErrorLoadingException("Video not found")
 
-        for (video in video_data.videos) {
-            Log.d("Kekik_${this.name}", "video » ${video}")
+        for (video in videoData.videos) {
 
-            val video_url = if (video.url.startsWith("//")) "https:${video.url}" else video.url
+            val videoUrl = if (video.url.startsWith("//")) "https:${video.url}" else video.url
 
             callback.invoke(
                 ExtractorLink(
                     source  = this.name,
                     name    = this.name,
-                    url     = video_url,
+                    url     = videoUrl,
                     referer = url,
-                    headers = mapOf("Cookie" to "video_key=${video_key}"),
+                    headers = mapOf("Cookie" to "video_key=${videoKey}"),
                     quality = getQualityFromName(video.key),
                     isM3u8  = false
                 )
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/MixDrop.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/MixDrop.kt
index cd7e2e26c9d..7d628a0451b 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/MixDrop.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/MixDrop.kt
@@ -7,6 +7,10 @@ class MixDropBz : MixDrop(){
     override var mainUrl = "https://mixdrop.bz"
 }
 
+class MixDropAg : MixDrop(){
+    override var mainUrl = "https://mixdrop.ag"
+}
+
 class MixDropCh : MixDrop(){
     override var mainUrl = "https://mixdrop.ch"
 }
@@ -25,7 +29,7 @@ open class MixDrop : ExtractorApi() {
     }
 
     override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink>? {
-        with(app.get(url)) {
+        with(app.get(url.replaceFirst("/f/", "/e/"))) {
             getAndUnpack(this.text).let { unpackedText ->
                 srcRegex.find(unpackedText)?.groupValues?.get(1)?.let { link ->
                     return listOf(
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/OdnoklassnikiExtractor.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/OdnoklassnikiExtractor.kt
index 6db0830c0f8..2162bd6a029 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/OdnoklassnikiExtractor.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/OdnoklassnikiExtractor.kt
@@ -13,22 +13,26 @@ open class Odnoklassniki : ExtractorApi() {
     override val requiresReferer = false
 
     override suspend fun getUrl(url: String, referer: String?, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
-        val ext_ref    = referer ?: ""
-        Log.d("Kekik_${this.name}", "url » ${url}")
+        val headers = mapOf(
+            "Accept" to "*/*",
+            "Connection" to "keep-alive",
+            "Sec-Fetch-Dest" to "empty",
+            "Sec-Fetch-Mode" to "cors",
+            "Sec-Fetch-Site" to "cross-site",
+            "Origin" to mainUrl,
+            "User-Agent" to USER_AGENT,
+        )
 
-        val user_agent = mapOf("User-Agent" to "Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Mobile Safari/537.36")
-
-        val video_req  = app.get(url, headers=user_agent).text.replace("\\&quot;", "\"").replace("\\\\", "\\")
+        val videoReq  = app.get(url, headers=headers).text.replace("\\&quot;", "\"").replace("\\\\", "\\")
             .replace(Regex("\\\\u([0-9A-Fa-f]{4})")) { matchResult ->
                 Integer.parseInt(matchResult.groupValues[1], 16).toChar().toString()
             }
-        val videos_str = Regex("""\"videos\":(\[[^\]]*\])""").find(video_req)?.groupValues?.get(1) ?: throw ErrorLoadingException("Video not found")
-        val videos     = AppUtils.tryParseJson<List<OkRuVideo>>(videos_str) ?: throw ErrorLoadingException("Video not found")
+        val videosStr = Regex("""\"videos\":(\[[^\]]*\])""").find(videoReq)?.groupValues?.get(1) ?: throw ErrorLoadingException("Video not found")
+        val videos    = AppUtils.tryParseJson<List<OkRuVideo>>(videosStr) ?: throw ErrorLoadingException("Video not found")
 
         for (video in videos) {
-            Log.d("Kekik_${this.name}", "video » ${video}")
 
-            val video_url = if (video.url.startsWith("//")) "https:${video.url}" else video.url
+            val videoUrl  = if (video.url.startsWith("//")) "https:${video.url}" else video.url
 
             val quality   = video.name.uppercase()
                 .replace("MOBILE", "144p")
@@ -44,11 +48,11 @@ open class Odnoklassniki : ExtractorApi() {
                 ExtractorLink(
                     source  = this.name,
                     name    = this.name,
-                    url     = video_url,
-                    referer = url,
+                    url     = videoUrl,
+                    referer = "$mainUrl/",
                     quality = getQualityFromName(quality),
-                    headers = user_agent,
-                    isM3u8  = false
+                    headers = headers,
+                    isM3u8  = false,
                 )
             )
         }
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/PeaceMakerstExtractor.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/PeaceMakerstExtractor.kt
index 0a0050360a1..3a5cf727c32 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/PeaceMakerstExtractor.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/PeaceMakerstExtractor.kt
@@ -13,39 +13,38 @@ open class PeaceMakerst : ExtractorApi() {
     override val requiresReferer = true
 
     override suspend fun getUrl(url: String, referer: String?, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
-        val m3u_link:String?
-        val ext_ref  = referer ?: ""
-        val post_url = "${url}?do=getVideo"
-        Log.d("Kekik_${this.name}", "post_url » ${post_url}")
+        val m3uLink:String?
+        val extRef  = referer ?: ""
+        val postUrl = "${url}?do=getVideo"
 
         val response = app.post(
-            post_url,
+            postUrl,
             data = mapOf(
                 "hash" to url.substringAfter("video/"),
-                "r"    to ext_ref,
+                "r"    to extRef,
                 "s"    to ""
             ),
-            referer = ext_ref,
+            referer = extRef,
             headers = mapOf(
                 "Content-Type"     to "application/x-www-form-urlencoded; charset=UTF-8",
                 "X-Requested-With" to "XMLHttpRequest"
             )
         )
         if (response.text.contains("teve2.com.tr\\/embed\\/")) {
-            val teve2_id       = response.text.substringAfter("teve2.com.tr\\/embed\\/").substringBefore("\"")
-            val teve2_response = app.get(
-                "https://www.teve2.com.tr/action/media/${teve2_id}",
-                referer = "https://www.teve2.com.tr/embed/${teve2_id}"
+            val teve2Id       = response.text.substringAfter("teve2.com.tr\\/embed\\/").substringBefore("\"")
+            val teve2Response = app.get(
+                "https://www.teve2.com.tr/action/media/${teve2Id}",
+                referer = "https://www.teve2.com.tr/embed/${teve2Id}"
             ).parsedSafe<Teve2ApiResponse>() ?: throw ErrorLoadingException("teve2 response is null")
 
-            m3u_link           = teve2_response.media.link.serviceUrl + "//" + teve2_response.media.link.securePath
+            m3uLink           = teve2Response.media.link.serviceUrl + "//" + teve2Response.media.link.securePath
         } else {
-            val video_response = response.parsedSafe<PeaceResponse>() ?: throw ErrorLoadingException("peace response is null")
-            val video_sources  = video_response.videoSources
-            if (video_sources.isNotEmpty()) {
-                m3u_link = video_sources.lastOrNull()?.file
+            val videoResponse = response.parsedSafe<PeaceResponse>() ?: throw ErrorLoadingException("peace response is null")
+            val videoSources  = videoResponse.videoSources
+            if (videoSources.isNotEmpty()) {
+                m3uLink = videoSources.lastOrNull()?.file
             } else {
-                m3u_link = null
+                m3uLink = null
             }
         }
 
@@ -53,8 +52,8 @@ open class PeaceMakerst : ExtractorApi() {
             ExtractorLink(
                 source  = this.name,
                 name    = this.name,
-                url     = m3u_link ?: throw ErrorLoadingException("m3u link not found"),
-                referer = ext_ref,
+                url     = m3uLink ?: throw ErrorLoadingException("m3u link not found"),
+                referer = extRef,
                 quality = Qualities.Unknown.value,
                 type    = INFER_TYPE
             )
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/PixelDrainExtractor.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/PixelDrainExtractor.kt
index 2e26409a7aa..5cd3c73dcb6 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/PixelDrainExtractor.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/PixelDrainExtractor.kt
@@ -11,15 +11,29 @@ open class PixelDrain : ExtractorApi() {
     override val requiresReferer = true
 
     override suspend fun getUrl(url: String, referer: String?, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
-        val mId = Regex("/([ul]/[\\da-zA-Z\\-]+)(?:\\?download)?").find(url)?.groupValues?.get(1)?.split("/")
-        callback.invoke(
-            ExtractorLink(
-                this.name,
-                this.name,
-                "$mainUrl/api/file/${mId?.last() ?: return}?download",
-                url,
-                Qualities.Unknown.value,
+        val mId = Regex("/u/(.*)").find(url)?.groupValues?.get(1)
+        if (mId.isNullOrEmpty())
+        {
+            callback.invoke(
+                ExtractorLink(
+                    this.name,
+                    this.name,
+                    url,
+                    url,
+                    Qualities.Unknown.value,
+                )
             )
-        )
+        }
+        else {
+            callback.invoke(
+                ExtractorLink(
+                    this.name,
+                    this.name,
+                    "$mainUrl/api/file/${mId}?download",
+                    url,
+                    Qualities.Unknown.value,
+                )
+            )
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/RapidVidExtractor.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/RapidVidExtractor.kt
index 607d2d7896a..1088f2e961e 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/RapidVidExtractor.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/RapidVidExtractor.kt
@@ -12,36 +12,45 @@ open class RapidVid : ExtractorApi() {
     override val requiresReferer = true
 
     override suspend fun getUrl(url: String, referer: String?, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
-        val ext_ref   = referer ?: ""
-        val video_req = app.get(url, referer=ext_ref).text
+        val extRef   = referer ?: ""
+        val videoReq = app.get(url, referer=extRef).text
 
-		val sub_urls = mutableSetOf<String>()
-        Regex("""captions\",\"file\":\"([^\"]+)\",\"label\":\"([^\"]+)\"""").findAll(video_req).forEach {
-            val (sub_url, sub_lang) = it.destructured
+		val subUrls = mutableSetOf<String>()
+        Regex("""captions\",\"file\":\"([^\"]+)\",\"label\":\"([^\"]+)\"""").findAll(videoReq).forEach {
+            val (subUrl, subLang) = it.destructured
 
-			if (sub_url in sub_urls) { return@forEach }
- 			sub_urls.add(sub_url)
+			if (subUrl in subUrls) { return@forEach }
+ 			subUrls.add(subUrl)
 
             subtitleCallback.invoke(
                 SubtitleFile(
-                    lang = sub_lang.replace("\\u0131", "ı").replace("\\u0130", "İ").replace("\\u00fc", "ü").replace("\\u00e7", "ç"),
-                    url  = fixUrl(sub_url.replace("\\", ""))
+                    lang = subLang.replace("\\u0131", "ı").replace("\\u0130", "İ").replace("\\u00fc", "ü").replace("\\u00e7", "ç"),
+                    url  = fixUrl(subUrl.replace("\\", ""))
                 )
             )
         }
 
-        val extracted_value = Regex("""file": "(.*)",""").find(video_req)?.groupValues?.get(1) ?: throw ErrorLoadingException("File not found")
+        var extractedValue   = Regex("""file": "(.*)",""").find(videoReq)?.groupValues?.get(1)
+        var decoded: String? = null
 
-        val bytes   = extracted_value.split("\\x").filter { it.isNotEmpty() }.map { it.toInt(16).toByte() }.toByteArray()
-        val decoded = String(bytes, Charsets.UTF_8)
-        Log.d("Kekik_${this.name}", "decoded » ${decoded}")
+        if (extractedValue != null) {
+            val bytes = extractedValue.split("\\x").filter { it.isNotEmpty() }.map { it.toInt(16).toByte() }.toByteArray()
+            decoded   = String(bytes, Charsets.UTF_8) ?: throw ErrorLoadingException("File not found")
+        } else {
+            val evalJWSsetup = Regex("""\};\s*(eval\(function[\s\S]*?)var played = \d+;""").find(videoReq)?.groupValues?.get(1) ?: throw ErrorLoadingException("File not found")
+            val JWSsetup      = getAndUnpack(getAndUnpack(evalJWSsetup)).replace("\\\\", "\\")
+            extractedValue  = Regex("""file":"(.*)","label""").find(JWSsetup)?.groupValues?.get(1)?.replace("\\\\x", "")
+
+            val bytes = extractedValue?.chunked(2)?.map { it.toInt(16).toByte() }?.toByteArray()
+            decoded   = bytes?.toString(Charsets.UTF_8) ?: throw ErrorLoadingException("File not found")
+        }
 
         callback.invoke(
             ExtractorLink(
                 source  = this.name,
                 name    = this.name,
                 url     = decoded,
-                referer = ext_ref,
+                referer = extRef,
                 quality = Qualities.Unknown.value,
                 isM3u8  = true
             )
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/SibNetExtractor.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/SibNetExtractor.kt
index ebd57f9ce18..89f731f70a5 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/SibNetExtractor.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/SibNetExtractor.kt
@@ -12,18 +12,17 @@ open class SibNet : ExtractorApi() {
     override val requiresReferer = true
 
     override suspend fun getUrl(url: String, referer: String?, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
-        val ext_ref   = referer ?: ""
-        val i_source  = app.get(url, referer=ext_ref).text
-        var m3u_link  = Regex("""player.src\(\[\{src: \"([^\"]+)""").find(i_source)?.groupValues?.get(1) ?: throw ErrorLoadingException("m3u link not found")
+        val extRef  = referer ?: ""
+        val iSource = app.get(url, referer=extRef).text
+        var m3uLink = Regex("""player.src\(\[\{src: \"([^\"]+)""").find(iSource)?.groupValues?.get(1) ?: throw ErrorLoadingException("m3u link not found")
 
-        m3u_link = "${mainUrl}${m3u_link}"
-        Log.d("Kekik_${this.name}", "m3u_link » ${m3u_link}")
+        m3uLink = "${mainUrl}${m3uLink}"
 
         callback.invoke(
             ExtractorLink(
                 source  = this.name,
                 name    = this.name,
-                url     = m3u_link,
+                url     = m3uLink,
                 referer = url,
                 quality = Qualities.Unknown.value,
                 type    = INFER_TYPE
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/StreamSilk.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/StreamSilk.kt
new file mode 100644
index 00000000000..f5ac6e6c6b0
--- /dev/null
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/StreamSilk.kt
@@ -0,0 +1,41 @@
+package com.lagradost.cloudstream3.extractors
+
+import com.lagradost.cloudstream3.SubtitleFile
+import com.lagradost.cloudstream3.USER_AGENT
+import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.utils.*
+
+open class StreamSilk : ExtractorApi() {
+    override val name = "StreamSilk"
+    override val mainUrl = "https://streamsilk.com"
+    override val requiresReferer = true
+    private val srcRegex = Regex("var urlPlay =\\s*\"(.*?m3u8.*?)\"")
+
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
+        val response = app.get(url, headers = mapOf("Accept" to "*/*"))
+        response.document.select("script").firstOrNull {
+            it.html().contains("h,u,n,t,e,r")
+        }?.html()?.let { hunted ->
+            JsHunter(hunted).dehunt()?.let { script ->
+                srcRegex.find(script)?.groupValues?.get(1)?.trim()?.let { link ->
+                    val headers = mapOf(
+                        "Origin" to mainUrl,
+                        "Referer" to "$mainUrl/",
+                        "User-Agent" to USER_AGENT,
+                    )
+                    M3u8Helper.generateM3u8(
+                        name,
+                        link,
+                        "$mainUrl/",
+                        headers = headers
+                    ).forEach(callback)
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/StreamTape.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/StreamTape.kt
index 2ee98c65282..7a97f8b8f0a 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/StreamTape.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/StreamTape.kt
@@ -4,6 +4,7 @@ import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.Qualities
+import org.mozilla.javascript.Context
 
 class StreamTapeNet : StreamTape() {
     override var mainUrl = "https://streamtape.net"
@@ -13,7 +14,7 @@ class StreamTapeXyz : StreamTape() {
     override var mainUrl = "https://streamtape.xyz"
 }
 
-class ShaveTape : StreamTape(){
+class ShaveTape : StreamTape() {
     override var mainUrl = "https://shavetape.cash"
 }
 
@@ -22,14 +23,27 @@ open class StreamTape : ExtractorApi() {
     override var mainUrl = "https://streamtape.com"
     override val requiresReferer = false
 
-    private val linkRegex =
-        Regex("""'robotlink'\)\.innerHTML = '(.+?)'\+ \('(.+?)'\)""")
-
     override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink>? {
         with(app.get(url)) {
-            linkRegex.find(this.text)?.let {
-                val extractedUrl =
-                    "https:${it.groups[1]!!.value + it.groups[2]!!.value.substring(3)}"
+            var result =
+                this.document.select("script").firstOrNull { it.html().contains("botlink').innerHTML") }
+                    ?.html()?.lines()?.firstOrNull{ it.contains("botlink').innerHTML") }?.let {
+                        val scriptContent =
+                            it.substringAfter(").innerHTML").replaceFirst("=", "var url =")
+                        val rhino = Context.enter()
+                        rhino.setInterpretedMode(true)
+                        val scope = rhino.initStandardObjects()
+                        var result = ""
+                        try {
+                            rhino.evaluateString(scope, scriptContent, "url", 1, null)
+                            result = scope.get("url", scope).toString()
+                        }finally {
+                            rhino.close()
+                        }
+                        result
+                    }
+            if(!result.isNullOrEmpty()){
+                val extractedUrl = "https:${result}&stream=1"
                 return listOf(
                     ExtractorLink(
                         name,
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/StreamWishExtractor.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/StreamWishExtractor.kt
index 551d1ef67f1..51ad0276ed4 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/StreamWishExtractor.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/StreamWishExtractor.kt
@@ -1,28 +1,142 @@
 package com.lagradost.cloudstream3.extractors
 
 import com.lagradost.cloudstream3.SubtitleFile
+import com.lagradost.cloudstream3.USER_AGENT
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
-import com.lagradost.cloudstream3.utils.getQualityFromName
+import com.lagradost.cloudstream3.utils.M3u8Helper
+import com.lagradost.cloudstream3.utils.getAndUnpack
+import com.lagradost.cloudstream3.utils.getPacked
 
+class Mwish : StreamWishExtractor() {
+    override val name = "Mwish"
+    override val mainUrl = "https://mwish.pro"
+}
+
+class Dwish : StreamWishExtractor() {
+    override val name = "Dwish"
+    override val mainUrl = "https://dwish.pro"
+}
+
+class Ewish : StreamWishExtractor() {
+    override val name = "Embedwish"
+    override val mainUrl = "https://embedwish.com"
+}
 
 class WishembedPro : StreamWishExtractor() {
+    override val name = "Wishembed"
     override val mainUrl = "https://wishembed.pro"
 }
-class CdnwishCom : StreamWishExtractor() {
-    override val mainUrl = "https://cdnwish.com"
+
+class Kswplayer : StreamWishExtractor() {
+    override val name = "Kswplayer"
+    override val mainUrl = "https://kswplayer.info"
 }
-class FlaswishCom : StreamWishExtractor() {
-    override val mainUrl = "https://flaswish.com"
+
+class Wishfast : StreamWishExtractor() {
+    override val name = "Wishfast"
+    override val mainUrl = "https://wishfast.top"
 }
+
+class Streamwish2 : StreamWishExtractor() {
+    override val mainUrl = "https://streamwish.site"
+}
+
 class SfastwishCom : StreamWishExtractor() {
+    override val name = "Sfastwish"
     override val mainUrl = "https://sfastwish.com"
 }
+
+class Strwish : StreamWishExtractor() {
+    override val name = "Strwish"
+    override val mainUrl = "https://strwish.xyz"
+}
+
+class Strwish2 : StreamWishExtractor() {
+    override val name = "Strwish"
+    override val mainUrl = "https://strwish.com"
+}
+
+class FlaswishCom : StreamWishExtractor() {
+    override val name = "Flaswish"
+    override val mainUrl = "https://flaswish.com"
+}
+
+class Awish : StreamWishExtractor() {
+    override val name = "Awish"
+    override val mainUrl = "https://awish.pro"
+}
+
+class Obeywish : StreamWishExtractor() {
+    override val name = "Obeywish"
+    override val mainUrl = "https://obeywish.com"
+}
+
+class Jodwish : StreamWishExtractor() {
+    override val name = "Jodwish"
+    override val mainUrl = "https://jodwish.com"
+}
+
+class Swhoi : StreamWishExtractor() {
+    override val name = "Swhoi"
+    override val mainUrl = "https://swhoi.com"
+}
+
+class Multimovies : StreamWishExtractor() {
+    override val name = "Multimovies"
+    override val mainUrl = "https://multimovies.cloud"
+}
+
+class UqloadsXyz : StreamWishExtractor() {
+    override val name = "Uqloads"
+    override val mainUrl = "https://uqloads.xyz"
+}
+
+class Doodporn : StreamWishExtractor() {
+    override val name = "Doodporn"
+    override val mainUrl = "https://doodporn.xyz"
+}
+
+class CdnwishCom : StreamWishExtractor() {
+    override val name = "Cdnwish"
+    override val mainUrl = "https://cdnwish.com"
+}
+
+class Asnwish : StreamWishExtractor() {
+    override val name = "Asnwish"
+    override val mainUrl = "https://asnwish.com"
+}
+
+class Nekowish : StreamWishExtractor() {
+    override val name = "Nekowish"
+    override val mainUrl = "https://nekowish.my.id"
+}
+
+class Nekostream : StreamWishExtractor() {
+    override val name = "Nekostream"
+    override val mainUrl = "https://neko-stream.click"
+}
+
+class Swdyu : StreamWishExtractor() {
+    override val name = "Swdyu"
+    override val mainUrl = "https://swdyu.com"
+}
+
+class Wishonly : StreamWishExtractor() {
+    override val name = "Wishonly"
+    override val mainUrl = "https://wishonly.site"
+}
+
+class Playerwish : StreamWishExtractor() {
+    override val name = "Playerwish"
+    override val mainUrl = "https://playerwish.com"
+}
+
 open class StreamWishExtractor : ExtractorApi() {
-    override var name = "StreamWish"
+    override val name = "Streamwish"
     override val mainUrl = "https://streamwish.to"
-    override val requiresReferer = false
+    override val requiresReferer = true
 
     override suspend fun getUrl(
         url: String,
@@ -30,27 +144,45 @@ open class StreamWishExtractor : ExtractorApi() {
         subtitleCallback: (SubtitleFile) -> Unit,
         callback: (ExtractorLink) -> Unit
     ) {
-        val doc = app.get(
-            url,
-            referer = referer,
-            allowRedirects = false
-        ).document
-        var script = doc.select("script").find {
-            it.html().contains("jwplayer(\"vplayer\").setup(")
+        val headers = mapOf(
+            "Accept" to "*/*",
+            "Connection" to "keep-alive",
+            "Sec-Fetch-Dest" to "empty",
+            "Sec-Fetch-Mode" to "cors",
+            "Sec-Fetch-Site" to "cross-site",
+            "Origin" to "$mainUrl/",
+            "User-Agent" to USER_AGENT
+        )
+        val response = app.get(getEmbedUrl(url), referer = referer)
+        val script = if (!getPacked(response.text).isNullOrEmpty()) {
+            getAndUnpack(response.text)
+        } else if (!response.document.select("script").firstOrNull {
+                it.html().contains("jwplayer(\"vplayer\").setup(")
+            }?.html().isNullOrEmpty()
+        ) {
+            response.document.select("script").firstOrNull {
+                it.html().contains("jwplayer(\"vplayer\").setup(")
+            }?.html()
+        } else {
+            response.document.selectFirst("script:containsData(sources:)")?.data()
         }
-        var scriptContent = script?.html()
-        val extractedurl = Regex("""sources: \[\{file:"(.*?)"""").find(scriptContent ?: "")?.groupValues?.get(1)
-        if (!extractedurl.isNullOrBlank()) {
-            callback(
-                ExtractorLink(
-                    this.name,
-                    this.name,
-                    extractedurl,
-                    referer ?: "$mainUrl/",
-                    getQualityFromName(""),
-                    extractedurl.contains("m3u8")
-                )
-            )
+        val m3u8 =
+            Regex("file:\\s*\"(.*?m3u8.*?)\"").find(script ?: return)?.groupValues?.getOrNull(1)
+        M3u8Helper.generateM3u8(
+            name,
+            m3u8 ?: return,
+            mainUrl,
+            headers = headers
+        ).forEach(callback)
+    }
+
+    private fun getEmbedUrl(url: String): String {
+        return if (url.contains("/f/")) {
+            val videoId = url.substringAfter("/f/")
+            "$mainUrl/$videoId"
+        } else {
+            url
         }
     }
-}
\ No newline at end of file
+
+}
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Supervideo.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Supervideo.kt
index dd49d99457f..e70cae6bdf8 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Supervideo.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Supervideo.kt
@@ -13,7 +13,7 @@ data class Files(
 
 open class Supervideo : ExtractorApi() {
     override var name = "Supervideo"
-    override var mainUrl = "https://supervideo.tv"
+    override var mainUrl = "https://supervideo.cc"
     override val requiresReferer = false
     override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink>? {
         val extractedLinksList: MutableList<ExtractorLink> = mutableListOf()
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/TRsTXExtractor.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/TRsTXExtractor.kt
index de5ca9a28c9..f2a75b94f72 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/TRsTXExtractor.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/TRsTXExtractor.kt
@@ -13,13 +13,13 @@ open class TRsTX : ExtractorApi() {
     override val requiresReferer = true
 
     override suspend fun getUrl(url: String, referer: String?, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
-        val ext_ref = referer ?: ""
+        val extRef = referer ?: ""
 
-        val video_req = app.get(url, referer=ext_ref).text
+        val videoReq = app.get(url, referer=extRef).text
 
-        val file     = Regex("""file\":\"([^\"]+)""").find(video_req)?.groupValues?.get(1) ?: throw ErrorLoadingException("File not found")
+        val file     = Regex("""file\":\"([^\"]+)""").find(videoReq)?.groupValues?.get(1) ?: throw ErrorLoadingException("File not found")
         val postLink = "${mainUrl}/" + file.replace("\\", "")
-        val rawList  = app.post(postLink, referer=ext_ref).parsedSafe<List<Any>>() ?: throw ErrorLoadingException("Post link not found")
+        val rawList  = app.post(postLink, referer=extRef).parsedSafe<List<Any>>() ?: throw ErrorLoadingException("Post link not found")
 
         val postJson: List<TrstxVideoData> = rawList.drop(1).map { item ->
             val mapItem = item as Map<*, *>
@@ -28,37 +28,35 @@ open class TRsTX : ExtractorApi() {
                 file  = mapItem["file"]  as? String
             )
         }
-        Log.d("Kekik_${this.name}", "postJson » ${postJson}")
 
-		val vid_links = mutableSetOf<String>()
-        val vid_map   = mutableListOf<Map<String, String>>()
+		val vidLinks = mutableSetOf<String>()
+        val vidMap   = mutableListOf<Map<String, String>>()
         for (item in postJson) {
             if (item.file == null || item.title == null) continue
 
             val fileUrl   = "${mainUrl}/playlist/" + item.file.substring(1) + ".txt"
-            val videoData = app.post(fileUrl, referer=ext_ref).text
+            val videoData = app.post(fileUrl, referer=extRef).text
 
-			if (videoData in vid_links) { continue }
- 			vid_links.add(videoData)
+			if (videoData in vidLinks) { continue }
+ 			vidLinks.add(videoData)
 
-            vid_map.add(mapOf(
+            vidMap.add(mapOf(
                 "title"     to item.title,
                 "videoData" to videoData
             ))
         }
 
 
-        for (mapEntry in vid_map) {
-            Log.d("Kekik_${this.name}", "mapEntry » ${mapEntry}")
+        for (mapEntry in vidMap) {
             val title    = mapEntry["title"] ?: continue
-            val m3u_link = mapEntry["videoData"] ?: continue
+            val m3uLink = mapEntry["videoData"] ?: continue
 
 	        callback.invoke(
                 ExtractorLink(
                     source  = this.name,
                     name    = "${this.name} - ${title}",
-                    url     = m3u_link,
-                    referer = ext_ref,
+                    url     = m3uLink,
+                    referer = extRef,
                     quality = Qualities.Unknown.value,
                     type    = INFER_TYPE
                 )
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/TauVideoExtractor.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/TauVideoExtractor.kt
index 157374a347e..0893b4dec4a 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/TauVideoExtractor.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/TauVideoExtractor.kt
@@ -13,12 +13,11 @@ open class TauVideo : ExtractorApi() {
     override val requiresReferer = true
 
     override suspend fun getUrl(url: String, referer: String?, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
-        val ext_ref   = referer ?: ""
-        val video_key = url.split("/").last()
-        val video_url = "${mainUrl}/api/video/${video_key}"
-        Log.d("Kekik_${this.name}", "video_url » ${video_url}")
+        val extRef   = referer ?: ""
+        val videoKey = url.split("/").last()
+        val videoUrl = "${mainUrl}/api/video/${videoKey}"
 
-        val api = app.get(video_url).parsedSafe<TauVideoUrls>() ?: throw ErrorLoadingException("TauVideo")
+        val api = app.get(videoUrl).parsedSafe<TauVideoUrls>() ?: throw ErrorLoadingException("TauVideo")
 
         for (video in api.urls) {
             callback.invoke(
@@ -26,7 +25,7 @@ open class TauVideo : ExtractorApi() {
                     source  = this.name,
                     name    = this.name,
                     url     = video.url,
-                    referer = ext_ref,
+                    referer = extRef,
                     quality = getQualityFromName(video.label),
                     type    = INFER_TYPE
                 )
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Userload.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Userload.kt
index 7752b82407f..51e60d1c5f8 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Userload.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Userload.kt
@@ -37,7 +37,7 @@ open class Userload : ExtractorApi() {
     private fun evaluateMath(mathExpression : String): String {
         val rhino = Context.enter()
         rhino.initStandardObjects()
-        rhino.optimizationLevel = -1
+        rhino.setInterpretedMode(true)
         val scope: Scriptable = rhino.initStandardObjects()
         return try {
             rhino.evaluateString(scope, "eval($mathExpression)", "JavaScript", 1, null).toString()
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VidHidePro.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VidHidePro.kt
new file mode 100644
index 00000000000..1f15fc5c6d0
--- /dev/null
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VidHidePro.kt
@@ -0,0 +1,80 @@
+package com.lagradost.cloudstream3.extractors
+
+import com.lagradost.cloudstream3.SubtitleFile
+import com.lagradost.cloudstream3.USER_AGENT
+import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.utils.*
+import com.lagradost.cloudstream3.utils.M3u8Helper.Companion.generateM3u8
+
+class VidHidePro1 : VidHidePro() {
+    override var mainUrl = "https://filelions.live"
+}
+
+class VidHidePro2 : VidHidePro() {
+    override var mainUrl = "https://filelions.online"
+}
+
+class VidHidePro3 : VidHidePro() {
+    override var mainUrl = "https://filelions.to"
+}
+
+class VidHidePro4 : VidHidePro() {
+    override val mainUrl = "https://kinoger.be"
+}
+
+class VidHidePro5: VidHidePro() {
+    override val mainUrl = "https://vidhidevip.com"
+}
+
+class VidHidePro6 : VidHidePro() {
+    override val mainUrl = "https://vidhidepre.com"
+}
+
+
+open class VidHidePro : ExtractorApi() {
+    override val name = "VidHidePro"
+    override val mainUrl = "https://vidhidepro.com"
+    override val requiresReferer = true
+
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
+        val headers = mapOf(
+            "Accept" to "*/*",
+            "Connection" to "keep-alive",
+            "Sec-Fetch-Dest" to "empty",
+            "Sec-Fetch-Mode" to "cors",
+            "Sec-Fetch-Site" to "cross-site",
+            "Origin" to "$mainUrl/",
+	        "User-Agent" to USER_AGENT,
+        )
+        
+        val response = app.get(getEmbedUrl(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,
+	        headers = headers
+        ).forEach(callback)
+    }
+
+    private fun getEmbedUrl(url: String): String {
+		return when {
+			url.contains("/d/") -> url.replace("/d/", "/v/")
+			url.contains("/download/") -> url.replace("/download/", "/v/")
+			url.contains("/file/") -> url.replace("/file/", "/v/")
+			else -> url.replace("/f/", "/v/")
+		}
+	}
+
+}
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VidMoxyExtractor.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VidMoxyExtractor.kt
index e57772cefaa..f7c3dd5e4c2 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VidMoxyExtractor.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VidMoxyExtractor.kt
@@ -12,36 +12,45 @@ open class VidMoxy : ExtractorApi() {
     override val requiresReferer = true
 
     override suspend fun getUrl(url: String, referer: String?, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
-        val ext_ref   = referer ?: ""
-        val video_req = app.get(url, referer=ext_ref).text
+        val extRef   = referer ?: ""
+        val videoReq = app.get(url, referer=extRef).text
 
-		val sub_urls = mutableSetOf<String>()
-        Regex("""captions\",\"file\":\"([^\"]+)\",\"label\":\"([^\"]+)\"""").findAll(video_req).forEach {
-            val (sub_url, sub_lang) = it.destructured
+		val subUrls = mutableSetOf<String>()
+        Regex("""captions\",\"file\":\"([^\"]+)\",\"label\":\"([^\"]+)\"""").findAll(videoReq).forEach {
+            val (subUrl, subLang) = it.destructured
 
-			if (sub_url in sub_urls) { return@forEach }
- 			sub_urls.add(sub_url)
+			if (subUrl in subUrls) { return@forEach }
+ 			subUrls.add(subUrl)
 
             subtitleCallback.invoke(
                 SubtitleFile(
-                    lang = sub_lang.replace("\\u0131", "ı").replace("\\u0130", "İ").replace("\\u00fc", "ü").replace("\\u00e7", "ç"),
-                    url  = fixUrl(sub_url.replace("\\", ""))
+                    lang = subLang.replace("\\u0131", "ı").replace("\\u0130", "İ").replace("\\u00fc", "ü").replace("\\u00e7", "ç"),
+                    url  = fixUrl(subUrl.replace("\\", ""))
                 )
             )
         }
 
-        val extracted_value = Regex("""file": "(.*)",""").find(video_req)?.groupValues?.get(1) ?: throw ErrorLoadingException("File not found")
+        var extractedValue  = Regex("""file": "(.*)",""").find(videoReq)?.groupValues?.get(1)
+        var decoded: String? = null
 
-        val bytes   = extracted_value.split("\\x").filter { it.isNotEmpty() }.map { it.toInt(16).toByte() }.toByteArray()
-        val decoded = String(bytes, Charsets.UTF_8)
-        Log.d("Kekik_${this.name}", "decoded » ${decoded}")
+        if (extractedValue != null) {
+            val bytes = extractedValue.split("\\x").filter { it.isNotEmpty() }.map { it.toInt(16).toByte() }.toByteArray()
+            decoded   = String(bytes, Charsets.UTF_8) ?: throw ErrorLoadingException("File not found")
+        } else {
+            val evaljwSetup = Regex("""\};\s*(eval\(function[\s\S]*?)var played = \d+;""").find(videoReq)?.groupValues?.get(1) ?: throw ErrorLoadingException("File not found")
+            val jwSetup     = getAndUnpack(getAndUnpack(evaljwSetup)).replace("\\\\", "\\")
+            extractedValue  = Regex("""file":"(.*)","label""").find(jwSetup)?.groupValues?.get(1)?.replace("\\\\x", "")
+
+            val bytes = extractedValue?.chunked(2)?.map { it.toInt(16).toByte() }?.toByteArray()
+            decoded   = bytes?.toString(Charsets.UTF_8) ?: throw ErrorLoadingException("File not found")
+        }
 
         callback.invoke(
             ExtractorLink(
                 source  = this.name,
                 name    = this.name,
                 url     = decoded,
-                referer = ext_ref,
+                referer = extRef,
                 quality = Qualities.Unknown.value,
                 isM3u8  = true
             )
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VidSrcExtractor.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VidSrcExtractor.kt
index a27bf1887bc..5da919e2f09 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VidSrcExtractor.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VidSrcExtractor.kt
@@ -3,98 +3,251 @@ package com.lagradost.cloudstream3.extractors
 import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.amap
 import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.utils.*
-import kotlinx.coroutines.delay
-import java.net.URI
+import com.lagradost.cloudstream3.utils.ExtractorApi
+import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.Qualities
+import com.lagradost.cloudstream3.utils.loadExtractor
+import java.util.Base64
 
 class VidSrcExtractor2 : VidSrcExtractor() {
-    override val mainUrl = "https://vidsrc.me/embed"
-    override suspend fun getUrl(
-        url: String,
-        referer: String?,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
-    ) {
-        val newUrl = url.lowercase().replace(mainUrl, super.mainUrl)
-        super.getUrl(newUrl, referer, subtitleCallback, callback)
-    }
+    override val mainUrl = "https://vidsrc.me"
 }
 
 open class VidSrcExtractor : ExtractorApi() {
     override val name = "VidSrc"
-    private val absoluteUrl = "https://v2.vidsrc.me"
-    override val mainUrl = "$absoluteUrl/embed"
+    override val mainUrl = "https://vidsrc.net"
+    private val apiUrl = "https://vidsrc.stream"
     override val requiresReferer = false
 
-    companion object {
-        /** Infinite function to validate the vidSrc pass */
-        suspend fun validatePass(url: String) {
-            val uri = URI(url)
-            val host = uri.host
-
-            // Basically turn https://tm3p.vidsrc.stream/ -> https://vidsrc.stream/
-            val referer = host.split(".").let {
-                val size = it.size
-                "https://" + it.subList(maxOf(0, size - 2), size).joinToString(".") + "/"
-            }
-
-            while (true) {
-                app.get(url, referer = referer)
-                delay(60_000)
-            }
-        }
-    }
-
     override suspend fun getUrl(
-        url: String,
-        referer: String?,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
+            url: String,
+            referer: String?,
+            subtitleCallback: (SubtitleFile) -> Unit,
+            callback: (ExtractorLink) -> Unit
     ) {
         val iframedoc = app.get(url).document
 
-        val serverslist =
-            iframedoc.select("div#sources.button_content div#content div#list div").map {
-                val datahash = it.attr("data-hash")
-                if (datahash.isNotBlank()) {
-                    val links = try {
-                        app.get(
-                            "$absoluteUrl/srcrcp/$datahash",
-                            referer = "https://rcp.vidsrc.me/"
-                        ).url
-                    } catch (e: Exception) {
-                        ""
-                    }
-                    links
-                } else ""
-            }
+        val srcrcpList =
+                iframedoc.select("div.serversList > div.server").mapNotNull {
+                    val datahash = it.attr("data-hash") ?: return@mapNotNull null
+                    val rcpLink = "$apiUrl/rcp/$datahash"
+                    val rcpRes = app.get(rcpLink, referer = apiUrl).text
+                    val srcrcpLink =
+                            Regex("src:\\s*'(.*)',").find(rcpRes)?.destructured?.component1()
+                                    ?: return@mapNotNull null
+                    "https:$srcrcpLink"
+                }
 
-        serverslist.amap { server ->
-            val linkfixed = server.replace("https://vidsrc.xyz/", "https://embedsito.com/")
-            if (linkfixed.contains("/prorcp")) {
-                val srcresponse = app.get(server, referer = absoluteUrl).text
-                val m3u8Regex = Regex("((https:|http:)//.*\\.m3u8)")
-                val srcm3u8 = m3u8Regex.find(srcresponse)?.value ?: return@amap
-                val passRegex = Regex("""['"](.*set_pass[^"']*)""")
-                val pass = passRegex.find(srcresponse)?.groupValues?.get(1)?.replace(
-                    Regex("""^//"""), "https://"
-                )
+        srcrcpList.amap { server ->
+            val res = app.get(server, referer = apiUrl)
+            if (res.url.contains("/prorcp")) {
+                val encodedElement = res.document.select("div#reporting_content+div")
+                val decodedUrl =
+                        decodeUrl(encodedElement.attr("id"), encodedElement.text()) ?: return@amap
 
                 callback.invoke(
-                    ExtractorLink(
-                        this.name,
-                        this.name,
-                        srcm3u8,
-                        "https://vidsrc.stream/",
-                        Qualities.Unknown.value,
-                        extractorData = pass,
-                        isM3u8 = true
-                    )
+                        ExtractorLink(
+                                this.name,
+                                this.name,
+                                decodedUrl,
+                                apiUrl,
+                                Qualities.Unknown.value,
+                                isM3u8 = true
+                        )
                 )
             } else {
-                loadExtractor(linkfixed, url, subtitleCallback, callback)
+                loadExtractor(res.url, url, subtitleCallback, callback)
             }
         }
     }
 
-}
\ No newline at end of file
+    private fun decodeUrl(encType: String, url: String): String? {
+        return when (encType) {
+            "NdonQLf1Tzyx7bMG" -> bMGyx71TzQLfdonN(url)
+            "sXnL9MQIry" -> Iry9MQXnLs(url)
+            "IhWrImMIGL" -> IGLImMhWrI(url)
+            "xTyBxQyGTA" -> GTAxQyTyBx(url)
+            "ux8qjPHC66" -> C66jPHx8qu(url)
+            "eSfH1IRMyL" -> MyL1IRSfHe(url)
+            "KJHidj7det" -> detdj7JHiK(url)
+            "o2VSUnjnZl" -> nZlUnj2VSo(url)
+            "Oi3v1dAlaM" -> laM1dAi3vO(url)
+            "TsA2KGDGux" -> GuxKGDsA2T(url)
+            "JoAHUMCLXV" -> LXVUMCoAHJ(url)
+            else -> null
+        }
+    }
+
+    private fun bMGyx71TzQLfdonN(a: String): String {
+        val b = 3
+        val c = mutableListOf<String>()
+        var d = 0
+        while (d < a.length) {
+            c.add(a.substring(d, minOf(d + b, a.length)))
+            d += b
+        }
+        val e = c.reversed().joinToString("")
+        return e
+    }
+
+    private fun Iry9MQXnLs(a: String): String {
+        val b = "pWB9V)[*4I`nJpp?ozyB~dbr9yt!_n4u"
+        val d = a.chunked(2).map { it.toInt(16).toChar() }.joinToString("")
+        var c = ""
+        for (e in d.indices) {
+            c += (d[e].code xor b[e % b.length].code).toChar()
+        }
+        var e = ""
+        for (ch in c) {
+            e += (ch.code - 3).toChar()
+        }
+        return String(Base64.getDecoder().decode(e))
+    }
+
+    private fun IGLImMhWrI(a: String): String {
+        val b = a.reversed()
+        val c =
+                b
+                        .map {
+                            when (it) {
+                                in 'a'..'m', in 'A'..'M' -> it + 13
+                                in 'n'..'z', in 'N'..'Z' -> it - 13
+                                else -> it
+                            }
+                        }
+                        .joinToString("")
+        val d = c.reversed()
+        return String(Base64.getDecoder().decode(d))
+    }
+
+    private fun GTAxQyTyBx(a: String): String {
+        val b = a.reversed()
+        val c = b.filterIndexed { index, _ -> index % 2 == 0 }
+        return String(Base64.getDecoder().decode(c))
+    }
+
+    private fun C66jPHx8qu(a: String): String {
+        val b = a.reversed()
+        val c = "X9a(O;FMV2-7VO5x;Ao:dN1NoFs?j,"
+        val d = b.chunked(2).map { it.toInt(16).toChar() }.joinToString("")
+        var e = ""
+        for (i in d.indices) {
+            e += (d[i].code xor c[i % c.length].code).toChar()
+        }
+        return e
+    }
+
+    private fun MyL1IRSfHe(a: String): String {
+        val b = a.reversed()
+        val c = b.map { (it.code - 1).toChar() }.joinToString("")
+        val d = c.chunked(2).map { it.toInt(16).toChar() }.joinToString("")
+        return d
+    }
+
+    private fun detdj7JHiK(a: String): String {
+        val b = a.substring(10, a.length - 16)
+        val c = "3SAY~#%Y(V%>5d/Yg\"\$G[Lh1rK4a;7ok"
+        val d = String(Base64.getDecoder().decode(b))
+        val e = c.repeat((d.length + c.length - 1) / c.length).substring(0, d.length)
+        var f = ""
+        for (i in d.indices) {
+            f += (d[i].code xor e[i].code).toChar()
+        }
+        return f
+    }
+
+    private fun nZlUnj2VSo(a: String): String {
+        val b =
+                mapOf(
+                        'x' to 'a',
+                        'y' to 'b',
+                        'z' to 'c',
+                        'a' to 'd',
+                        'b' to 'e',
+                        'c' to 'f',
+                        'd' to 'g',
+                        'e' to 'h',
+                        'f' to 'i',
+                        'g' to 'j',
+                        'h' to 'k',
+                        'i' to 'l',
+                        'j' to 'm',
+                        'k' to 'n',
+                        'l' to 'o',
+                        'm' to 'p',
+                        'n' to 'q',
+                        'o' to 'r',
+                        'p' to 's',
+                        'q' to 't',
+                        'r' to 'u',
+                        's' to 'v',
+                        't' to 'w',
+                        'u' to 'x',
+                        'v' to 'y',
+                        'w' to 'z',
+                        'X' to 'A',
+                        'Y' to 'B',
+                        'Z' to 'C',
+                        'A' to 'D',
+                        'B' to 'E',
+                        'C' to 'F',
+                        'D' to 'G',
+                        'E' to 'H',
+                        'F' to 'I',
+                        'G' to 'J',
+                        'H' to 'K',
+                        'I' to 'L',
+                        'J' to 'M',
+                        'K' to 'N',
+                        'L' to 'O',
+                        'M' to 'P',
+                        'N' to 'Q',
+                        'O' to 'R',
+                        'P' to 'S',
+                        'Q' to 'T',
+                        'R' to 'U',
+                        'S' to 'V',
+                        'T' to 'W',
+                        'U' to 'X',
+                        'V' to 'Y',
+                        'W' to 'Z'
+                )
+        return a.map { b[it] ?: it }.joinToString("")
+    }
+
+    private fun laM1dAi3vO(a: String): String {
+        val b = a.reversed()
+        val c = b.replace("-", "+").replace("_", "/")
+        val d = String(Base64.getDecoder().decode(c))
+        var e = ""
+        val f = 5
+        for (ch in d) {
+            e += (ch.code - f).toChar()
+        }
+        return e
+    }
+
+    private fun GuxKGDsA2T(a: String): String {
+        val b = a.reversed()
+        val c = b.replace("-", "+").replace("_", "/")
+        val d = String(Base64.getDecoder().decode(c))
+        var e = ""
+        val f = 7
+        for (ch in d) {
+            e += (ch.code - f).toChar()
+        }
+        return e
+    }
+
+    private fun LXVUMCoAHJ(a: String): String {
+        val b = a.reversed()
+        val c = b.replace("-", "+").replace("_", "/")
+        val d = String(Base64.getDecoder().decode(c))
+        var e = ""
+        val f = 3
+        for (ch in d) {
+            e += (ch.code - f).toChar()
+        }
+        return e
+    }
+}
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VidSrcTo.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VidSrcTo.kt
index 578f5fb93e8..fa1e9796a15 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VidSrcTo.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VidSrcTo.kt
@@ -4,7 +4,6 @@ import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.amap
 import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.base64Decode
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
@@ -14,9 +13,10 @@ import javax.crypto.spec.SecretKeySpec
 import kotlin.io.encoding.Base64
 import kotlin.io.encoding.ExperimentalEncodingApi
 
-class VidSrcTo : ExtractorApi() {
+@OptIn(ExperimentalEncodingApi::class)
+open class VidSrcTo : ExtractorApi() {
     override val name = "VidSrcTo"
-    override val mainUrl = "https://vidsrc.to"
+    override val mainUrl = "https://vidsrc2.to"
     override val requiresReferer = true
 
     override suspend fun getUrl(
@@ -31,17 +31,18 @@ class VidSrcTo : ExtractorApi() {
         subRes?.forEach {
             if (it.kind.equals("captions")) subtitleCallback.invoke(SubtitleFile(it.label, it.file))
         }
-        val sourcesLink = "$mainUrl/ajax/embed/episode/$mediaId/sources"
+        val sourcesLink = "$mainUrl/ajax/embed/episode/$mediaId/sources?token=${vrfEncrypt(RowdyAvocadoKeys.getKeys(), mediaId)}"
         val res = app.get(sourcesLink).parsedSafe<VidsrctoEpisodeSources>() ?: return
         if (res.status != 200) return
         res.result?.amap { source ->
             try {
-                val embedRes = app.get("$mainUrl/ajax/embed/source/${source.id}").parsedSafe<VidsrctoEmbedSource>() ?: return@amap
-                val finalUrl = DecryptUrl(embedRes.result.encUrl)
+                val embedResUrl = "$mainUrl/ajax/embed/source/${source.id}?token=${vrfEncrypt(RowdyAvocadoKeys.getKeys(), source.id)}"
+                val embedRes = app.get(embedResUrl).parsedSafe<VidsrctoEmbedSource>() ?: return@amap
+                val finalUrl = vrfDecrypt(RowdyAvocadoKeys.getKeys(), embedRes.result.encUrl)
                 if(finalUrl.equals(embedRes.result.encUrl)) return@amap
                 when (source.title) {
-                    "Vidplay" -> AnyVidplay(finalUrl.substringBefore("/e/")).getUrl(finalUrl, referer, subtitleCallback, callback)
-                    "Filemoon" -> FileMoon().getUrl(finalUrl, referer, subtitleCallback, callback)
+                    "Server 1" -> AnyVidplay(finalUrl.substringBefore("/e/")).getUrl(finalUrl, referer, subtitleCallback, callback)
+                    "Server 2" -> FileMoon().getUrl(finalUrl, referer, subtitleCallback, callback)
                 }
             } catch (e: Exception) {
                 logError(e)
@@ -49,14 +50,64 @@ class VidSrcTo : ExtractorApi() {
         }
     }
 
-    @OptIn(ExperimentalEncodingApi::class)
-    private fun DecryptUrl(encUrl: String): String {
-        val data = Base64.UrlSafe.decode(encUrl)
-        val rc4Key = SecretKeySpec("WXrUARXb1aDLaZjI".toByteArray(), "RC4")
+    private fun vrfEncrypt(keys: RowdyAvocadoKeys.KeysData, input: String): String {
+        var vrf = input
+        keys.vidsrcto.sortedBy { it.sequence }.forEach { step ->
+            when(step.method) {
+                "exchange" -> vrf = exchange(vrf, step.keys?.get(0) ?: return@forEach, step.keys.get(1))
+                "rc4" -> vrf = rc4Encryption(step.keys?.get(0) ?: return@forEach, vrf)
+                "reverse" -> vrf = vrf.reversed()
+                "base64" -> vrf = Base64.UrlSafe.encode(vrf.toByteArray())
+                "else" -> {}
+            }
+        }
+        // vrf = java.net.URLEncoder.encode(vrf, "UTF-8")
+        return vrf
+    }
+
+    private fun vrfDecrypt(keys: RowdyAvocadoKeys.KeysData, input: String): String {
+        var vrf = input
+        keys.vidsrcto.sortedByDescending { it.sequence }.forEach { step ->
+            when(step.method) {
+                "exchange" -> vrf = exchange(vrf, step.keys?.get(1) ?: return@forEach, step.keys.get(0))
+                "rc4" -> vrf = rc4Decryption(step.keys?.get(0) ?: return@forEach, vrf)
+                "reverse" -> vrf = vrf.reversed()
+                "base64" -> vrf = Base64.UrlSafe.decode(vrf).toString(Charsets.UTF_8)
+                "else" -> {}
+            }
+        }
+        return URLDecoder.decode(vrf, "utf-8")
+    }
+
+    private fun rc4Encryption(key: String, input: String): String {
+        val rc4Key = SecretKeySpec(key.toByteArray(), "RC4")
         val cipher = Cipher.getInstance("RC4")
         cipher.init(Cipher.DECRYPT_MODE, rc4Key, cipher.parameters)
-        val finalData = cipher.doFinal(data)
-        return URLDecoder.decode(finalData.toString(Charsets.UTF_8), "utf-8")
+        var output = cipher.doFinal(input.toByteArray())
+        output = Base64.UrlSafe.encode(output).toByteArray()
+        return output.toString(Charsets.UTF_8)
+    }
+
+    private fun rc4Decryption(key: String, input: String): String {
+        var vrf = input.toByteArray()
+        vrf = Base64.UrlSafe.decode(vrf)
+        val rc4Key = SecretKeySpec(key.toByteArray(), "RC4")
+        val cipher = Cipher.getInstance("RC4")
+        cipher.init(Cipher.DECRYPT_MODE, rc4Key, cipher.parameters)
+        vrf = cipher.doFinal(vrf)
+
+        return vrf.toString(Charsets.UTF_8)
+    }
+
+    private fun exchange(input: String, key1: String, key2: String): String {
+        return input.map { i -> 
+            val index = key1.indexOf(i)
+            if (index != -1) {
+                key2[index]
+            } else {
+                i
+            }
+        }.joinToString("")
     }
 
     data class VidsrctoEpisodeSources(
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VidStack.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VidStack.kt
new file mode 100644
index 00000000000..56d37352503
--- /dev/null
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VidStack.kt
@@ -0,0 +1,52 @@
+package com.lagradost.cloudstream3.extractors
+
+import com.lagradost.cloudstream3.app
+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.spec.IvParameterSpec
+import javax.crypto.spec.SecretKeySpec
+
+class VidStack : ExtractorApi() {
+    override var name = "Vidstack"
+    override var mainUrl = "https://vidstack.io"
+    override val requiresReferer = true
+
+    override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink> {
+        val headers= mapOf("User-Agent" to "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:134.0) Gecko/20100101 Firefox/134.0")
+        val hash=url.substringAfterLast("#")
+        val encoded= app.get("$mainUrl/api/v1/video?id=$hash",headers=headers).text.trim()
+        val decryptedText = AesHelper.decryptAES(encoded, "kiemtienmua911ca", "0123456789abcdef")
+        val m3u8=Regex("\"source\":\"(.*?)\"").find(decryptedText)?.groupValues?.get(1)?.replace("\\/","/") ?:""
+        return listOf(
+            ExtractorLink(
+                this.name,
+                this.name,
+                m3u8,
+                url,
+                Qualities.Unknown.value,
+                isM3u8 = true
+            )
+        )
+    }
+}
+
+object AesHelper {
+    private const val TRANSFORMATION = "AES/CBC/PKCS5PADDING"
+
+    fun decryptAES(inputHex: String, key: String, iv: String): String {
+        val cipher = Cipher.getInstance(TRANSFORMATION)
+        val secretKey = SecretKeySpec(key.toByteArray(Charsets.UTF_8), "AES")
+        val ivSpec = IvParameterSpec(iv.toByteArray(Charsets.UTF_8))
+
+        cipher.init(Cipher.DECRYPT_MODE, secretKey, ivSpec)
+        val decryptedBytes = cipher.doFinal(inputHex.hexToByteArray())
+        return String(decryptedBytes, Charsets.UTF_8)
+    }
+
+    private fun String.hexToByteArray(): ByteArray {
+        check(length % 2 == 0) { "Hex string must have an even length" }
+        return chunked(2).map { it.toInt(16).toByte() }.toByteArray()
+    }
+}
\ No newline at end of file
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VideoSeyredExtractor.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VideoSeyredExtractor.kt
index 1161ff6600a..c85e64165c6 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VideoSeyredExtractor.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VideoSeyredExtractor.kt
@@ -15,14 +15,13 @@ open class VideoSeyred : ExtractorApi() {
     override val requiresReferer = true
 
     override suspend fun getUrl(url: String, referer: String?, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
-        val ext_ref   = referer ?: ""
-        val video_id  = url.substringAfter("embed/").substringBefore("?")
-        val video_url = "${mainUrl}/playlist/${video_id}.json"
-        Log.d("Kekik_${this.name}", "video_url » ${video_url}")
+        val extRef   = referer ?: ""
+        val videoId  = url.substringAfter("embed/").substringBefore("?")
+        val videoUrl = "${mainUrl}/playlist/${videoId}.json"
 
-        val response_raw                          = app.get(video_url)
-        val response_list:List<VideoSeyredSource> = jacksonObjectMapper().readValue(response_raw.text) ?: throw ErrorLoadingException("VideoSeyred")
-        val response                              = response_list[0] ?: throw ErrorLoadingException("VideoSeyred")
+        val responseRaw                          = app.get(videoUrl)
+        val responseList:List<VideoSeyredSource> = jacksonObjectMapper().readValue(responseRaw.text) ?: throw ErrorLoadingException("VideoSeyred")
+        val response                              = responseList[0] ?: throw ErrorLoadingException("VideoSeyred")
 
         for (track in response.tracks) {
             if (track.label != null && track.kind == "captions") {
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vidguard.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vidguard.kt
index c48b683c72a..0ae28ad85bd 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vidguard.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vidguard.kt
@@ -12,7 +12,20 @@ import org.mozilla.javascript.Context
 import org.mozilla.javascript.NativeJSON
 import org.mozilla.javascript.NativeObject
 import org.mozilla.javascript.Scriptable
-import java.util.Base64
+import kotlin.io.encoding.Base64
+import kotlin.io.encoding.ExperimentalEncodingApi
+
+class Vidguardto1 : Vidguardto() {
+    override val mainUrl = "https://bembed.net"
+}
+
+class Vidguardto2 : Vidguardto() {
+    override val mainUrl = "https://listeamed.net"
+}
+
+class Vidguardto3 : Vidguardto() {
+    override val mainUrl = "https://vgfplay.com"
+}
 
 open class Vidguardto : ExtractorApi() {
     override val name = "Vidguard"
@@ -25,8 +38,8 @@ open class Vidguardto : ExtractorApi() {
         subtitleCallback: (SubtitleFile) -> Unit,
         callback: (ExtractorLink) -> Unit
     ) {
-	val res = app.get(url)
-	val resc = res.document.select("script:containsData(eval)").firstOrNull()?.data()
+        val res = app.get(getEmbedUrl(url))
+        val resc = res.document.select("script:containsData(eval)").firstOrNull()?.data()
         resc?.let {
             val jsonStr2 = AppUtils.parseJson<SvgObject>(runJS2(it))
             val watchlink = sigDecode(jsonStr2.stream)
@@ -44,58 +57,83 @@ open class Vidguardto : ExtractorApi() {
         }
     }
 
-    private fun sigDecode(url: String): String {
+    @OptIn(ExperimentalEncodingApi::class)
+	private fun sigDecode(url: String): String {
         val sig = url.split("sig=")[1].split("&")[0]
-        var t = ""
-        for (v in sig.chunked(2)) {
-            val byteValue = Integer.parseInt(v, 16) xor 2
-            t += byteValue.toChar()
-        }
-        val padding = when (t.length % 4) {
-            2 -> "=="
-            3 -> "="
-            else -> ""
-        }
-        val decoded = Base64.getDecoder().decode((t + padding).toByteArray(Charsets.UTF_8))
-        t = String(decoded).dropLast(5).reversed()
-        val charArray = t.toCharArray()
-        for (i in 0 until charArray.size - 1 step 2) {
-            val temp = charArray[i]
-            charArray[i] = charArray[i + 1]
-            charArray[i + 1] = temp
-        }
-        val modifiedSig = String(charArray).dropLast(5)
-        return url.replace(sig, modifiedSig)
+        val t = sig.chunked(2)
+            .joinToString("") { (Integer.parseInt(it, 16) xor 2).toChar().toString() }
+            .let {
+                val padding = when (it.length % 4) {
+                    2 -> "=="
+                    3 -> "="
+                    else -> ""
+                }
+                String(Base64.decode((it + padding).toByteArray(Charsets.UTF_8)))
+            }
+            .dropLast(5)
+            .reversed()
+            .toCharArray()
+            .apply {
+                for (i in indices step 2) {
+                    if (i + 1 < size) {
+                        this[i] = this[i + 1].also { this[i + 1] = this[i] }
+                    }
+                }
+            }
+            .concatToString()
+            .dropLast(5)
+        return url.replace(sig, t)
     }
 
     private fun runJS2(hideMyHtmlContent: String): String {
-        Log.d("runJS", "start")
-        val rhino = Context.enter()
-        rhino.initSafeStandardObjects()
-        rhino.optimizationLevel = -1
-        val scope: Scriptable = rhino.initSafeStandardObjects()
-        scope.put("window", scope, scope)
         var result = ""
-        try {
-            Log.d("runJS", "Executing JavaScript: $hideMyHtmlContent")
-            rhino.evaluateString(scope, hideMyHtmlContent, "JavaScript", 1, null)
-            val svgObject = scope.get("svg", scope)
-            result = if (svgObject is NativeObject) {
-                NativeJSON.stringify(Context.getCurrentContext(), scope, svgObject, null, null).toString()
-            } else {
-                Context.toString(svgObject)
+        val r = Runnable {
+            val rhino = Context.enter()
+            rhino.initSafeStandardObjects()
+            rhino.setInterpretedMode(true)
+            val scope: Scriptable = rhino.initSafeStandardObjects()
+            scope.put("window", scope, scope)
+            try {
+                rhino.evaluateString(
+                    scope,
+                    hideMyHtmlContent,
+                    "JavaScript",
+                    1,
+                    null
+                )
+                val svgObject = scope.get("svg", scope)
+                result = if (svgObject is NativeObject) {
+                    NativeJSON.stringify(
+                        Context.getCurrentContext(),
+                        scope,
+                        svgObject,
+                        null,
+                        null
+                    ).toString()
+                } else {
+                    Context.toString(svgObject)
+                }
+            } catch (e: Exception) {
+                Log.e("runJS", "Error executing JavaScript: ${e.message}")
+            } finally {
+                Context.exit()
             }
-            Log.d("runJS", "Result: $result")
-        } catch (e: Exception) {
-            Log.e("runJS", "Error executing JavaScript: ${e.message}")
-        } finally {
-            Context.exit()
         }
+        val t = Thread(ThreadGroup("A"), r, "thread_rhino", 8 * 1024 * 1024) // Increase stack size to 8MB
+        t.start()
+        t.join()
+        t.interrupt()
         return result
     }
+	
+    private fun getEmbedUrl(url: String): String {
+        return url.takeIf { it.contains("/d/") || it.contains("/v/") }
+            ?.replace("/d/", "/e/")?.replace("/v/", "/e/") ?: url
+    }
 
     data class SvgObject(
         val stream: String,
         val hash: String
-    )
+    )	
+	
 }
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vidmoly.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vidmoly.kt
index 979fd8c5023..6abecf4b13e 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vidmoly.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vidmoly.kt
@@ -2,9 +2,11 @@ package com.lagradost.cloudstream3.extractors
 
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.SubtitleFile
+import com.lagradost.cloudstream3.USER_AGENT
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.utils.*
 import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
+import kotlinx.coroutines.delay
 
 class Vidmolyme : Vidmoly() {
     override val mainUrl = "https://vidmoly.me"
@@ -26,15 +28,25 @@ open class Vidmoly : ExtractorApi() {
         callback: (ExtractorLink) -> Unit
     ) {
         val headers  = mapOf(
-            "User-Agent"     to "Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Mobile Safari/537.36",
+            "user-agent"     to USER_AGENT,
             "Sec-Fetch-Dest" to "iframe"
         )
-        val script = app.get(
-            url,
-            headers = headers,
-            referer = referer,
-        ).document.select("script")
-            .find { it.data().contains("sources:") }?.data()
+        val newUrl = if(url.contains("/w/"))
+            url.replaceFirst("/w/", "/embed-")+"-920x360.html"
+            else url
+        var script: String? = null;
+        var attemps = 0
+        while (attemps < 10 && script.isNullOrEmpty()){
+            attemps++
+            script = app.get(
+                newUrl,
+                headers = headers,
+                referer = referer,
+            ).document.select("script")
+                .firstOrNull { it.data().contains("sources:") }?.data()
+            if(script.isNullOrEmpty())
+                delay(500)
+        }
         val videoData = script?.substringAfter("sources: [")
             ?.substringBefore("],")?.addMarks("file")
         val subData = script?.substringAfter("tracks: [")?.substringBefore("]")?.addMarks("file")
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vidplay.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vidplay.kt
index 6202800faeb..5e07023d4c9 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vidplay.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vidplay.kt
@@ -4,13 +4,14 @@ 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.base64Encode
+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
+import java.net.URLDecoder
 import javax.crypto.Cipher
 import javax.crypto.spec.SecretKeySpec
-import kotlin.run
+import kotlin.io.encoding.Base64
 
 // Code found in https://github.com/KillerDogeEmpire/vidplay-keys
 // special credits to @KillerDogeEmpire for providing key
@@ -33,29 +34,38 @@ class VidplayOnline : Vidplay() {
     override val mainUrl = "https://vidplay.online"
 }
 
-open class Vidplay : ExtractorApi() {
-    override val name = "Vidplay"
-    override val mainUrl = "https://vidplay.site"
-    override val requiresReferer = true
+object RowdyAvocadoKeys {
+    data class KeysData(
+        @JsonProperty("vidplay") val vidplay: List<Step> = emptyList(),
+        @JsonProperty("chillx") val chillx: List<String> = emptyList(),
+        @JsonProperty("vidsrcto") val vidsrcto: List<Step> = emptyList(),
+    )
 
-    companion object {
-        private val keySource = "https://rowdy-avocado.github.io/multi-keys/"
+    data class Step(
+        @JsonProperty("sequence") val sequence: Int,
+        @JsonProperty("method") val method: String,
+        @JsonProperty("keys") val keys: List<String>? = null
+    )
 
-        private var keys: List<String>? = null
+    private const val SOURCE = "https://rowdy-avocado.github.io/multi-keys/"
 
-        private suspend fun getKeys(): List<String> {
-            return keys
-                    ?: run {
-                        val res =
-                                app.get(keySource).parsedSafe<KeysData>()
-                                        ?: throw ErrorLoadingException("Unable to get keys")
-                        keys = res.keys
-                        res.keys
-                    }
-        }
+    private var keys: KeysData? = null
 
-        private data class KeysData(@JsonProperty("vidplay") val keys: List<String>)
+    suspend fun getKeys(): KeysData {
+        return keys
+            ?: run {
+                keys = app.get(SOURCE).parsedSafe<KeysData>()
+                    ?: throw ErrorLoadingException("Unable to get keys")
+                keys!!
+            }
     }
+}
+
+@OptIn(kotlin.io.encoding.ExperimentalEncodingApi::class)
+open class Vidplay : ExtractorApi() {
+    override val name = "Vidplay"
+    override val mainUrl = "https://vidplay.site"
+    override val requiresReferer = true
 
     override suspend fun getUrl(
         url: String,
@@ -63,59 +73,94 @@ open class Vidplay : ExtractorApi() {
         subtitleCallback: (SubtitleFile) -> Unit,
         callback: (ExtractorLink) -> Unit
     ) {
+        val myKeys = RowdyAvocadoKeys.getKeys()
+        val domain = url.substringBefore("/e/")
         val id = url.substringBefore("?").substringAfterLast("/")
-        val encodeId = encodeId(id, getKeys())
-        val mediaUrl = callFutoken(encodeId, url)
-        val res = app.get(
-            "$mediaUrl", headers = mapOf(
-                "Accept" to "application/json, text/javascript, */*; q=0.01",
-                "X-Requested-With" to "XMLHttpRequest",
-            ), referer = url
-        ).parsedSafe<Response>()?.result
-
+        val encodedId = vrfEncrypt(myKeys, id)
+        val t = url.substringAfter("t=").substringBefore("&")
+        val h = rc4Encryption(myKeys.vidplay.find { it.method == "h" }?.keys?.get(0) ?: return, id)
+        val mediaUrl = "$domain/mediainfo/$encodedId?t=$t&h=$h"
+        val encodedRes = app.get("$mediaUrl").parsedSafe<Response>()?.result
+            ?: throw Exception("Unable to fetch link")
+        val decodedRes = vrfDecrypt(myKeys, encodedRes)
+        val res = tryParseJson<Result>(decodedRes)
         res?.sources?.map {
-            M3u8Helper.generateM3u8(
-                this.name,
-                it.file ?: return@map,
-                "$mainUrl/"
-            ).forEach(callback)
+            M3u8Helper.generateM3u8(this.name, it.file ?: return@map, "$mainUrl/").forEach(callback)
         }
 
         res?.tracks?.filter { it.kind == "captions" }?.map {
-            subtitleCallback.invoke(
-                SubtitleFile(it.label ?: return@map, it.file ?: return@map)
-            )
+            subtitleCallback.invoke(SubtitleFile(it.label ?: return@map, it.file ?: return@map))
         }
+    }
 
+    private fun vrfEncrypt(keys: RowdyAvocadoKeys.KeysData, input: String): String? {
+        var vrf = input
+        keys.vidplay.sortedBy { it.sequence }.forEach { step ->
+            when (step.method) {
+                "exchange" -> vrf = exchange(
+                    vrf,
+                    step.keys?.get(0) ?: return@forEach,
+                    step.keys?.get(1) ?: return@forEach
+                )
+
+                "rc4" -> vrf = rc4Encryption(step.keys?.get(0) ?: return@forEach, vrf)
+                "reverse" -> vrf = vrf.reversed()
+                "base64" -> vrf = Base64.UrlSafe.encode(vrf.toByteArray())
+                "else" -> {}
+            }
+        }
+        // vrf = java.net.URLEncoder.encode(vrf, "UTF-8")
+        return vrf
     }
 
-    private suspend fun callFutoken(id: String, url: String): String? {
-        val script = app.get("$mainUrl/futoken", referer = url).text
-        val k = "k='(\\S+)'".toRegex().find(script)?.groupValues?.get(1) ?: return null
-        val a = mutableListOf(k)
-        for (i in id.indices) {
-            a.add((k[i % k.length].code + id[i].code).toString())
+    private fun vrfDecrypt(keys: RowdyAvocadoKeys.KeysData, input: String): String {
+        var vrf = input
+        keys.vidplay.sortedByDescending { it.sequence }.forEach { step ->
+            when (step.method) {
+                "exchange" -> vrf = exchange(
+                    vrf,
+                    step.keys?.get(1) ?: return@forEach,
+                    step.keys?.get(0) ?: return@forEach
+                )
+
+                "rc4" -> vrf = rc4Decryption(step.keys?.get(0) ?: return@forEach, vrf)
+                "reverse" -> vrf = vrf.reversed()
+                "base64" -> vrf = Base64.UrlSafe.decode(vrf).toString(Charsets.UTF_8)
+                "else" -> {}
+            }
         }
-        return "$mainUrl/mediainfo/${a.joinToString(",")}?${url.substringAfter("?")}"
+        return URLDecoder.decode(vrf, "utf-8")
     }
 
-    private fun encodeId(id: String, keyList: List<String>): String {
-        val cipher1 = Cipher.getInstance("RC4")
-        val cipher2 = Cipher.getInstance("RC4")
-        cipher1.init(
-            Cipher.DECRYPT_MODE,
-            SecretKeySpec(keyList[0].toByteArray(), "RC4"),
-            cipher1.parameters
-        )
-        cipher2.init(
-            Cipher.DECRYPT_MODE,
-            SecretKeySpec(keyList[1].toByteArray(), "RC4"),
-            cipher2.parameters
-        )
-        var input = id.toByteArray()
-        input = cipher1.doFinal(input)
-        input = cipher2.doFinal(input)
-        return base64Encode(input).replace("/", "_")
+    private fun rc4Encryption(key: String, input: String): String {
+        val rc4Key = SecretKeySpec(key.toByteArray(), "RC4")
+        val cipher = Cipher.getInstance("RC4")
+        cipher.init(Cipher.DECRYPT_MODE, rc4Key, cipher.parameters)
+        var output = cipher.doFinal(input.toByteArray())
+        output = Base64.UrlSafe.encode(output).toByteArray()
+        return output.toString(Charsets.UTF_8)
+    }
+
+    private fun rc4Decryption(key: String, input: String): String {
+        var vrf = input.toByteArray()
+        vrf = Base64.UrlSafe.decode(vrf)
+        val rc4Key = SecretKeySpec(key.toByteArray(), "RC4")
+        val cipher = Cipher.getInstance("RC4")
+        cipher.init(Cipher.DECRYPT_MODE, rc4Key, cipher.parameters)
+        vrf = cipher.doFinal(vrf)
+
+        return vrf.toString(Charsets.UTF_8)
+    }
+
+    private fun exchange(input: String, key1: String, key2: String): String {
+        return input.map { i ->
+            val index = key1.indexOf(i)
+            if (index != -1) {
+                key2[index]
+            } else {
+                i
+            }
+        }.joinToString("")
     }
 
     data class Tracks(
@@ -133,8 +178,6 @@ open class Vidplay : ExtractorApi() {
         @JsonProperty("tracks") val tracks: ArrayList<Tracks>? = arrayListOf(),
     )
 
-    data class Response(
-        @JsonProperty("result") val result: Result? = null,
-    )
+    data class Response(@JsonProperty("result") val result: String? = null)
 
 }
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Voe.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Voe.kt
index 1d7dee7c5c9..28f455ef9d3 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Voe.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Voe.kt
@@ -34,13 +34,19 @@ class MetaGnathTuggers : Voe() {
     override val mainUrl = "https://metagnathtuggers.com"
 }
 
+class Voe1 : Voe() {
+    override val mainUrl = "https://donaldlineelse.com"
+}
+
 open class Voe : ExtractorApi() {
     override val name = "Voe"
     override val mainUrl = "https://voe.sx"
     override val requiresReferer = true
-	
-	private val linkRegex = "(http|https)://([\\w_-]+(?:\\.[\\w_-]+)+)([\\w.,@?^=%&:/~+#-]*[\\w@?^=%&/~+#-])".toRegex()
+
+    private val linkRegex =
+        "(http|https)://([\\w_-]+(?:\\.[\\w_-]+)+)([\\w.,@?^=%&:/~+#-]*[\\w@?^=%&/~+#-])".toRegex()
     private val base64Regex = Regex("'.*'")
+    private val redirectRegex = Regex("""window.location.href = '([^']+)';""")
 
     override suspend fun getUrl(
         url: String,
@@ -49,11 +55,26 @@ open class Voe : ExtractorApi() {
         callback: (ExtractorLink) -> Unit
     ) {
         val res = app.get(url, referer = referer).document
-        val script = res.select("script").find { it.data().contains("sources =") }?.data()
-        val link = Regex("[\"']hls[\"']:\\s*[\"'](.*)[\"']").find(script ?: return)?.groupValues?.get(1)
+
+        val script =
+            if (!res.select("script").firstOrNull() { it.data().contains("sources =") }?.data()
+                    .isNullOrEmpty()
+            ) {
+                res.select("script").find { it.data().contains("sources =") }?.data()
+            } else {
+                redirectRegex.find(res.data())?.groupValues?.get(1)?.let { redirectUrl ->
+                    app.get(
+                        redirectUrl,
+                        referer = referer
+                    ).document.select("script").find { it.data().contains("sources =") }?.data()
+                }
+            }
+
+        val link =
+            Regex("[\"']hls[\"']:\\s*[\"'](.*)[\"']").find(script ?: return)?.groupValues?.get(1)
 
         val videoLinks = mutableListOf<String>()
-        
+
         if (!link.isNullOrBlank()) {
             videoLinks.add(
                 when {
@@ -61,13 +82,13 @@ open class Voe : ExtractorApi() {
                     else -> base64Decode(link)
                 }
             )
-        } else {            
+        } else {
             val link2 = base64Regex.find(script)?.value ?: return
             val decoded = base64Decode(link2)
             val videoLinkDTO = AppUtils.parseJson<WcoSources>(decoded)
             videoLinkDTO.let { videoLinks.add(it.toString()) }
         }
-        
+
         videoLinks.forEach { videoLink ->
             M3u8Helper.generateM3u8(
                 name,
@@ -77,8 +98,8 @@ open class Voe : ExtractorApi() {
             ).forEach(callback)
         }
     }
-	
-	data class WcoSources(
+
+    data class WcoSources(
         @JsonProperty("VideoLinkDTO") val VideoLinkDTO: String,
     )
 }
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/YoutubeExtractor.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/YoutubeExtractor.kt
index 4e854630f09..e6abfaea699 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/YoutubeExtractor.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/YoutubeExtractor.kt
@@ -4,12 +4,12 @@ import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.Qualities
 import com.lagradost.cloudstream3.utils.schemaStripRegex
 import org.schabi.newpipe.extractor.ServiceList
 import org.schabi.newpipe.extractor.services.youtube.extractors.YoutubeStreamExtractor
 import org.schabi.newpipe.extractor.services.youtube.linkHandler.YoutubeStreamLinkHandlerFactory
 import org.schabi.newpipe.extractor.stream.SubtitlesStream
-import org.schabi.newpipe.extractor.stream.VideoStream
 
 class YoutubeShortLinkExtractor : YoutubeExtractor() {
     override val mainUrl = "https://youtu.be"
@@ -19,10 +19,11 @@ class YoutubeShortLinkExtractor : YoutubeExtractor() {
     }
 }
 
-class YoutubeMobileExtractor  : YoutubeExtractor() {
+class YoutubeMobileExtractor : YoutubeExtractor() {
     override val mainUrl = "https://m.youtube.com"
 }
-class YoutubeNoCookieExtractor  : YoutubeExtractor() {
+
+class YoutubeNoCookieExtractor : YoutubeExtractor() {
     override val mainUrl = "https://www.youtube-nocookie.com"
 }
 
@@ -32,7 +33,7 @@ open class YoutubeExtractor : ExtractorApi() {
     override val name = "YouTube"
 
     companion object {
-        private var ytVideos: MutableMap<String, List<VideoStream>> = mutableMapOf()
+        private var ytVideos: MutableMap<String, String> = mutableMapOf()
         private var ytVideosSubtitles: MutableMap<String, List<SubtitlesStream>> = mutableMapOf()
     }
 
@@ -61,7 +62,8 @@ open class YoutubeExtractor : ExtractorApi() {
 
             }
             s.fetchPage()
-            ytVideos[url] = s.videoStreams
+            ytVideos[url] = s.hlsUrl
+
             ytVideosSubtitles[url] = try {
                 s.subtitlesDefault.filterNotNull()
             } catch (e: Exception) {
@@ -69,19 +71,24 @@ open class YoutubeExtractor : ExtractorApi() {
                 emptyList()
             }
         }
-        ytVideos[url]?.mapNotNull {
-            if (it.isVideoOnly() || it.height <= 0) return@mapNotNull null
-
-            ExtractorLink(
-                this.name,
-                this.name,
-                it.content ?: return@mapNotNull null,
-                "",
-                it.height
+        ytVideos[url]?.let {
+            callback(
+                ExtractorLink(
+                    this.name,
+                    this.name,
+                    it,
+                    "",
+                    Qualities.Unknown.value,
+                    isM3u8 = true
+                )
             )
-        }?.forEach(callback)
+        }
+
         ytVideosSubtitles[url]?.mapNotNull {
-            SubtitleFile(it.languageTag ?: return@mapNotNull null, it.content ?: return@mapNotNull null)
+            SubtitleFile(
+                it.languageTag ?: return@mapNotNull null,
+                it.content ?: return@mapNotNull null
+            )
         }?.forEach(subtitleCallback)
     }
-}
\ No newline at end of file
+}
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/CryptoJSHelper.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/CryptoJSHelper.kt
new file mode 100644
index 00000000000..a13db65cc36
--- /dev/null
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/CryptoJSHelper.kt
@@ -0,0 +1,129 @@
+package com.lagradost.cloudstream3.extractors.helper
+
+import java.util.Arrays
+import java.util.Base64
+import java.security.MessageDigest
+import java.security.SecureRandom
+import javax.crypto.Cipher
+import javax.crypto.spec.SecretKeySpec
+import javax.crypto.spec.IvParameterSpec
+import java.nio.charset.StandardCharsets
+import kotlin.math.min
+
+/**
+ * Conforming with CryptoJS AES method
+ */
+// see https://gist.github.com/thackerronak/554c985c3001b16810af5fc0eb5c358f
+@Suppress("unused", "FunctionName", "SameParameterValue")
+object CryptoJS {
+
+    private const val KEY_SIZE    = 256
+    private const val IV_SIZE     = 128
+    private const val HASH_CIPHER = "AES/CBC/PKCS7Padding"
+    private const val AES         = "AES"
+    private const val KDF_DIGEST  = "MD5"
+
+    // Seriously crypto-js, what's wrong with you?
+    private const val APPEND      = "Salted__"
+
+    /**
+     * Encrypt
+     * @param password passphrase
+     * @param plainText plain string
+     */
+    fun encrypt(password: String, plainText: String): String {
+        val saltBytes = generateSalt(8)
+        val key       = ByteArray(KEY_SIZE / 8)
+        val iv        = ByteArray(IV_SIZE / 8)
+        evpkdf(password.toByteArray(), KEY_SIZE, IV_SIZE, saltBytes, key, iv)
+
+        val keyS   = SecretKeySpec(key, AES)
+        val cipher = Cipher.getInstance(HASH_CIPHER)
+        val ivSpec = IvParameterSpec(iv)
+        cipher.init(Cipher.ENCRYPT_MODE, keyS, ivSpec)
+
+        val cipherText = cipher.doFinal(plainText.toByteArray())
+        // Thanks kientux for this: https://gist.github.com/kientux/bb48259c6f2133e628ad
+        // Create CryptoJS-like encrypted!
+        val sBytes     = APPEND.toByteArray()
+        val b          = ByteArray(sBytes.size + saltBytes.size + cipherText.size)
+        System.arraycopy(sBytes, 0, b, 0, sBytes.size)
+        System.arraycopy(saltBytes, 0, b, sBytes.size, saltBytes.size)
+        System.arraycopy(cipherText, 0, b, sBytes.size + saltBytes.size, cipherText.size)
+
+        val bEncode = Base64.getEncoder().encode(b)
+        return String(bEncode)
+    }
+
+    /**
+     * Decrypt
+     * Thanks Artjom B. for this: http://stackoverflow.com/a/29152379/4405051
+     * @param password passphrase
+     * @param cipherText encrypted string
+     */
+    fun decrypt(password: String, cipherText: String): String {
+        val ctBytes         = Base64.getDecoder().decode(cipherText.toByteArray())
+        val saltBytes       = Arrays.copyOfRange(ctBytes, 8, 16)
+        val cipherTextBytes = Arrays.copyOfRange(ctBytes, 16, ctBytes.size)
+
+        val key = ByteArray(KEY_SIZE / 8)
+        val iv  = ByteArray(IV_SIZE / 8)
+        evpkdf(password.toByteArray(), KEY_SIZE, IV_SIZE, saltBytes, key, iv)
+
+        val cipher = Cipher.getInstance(HASH_CIPHER)
+        val keyS   = SecretKeySpec(key, AES)
+        cipher.init(Cipher.DECRYPT_MODE, keyS, IvParameterSpec(iv))
+
+        val plainText = cipher.doFinal(cipherTextBytes)
+        return String(plainText)
+    }
+
+    private fun evpkdf(password: ByteArray, keySize: Int, ivSize: Int, salt: ByteArray, resultKey: ByteArray, resultIv: ByteArray): ByteArray {
+        return evpkdf(password, keySize, ivSize, salt, 1, KDF_DIGEST, resultKey, resultIv)
+    }
+
+    @Suppress("NAME_SHADOWING")
+    private fun evpkdf(password: ByteArray, keySize: Int, ivSize: Int, salt: ByteArray, iterations: Int, hashAlgorithm: String, resultKey: ByteArray, resultIv: ByteArray): ByteArray {
+        val keySize              = keySize / 32
+        val ivSize               = ivSize / 32
+        val targetKeySize        = keySize + ivSize
+        val derivedBytes         = ByteArray(targetKeySize * 4)
+        var numberOfDerivedWords = 0
+        var block: ByteArray?    = null
+        val hash                 = MessageDigest.getInstance(hashAlgorithm)
+
+        while (numberOfDerivedWords < targetKeySize) {
+            if (block != null) {
+                hash.update(block)
+            }
+
+            hash.update(password)
+            block = hash.digest(salt)
+            hash.reset()
+
+            // Iterations
+            for (i in 1 until iterations) {
+                block = hash.digest(block!!)
+                hash.reset()
+            }
+
+            System.arraycopy(
+                block!!, 0, derivedBytes, numberOfDerivedWords * 4,
+                min(block.size, (targetKeySize - numberOfDerivedWords) * 4)
+            )
+
+            numberOfDerivedWords += block.size / 4
+        }
+
+        System.arraycopy(derivedBytes, 0, resultKey, 0, keySize * 4)
+        System.arraycopy(derivedBytes, keySize * 4, resultIv, 0, ivSize * 4)
+
+        return derivedBytes // key + iv
+    }
+
+    private fun generateSalt(length: Int): ByteArray {
+        return ByteArray(length).apply {
+            SecureRandom().nextBytes(this)
+        }
+    }
+}
\ No newline at end of file
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/GogoHelper.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/GogoHelper.kt
index 1766af6cf33..35c23b2f711 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/GogoHelper.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/GogoHelper.kt
@@ -107,8 +107,7 @@ object GogoHelper {
                 "$mainUrl/encrypt-ajax.php?$encryptRequestData",
                 headers = mapOf("X-Requested-With" to "XMLHttpRequest")
             )
-        val dataencrypted =
-            jsonResponse.text.substringAfter("{\"data\":\"").substringBefore("\"}")
+        val dataencrypted = jsonResponse.parsedSafe<GogoJsonData>()?.data ?: return@safeApiCall
         val datadecrypted = cryptoHandler(dataencrypted, foundIv, foundDecryptKey, false)
         val sources = AppUtils.parseJson<GogoSources>(datadecrypted)
 
@@ -155,4 +154,8 @@ object GogoHelper {
         @JsonProperty("type") val type: String?,
         @JsonProperty("default") val default: String? = null
     )
+
+    data class GogoJsonData(
+        @JsonProperty("data") val data: String? = null
+    )
 }
\ No newline at end of file
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/NineAnimeHelper.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/NineAnimeHelper.kt
index be75375f7b6..2563d40e1ba 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/NineAnimeHelper.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/NineAnimeHelper.kt
@@ -1,6 +1,9 @@
 package com.lagradost.cloudstream3.extractors.helper
 
-// taken from https://github.com/saikou-app/saikou/blob/b35364c8c2a00364178a472fccf1ab72f09815b4/app/src/main/java/ani/saikou/parsers/anime/NineAnime.kt
+import com.lagradost.cloudstream3.utils.StringUtils.decodeUri
+import com.lagradost.cloudstream3.utils.StringUtils.encodeUri
+
+// Taken from https://github.com/saikou-app/saikou/blob/b35364c8c2a00364178a472fccf1ab72f09815b4/app/src/main/java/ani/saikou/parsers/anime/NineAnime.kt
 // GNU General Public License v3.0 https://github.com/saikou-app/saikou/blob/main/LICENSE.md
 object NineAnimeHelper {
     private const val nineAnimeKey =
@@ -106,7 +109,7 @@ object NineAnimeHelper {
     }
 
     fun encode(input: String): String =
-        java.net.URLEncoder.encode(input, "utf-8").replace("+", "%20")
+        input.encodeUri().replace("+", "%20")
 
-    private fun decode(input: String): String = java.net.URLDecoder.decode(input, "utf-8")
+    private fun decode(input: String): String = input.decodeUri()
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/metaproviders/CrossTmdbProvider.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/metaproviders/CrossTmdbProvider.kt
similarity index 91%
rename from app/src/main/java/com/lagradost/cloudstream3/metaproviders/CrossTmdbProvider.kt
rename to library/src/commonMain/kotlin/com/lagradost/cloudstream3/metaproviders/CrossTmdbProvider.kt
index 5bbb4538b77..a9910502d3b 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/metaproviders/CrossTmdbProvider.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/metaproviders/CrossTmdbProvider.kt
@@ -1,9 +1,16 @@
 package com.lagradost.cloudstream3.metaproviders
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.APIHolder.apis
 import com.lagradost.cloudstream3.APIHolder.getApiFromNameNull
+import com.lagradost.cloudstream3.ErrorLoadingException
+import com.lagradost.cloudstream3.LoadResponse
+import com.lagradost.cloudstream3.MovieLoadResponse
+import com.lagradost.cloudstream3.MovieSearchResponse
+import com.lagradost.cloudstream3.SearchResponse
+import com.lagradost.cloudstream3.SubtitleFile
+import com.lagradost.cloudstream3.TvType
+import com.lagradost.cloudstream3.amap
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.utils.AppUtils.toJson
 import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
diff --git a/app/src/main/java/com/lagradost/cloudstream3/metaproviders/SyncRedirector.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/metaproviders/SyncRedirector.kt
similarity index 86%
rename from app/src/main/java/com/lagradost/cloudstream3/metaproviders/SyncRedirector.kt
rename to library/src/commonMain/kotlin/com/lagradost/cloudstream3/metaproviders/SyncRedirector.kt
index 75e96bec137..bc646a8d2a2 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/metaproviders/SyncRedirector.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/metaproviders/SyncRedirector.kt
@@ -2,15 +2,13 @@ package com.lagradost.cloudstream3.metaproviders
 
 import com.lagradost.cloudstream3.MainAPI
 import com.lagradost.cloudstream3.mvvm.suspendSafeApiCall
-import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.SyncApis
 import com.lagradost.cloudstream3.syncproviders.SyncIdName
 
 object SyncRedirector {
-    val syncApis = SyncApis
     private val syncIds =
         listOf(
-            SyncIdName.MyAnimeList to Regex("""myanimelist\.net\/anime\/(\d+)"""),
-            SyncIdName.Anilist to Regex("""anilist\.co\/anime\/(\d+)""")
+            SyncIdName.MyAnimeList to Regex("""myanimelist\.net/anime/(\d+)"""),
+            SyncIdName.Anilist to Regex("""anilist\.co/anime/(\d+)""")
         )
 
     suspend fun redirect(
diff --git a/app/src/main/java/com/lagradost/cloudstream3/metaproviders/TmdbProvider.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/metaproviders/TmdbProvider.kt
similarity index 80%
rename from app/src/main/java/com/lagradost/cloudstream3/metaproviders/TmdbProvider.kt
rename to library/src/commonMain/kotlin/com/lagradost/cloudstream3/metaproviders/TmdbProvider.kt
index c5b4d453d7c..5ff3e74e45c 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/metaproviders/TmdbProvider.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/metaproviders/TmdbProvider.kt
@@ -1,17 +1,47 @@
 package com.lagradost.cloudstream3.metaproviders
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import com.lagradost.cloudstream3.*
+import com.lagradost.cloudstream3.Actor
+import com.lagradost.cloudstream3.ErrorLoadingException
+import com.lagradost.cloudstream3.HomePageList
+import com.lagradost.cloudstream3.HomePageResponse
+import com.lagradost.cloudstream3.LoadResponse
 import com.lagradost.cloudstream3.LoadResponse.Companion.addActors
 import com.lagradost.cloudstream3.LoadResponse.Companion.addImdbId
 import com.lagradost.cloudstream3.LoadResponse.Companion.addTrailer
+import com.lagradost.cloudstream3.MainAPI
+import com.lagradost.cloudstream3.MainPageRequest
+import com.lagradost.cloudstream3.MovieLoadResponse
+import com.lagradost.cloudstream3.MovieSearchResponse
+import com.lagradost.cloudstream3.ProviderType
+import com.lagradost.cloudstream3.SearchResponse
+import com.lagradost.cloudstream3.TvSeriesLoadResponse
+import com.lagradost.cloudstream3.TvSeriesSearchResponse
+import com.lagradost.cloudstream3.TvType
+import com.lagradost.cloudstream3.argamap
+import com.lagradost.cloudstream3.newEpisode
+import com.lagradost.cloudstream3.newHomePageResponse
+import com.lagradost.cloudstream3.newMovieLoadResponse
+import com.lagradost.cloudstream3.newMovieSearchResponse
+import com.lagradost.cloudstream3.newTvSeriesLoadResponse
+import com.lagradost.cloudstream3.newTvSeriesSearchResponse
 import com.lagradost.cloudstream3.utils.AppUtils.toJson
 import com.uwetrottmann.tmdb2.Tmdb
-import com.uwetrottmann.tmdb2.entities.*
+import com.uwetrottmann.tmdb2.entities.AppendToResponse
+import com.uwetrottmann.tmdb2.entities.BaseMovie
+import com.uwetrottmann.tmdb2.entities.BaseTvShow
+import com.uwetrottmann.tmdb2.entities.CastMember
+import com.uwetrottmann.tmdb2.entities.ContentRating
+import com.uwetrottmann.tmdb2.entities.Movie
+import com.uwetrottmann.tmdb2.entities.ReleaseDate
+import com.uwetrottmann.tmdb2.entities.ReleaseDatesResult
+import com.uwetrottmann.tmdb2.entities.TvSeason
+import com.uwetrottmann.tmdb2.entities.TvShow
+import com.uwetrottmann.tmdb2.entities.Videos
 import com.uwetrottmann.tmdb2.enumerations.AppendToResponseItem
 import com.uwetrottmann.tmdb2.enumerations.VideoType
 import retrofit2.awaitResponse
-import java.util.*
+import java.util.Calendar
 
 /**
  * episode and season starting from 1
@@ -54,36 +84,37 @@ open class TmdbProvider : MainAPI() {
     }
 
     private fun BaseTvShow.toSearchResponse(): TvSeriesSearchResponse {
-        return TvSeriesSearchResponse(
-            this.name ?: this.original_name,
-            getUrl(id, true),
-            apiName,
-            TvType.TvSeries,
-            getImageUrl(this.poster_path),
-            this.first_air_date?.let {
+        return newTvSeriesSearchResponse(
+            name = this.name ?: this.original_name,
+            url = getUrl(id, true),
+            type = TvType.TvSeries,
+            fix = false
+        ) {
+            this.id = this@toSearchResponse.id
+            this.posterUrl = getImageUrl(poster_path)
+            this.year = first_air_date?.let {
                 Calendar.getInstance().apply {
                     time = it
                 }.get(Calendar.YEAR)
-            },
-            null,
-            this.id
-        )
+            }
+        }
     }
 
     private fun BaseMovie.toSearchResponse(): MovieSearchResponse {
-        return MovieSearchResponse(
-            this.title ?: this.original_title,
-            getUrl(id, false),
-            apiName,
-            TvType.TvSeries,
-            getImageUrl(this.poster_path),
-            this.release_date?.let {
+        return newMovieSearchResponse(
+            name = this.title ?: this.original_title,
+            url = getUrl(id, false),
+            type = TvType.Movie,
+            fix = false
+        ) {
+            this.id = this@toSearchResponse.id
+            this.posterUrl = getImageUrl(poster_path)
+            this.year = release_date?.let {
                 Calendar.getInstance().apply {
                     time = it
                 }.get(Calendar.YEAR)
-            },
-            this.id,
-        )
+            }
+        }
     }
 
     private fun List<CastMember?>?.toActors(): List<Pair<Actor, String?>>? {
@@ -99,34 +130,36 @@ open class TmdbProvider : MainAPI() {
         val episodes = this.seasons?.filter { !disableSeasonZero || (it.season_number ?: 0) != 0 }
             ?.mapNotNull { season ->
                 season.episodes?.map { episode ->
-                    Episode(
+                    newEpisode(
                         TmdbLink(
                             episode.external_ids?.imdb_id ?: this.external_ids?.imdb_id,
                             this.id,
                             episode.episode_number,
                             episode.season_number,
                             this.name ?: this.original_name,
-                        ).toJson(),
-                        episode.name,
-                        episode.season_number,
-                        episode.episode_number,
-                        getImageUrl(episode.still_path),
-                        episode.rating,
-                        episode.overview,
-                        episode.air_date?.time,
-                    )
+                        ).toJson()
+                    ) {
+                        this.name = episode.name
+                        this.season = episode.season_number
+                        this.episode = episode.episode_number
+                        this.rating = episode.rating
+                        this.description = episode.overview
+                        this.date = episode.air_date?.time
+                        this.posterUrl = getImageUrl(episode.still_path)
+                    }
                 } ?: (1..(season.episode_count ?: 1)).map { episodeNum ->
-                    Episode(
-                        episode = episodeNum,
-                        data = TmdbLink(
+                    newEpisode(
+                        TmdbLink(
                             this.external_ids?.imdb_id,
                             this.id,
                             episodeNum,
                             season.season_number,
                             this.name ?: this.original_name,
-                        ).toJson(),
-                        season = season.season_number
-                    )
+                        ).toJson()
+                    ) {
+                        this.episode = episodeNum
+                        this.season = season.season_number
+                    }
                 }
             }?.flatten() ?: listOf()
 
@@ -242,7 +275,7 @@ open class TmdbProvider : MainAPI() {
             }
         )
 
-        return HomePageResponse(
+        return newHomePageResponse(
             listOf(
 //                HomePageList("Popular Series", popularSeries),
 //                HomePageList("Popular Movies", popularMovies),
@@ -368,9 +401,7 @@ open class TmdbProvider : MainAPI() {
                         val details = tmdb.tvService().tv(id, "en-US").awaitResponse().body()
                         loadFromImdb(it, details?.seasons ?: listOf())
                             ?: loadFromTmdb(id, details?.seasons ?: listOf())
-                    } else {
-                        fromImdb
-                    }
+                    } else fromImdb
 
                     result
                 }
@@ -387,4 +418,4 @@ open class TmdbProvider : MainAPI() {
                 it.movie?.toSearchResponse() ?: it.tvShow?.toSearchResponse()
             }
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/metaproviders/TraktProvider.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/metaproviders/TraktProvider.kt
similarity index 96%
rename from app/src/main/java/com/lagradost/cloudstream3/metaproviders/TraktProvider.kt
rename to library/src/commonMain/kotlin/com/lagradost/cloudstream3/metaproviders/TraktProvider.kt
index 7c375e0af6f..bb81cd721d5 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/metaproviders/TraktProvider.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/metaproviders/TraktProvider.kt
@@ -1,9 +1,7 @@
 package com.lagradost.cloudstream3.metaproviders
 
-import android.net.Uri
 import com.fasterxml.jackson.annotation.JsonAlias
 import com.fasterxml.jackson.annotation.JsonProperty
-import com.lagradost.cloudstream3.APIHolder
 import com.lagradost.cloudstream3.APIHolder.unixTimeMS
 import com.lagradost.cloudstream3.Actor
 import com.lagradost.cloudstream3.ActorData
@@ -25,6 +23,7 @@ import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.base64Decode
 import com.lagradost.cloudstream3.mainPageOf
 import com.lagradost.cloudstream3.mvvm.logError
+import com.lagradost.cloudstream3.newEpisode
 import com.lagradost.cloudstream3.newHomePageResponse
 import com.lagradost.cloudstream3.newMovieLoadResponse
 import com.lagradost.cloudstream3.newMovieSearchResponse
@@ -32,6 +31,7 @@ import com.lagradost.cloudstream3.newTvSeriesLoadResponse
 import com.lagradost.cloudstream3.newTvSeriesSearchResponse
 import com.lagradost.cloudstream3.utils.AppUtils.parseJson
 import com.lagradost.cloudstream3.utils.AppUtils.toJson
+import java.net.URI
 import java.text.SimpleDateFormat
 import java.util.Locale
 import kotlin.math.roundToInt
@@ -75,7 +75,7 @@ open class TraktProvider : MainAPI() {
 
         if (mediaType == TvType.Movie) {
             return newMovieSearchResponse(
-                name = media.title!!,
+                name = media.title ?: "",
                 url = Data(
                     type = mediaType,
                     mediaDetails = media,
@@ -86,7 +86,7 @@ open class TraktProvider : MainAPI() {
             }
         } else {
             return newTvSeriesSearchResponse(
-                name = media.title!!,
+                name = media.title ?: "",
                 url = Data(
                     type = mediaType,
                     mediaDetails = media,
@@ -228,15 +228,15 @@ open class TraktProvider : MainAPI() {
                     ).toJson()
 
                     episodes.add(
-                        Episode(
-                            data = linkData.toJson(),
-                            name = episode.title,
-                            season = episode.season,
-                            episode = episode.number,
-                            posterUrl = fixPath(episode.images?.screenshot?.firstOrNull()),
-                            rating = episode.rating?.times(10)?.roundToInt(),
-                            description = episode.overview,
-                        ).apply {
+                        newEpisode(linkData.toJson()) {
+                            this.name = episode.title
+                            this.season = episode.season
+                            this.episode = episode.number
+                            this.description = episode.overview
+                            this.runTime = episode.runtime
+                            this.posterUrl = fixPath(episode.images?.screenshot?.firstOrNull())
+                            this.rating = episode.rating?.times(10)?.roundToInt()
+
                             this.addDate(episode.firstAired, "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
                             if (nextAir == null && this.date != null && this.date!! > unixTimeMS && this.season != 0) {
                                 nextAir = NextAiring(
@@ -295,7 +295,7 @@ open class TraktProvider : MainAPI() {
         return try {
             val format = SimpleDateFormat("yyyy-MM-dd", Locale.getDefault())
             val dateTime = dateString?.let { format.parse(it)?.time } ?: return false
-            APIHolder.unixTimeMS < dateTime
+            unixTimeMS < dateTime
         } catch (t: Throwable) {
             logError(t)
             false
@@ -318,7 +318,7 @@ open class TraktProvider : MainAPI() {
     private fun getWidthImageUrl(path: String?, width: String): String? {
         if (path == null) return null
         if (!path.contains("image.tmdb.org")) return fixPath(path)
-        val fileName = Uri.parse(path).lastPathSegment ?: return null
+        val fileName = URI(path).path?.substringAfterLast('/') ?: return null
         return "https://image.tmdb.org/t/p/${width}/${fileName}"
     }
 
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/mvvm/ArchComponentExt.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/mvvm/ArchComponentExt.kt
index d3b4999a1b6..26573e329cb 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/mvvm/ArchComponentExt.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/mvvm/ArchComponentExt.kt
@@ -10,6 +10,7 @@ import java.net.UnknownHostException
 import javax.net.ssl.SSLHandshakeException
 import kotlin.coroutines.CoroutineContext
 import kotlin.coroutines.EmptyCoroutineContext
+import kotlin.reflect.full.NoSuchPropertyException
 
 const val DEBUG_EXCEPTION = "THIS IS A DEBUG EXCEPTION!"
 const val DEBUG_PRINT = "DEBUG PRINT"
@@ -122,6 +123,14 @@ fun<T> throwAbleToResource(
     throwable: Throwable
 ): Resource<T> {
     return when (throwable) {
+        is NoSuchMethodException, is NoSuchFieldException, is NoSuchMethodError, is NoSuchFieldError, is NoSuchPropertyException -> {
+            Resource.Failure(
+                false,
+                null,
+                null,
+                "App or extension is outdated, update the app or try pre-release.\n${throwable.message}" // todo add exact version?
+            )
+        }
         is NullPointerException -> {
             for (line in throwable.stackTrace) {
                 if (line?.fileName?.endsWith("provider.kt", ignoreCase = true) == true) {
@@ -193,4 +202,4 @@ suspend fun <T> safeApiCall(
             throwAbleToResource(throwable)
         }
     }
-}
\ No newline at end of file
+}
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/plugins/BasePlugin.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/plugins/BasePlugin.kt
new file mode 100644
index 00000000000..c7c0bb82f0e
--- /dev/null
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/plugins/BasePlugin.kt
@@ -0,0 +1,77 @@
+package com.lagradost.cloudstream3.plugins
+
+import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.cloudstream3.APIHolder
+import com.lagradost.cloudstream3.MainAPI
+import com.lagradost.cloudstream3.utils.ExtractorApi
+import com.lagradost.api.Log
+import com.lagradost.cloudstream3.utils.extractorApis
+
+const val PLUGIN_TAG = "PluginInstance"
+
+abstract class BasePlugin {
+    /**
+     * Used to register providers instances of MainAPI
+     * @param element MainAPI provider you want to register
+     */
+    fun registerMainAPI(element: MainAPI) {
+        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
+        synchronized(APIHolder.allProviders) {
+            APIHolder.allProviders.add(element)
+        }
+        APIHolder.addPluginMapping(element)
+    }
+
+    /**
+     * Used to register extractor instances of ExtractorApi
+     * @param element ExtractorApi provider you want to register
+     */
+    fun registerExtractorAPI(element: ExtractorApi) {
+        Log.i(PLUGIN_TAG, "Adding ${element.name} (${element.mainUrl}) ExtractorApi")
+        element.sourcePlugin = this.filename
+        extractorApis.add(element)
+    }
+
+    /**
+     * Called when your Plugin is being unloaded
+     */
+    @Throws(Throwable::class)
+    open fun beforeUnload() {
+    }
+
+    /**
+     * Called when your Plugin is loaded
+     */
+    @Throws(Throwable::class)
+    open fun load() {
+    }
+
+    /** Full file path to the plugin. */
+    @Deprecated(
+        "Renamed to `filename` to follow conventions",
+        replaceWith = ReplaceWith("filename")
+    )
+    var __filename: String?
+        get() = filename
+        set(value) {
+            filename = value
+        }
+    var filename: String? = null
+
+
+    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
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/plugins/CloudstreamPlugin.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/plugins/CloudstreamPlugin.kt
similarity index 72%
rename from app/src/main/java/com/lagradost/cloudstream3/plugins/CloudstreamPlugin.kt
rename to library/src/commonMain/kotlin/com/lagradost/cloudstream3/plugins/CloudstreamPlugin.kt
index e89ccfeb316..ddf5b286870 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/plugins/CloudstreamPlugin.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/plugins/CloudstreamPlugin.kt
@@ -2,5 +2,4 @@ package com.lagradost.cloudstream3.plugins
 
 @Suppress("unused")
 @Target(AnnotationTarget.CLASS)
-annotation class CloudstreamPlugin(
-)
\ No newline at end of file
+annotation class CloudstreamPlugin
\ No newline at end of file
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/AppUtils.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/AppUtils.kt
index 374751a8024..6832ab8d27f 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/AppUtils.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/AppUtils.kt
@@ -2,6 +2,7 @@ package com.lagradost.cloudstream3.utils
 
 import com.fasterxml.jackson.module.kotlin.readValue
 import com.lagradost.cloudstream3.mapper
+import java.io.Reader
 
 object AppUtils {
     /** Any object as json string */
@@ -14,6 +15,10 @@ object AppUtils {
         return mapper.readValue(value)
     }
 
+    inline fun <reified T> parseJson(reader: Reader, valueType: Class<T>): T {
+        return mapper.readValue(reader, valueType)
+    }
+
     inline fun <reified T> tryParseJson(value: String?): T? {
         return try {
             parseJson(value ?: return null)
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/ExtractorApi.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/ExtractorApi.kt
index 0df73a0ed3f..802b51df63f 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/ExtractorApi.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/ExtractorApi.kt
@@ -9,9 +9,16 @@ 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.AnimesagaStream
+import com.lagradost.cloudstream3.extractors.Anplay
 import com.lagradost.cloudstream3.extractors.AsianLoad
+import com.lagradost.cloudstream3.extractors.Asnwish
+import com.lagradost.cloudstream3.extractors.Awish
+import com.lagradost.cloudstream3.extractors.Beastx
 import com.lagradost.cloudstream3.extractors.Bestx
 import com.lagradost.cloudstream3.extractors.Blogger
+import com.lagradost.cloudstream3.extractors.Boltx
+import com.lagradost.cloudstream3.extractors.Boosterx
 import com.lagradost.cloudstream3.extractors.BullStream
 import com.lagradost.cloudstream3.extractors.ByteShare
 import com.lagradost.cloudstream3.extractors.Cda
@@ -20,6 +27,9 @@ import com.lagradost.cloudstream3.extractors.CdnwishCom
 import com.lagradost.cloudstream3.extractors.Chillx
 import com.lagradost.cloudstream3.extractors.CineGrabber
 import com.lagradost.cloudstream3.extractors.Cinestart
+import com.lagradost.cloudstream3.extractors.ContentX
+import com.lagradost.cloudstream3.extractors.D0000d
+import com.lagradost.cloudstream3.extractors.D000dCom
 import com.lagradost.cloudstream3.extractors.DBfilm
 import com.lagradost.cloudstream3.extractors.Dailymotion
 import com.lagradost.cloudstream3.extractors.DatabaseGdrive
@@ -39,10 +49,18 @@ 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.Doodporn
+import com.lagradost.cloudstream3.extractors.DoodstreamCom
 import com.lagradost.cloudstream3.extractors.Dooood
+import com.lagradost.cloudstream3.extractors.Ds2play
+import com.lagradost.cloudstream3.extractors.Ds2video
+import com.lagradost.cloudstream3.extractors.Dwish
+import com.lagradost.cloudstream3.extractors.EPlayExtractor
 import com.lagradost.cloudstream3.extractors.Embedgram
+import com.lagradost.cloudstream3.extractors.EmturbovidExtractor
 import com.lagradost.cloudstream3.extractors.Evoload
 import com.lagradost.cloudstream3.extractors.Evoload1
+import com.lagradost.cloudstream3.extractors.Ewish
 import com.lagradost.cloudstream3.extractors.FEmbed
 import com.lagradost.cloudstream3.extractors.FEnet
 import com.lagradost.cloudstream3.extractors.Fastream
@@ -51,10 +69,15 @@ 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.Filegram
 import com.lagradost.cloudstream3.extractors.Filesim
+import com.lagradost.cloudstream3.extractors.FlaswishCom
+import com.lagradost.cloudstream3.extractors.FourCX
+import com.lagradost.cloudstream3.extractors.FourPichive
+import com.lagradost.cloudstream3.extractors.FourPlayRu
 import com.lagradost.cloudstream3.extractors.Fplayer
-import com.lagradost.cloudstream3.extractors.Geodailymotion
 import com.lagradost.cloudstream3.extractors.GMPlayer
+import com.lagradost.cloudstream3.extractors.GamoVideo
 import com.lagradost.cloudstream3.extractors.Gdriveplayer
 import com.lagradost.cloudstream3.extractors.Gdriveplayerapi
 import com.lagradost.cloudstream3.extractors.Gdriveplayerapp
@@ -65,29 +88,44 @@ 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.Geodailymotion
 import com.lagradost.cloudstream3.extractors.Gofile
-import com.lagradost.cloudstream3.extractors.GuardareStream
 import com.lagradost.cloudstream3.extractors.GoodstreamExtractor
+import com.lagradost.cloudstream3.extractors.GuardareStream
 import com.lagradost.cloudstream3.extractors.Guccihide
+import com.lagradost.cloudstream3.extractors.HDMomPlayer
+import com.lagradost.cloudstream3.extractors.HDPlayerSystem
+import com.lagradost.cloudstream3.extractors.HDStreamAble
+import com.lagradost.cloudstream3.extractors.Hotlinger
 import com.lagradost.cloudstream3.extractors.Hxfile
+import com.lagradost.cloudstream3.extractors.InternetArchive
 import com.lagradost.cloudstream3.extractors.JWPlayer
 import com.lagradost.cloudstream3.extractors.Jawcloud
 import com.lagradost.cloudstream3.extractors.Jeniusplay
+import com.lagradost.cloudstream3.extractors.Jodwish
 import com.lagradost.cloudstream3.extractors.Keephealth
+import com.lagradost.cloudstream3.extractors.Kinogeru
 import com.lagradost.cloudstream3.extractors.KotakAnimeid
 import com.lagradost.cloudstream3.extractors.Kotakajair
 import com.lagradost.cloudstream3.extractors.Krakenfiles
+import com.lagradost.cloudstream3.extractors.Kswplayer
 import com.lagradost.cloudstream3.extractors.LayarKaca
 import com.lagradost.cloudstream3.extractors.Linkbox
+import com.lagradost.cloudstream3.extractors.Lulustream1
+import com.lagradost.cloudstream3.extractors.Lulustream2
 import com.lagradost.cloudstream3.extractors.Luxubu
 import com.lagradost.cloudstream3.extractors.Lvturbo
+import com.lagradost.cloudstream3.extractors.MailRu
 import com.lagradost.cloudstream3.extractors.Maxstream
 import com.lagradost.cloudstream3.extractors.Mcloud
+import com.lagradost.cloudstream3.extractors.Mediafire
+import com.lagradost.cloudstream3.extractors.MegaF
 import com.lagradost.cloudstream3.extractors.Megacloud
 import com.lagradost.cloudstream3.extractors.Meownime
 import com.lagradost.cloudstream3.extractors.MetaGnathTuggers
 import com.lagradost.cloudstream3.extractors.Minoplres
 import com.lagradost.cloudstream3.extractors.MixDrop
+import com.lagradost.cloudstream3.extractors.MixDropAg
 import com.lagradost.cloudstream3.extractors.MixDropBz
 import com.lagradost.cloudstream3.extractors.MixDropCh
 import com.lagradost.cloudstream3.extractors.MixDropTo
@@ -97,44 +135,30 @@ 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.Multimovies
 import com.lagradost.cloudstream3.extractors.Mvidoo
+import com.lagradost.cloudstream3.extractors.Mwish
 import com.lagradost.cloudstream3.extractors.MwvnVizcloudInfo
 import com.lagradost.cloudstream3.extractors.MyCloud
-import com.lagradost.cloudstream3.extractors.MegaF
+import com.lagradost.cloudstream3.extractors.Nekostream
+import com.lagradost.cloudstream3.extractors.Nekowish
 import com.lagradost.cloudstream3.extractors.Neonime7n
 import com.lagradost.cloudstream3.extractors.Neonime8n
+import com.lagradost.cloudstream3.extractors.Obeywish
 import com.lagradost.cloudstream3.extractors.Odnoklassniki
-import com.lagradost.cloudstream3.extractors.TauVideo
-import com.lagradost.cloudstream3.extractors.SibNet
-import com.lagradost.cloudstream3.extractors.ContentX
-import com.lagradost.cloudstream3.extractors.D0000d
-import com.lagradost.cloudstream3.extractors.D000dCom
-import com.lagradost.cloudstream3.extractors.DoodstreamCom
-import com.lagradost.cloudstream3.extractors.EmturbovidExtractor
-import com.lagradost.cloudstream3.extractors.Hotlinger
-import com.lagradost.cloudstream3.extractors.FourCX
-import com.lagradost.cloudstream3.extractors.PlayRu
-import com.lagradost.cloudstream3.extractors.FourPlayRu
-import com.lagradost.cloudstream3.extractors.Pichive
-import com.lagradost.cloudstream3.extractors.FourPichive
-import com.lagradost.cloudstream3.extractors.HDMomPlayer
-import com.lagradost.cloudstream3.extractors.HDPlayerSystem
-import com.lagradost.cloudstream3.extractors.VideoSeyred
-import com.lagradost.cloudstream3.extractors.PeaceMakerst
-import com.lagradost.cloudstream3.extractors.HDStreamAble
-import com.lagradost.cloudstream3.extractors.RapidVid
-import com.lagradost.cloudstream3.extractors.TRsTX
-import com.lagradost.cloudstream3.extractors.VidMoxy
-import com.lagradost.cloudstream3.extractors.Sobreatsesuyp
-import com.lagradost.cloudstream3.extractors.PixelDrain
-import com.lagradost.cloudstream3.extractors.MailRu
-import com.lagradost.cloudstream3.extractors.Mediafire
-import com.lagradost.cloudstream3.extractors.OkRuSSL
 import com.lagradost.cloudstream3.extractors.OkRuHTTP
+import com.lagradost.cloudstream3.extractors.OkRuSSL
 import com.lagradost.cloudstream3.extractors.Okrulink
+import com.lagradost.cloudstream3.extractors.PeaceMakerst
+import com.lagradost.cloudstream3.extractors.Pichive
+import com.lagradost.cloudstream3.extractors.PixelDrain
 import com.lagradost.cloudstream3.extractors.PlayLtXyz
+import com.lagradost.cloudstream3.extractors.PlayRu
 import com.lagradost.cloudstream3.extractors.PlayerVoxzer
+import com.lagradost.cloudstream3.extractors.Playerwish
+import com.lagradost.cloudstream3.extractors.Playerx
 import com.lagradost.cloudstream3.extractors.Rabbitstream
+import com.lagradost.cloudstream3.extractors.RapidVid
 import com.lagradost.cloudstream3.extractors.Rasacintaku
 import com.lagradost.cloudstream3.extractors.SBfull
 import com.lagradost.cloudstream3.extractors.Sbasian
@@ -148,8 +172,11 @@ 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.SfastwishCom
 import com.lagradost.cloudstream3.extractors.ShaveTape
+import com.lagradost.cloudstream3.extractors.SibNet
 import com.lagradost.cloudstream3.extractors.Simpulumlamerop
+import com.lagradost.cloudstream3.extractors.Sobreatsesuyp
 import com.lagradost.cloudstream3.extractors.Solidfiles
 import com.lagradost.cloudstream3.extractors.Ssbstream
 import com.lagradost.cloudstream3.extractors.StreamM4u
@@ -165,6 +192,7 @@ 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.StreamSilk
 import com.lagradost.cloudstream3.extractors.StreamTape
 import com.lagradost.cloudstream3.extractors.StreamTapeNet
 import com.lagradost.cloudstream3.extractors.StreamTapeXyz
@@ -176,8 +204,15 @@ 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.Streamwish2
+import com.lagradost.cloudstream3.extractors.Strwish
+import com.lagradost.cloudstream3.extractors.Strwish2
 import com.lagradost.cloudstream3.extractors.Supervideo
+import com.lagradost.cloudstream3.extractors.Swdyu
+import com.lagradost.cloudstream3.extractors.Swhoi
+import com.lagradost.cloudstream3.extractors.TRsTX
 import com.lagradost.cloudstream3.extractors.Tantifilm
+import com.lagradost.cloudstream3.extractors.TauVideo
 import com.lagradost.cloudstream3.extractors.Tomatomatela
 import com.lagradost.cloudstream3.extractors.TomatomatelalClub
 import com.lagradost.cloudstream3.extractors.Tubeless
@@ -186,20 +221,34 @@ 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.UqloadsXyz
 import com.lagradost.cloudstream3.extractors.Urochsunloath
 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.Vectorx
 import com.lagradost.cloudstream3.extractors.Vicloud
+import com.lagradost.cloudstream3.extractors.VidHidePro
+import com.lagradost.cloudstream3.extractors.VidHidePro1
+import com.lagradost.cloudstream3.extractors.VidHidePro2
+import com.lagradost.cloudstream3.extractors.VidHidePro3
+import com.lagradost.cloudstream3.extractors.VidHidePro4
+import com.lagradost.cloudstream3.extractors.VidHidePro5
+import com.lagradost.cloudstream3.extractors.VidHidePro6
+import com.lagradost.cloudstream3.extractors.VidMoxy
 import com.lagradost.cloudstream3.extractors.VidSrcExtractor
 import com.lagradost.cloudstream3.extractors.VidSrcExtractor2
 import com.lagradost.cloudstream3.extractors.VidSrcTo
+import com.lagradost.cloudstream3.extractors.VideoSeyred
 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.Vidguardto
+import com.lagradost.cloudstream3.extractors.Vidguardto1
+import com.lagradost.cloudstream3.extractors.Vidguardto2
+import com.lagradost.cloudstream3.extractors.Vidguardto3
 import com.lagradost.cloudstream3.extractors.VidhideExtractor
 import com.lagradost.cloudstream3.extractors.Vidmoly
 import com.lagradost.cloudstream3.extractors.Vidmolyme
@@ -207,6 +256,7 @@ import com.lagradost.cloudstream3.extractors.Vido
 import com.lagradost.cloudstream3.extractors.Vidplay
 import com.lagradost.cloudstream3.extractors.VidplayOnline
 import com.lagradost.cloudstream3.extractors.Vidstreamz
+import com.lagradost.cloudstream3.extractors.Vidxstream
 import com.lagradost.cloudstream3.extractors.Vizcloud
 import com.lagradost.cloudstream3.extractors.Vizcloud2
 import com.lagradost.cloudstream3.extractors.VizcloudCloud
@@ -217,9 +267,14 @@ 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.Voe1
+import com.lagradost.cloudstream3.extractors.Vtbe
 import com.lagradost.cloudstream3.extractors.Watchx
 import com.lagradost.cloudstream3.extractors.WcoStream
 import com.lagradost.cloudstream3.extractors.Wibufile
+import com.lagradost.cloudstream3.extractors.WishembedPro
+import com.lagradost.cloudstream3.extractors.Wishfast
+import com.lagradost.cloudstream3.extractors.Wishonly
 import com.lagradost.cloudstream3.extractors.XStreamCdn
 import com.lagradost.cloudstream3.extractors.Yipsu
 import com.lagradost.cloudstream3.extractors.YourUpload
@@ -232,17 +287,14 @@ 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.extractors.EPlayExtractor
-import com.lagradost.cloudstream3.extractors.FlaswishCom
-import com.lagradost.cloudstream3.extractors.SfastwishCom
-import com.lagradost.cloudstream3.extractors.Vtbe
-import com.lagradost.cloudstream3.extractors.WishembedPro
+import com.lagradost.cloudstream3.extractors.VidStack
+import com.lagradost.cloudstream3.extractors.GDMirrorbot
+import com.lagradost.cloudstream3.extractors.LuluStream
 import com.lagradost.cloudstream3.mvvm.logError
-import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
 import kotlinx.coroutines.delay
 import me.xdrop.fuzzywuzzy.FuzzySearch
 import org.jsoup.Jsoup
-import java.net.URL
+import java.net.URI
 import java.util.UUID
 
 /**
@@ -312,12 +364,16 @@ data class ExtractorLinkPlayList(
 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;
 
@@ -334,7 +390,12 @@ enum class ExtractorLinkType {
 }
 
 private fun inferTypeFromUrl(url: String): ExtractorLinkType {
-    val path = normalSafeApiCall { URL(url).path }
+    val path = try {
+        URI(url).path
+    } catch (_: Throwable) {
+        // don't log magnet links as errors
+        null
+    }
     return when {
         path?.endsWith(".m3u8") == true -> ExtractorLinkType.M3U8
         path?.endsWith(".mpd") == true -> ExtractorLinkType.DASH
@@ -343,7 +404,8 @@ private fun inferTypeFromUrl(url: String): ExtractorLinkType {
         else -> ExtractorLinkType.VIDEO
     }
 }
-val INFER_TYPE : ExtractorLinkType? = null
+
+val INFER_TYPE: ExtractorLinkType? = null
 
 /**
  * UUID for the ClearKey DRM scheme.
@@ -370,6 +432,21 @@ val WIDEVINE_UUID = UUID(-0x121074568629b532L, -0x5c37d8232ae2de13L)
  */
 val PLAYREADY_UUID = UUID(-0x65fb0f8667bfbd7aL, -0x546d19a41f77a06bL)
 
+/** Class holds extracted DRM media info to be passed to the player.
+ * @property source Name of the media source, appears on player layout.
+ * @property name Title of the media, appears on player layout.
+ * @property url Url string of media file
+ * @property referer Referer that will be used by network request.
+ * @property quality Quality of the media file
+ * @property headers Headers <String, String> map that will be used by network request.
+ * @property extractorData Used for getExtractorVerifierJob()
+ * @property type the type of the media, use [INFER_TYPE] if you want to auto infer the type from the url
+ * @property kid  Base64 value of The KID element (Key Id) contains the identifier of the key associated with a license.
+ * @property key Base64 value of Key to be used to decrypt the media file.
+ * @property uuid Drm UUID [WIDEVINE_UUID], [PLAYREADY_UUID], [CLEARKEY_UUID] (by default) .. etc
+ * @property kty Key type "oct" (octet sequence) by default
+ * @property keyRequestParameters Parameters that will used to request the key.
+ * */
 open class DrmExtractorLink private constructor(
     override val source: String,
     override val name: String,
@@ -380,12 +457,12 @@ open class DrmExtractorLink private constructor(
     /** 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>
+    open var kid: String? = null,
+    open var key: String? = null,
+    open var uuid: UUID,
+    open var kty: String? = null,
+    open var keyRequestParameters: HashMap<String, String>,
+    open var licenseUrl: String? = null,
 ) : ExtractorLink(
     source, name, url, referer, quality, type, headers, extractorData
 ) {
@@ -400,11 +477,12 @@ open class DrmExtractorLink private constructor(
         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(),
+        kid: String? = null,
+        key: String? = null,
+        uuid: UUID = CLEARKEY_UUID,
+        kty: String? = "oct",
+        keyRequestParameters: HashMap<String, String> = hashMapOf(),
+        licenseUrl: String? = null,
     ) : this(
         source = source,
         name = name,
@@ -419,9 +497,20 @@ open class DrmExtractorLink private constructor(
         uuid = uuid,
         keyRequestParameters = keyRequestParameters,
         kty = kty,
+        licenseUrl = licenseUrl,
     )
 }
 
+/** Class holds extracted media info to be passed to the player.
+ * @property source Name of the media source, appears on player layout.
+ * @property name Title of the media, appears on player layout.
+ * @property url Url string of media file
+ * @property referer Referer that will be used by network request.
+ * @property quality Quality of the media file
+ * @property headers Headers <String, String> map that will be used by network request.
+ * @property extractorData Used for getExtractorVerifierJob()
+ * @property type Extracted link type (Video, M3u8, Dash, Torrent or Magnet)
+ * */
 open class ExtractorLink constructor(
     open val source: String,
     open val name: String,
@@ -457,7 +546,7 @@ open class ExtractorLink constructor(
     }
 
     @JsonIgnore
-    fun getAllHeaders() : Map<String, String> {
+    fun getAllHeaders(): Map<String, String> {
         if (referer.isBlank()) {
             return headers
         } else if (headers.keys.none { it.equals("referer", ignoreCase = true) }) {
@@ -626,7 +715,10 @@ suspend fun loadExtractor(
 ): Boolean {
     val currentUrl = unshortenLinkSafe(url)
     val compareUrl = currentUrl.lowercase().replace(schemaStripRegex, "")
-    for (extractor in extractorApis) {
+
+    // Iterate in reverse order so the new registered ExtractorApi takes priority
+    for (index in extractorApis.lastIndex downTo 0) {
+        val extractor = extractorApis[index]
         if (compareUrl.startsWith(extractor.mainUrl.replace(schemaStripRegex, ""))) {
             extractor.getSafeUrl(currentUrl, referer, subtitleCallback, callback)
             return true
@@ -634,7 +726,8 @@ suspend fun loadExtractor(
     }
 
     // this is to match mirror domains - like example.com, example.net
-    for (extractor in extractorApis) {
+    for (index in extractorApis.lastIndex downTo 0) {
+        val extractor = extractorApis[index]
         if (FuzzySearch.partialRatio(
                 extractor.mainUrl,
                 currentUrl
@@ -674,6 +767,7 @@ val extractorApis: MutableList<ExtractorApi> = arrayListOf(
     MixDropBz(),
     MixDropCh(),
     MixDropTo(),
+    MixDropAg(),
 
     MixDrop(),
 
@@ -683,6 +777,7 @@ val extractorApis: MutableList<ExtractorApi> = arrayListOf(
     StreamSB(),
     Sblona(),
     Vidgomunimesb(),
+    StreamSilk(),
     StreamSB1(),
     StreamSB2(),
     StreamSB3(),
@@ -857,12 +952,14 @@ val extractorApis: MutableList<ExtractorApi> = arrayListOf(
     Vidmoly(),
     Vidmolyme(),
     Voe(),
+    Voe1(),
     Tubeless(),
     Moviehab(),
     MoviehabNet(),
     Jeniusplay(),
     StreamoUpload(),
 
+    GamoVideo(),
     Gdriveplayerapi(),
     Gdriveplayerapp(),
     Gdriveplayerfun(),
@@ -901,22 +998,70 @@ val extractorApis: MutableList<ExtractorApi> = arrayListOf(
     Dokicloud(),
     Megacloud(),
     VidhideExtractor(),
+    VidHidePro(),
+    VidHidePro1(),
+    VidHidePro2(),
+    VidHidePro3(),
+    VidHidePro4(),
+    VidHidePro5(),
+    VidHidePro6(),
+    LuluStream(),
+    Lulustream1(),
+    Lulustream2(),
     StreamWishExtractor(),
     WishembedPro(),
     CdnwishCom(),
     FlaswishCom(),
     SfastwishCom(),
+    Playerwish(),
     EmturbovidExtractor(),
     Vtbe(),
     EPlayExtractor(),
     Vidguardto(),
+    Vidguardto1(),
+    Vidguardto2(),
+    Vidguardto3(),
     Simpulumlamerop(),
     Urochsunloath(),
     Yipsu(),
     MetaGnathTuggers(),
     Geodailymotion(),
-    
-)
+    Mwish(),
+    Dwish(),
+    Ewish(),
+    Kswplayer(),
+    Wishfast(),
+    Streamwish2(),
+    Strwish(),
+    Strwish2(),
+    Awish(),
+    Obeywish(),
+    Jodwish(),
+    Swhoi(),
+    Multimovies(),
+    UqloadsXyz(),
+    Doodporn(),
+    Asnwish(),
+    Nekowish(),
+    Nekostream(),
+    Swdyu(),
+    Wishonly(),
+    Beastx(),
+    Playerx(),
+    AnimesagaStream(),
+    Anplay(),
+    Kinogeru(),
+    Vidxstream(),
+    Boltx(),
+    Vectorx(),
+    Boosterx(),
+    Ds2play(),
+    Ds2video(),
+    Filegram(),
+    InternetArchive(),
+    VidStack(),
+    GDMirrorbot(),
+    )
 
 
 fun getExtractorApiFromName(name: String): ExtractorApi {
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/JsHunter.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/JsHunter.kt
index 8ccb2c70d2b..dd595dffaa7 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/JsHunter.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/JsHunter.kt
@@ -29,7 +29,7 @@ class JsHunter(private val hunterJS: String) {
         try {
             val p: Pattern =
                 Pattern.compile(
-                    """}\("([^"]+)",[^,]+,\s*"([^"]+)",\s*(\d+),\s*(\d+)""",
+                    """\}\("([^"]+)",[^,]+,\s*"([^"]+)",\s*(\d+),\s*(\d+)""",
                     Pattern.DOTALL
                 )
             val searchResults: Matcher = p.matcher(hunterJS)
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/JsUnpacker.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/JsUnpacker.kt
index d9f0b382b33..7ed2e9be2c2 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/JsUnpacker.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/JsUnpacker.kt
@@ -26,25 +26,25 @@ class JsUnpacker(packedJS: String?) {
      * @return the javascript unpacked or null.
      */
     fun unpack(): String? {
-        val js = packedJS
+        val js = packedJS ?: return null
         try {
             var p =
                 Pattern.compile("""\}\s*\('(.*)',\s*(.*?),\s*(\d+),\s*'(.*?)'\.split\('\|'\)""", Pattern.DOTALL)
             var m = p.matcher(js)
             if (m.find() && m.groupCount() == 4) {
-                val payload = m.group(1).replace("\\'", "'")
+                val payload = m.group(1)?.replace("\\'", "'") ?: ""
                 val radixStr = m.group(2)
                 val countStr = m.group(3)
-                val symtab = m.group(4).split("\\|".toRegex()).toTypedArray()
+                val symtab = (m.group(4)?.split("\\|".toRegex()) ?: emptyList()).toTypedArray()
                 var radix = 36
                 var count = 0
                 try {
-                    radix = radixStr.toInt()
-                } catch (e: Exception) {
+                    radix = radixStr?.toIntOrNull() ?: radix
+                } catch (_: Exception) {
                 }
                 try {
-                    count = countStr.toInt()
-                } catch (e: Exception) {
+                    count = countStr?.toIntOrNull() ?: 0
+                } catch (_: Exception) {
                 }
                 if (symtab.size != count) {
                     throw Exception("Unknown p.a.c.k.e.r. encoding")
@@ -56,12 +56,12 @@ class JsUnpacker(packedJS: String?) {
                 var replaceOffset = 0
                 while (m.find()) {
                     val word = m.group(0)
-                    val x = unbase.unbase(word)
+                    val x = if (word == null) 0 else unbase.unbase(word)
                     var value: String? = null
                     if (x < symtab.size && x >= 0) {
                         value = symtab[x]
                     }
-                    if (value != null && value.isNotEmpty()) {
+                    if (!value.isNullOrEmpty() && !word.isNullOrEmpty()) {
                         decoded.replace(m.start() + replaceOffset, m.end() + replaceOffset, value)
                         replaceOffset += value.length - word.length
                     }
@@ -118,7 +118,7 @@ class JsUnpacker(packedJS: String?) {
     }
 
     /**
-     * @param  packedJS javascript P.A.C.K.E.R. coded.
+     * @param packedJS javascript P.A.C.K.E.R. coded.
      */
     init {
         this.packedJS = packedJS
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/M3u8Helper.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/M3u8Helper.kt
index 298f1601b00..dcf98e221c8 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/M3u8Helper.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/M3u8Helper.kt
@@ -133,7 +133,7 @@ object M3u8Helper2 {
 
     private fun getParentLink(uri: String): String {
         val split = uri.split("/").toMutableList()
-        split.removeLast()
+        split.removeAt(split.lastIndex)
         return split.joinToString("/")
     }
 
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/StringUtils.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/StringUtils.kt
new file mode 100644
index 00000000000..1e3a2ffb78e
--- /dev/null
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/StringUtils.kt
@@ -0,0 +1,14 @@
+package com.lagradost.cloudstream3.utils
+
+import java.net.URLDecoder
+import java.net.URLEncoder
+
+object StringUtils {
+    fun String.encodeUri(): String {
+        return URLEncoder.encode(this, "UTF-8")
+    }
+
+    fun String.decodeUri(): String {
+        return URLDecoder.decode(this, "UTF-8")
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/SubtitleHelper.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/SubtitleHelper.kt
similarity index 97%
rename from app/src/main/java/com/lagradost/cloudstream3/utils/SubtitleHelper.kt
rename to library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/SubtitleHelper.kt
index 09f5e0f18b4..c65b2b14b17 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/SubtitleHelper.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/SubtitleHelper.kt
@@ -1,520 +1,519 @@
-package com.lagradost.cloudstream3.utils
-
-import com.lagradost.cloudstream3.mvvm.logError
-import java.util.*
-
-
-object SubtitleHelper {
-    data class Language639(
-        val languageName: String,
-        val nativeName: String,
-        val ISO_639_1: String,
-        val ISO_639_2_T: String,
-        val ISO_639_2_B: String,
-        val ISO_639_3: String,
-        val ISO_639_6: String,
-    )
-
-    /*fun createISO() {
-        val url = "https://infogalactic.com/info/List_of_ISO_639-1_codes"
-        val response = get(url).text
-        val document = Jsoup.parse(response)
-        val headers = document.select("table.wikitable > tbody > tr")
-
-        var text = "listOf(\n"
-        for (head in headers) {
-            val tds = head.select("td")
-            if (tds.size < 8) continue
-            val name = tds[2].selectFirst("> a").text()
-            val native = tds[3].text()
-            val ISO_639_1 = tds[4].ownText().replace("+", "").replace(" ", "")
-            val ISO_639_2_T = tds[5].ownText().replace("+", "").replace(" ", "")
-            val ISO_639_2_B = tds[6].ownText().replace("+", "").replace(" ", "")
-            val ISO_639_3 = tds[7].ownText().replace("+", "").replace(" ", "")
-            val ISO_639_6 = tds[8].ownText().replace("+", "").replace(" ", "")
-
-            val txtAdd =
-                "Language(\"$name\", \"$native\", \"$ISO_639_1\", \"$ISO_639_2_T\", \"$ISO_639_2_B\", \"$ISO_639_3\", \"$ISO_639_6\"),\n"
-            text += txtAdd
-        }
-        text += ")"
-        println("ISO CREATED:\n$text")
-    }*/
-
-    /** lang -> ISO_639_1
-     * @param looseCheck will use .contains in addition to .equals
-     * */
-    fun fromLanguageToTwoLetters(input: String, looseCheck: Boolean): String? {
-        languages.forEach {
-            if (it.languageName.equals(input, ignoreCase = true)
-                || it.nativeName.equals(input, ignoreCase = true)
-            ) return it.ISO_639_1
-        }
-
-        // Runs as a separate loop as to prioritize fully matching languages.
-        if (looseCheck)
-            languages.forEach {
-                if (input.contains(it.languageName, ignoreCase = true)
-                    || input.contains(it.nativeName, ignoreCase = true)
-                ) return it.ISO_639_1
-            }
-
-        return null
-    }
-
-    private var ISO_639_1Map: HashMap<String, String> = hashMapOf()
-    private fun initISO6391Map() {
-        for (lang in languages) {
-            ISO_639_1Map[lang.ISO_639_1] = lang.languageName
-        }
-    }
-
-    /** ISO_639_1 -> lang*/
-    fun fromTwoLettersToLanguage(input: String): String? {
-        // pr-BR
-        if (input.substringBefore("-").length != 2) return null
-        if (ISO_639_1Map.isEmpty()) {
-            initISO6391Map()
-        }
-        val comparison = input.lowercase(Locale.ROOT)
-
-        return ISO_639_1Map[comparison]
-    }
-
-    /**ISO_639_2_B or ISO_639_2_T or ISO_639_3-> lang*/
-    fun fromThreeLettersToLanguage(input: String): String? {
-        if (input.length != 3) return null
-        val comparison = input.lowercase(Locale.ROOT)
-        for (lang in languages) {
-            if (lang.ISO_639_2_B == comparison) {
-                return lang.languageName
-            }
-        }
-        for (lang in languages) {
-            if (lang.ISO_639_2_T == comparison) {
-                return lang.languageName
-            }
-        }
-        for (lang in languages) {
-            if (lang.ISO_639_3 == comparison) {
-                return lang.languageName
-            }
-        }
-        return null
-    }
-
-    /** lang -> ISO_639_2_T*/
-    fun fromLanguageToThreeLetters(input: String): String? {
-        for (lang in languages) {
-            if (lang.languageName == input || lang.nativeName == input) {
-                return lang.ISO_639_2_T
-            }
-        }
-        return null
-    }
-
-    private const val flagOffset = 0x1F1E6
-    private const val asciiOffset = 0x41
-    private const val offset = flagOffset - asciiOffset
-
-    private val flagRegex = Regex("[\uD83C\uDDE6-\uD83C\uDDFF]{2}")
-
-    fun getFlagFromIso(inp: String?): String? {
-        if (inp.isNullOrBlank() || inp.length < 2) return null
-
-        try {
-            val ret = getFlagFromIsoShort(flags[inp])
-                ?: getFlagFromIsoShort(inp.uppercase()) ?: return null
-
-            return if (flagRegex.matches(ret)) {
-                ret
-            } else {
-                null
-            }
-        } catch (e: Exception) {
-            logError(e)
-            return null
-        }
-    }
-
-    private fun getFlagFromIsoShort(flagAscii: String?): String? {
-        if (flagAscii.isNullOrBlank() || flagAscii.length < 2) return null
-        return try {
-            val firstChar: Int = Character.codePointAt(flagAscii, 0) + offset
-            val secondChar: Int = Character.codePointAt(flagAscii, 1) + offset
-
-            (String(Character.toChars(firstChar)) + String(Character.toChars(secondChar)))
-        } catch (e: Exception) {
-            logError(e)
-            null
-        }
-    }
-
-    private val flags = mapOf(
-        "af" to "ZA",
-        "agq" to "CM",
-        "ajp" to "SY",
-        "ak" to "GH",
-        "am" to "ET",
-        "ar" to "AE",
-        "ars" to "SA",
-        "as" to "IN",
-        "asa" to "TZ",
-        "az" to "AZ",
-        "bas" to "CM",
-        "be" to "BY",
-        "bem" to "ZM",
-        "bez" to "IT",
-        "bg" to "BG",
-        "bm" to "ML",
-        "bn" to "BD",
-        "bo" to "CN",
-        "br" to "FR",
-        "brx" to "IN",
-        "bs" to "BA",
-        "ca" to "ES",
-        "cgg" to "UG",
-        "chr" to "US",
-        "cs" to "CZ",
-        "cy" to "GB",
-        "da" to "DK",
-        "dav" to "KE",
-        "de" to "DE",
-        "dje" to "NE",
-        "dua" to "CM",
-        "dyo" to "SN",
-        "ebu" to "KE",
-        "ee" to "GH",
-        "en" to "GB",
-        "el" to "GR",
-        "es" to "ES",
-        "et" to "EE",
-        "eu" to "ES",
-        "ewo" to "CM",
-        "fa" to "IR",
-        "fil" to "PH",
-        "fr" to "FR",
-        "ga" to "IE",
-        "gl" to "ES",
-        "gsw" to "CH",
-        "gu" to "IN",
-        "guz" to "KE",
-        "gv" to "GB",
-        "ha" to "NG",
-        "haw" to "US",
-        "he" to "IL",
-        "hi" to "IN",
-        "ff" to "CN",
-        "fi" to "FI",
-        "fo" to "FO",
-        "hr" to "HR",
-        "hu" to "HU",
-        "hy" to "AM",
-        "id" to "ID",
-        "ig" to "NG",
-        "ii" to "CN",
-        "is" to "IS",
-        "it" to "IT",
-        "ita" to "IT",
-        "ja" to "JP",
-        "jmc" to "TZ",
-        "ka" to "GE",
-        "kab" to "DZ",
-        "ki" to "KE",
-        "kam" to "KE",
-        "mer" to "KE",
-        "kde" to "TZ",
-        "kea" to "CV",
-        "khq" to "ML",
-        "kk" to "KZ",
-        "kl" to "GL",
-        "kln" to "KE",
-        "km" to "KH",
-        "kn" to "IN",
-        "ko" to "KR",
-        "kok" to "IN",
-        "ksb" to "TZ",
-        "ksf" to "CM",
-        "kw" to "GB",
-        "lag" to "TZ",
-        "lg" to "UG",
-        "ln" to "CG",
-        "lt" to "LT",
-        "lu" to "CD",
-        "lv" to "LV",
-        "lat" to "LV",
-        "luo" to "KE",
-        "luy" to "KE",
-        "mas" to "TZ",
-        "mfe" to "MU",
-        "mg" to "MG",
-        "mgh" to "MZ",
-        "ml" to "IN",
-        "mk" to "MK",
-        "mr" to "IN",
-        "ms" to "MY",
-        "mt" to "MT",
-        "mua" to "CM",
-        "my" to "MM",
-        "naq" to "NA",
-        "nb" to "NO",
-        "no" to "NO",
-        "nn" to "NO",
-        "nd" to "ZW",
-        "ne" to "NP",
-        "nl" to "NL",
-        "nmg" to "CM",
-        "nus" to "SD",
-        "nyn" to "UG",
-        "om" to "ET",
-        "or" to "IN",
-        "pa" to "PK",
-        "pl" to "PL",
-        "ps" to "AF",
-        "pt" to "PT",
-        "pt-pt" to "PT",
-        "pt-br" to "BR",
-        "rm" to "CH",
-        "rn" to "BI",
-        "ro" to "RO",
-        "ru" to "RU",
-        "rw" to "RW",
-        "rof" to "TZ",
-        "rwk" to "TZ",
-        "saq" to "KE",
-        "sbp" to "TZ",
-        "seh" to "MZ",
-        "ses" to "ML",
-        "sg" to "CF",
-        "shi" to "MA",
-        "si" to "LK",
-        "sk" to "SK",
-        "sl" to "SI",
-        "sn" to "ZW",
-        "so" to "SO",
-        "sq" to "AL",
-        "sr" to "RS",
-        "sv" to "SE",
-        "sw" to "TZ",
-        "swc" to "CD",
-        "ta" to "IN",
-        "te" to "IN",
-        "teo" to "UG",
-        "th" to "TH",
-        "ti" to "ET",
-        "to" to "TO",
-        "tr" to "TR",
-        "twq" to "NE",
-        "tzm" to "MA",
-        "uk" to "UA",
-        "ur" to "PK",
-        "uz" to "UZ",
-        "vai" to "LR",
-        "vi" to "VN",
-        "vun" to "TZ",
-        "xog" to "UG",
-        "yav" to "CM",
-        "yo" to "NG",
-        "zh" to "CN",
-        "zu" to "ZA",
-        "tl" to "PH",
-    )
-
-    val languages = listOf(
-        Language639("Abkhaz", "аҧсуа бызшәа, аҧсшәа", "ab", "abk", "abk", "abk", "abks"),
-        Language639("Afar", "Afaraf", "aa", "aar", "aar", "aar", "aars"),
-        Language639("Afrikaans", "Afrikaans", "af", "afr", "afr", "afr", "afrs"),
-        Language639("Akan", "Akan", "ak", "aka", "aka", "aka", ""),
-        Language639("Albanian", "Shqip", "sq", "sqi", "", "sqi", ""),
-        Language639("Amharic", "አማርኛ", "am", "amh", "amh", "amh", ""),
-        Language639("Arabic", "العربية", "ar", "ara", "ara", "ara", ""),
-        Language639("Aragonese", "aragonés", "an", "arg", "arg", "arg", ""),
-        Language639("Armenian", "Հայերեն", "hy", "hye", "", "hye", ""),
-        Language639("Assamese", "অসমীয়া", "as", "asm", "asm", "asm", ""),
-        Language639("Avaric", "авар мацӀ, магӀарул мацӀ", "av", "ava", "ava", "ava", ""),
-        Language639("Avestan", "avesta", "ae", "ave", "ave", "ave", ""),
-        Language639("Aymara", "aymar aru", "ay", "aym", "aym", "aym", ""),
-        Language639("Azerbaijani", "azərbaycan dili", "az", "aze", "aze", "aze", ""),
-        Language639("Bambara", "bamanankan", "bm", "bam", "bam", "bam", ""),
-        Language639("Bashkir", "башҡорт теле", "ba", "bak", "bak", "bak", ""),
-        Language639("Basque", "euskara, euskera", "eu", "eus", "", "eus", ""),
-        Language639("Belarusian", "беларуская мова", "be", "bel", "bel", "bel", ""),
-        Language639("Bengali", "বাংলা", "bn", "ben", "ben", "ben", ""),
-        Language639("Bihari", "भोजपुरी", "bh", "bih", "bih", "", ""),
-        Language639("Bislama", "Bislama", "bi", "bis", "bis", "bis", ""),
-        Language639("Bosnian", "bosanski jezik", "bs", "bos", "bos", "bos", "boss"),
-        Language639("Breton", "brezhoneg", "br", "bre", "bre", "bre", ""),
-        Language639("Bulgarian", "български език", "bg", "bul", "bul", "bul", "buls"),
-        Language639("Burmese", "ဗမာစာ", "my", "mya", "", "mya", ""),
-        Language639("Catalan", "català", "ca", "cat", "cat", "cat", ""),
-        Language639("Chamorro", "Chamoru", "ch", "cha", "cha", "cha", ""),
-        Language639("Chechen", "нохчийн мотт", "ce", "che", "che", "che", ""),
-        Language639("Chichewa", "chiCheŵa, chinyanja", "ny", "nya", "nya", "nya", ""),
-        Language639("Chinese", "中文 (Zhōngwén), 汉语, 漢語", "zh", "zho", "", "zho", ""),
-        Language639("Chuvash", "чӑваш чӗлхи", "cv", "chv", "chv", "chv", ""),
-        Language639("Cornish", "Kernewek", "kw", "cor", "cor", "cor", ""),
-        Language639("Corsican", "corsu, lingua corsa", "co", "cos", "cos", "cos", ""),
-        Language639("Cree", "ᓀᐦᐃᔭᐍᐏᐣ", "cr", "cre", "cre", "cre", ""),
-        Language639("Croatian", "hrvatski jezik", "hr", "hrv", "hrv", "hrv", ""),
-        Language639("Czech", "čeština, český jazyk", "cs", "ces", "", "ces", ""),
-        Language639("Danish", "dansk", "da", "dan", "dan", "dan", ""),
-        Language639("Divehi", "ދިވެހި", "dv", "div", "div", "div", ""),
-        Language639("Dutch", "Nederlands, Vlaams", "nl", "nld", "", "nld", ""),
-        Language639("Dzongkha", "རྫོང་ཁ", "dz", "dzo", "dzo", "dzo", ""),
-        Language639("English", "English", "en", "eng", "eng", "eng", "engs"),
-        Language639("Esperanto", "Esperanto", "eo", "epo", "epo", "epo", ""),
-        Language639("Estonian", "eesti, eesti keel", "et", "est", "est", "est", ""),
-        Language639("Ewe", "Eʋegbe", "ee", "ewe", "ewe", "ewe", ""),
-        Language639("Faroese", "føroyskt", "fo", "fao", "fao", "fao", ""),
-        Language639("Fijian", "vosa Vakaviti", "fj", "fij", "fij", "fij", ""),
-        Language639("Finnish", "suomi, suomen kieli", "fi", "fin", "fin", "fin", ""),
-        Language639("French", "français, langue française", "fr", "fra", "", "fra", "fras"),
-        Language639("Fula", "Fulfulde, Pulaar, Pular", "ff", "ful", "ful", "ful", ""),
-        Language639("Galician", "galego", "gl", "glg", "glg", "glg", ""),
-        Language639("Georgian", "ქართული", "ka", "kat", "", "kat", ""),
-        Language639("German", "Deutsch", "de", "deu", "", "deu", "deus"),
-        Language639("Greek", "ελληνικά", "el", "ell", "", "ell", "ells"),
-        Language639("Guaraní", "Avañe'ẽ", "gn", "grn", "grn", "grn", ""),
-        Language639("Gujarati", "ગુજરાતી", "gu", "guj", "guj", "guj", ""),
-        Language639("Haitian", "Kreyòl ayisyen", "ht", "hat", "hat", "hat", ""),
-        Language639("Hausa", "(Hausa) هَوُسَ", "ha", "hau", "hau", "hau", ""),
-        Language639("Hebrew", "עברית", "he", "heb", "heb", "heb", ""),
-        Language639("Herero", "Otjiherero", "hz", "her", "her", "her", ""),
-        Language639("Hindi", "हिन्दी, हिंदी", "hi", "hin", "hin", "hin", "hins"),
-        Language639("Hiri Motu", "Hiri Motu", "ho", "hmo", "hmo", "hmo", ""),
-        Language639("Hungarian", "magyar", "hu", "hun", "hun", "hun", ""),
-        Language639("Interlingua", "Interlingua", "ia", "ina", "ina", "ina", ""),
-        Language639("Indonesian", "Bahasa Indonesia", "id", "ind", "ind", "ind", ""),
-        Language639(
-            "Interlingue",
-            "Originally called Occidental; then Interlingue after WWII",
-            "ie",
-            "ile",
-            "ile",
-            "ile",
-            ""
-        ),
-        Language639("Irish", "Gaeilge", "ga", "gle", "gle", "gle", ""),
-        Language639("Igbo", "Asụsụ Igbo", "ig", "ibo", "ibo", "ibo", ""),
-        Language639("Inupiaq", "Iñupiaq, Iñupiatun", "ik", "ipk", "ipk", "ipk", ""),
-        Language639("Ido", "Ido", "io", "ido", "ido", "ido", "idos"),
-        Language639("Icelandic", "Íslenska", "is", "isl", "", "isl", ""),
-        Language639("Italian", "italiano", "it", "ita", "ita", "ita", "itas"),
-        Language639("Inuktitut", "ᐃᓄᒃᑎᑐᑦ", "iu", "iku", "iku", "iku", ""),
-        Language639("Japanese", "日本語 (にほんご)", "ja", "jpn", "jpn", "jpn", ""),
-        Language639("Javanese", "ꦧꦱꦗꦮ", "jv", "jav", "jav", "jav", ""),
-        Language639("Kalaallisut", "kalaallisut, kalaallit oqaasii", "kl", "kal", "kal", "kal", ""),
-        Language639("Kannada", "ಕನ್ನಡ", "kn", "kan", "kan", "kan", ""),
-        Language639("Kanuri", "Kanuri", "kr", "kau", "kau", "kau", ""),
-        Language639("Kashmiri", "कश्मीरी, كشميري‎", "ks", "kas", "kas", "kas", ""),
-        Language639("Kazakh", "қазақ тілі", "kk", "kaz", "kaz", "kaz", ""),
-        Language639("Khmer", "ខ្មែរ, ខេមរភាសា, ភាសាខ្មែរ", "km", "khm", "khm", "khm", ""),
-        Language639("Kikuyu", "Gĩkũyũ", "ki", "kik", "kik", "kik", ""),
-        Language639("Kinyarwanda", "Ikinyarwanda", "rw", "kin", "kin", "kin", ""),
-        Language639("Kyrgyz", "Кыргызча, Кыргыз тили", "ky", "kir", "kir", "kir", ""),
-        Language639("Komi", "коми кыв", "kv", "kom", "kom", "kom", ""),
-        Language639("Kongo", "Kikongo", "kg", "kon", "kon", "kon", ""),
-        Language639("Korean", "한국어, 조선어", "ko", "kor", "kor", "kor", ""),
-        Language639("Kurdish", "Kurdî, كوردی‎", "ku", "kur", "kur", "kur", ""),
-        Language639("Kwanyama", "Kuanyama", "kj", "kua", "kua", "kua", ""),
-        Language639("Latin", "latine, lingua latina", "la", "lat", "lat", "lat", "lats"),
-        Language639("Luxembourgish", "Lëtzebuergesch", "lb", "ltz", "ltz", "ltz", ""),
-        Language639("Ganda", "Luganda", "lg", "lug", "lug", "lug", ""),
-        Language639("Limburgish", "Limburgs", "li", "lim", "lim", "lim", ""),
-        Language639("Lingala", "Lingála", "ln", "lin", "lin", "lin", ""),
-        Language639("Lao", "ພາສາລາວ", "lo", "lao", "lao", "lao", ""),
-        Language639("Lithuanian", "lietuvių kalba", "lt", "lit", "lit", "lit", ""),
-        Language639("Luba-Katanga", "Tshiluba", "lu", "lub", "lub", "lub", ""),
-        Language639("Latvian", "latviešu valoda", "lv", "lav", "lav", "lav", ""),
-        Language639("Manx", "Gaelg, Gailck", "gv", "glv", "glv", "glv", ""),
-        Language639("Macedonian", "македонски јазик", "mk", "mkd", "", "mkd", ""),
-        Language639("Malagasy", "fiteny malagasy", "mg", "mlg", "mlg", "mlg", ""),
-        Language639("Malay", "bahasa Melayu, بهاس ملايو‎", "ms", "msa", "", "msa", ""),
-        Language639("Malayalam", "മലയാളം", "ml", "mal", "mal", "mal", ""),
-        Language639("Maltese", "Malti", "mt", "mlt", "mlt", "mlt", ""),
-        Language639("Māori", "te reo Māori", "mi", "mri", "", "mri", ""),
-        Language639("Marathi", "मराठी", "mr", "mar", "mar", "mar", ""),
-        Language639("Marshallese", "Kajin M̧ajeļ", "mh", "mah", "mah", "mah", ""),
-        Language639("Mongolian", "Монгол хэл", "mn", "mon", "mon", "mon", ""),
-        Language639("Nauruan", "Dorerin Naoero", "na", "nau", "nau", "nau", ""),
-        Language639("Navajo", "Diné bizaad", "nv", "nav", "nav", "nav", ""),
-        Language639("Northern Ndebele", "isiNdebele", "nd", "nde", "nde", "nde", ""),
-        Language639("Nepali", "नेपाली", "ne", "nep", "nep", "nep", ""),
-        Language639("Ndonga", "Owambo", "ng", "ndo", "ndo", "ndo", ""),
-        Language639("Norwegian Bokmål", "Norsk bokmål", "nb", "nob", "nob", "nob", ""),
-        Language639("Norwegian Nynorsk", "Norsk nynorsk", "nn", "nno", "nno", "nno", ""),
-        Language639("Norwegian", "Norsk", "no", "nor", "nor", "nor", ""),
-        Language639("Nuosu", "ꆈꌠ꒿ Nuosuhxop", "ii", "iii", "iii", "iii", ""),
-        Language639("Southern Ndebele", "isiNdebele", "nr", "nbl", "nbl", "nbl", ""),
-        Language639("Occitan", "occitan, lenga d'òc", "oc", "oci", "oci", "oci", ""),
-        Language639("Ojibwe", "ᐊᓂᔑᓈᐯᒧᐎᓐ", "oj", "oji", "oji", "oji", ""),
-        Language639("Old Church Slavonic", "ѩзыкъ словѣньскъ", "cu", "chu", "chu", "chu", ""),
-        Language639("Oromo", "Afaan Oromoo", "om", "orm", "orm", "orm", ""),
-        Language639("Oriya", "ଓଡ଼ିଆ", "or", "ori", "ori", "ori", ""),
-        Language639("Ossetian", "ирон æвзаг", "os", "oss", "oss", "oss", ""),
-        Language639("Panjabi", "ਪੰਜਾਬੀ, پنجابی‎", "pa", "pan", "pan", "pan", ""),
-        Language639("Pāli", "पाऴि", "pi", "pli", "pli", "pli", ""),
-        Language639("Persian", "فارسی", "fa", "fas", "", "fas", ""),
-        Language639("Polish", "język polski, polszczyzna", "pl", "pol", "pol", "pol", "pols"),
-        Language639("Pashto", "پښتو", "ps", "pus", "pus", "pus", ""),
-        Language639("Portuguese", "português", "pt-pt", "por", "por", "por", ""),
-        // Addition to support Brazilian Portuguese properly, might break other things
-        Language639("Portuguese (Brazilian)", "português", "pt-br", "por", "por", "por", ""),
-        Language639("Quechua", "Runa Simi, Kichwa", "qu", "que", "que", "que", ""),
-        Language639("Romansh", "rumantsch grischun", "rm", "roh", "roh", "roh", ""),
-        Language639("Kirundi", "Ikirundi", "rn", "run", "run", "run", ""),
-        Language639("Reunion Creole", "Kréol Rénioné", "rc", "rcf", "rcf", "rcf", ""),
-        Language639("Romanian", "limba română", "ro", "ron", "", "ron", ""),
-        Language639("Russian", "Русский", "ru", "rus", "rus", "rus", ""),
-        Language639("Sanskrit", "संस्कृतम्", "sa", "san", "san", "san", ""),
-        Language639("Sardinian", "sardu", "sc", "srd", "srd", "srd", ""),
-        Language639("Sindhi", "सिन्धी, سنڌي، سندھی‎", "sd", "snd", "snd", "snd", ""),
-        Language639("Northern Sami", "Davvisámegiella", "se", "sme", "sme", "sme", ""),
-        Language639("Samoan", "gagana fa'a Samoa", "sm", "smo", "smo", "smo", ""),
-        Language639("Sango", "yângâ tî sängö", "sg", "sag", "sag", "sag", ""),
-        Language639("Serbian", "српски језик", "sr", "srp", "srp", "srp", ""),
-        Language639("Scottish Gaelic", "Gàidhlig", "gd", "gla", "gla", "gla", ""),
-        Language639("Shona", "chiShona", "sn", "sna", "sna", "sna", ""),
-        Language639("Sinhalese", "සිංහල", "si", "sin", "sin", "sin", ""),
-        Language639("Slovak", "slovenčina, slovenský jazyk", "sk", "slk", "", "slk", ""),
-        Language639("Slovene", "slovenski jezik, slovenščina", "sl", "slv", "slv", "slv", ""),
-        Language639("Somali", "Soomaaliga, af Soomaali", "so", "som", "som", "som", ""),
-        Language639("Southern Sotho", "Sesotho", "st", "sot", "sot", "sot", ""),
-        Language639("Spanish", "español", "es", "spa", "spa", "spa", ""),
-        Language639("Sundanese", "Basa Sunda", "su", "sun", "sun", "sun", ""),
-        Language639("Swahili", "Kiswahili", "sw", "swa", "swa", "swa", ""),
-        Language639("Swati", "SiSwati", "ss", "ssw", "ssw", "ssw", ""),
-        Language639("Swedish", "svenska", "sv", "swe", "swe", "swe", ""),
-        Language639("Tamil", "தமிழ்", "ta", "tam", "tam", "tam", ""),
-        Language639("Telugu", "తెలుగు", "te", "tel", "tel", "tel", ""),
-        Language639("Tajik", "тоҷикӣ, toçikī, تاجیکی‎", "tg", "tgk", "tgk", "tgk", ""),
-        Language639("Thai", "ไทย", "th", "tha", "tha", "tha", ""),
-        Language639("Tigrinya", "ትግርኛ", "ti", "tir", "tir", "tir", ""),
-        Language639("Tibetan Standard", "བོད་ཡིག", "bo", "bod", "", "bod", ""),
-        Language639("Turkmen", "Türkmen, Түркмен", "tk", "tuk", "tuk", "tuk", ""),
-        Language639("Tagalog", "Wikang Tagalog", "tl", "tgl", "tgl", "tgl", ""),
-        Language639("Tswana", "Setswana", "tn", "tsn", "tsn", "tsn", ""),
-        Language639("Tonga", "faka Tonga", "to", "ton", "ton", "ton", ""),
-        Language639("Turkish", "Türkçe", "tr", "tur", "tur", "tur", ""),
-        Language639("Tsonga", "Xitsonga", "ts", "tso", "tso", "tso", ""),
-        Language639("Tatar", "татар теле, tatar tele", "tt", "tat", "tat", "tat", ""),
-        Language639("Twi", "Twi", "tw", "twi", "twi", "twi", ""),
-        Language639("Tahitian", "Reo Tahiti", "ty", "tah", "tah", "tah", ""),
-        Language639("Uyghur", "ئۇيغۇرچە‎, Uyghurche", "ug", "uig", "uig", "uig", ""),
-        Language639("Ukrainian", "Українська", "uk", "ukr", "ukr", "ukr", ""),
-        Language639("Urdu", "اردو", "ur", "urd", "urd", "urd", ""),
-        Language639("Uzbek", "Oʻzbek, Ўзбек, أۇزبېك‎", "uz", "uzb", "uzb", "uzb", ""),
-        Language639("Venda", "Tshivenḓa", "ve", "ven", "ven", "ven", ""),
-        Language639("Vietnamese", "Tiếng Việt", "vi", "vie", "vie", "vie", ""),
-        Language639("Volapük", "Volapük", "vo", "vol", "vol", "vol", ""),
-        Language639("Walloon", "walon", "wa", "wln", "wln", "wln", ""),
-        Language639("Welsh", "Cymraeg", "cy", "cym", "", "cym", ""),
-        Language639("Wolof", "Wollof", "wo", "wol", "wol", "wol", ""),
-        Language639("Western Frisian", "Frysk", "fy", "fry", "fry", "fry", ""),
-        Language639("Xhosa", "isiXhosa", "xh", "xho", "xho", "xho", ""),
-        Language639("Yiddish", "ייִדיש", "yi", "yid", "yid", "yid", ""),
-        Language639("Yoruba", "Yorùbá", "yo", "yor", "yor", "yor", ""),
-        Language639("Zhuang", "Saɯ cueŋƅ, Saw cuengh", "za", "zha", "zha", "zha", ""),
-        Language639("Zulu", "isiZulu", "zu", "zul", "zul", "zul", ""),
-    )
-}
+package com.lagradost.cloudstream3.utils
+
+import com.lagradost.cloudstream3.mvvm.logError
+import java.util.Locale
+
+object SubtitleHelper {
+    data class Language639(
+        val languageName: String,
+        val nativeName: String,
+        val ISO_639_1: String,
+        val ISO_639_2_T: String,
+        val ISO_639_2_B: String,
+        val ISO_639_3: String,
+        val ISO_639_6: String,
+    )
+
+    /*fun createISO() {
+        val url = "https://infogalactic.com/info/List_of_ISO_639-1_codes"
+        val response = get(url).text
+        val document = Jsoup.parse(response)
+        val headers = document.select("table.wikitable > tbody > tr")
+
+        var text = "listOf(\n"
+        for (head in headers) {
+            val tds = head.select("td")
+            if (tds.size < 8) continue
+            val name = tds[2].selectFirst("> a").text()
+            val native = tds[3].text()
+            val ISO_639_1 = tds[4].ownText().replace("+", "").replace(" ", "")
+            val ISO_639_2_T = tds[5].ownText().replace("+", "").replace(" ", "")
+            val ISO_639_2_B = tds[6].ownText().replace("+", "").replace(" ", "")
+            val ISO_639_3 = tds[7].ownText().replace("+", "").replace(" ", "")
+            val ISO_639_6 = tds[8].ownText().replace("+", "").replace(" ", "")
+
+            val txtAdd =
+                "Language(\"$name\", \"$native\", \"$ISO_639_1\", \"$ISO_639_2_T\", \"$ISO_639_2_B\", \"$ISO_639_3\", \"$ISO_639_6\"),\n"
+            text += txtAdd
+        }
+        text += ")"
+        println("ISO CREATED:\n$text")
+    }*/
+
+    /** lang -> ISO_639_1
+     * @param looseCheck will use .contains in addition to .equals
+     * */
+    fun fromLanguageToTwoLetters(input: String, looseCheck: Boolean): String? {
+        languages.forEach {
+            if (it.languageName.equals(input, ignoreCase = true)
+                || it.nativeName.equals(input, ignoreCase = true)
+            ) return it.ISO_639_1
+        }
+
+        // Runs as a separate loop as to prioritize fully matching languages.
+        if (looseCheck)
+            languages.forEach {
+                if (input.contains(it.languageName, ignoreCase = true)
+                    || input.contains(it.nativeName, ignoreCase = true)
+                ) return it.ISO_639_1
+            }
+
+        return null
+    }
+
+    private var ISO_639_1Map: HashMap<String, String> = hashMapOf()
+    private fun initISO6391Map() {
+        for (lang in languages) {
+            ISO_639_1Map[lang.ISO_639_1] = lang.languageName
+        }
+    }
+
+    /** ISO_639_1 -> lang*/
+    fun fromTwoLettersToLanguage(input: String): String? {
+        // pr-BR
+        if (input.substringBefore("-").length != 2) return null
+        if (ISO_639_1Map.isEmpty()) {
+            initISO6391Map()
+        }
+        val comparison = input.lowercase(Locale.ROOT)
+
+        return ISO_639_1Map[comparison]
+    }
+
+    /**ISO_639_2_B or ISO_639_2_T or ISO_639_3-> lang*/
+    fun fromThreeLettersToLanguage(input: String): String? {
+        if (input.length != 3) return null
+        val comparison = input.lowercase(Locale.ROOT)
+        for (lang in languages) {
+            if (lang.ISO_639_2_B == comparison) {
+                return lang.languageName
+            }
+        }
+        for (lang in languages) {
+            if (lang.ISO_639_2_T == comparison) {
+                return lang.languageName
+            }
+        }
+        for (lang in languages) {
+            if (lang.ISO_639_3 == comparison) {
+                return lang.languageName
+            }
+        }
+        return null
+    }
+
+    /** lang -> ISO_639_2_T*/
+    fun fromLanguageToThreeLetters(input: String): String? {
+        for (lang in languages) {
+            if (lang.languageName == input || lang.nativeName == input) {
+                return lang.ISO_639_2_T
+            }
+        }
+        return null
+    }
+
+    private const val flagOffset = 0x1F1E6
+    private const val asciiOffset = 0x41
+    private const val offset = flagOffset - asciiOffset
+
+    private val flagRegex = Regex("[\uD83C\uDDE6-\uD83C\uDDFF]{2}")
+
+    fun getFlagFromIso(inp: String?): String? {
+        if (inp.isNullOrBlank() || inp.length < 2) return null
+
+        try {
+            val ret = getFlagFromIsoShort(flags[inp])
+                ?: getFlagFromIsoShort(inp.uppercase()) ?: return null
+
+            return if (flagRegex.matches(ret)) {
+                ret
+            } else {
+                null
+            }
+        } catch (e: Exception) {
+            logError(e)
+            return null
+        }
+    }
+
+    private fun getFlagFromIsoShort(flagAscii: String?): String? {
+        if (flagAscii.isNullOrBlank() || flagAscii.length < 2) return null
+        return try {
+            val firstChar: Int = Character.codePointAt(flagAscii, 0) + offset
+            val secondChar: Int = Character.codePointAt(flagAscii, 1) + offset
+
+            (String(Character.toChars(firstChar)) + String(Character.toChars(secondChar)))
+        } catch (e: Exception) {
+            logError(e)
+            null
+        }
+    }
+
+    private val flags = mapOf(
+        "af" to "ZA",
+        "agq" to "CM",
+        "ajp" to "SY",
+        "ak" to "GH",
+        "am" to "ET",
+        "ar" to "AE",
+        "ars" to "SA",
+        "as" to "IN",
+        "asa" to "TZ",
+        "az" to "AZ",
+        "bas" to "CM",
+        "be" to "BY",
+        "bem" to "ZM",
+        "bez" to "IT",
+        "bg" to "BG",
+        "bm" to "ML",
+        "bn" to "BD",
+        "bo" to "CN",
+        "br" to "FR",
+        "brx" to "IN",
+        "bs" to "BA",
+        "ca" to "ES",
+        "cgg" to "UG",
+        "chr" to "US",
+        "cs" to "CZ",
+        "cy" to "GB",
+        "da" to "DK",
+        "dav" to "KE",
+        "de" to "DE",
+        "dje" to "NE",
+        "dua" to "CM",
+        "dyo" to "SN",
+        "ebu" to "KE",
+        "ee" to "GH",
+        "en" to "GB",
+        "el" to "GR",
+        "es" to "ES",
+        "et" to "EE",
+        "eu" to "ES",
+        "ewo" to "CM",
+        "fa" to "IR",
+        "fil" to "PH",
+        "fr" to "FR",
+        "ga" to "IE",
+        "gl" to "ES",
+        "gsw" to "CH",
+        "gu" to "IN",
+        "guz" to "KE",
+        "gv" to "GB",
+        "ha" to "NG",
+        "haw" to "US",
+        "he" to "IL",
+        "hi" to "IN",
+        "ff" to "CN",
+        "fi" to "FI",
+        "fo" to "FO",
+        "hr" to "HR",
+        "hu" to "HU",
+        "hy" to "AM",
+        "id" to "ID",
+        "ig" to "NG",
+        "ii" to "CN",
+        "is" to "IS",
+        "it" to "IT",
+        "ita" to "IT",
+        "ja" to "JP",
+        "jmc" to "TZ",
+        "ka" to "GE",
+        "kab" to "DZ",
+        "ki" to "KE",
+        "kam" to "KE",
+        "mer" to "KE",
+        "kde" to "TZ",
+        "kea" to "CV",
+        "khq" to "ML",
+        "kk" to "KZ",
+        "kl" to "GL",
+        "kln" to "KE",
+        "km" to "KH",
+        "kn" to "IN",
+        "ko" to "KR",
+        "kok" to "IN",
+        "ksb" to "TZ",
+        "ksf" to "CM",
+        "kw" to "GB",
+        "lag" to "TZ",
+        "lg" to "UG",
+        "ln" to "CG",
+        "lt" to "LT",
+        "lu" to "CD",
+        "lv" to "LV",
+        "lat" to "LV",
+        "luo" to "KE",
+        "luy" to "KE",
+        "mas" to "TZ",
+        "mfe" to "MU",
+        "mg" to "MG",
+        "mgh" to "MZ",
+        "ml" to "IN",
+        "mk" to "MK",
+        "mr" to "IN",
+        "ms" to "MY",
+        "mt" to "MT",
+        "mua" to "CM",
+        "my" to "MM",
+        "naq" to "NA",
+        "nb" to "NO",
+        "no" to "NO",
+        "nn" to "NO",
+        "nd" to "ZW",
+        "ne" to "NP",
+        "nl" to "NL",
+        "nmg" to "CM",
+        "nus" to "SD",
+        "nyn" to "UG",
+        "om" to "ET",
+        "or" to "IN",
+        "pa" to "PK",
+        "pl" to "PL",
+        "ps" to "AF",
+        "pt" to "PT",
+        "pt-pt" to "PT",
+        "pt-br" to "BR",
+        "rm" to "CH",
+        "rn" to "BI",
+        "ro" to "RO",
+        "ru" to "RU",
+        "rw" to "RW",
+        "rof" to "TZ",
+        "rwk" to "TZ",
+        "saq" to "KE",
+        "sbp" to "TZ",
+        "seh" to "MZ",
+        "ses" to "ML",
+        "sg" to "CF",
+        "shi" to "MA",
+        "si" to "LK",
+        "sk" to "SK",
+        "sl" to "SI",
+        "sn" to "ZW",
+        "so" to "SO",
+        "sq" to "AL",
+        "sr" to "RS",
+        "sv" to "SE",
+        "sw" to "TZ",
+        "swc" to "CD",
+        "ta" to "IN",
+        "te" to "IN",
+        "teo" to "UG",
+        "th" to "TH",
+        "ti" to "ET",
+        "to" to "TO",
+        "tr" to "TR",
+        "twq" to "NE",
+        "tzm" to "MA",
+        "uk" to "UA",
+        "ur" to "PK",
+        "uz" to "UZ",
+        "vai" to "LR",
+        "vi" to "VN",
+        "vun" to "TZ",
+        "xog" to "UG",
+        "yav" to "CM",
+        "yo" to "NG",
+        "zh" to "CN",
+        "zu" to "ZA",
+        "tl" to "PH",
+    )
+
+    val languages = listOf(
+        Language639("Abkhaz", "аҧсуа бызшәа, аҧсшәа", "ab", "abk", "abk", "abk", "abks"),
+        Language639("Afar", "Afaraf", "aa", "aar", "aar", "aar", "aars"),
+        Language639("Afrikaans", "Afrikaans", "af", "afr", "afr", "afr", "afrs"),
+        Language639("Akan", "Akan", "ak", "aka", "aka", "aka", ""),
+        Language639("Albanian", "Shqip", "sq", "sqi", "", "sqi", ""),
+        Language639("Amharic", "አማርኛ", "am", "amh", "amh", "amh", ""),
+        Language639("Arabic", "العربية", "ar", "ara", "ara", "ara", ""),
+        Language639("Aragonese", "aragonés", "an", "arg", "arg", "arg", ""),
+        Language639("Armenian", "Հայերեն", "hy", "hye", "", "hye", ""),
+        Language639("Assamese", "অসমীয়া", "as", "asm", "asm", "asm", ""),
+        Language639("Avaric", "авар мацӀ, магӀарул мацӀ", "av", "ava", "ava", "ava", ""),
+        Language639("Avestan", "avesta", "ae", "ave", "ave", "ave", ""),
+        Language639("Aymara", "aymar aru", "ay", "aym", "aym", "aym", ""),
+        Language639("Azerbaijani", "azərbaycan dili", "az", "aze", "aze", "aze", ""),
+        Language639("Bambara", "bamanankan", "bm", "bam", "bam", "bam", ""),
+        Language639("Bashkir", "башҡорт теле", "ba", "bak", "bak", "bak", ""),
+        Language639("Basque", "euskara, euskera", "eu", "eus", "", "eus", ""),
+        Language639("Belarusian", "беларуская мова", "be", "bel", "bel", "bel", ""),
+        Language639("Bengali", "বাংলা", "bn", "ben", "ben", "ben", ""),
+        Language639("Bihari", "भोजपुरी", "bh", "bih", "bih", "", ""),
+        Language639("Bislama", "Bislama", "bi", "bis", "bis", "bis", ""),
+        Language639("Bosnian", "bosanski jezik", "bs", "bos", "bos", "bos", "boss"),
+        Language639("Breton", "brezhoneg", "br", "bre", "bre", "bre", ""),
+        Language639("Bulgarian", "български език", "bg", "bul", "bul", "bul", "buls"),
+        Language639("Burmese", "ဗမာစာ", "my", "mya", "", "mya", ""),
+        Language639("Catalan", "català", "ca", "cat", "cat", "cat", ""),
+        Language639("Chamorro", "Chamoru", "ch", "cha", "cha", "cha", ""),
+        Language639("Chechen", "нохчийн мотт", "ce", "che", "che", "che", ""),
+        Language639("Chichewa", "chiCheŵa, chinyanja", "ny", "nya", "nya", "nya", ""),
+        Language639("Chinese", "中文 (Zhōngwén), 汉语, 漢語", "zh", "zho", "", "zho", ""),
+        Language639("Chuvash", "чӑваш чӗлхи", "cv", "chv", "chv", "chv", ""),
+        Language639("Cornish", "Kernewek", "kw", "cor", "cor", "cor", ""),
+        Language639("Corsican", "corsu, lingua corsa", "co", "cos", "cos", "cos", ""),
+        Language639("Cree", "ᓀᐦᐃᔭᐍᐏᐣ", "cr", "cre", "cre", "cre", ""),
+        Language639("Croatian", "hrvatski jezik", "hr", "hrv", "hrv", "hrv", ""),
+        Language639("Czech", "čeština, český jazyk", "cs", "ces", "", "ces", ""),
+        Language639("Danish", "dansk", "da", "dan", "dan", "dan", ""),
+        Language639("Divehi", "ދިވެހި", "dv", "div", "div", "div", ""),
+        Language639("Dutch", "Nederlands, Vlaams", "nl", "nld", "", "nld", ""),
+        Language639("Dzongkha", "རྫོང་ཁ", "dz", "dzo", "dzo", "dzo", ""),
+        Language639("English", "English", "en", "eng", "eng", "eng", "engs"),
+        Language639("Esperanto", "Esperanto", "eo", "epo", "epo", "epo", ""),
+        Language639("Estonian", "eesti, eesti keel", "et", "est", "est", "est", ""),
+        Language639("Ewe", "Eʋegbe", "ee", "ewe", "ewe", "ewe", ""),
+        Language639("Faroese", "føroyskt", "fo", "fao", "fao", "fao", ""),
+        Language639("Fijian", "vosa Vakaviti", "fj", "fij", "fij", "fij", ""),
+        Language639("Finnish", "suomi, suomen kieli", "fi", "fin", "fin", "fin", ""),
+        Language639("French", "français, langue française", "fr", "fra", "", "fra", "fras"),
+        Language639("Fula", "Fulfulde, Pulaar, Pular", "ff", "ful", "ful", "ful", ""),
+        Language639("Galician", "galego", "gl", "glg", "glg", "glg", ""),
+        Language639("Georgian", "ქართული", "ka", "kat", "", "kat", ""),
+        Language639("German", "Deutsch", "de", "deu", "", "deu", "deus"),
+        Language639("Greek", "ελληνικά", "el", "ell", "", "ell", "ells"),
+        Language639("Guaraní", "Avañe'ẽ", "gn", "grn", "grn", "grn", ""),
+        Language639("Gujarati", "ગુજરાતી", "gu", "guj", "guj", "guj", ""),
+        Language639("Haitian", "Kreyòl ayisyen", "ht", "hat", "hat", "hat", ""),
+        Language639("Hausa", "(Hausa) هَوُسَ", "ha", "hau", "hau", "hau", ""),
+        Language639("Hebrew", "עברית", "he", "heb", "heb", "heb", ""),
+        Language639("Herero", "Otjiherero", "hz", "her", "her", "her", ""),
+        Language639("Hindi", "हिन्दी, हिंदी", "hi", "hin", "hin", "hin", "hins"),
+        Language639("Hiri Motu", "Hiri Motu", "ho", "hmo", "hmo", "hmo", ""),
+        Language639("Hungarian", "magyar", "hu", "hun", "hun", "hun", ""),
+        Language639("Interlingua", "Interlingua", "ia", "ina", "ina", "ina", ""),
+        Language639("Indonesian", "Bahasa Indonesia", "id", "ind", "ind", "ind", ""),
+        Language639(
+            "Interlingue",
+            "Originally called Occidental; then Interlingue after WWII",
+            "ie",
+            "ile",
+            "ile",
+            "ile",
+            ""
+        ),
+        Language639("Irish", "Gaeilge", "ga", "gle", "gle", "gle", ""),
+        Language639("Igbo", "Asụsụ Igbo", "ig", "ibo", "ibo", "ibo", ""),
+        Language639("Inupiaq", "Iñupiaq, Iñupiatun", "ik", "ipk", "ipk", "ipk", ""),
+        Language639("Ido", "Ido", "io", "ido", "ido", "ido", "idos"),
+        Language639("Icelandic", "Íslenska", "is", "isl", "", "isl", ""),
+        Language639("Italian", "italiano", "it", "ita", "ita", "ita", "itas"),
+        Language639("Inuktitut", "ᐃᓄᒃᑎᑐᑦ", "iu", "iku", "iku", "iku", ""),
+        Language639("Japanese", "日本語 (にほんご)", "ja", "jpn", "jpn", "jpn", ""),
+        Language639("Javanese", "ꦧꦱꦗꦮ", "jv", "jav", "jav", "jav", ""),
+        Language639("Kalaallisut", "kalaallisut, kalaallit oqaasii", "kl", "kal", "kal", "kal", ""),
+        Language639("Kannada", "ಕನ್ನಡ", "kn", "kan", "kan", "kan", ""),
+        Language639("Kanuri", "Kanuri", "kr", "kau", "kau", "kau", ""),
+        Language639("Kashmiri", "कश्मीरी, كشميري‎", "ks", "kas", "kas", "kas", ""),
+        Language639("Kazakh", "қазақ тілі", "kk", "kaz", "kaz", "kaz", ""),
+        Language639("Khmer", "ខ្មែរ, ខេមរភាសា, ភាសាខ្មែរ", "km", "khm", "khm", "khm", ""),
+        Language639("Kikuyu", "Gĩkũyũ", "ki", "kik", "kik", "kik", ""),
+        Language639("Kinyarwanda", "Ikinyarwanda", "rw", "kin", "kin", "kin", ""),
+        Language639("Kyrgyz", "Кыргызча, Кыргыз тили", "ky", "kir", "kir", "kir", ""),
+        Language639("Komi", "коми кыв", "kv", "kom", "kom", "kom", ""),
+        Language639("Kongo", "Kikongo", "kg", "kon", "kon", "kon", ""),
+        Language639("Korean", "한국어, 조선어", "ko", "kor", "kor", "kor", ""),
+        Language639("Kurdish", "Kurdî, كوردی‎", "ku", "kur", "kur", "kur", ""),
+        Language639("Kwanyama", "Kuanyama", "kj", "kua", "kua", "kua", ""),
+        Language639("Latin", "latine, lingua latina", "la", "lat", "lat", "lat", "lats"),
+        Language639("Luxembourgish", "Lëtzebuergesch", "lb", "ltz", "ltz", "ltz", ""),
+        Language639("Ganda", "Luganda", "lg", "lug", "lug", "lug", ""),
+        Language639("Limburgish", "Limburgs", "li", "lim", "lim", "lim", ""),
+        Language639("Lingala", "Lingála", "ln", "lin", "lin", "lin", ""),
+        Language639("Lao", "ພາສາລາວ", "lo", "lao", "lao", "lao", ""),
+        Language639("Lithuanian", "lietuvių kalba", "lt", "lit", "lit", "lit", ""),
+        Language639("Luba-Katanga", "Tshiluba", "lu", "lub", "lub", "lub", ""),
+        Language639("Latvian", "latviešu valoda", "lv", "lav", "lav", "lav", ""),
+        Language639("Manx", "Gaelg, Gailck", "gv", "glv", "glv", "glv", ""),
+        Language639("Macedonian", "македонски јазик", "mk", "mkd", "", "mkd", ""),
+        Language639("Malagasy", "fiteny malagasy", "mg", "mlg", "mlg", "mlg", ""),
+        Language639("Malay", "bahasa Melayu, بهاس ملايو‎", "ms", "msa", "", "msa", ""),
+        Language639("Malayalam", "മലയാളം", "ml", "mal", "mal", "mal", ""),
+        Language639("Maltese", "Malti", "mt", "mlt", "mlt", "mlt", ""),
+        Language639("Māori", "te reo Māori", "mi", "mri", "", "mri", ""),
+        Language639("Marathi", "मराठी", "mr", "mar", "mar", "mar", ""),
+        Language639("Marshallese", "Kajin M̧ajeļ", "mh", "mah", "mah", "mah", ""),
+        Language639("Mongolian", "Монгол хэл", "mn", "mon", "mon", "mon", ""),
+        Language639("Nauruan", "Dorerin Naoero", "na", "nau", "nau", "nau", ""),
+        Language639("Navajo", "Diné bizaad", "nv", "nav", "nav", "nav", ""),
+        Language639("Northern Ndebele", "isiNdebele", "nd", "nde", "nde", "nde", ""),
+        Language639("Nepali", "नेपाली", "ne", "nep", "nep", "nep", ""),
+        Language639("Ndonga", "Owambo", "ng", "ndo", "ndo", "ndo", ""),
+        Language639("Norwegian Bokmål", "Norsk bokmål", "nb", "nob", "nob", "nob", ""),
+        Language639("Norwegian Nynorsk", "Norsk nynorsk", "nn", "nno", "nno", "nno", ""),
+        Language639("Norwegian", "Norsk", "no", "nor", "nor", "nor", ""),
+        Language639("Nuosu", "ꆈꌠ꒿ Nuosuhxop", "ii", "iii", "iii", "iii", ""),
+        Language639("Southern Ndebele", "isiNdebele", "nr", "nbl", "nbl", "nbl", ""),
+        Language639("Occitan", "occitan, lenga d'òc", "oc", "oci", "oci", "oci", ""),
+        Language639("Ojibwe", "ᐊᓂᔑᓈᐯᒧᐎᓐ", "oj", "oji", "oji", "oji", ""),
+        Language639("Old Church Slavonic", "ѩзыкъ словѣньскъ", "cu", "chu", "chu", "chu", ""),
+        Language639("Oromo", "Afaan Oromoo", "om", "orm", "orm", "orm", ""),
+        Language639("Oriya", "ଓଡ଼ିଆ", "or", "ori", "ori", "ori", ""),
+        Language639("Ossetian", "ирон æвзаг", "os", "oss", "oss", "oss", ""),
+        Language639("Panjabi", "ਪੰਜਾਬੀ, پنجابی‎", "pa", "pan", "pan", "pan", ""),
+        Language639("Pāli", "पाऴि", "pi", "pli", "pli", "pli", ""),
+        Language639("Persian", "فارسی", "fa", "fas", "", "fas", ""),
+        Language639("Polish", "język polski, polszczyzna", "pl", "pol", "pol", "pol", "pols"),
+        Language639("Pashto", "پښتو", "ps", "pus", "pus", "pus", ""),
+        Language639("Portuguese", "português", "pt-pt", "por", "por", "por", ""),
+        // Addition to support Brazilian Portuguese properly, might break other things
+        Language639("Portuguese (Brazilian)", "português", "pt-br", "por", "por", "por", ""),
+        Language639("Quechua", "Runa Simi, Kichwa", "qu", "que", "que", "que", ""),
+        Language639("Romansh", "rumantsch grischun", "rm", "roh", "roh", "roh", ""),
+        Language639("Kirundi", "Ikirundi", "rn", "run", "run", "run", ""),
+        Language639("Reunion Creole", "Kréol Rénioné", "rc", "rcf", "rcf", "rcf", ""),
+        Language639("Romanian", "limba română", "ro", "ron", "", "ron", ""),
+        Language639("Russian", "Русский", "ru", "rus", "rus", "rus", ""),
+        Language639("Sanskrit", "संस्कृतम्", "sa", "san", "san", "san", ""),
+        Language639("Sardinian", "sardu", "sc", "srd", "srd", "srd", ""),
+        Language639("Sindhi", "सिन्धी, سنڌي، سندھی‎", "sd", "snd", "snd", "snd", ""),
+        Language639("Northern Sami", "Davvisámegiella", "se", "sme", "sme", "sme", ""),
+        Language639("Samoan", "gagana fa'a Samoa", "sm", "smo", "smo", "smo", ""),
+        Language639("Sango", "yângâ tî sängö", "sg", "sag", "sag", "sag", ""),
+        Language639("Serbian", "српски језик", "sr", "srp", "srp", "srp", ""),
+        Language639("Scottish Gaelic", "Gàidhlig", "gd", "gla", "gla", "gla", ""),
+        Language639("Shona", "chiShona", "sn", "sna", "sna", "sna", ""),
+        Language639("Sinhalese", "සිංහල", "si", "sin", "sin", "sin", ""),
+        Language639("Slovak", "slovenčina, slovenský jazyk", "sk", "slk", "", "slk", ""),
+        Language639("Slovene", "slovenski jezik, slovenščina", "sl", "slv", "slv", "slv", ""),
+        Language639("Somali", "Soomaaliga, af Soomaali", "so", "som", "som", "som", ""),
+        Language639("Southern Sotho", "Sesotho", "st", "sot", "sot", "sot", ""),
+        Language639("Spanish", "español", "es", "spa", "spa", "spa", ""),
+        Language639("Sundanese", "Basa Sunda", "su", "sun", "sun", "sun", ""),
+        Language639("Swahili", "Kiswahili", "sw", "swa", "swa", "swa", ""),
+        Language639("Swati", "SiSwati", "ss", "ssw", "ssw", "ssw", ""),
+        Language639("Swedish", "svenska", "sv", "swe", "swe", "swe", ""),
+        Language639("Tamil", "தமிழ்", "ta", "tam", "tam", "tam", ""),
+        Language639("Telugu", "తెలుగు", "te", "tel", "tel", "tel", ""),
+        Language639("Tajik", "тоҷикӣ, toçikī, تاجیکی‎", "tg", "tgk", "tgk", "tgk", ""),
+        Language639("Thai", "ไทย", "th", "tha", "tha", "tha", ""),
+        Language639("Tigrinya", "ትግርኛ", "ti", "tir", "tir", "tir", ""),
+        Language639("Tibetan Standard", "བོད་ཡིག", "bo", "bod", "", "bod", ""),
+        Language639("Turkmen", "Türkmen, Түркмен", "tk", "tuk", "tuk", "tuk", ""),
+        Language639("Tagalog", "Wikang Tagalog", "tl", "tgl", "tgl", "tgl", ""),
+        Language639("Tswana", "Setswana", "tn", "tsn", "tsn", "tsn", ""),
+        Language639("Tonga", "faka Tonga", "to", "ton", "ton", "ton", ""),
+        Language639("Turkish", "Türkçe", "tr", "tur", "tur", "tur", ""),
+        Language639("Tsonga", "Xitsonga", "ts", "tso", "tso", "tso", ""),
+        Language639("Tatar", "татар теле, tatar tele", "tt", "tat", "tat", "tat", ""),
+        Language639("Twi", "Twi", "tw", "twi", "twi", "twi", ""),
+        Language639("Tahitian", "Reo Tahiti", "ty", "tah", "tah", "tah", ""),
+        Language639("Uyghur", "ئۇيغۇرچە‎, Uyghurche", "ug", "uig", "uig", "uig", ""),
+        Language639("Ukrainian", "Українська", "uk", "ukr", "ukr", "ukr", ""),
+        Language639("Urdu", "اردو", "ur", "urd", "urd", "urd", ""),
+        Language639("Uzbek", "Oʻzbek, Ўзбек, أۇزبېك‎", "uz", "uzb", "uzb", "uzb", ""),
+        Language639("Venda", "Tshivenḓa", "ve", "ven", "ven", "ven", ""),
+        Language639("Vietnamese", "Tiếng Việt", "vi", "vie", "vie", "vie", ""),
+        Language639("Volapük", "Volapük", "vo", "vol", "vol", "vol", ""),
+        Language639("Walloon", "walon", "wa", "wln", "wln", "wln", ""),
+        Language639("Welsh", "Cymraeg", "cy", "cym", "", "cym", ""),
+        Language639("Wolof", "Wollof", "wo", "wol", "wol", "wol", ""),
+        Language639("Western Frisian", "Frysk", "fy", "fry", "fry", "fry", ""),
+        Language639("Xhosa", "isiXhosa", "xh", "xho", "xho", "xho", ""),
+        Language639("Yiddish", "ייִדיש", "yi", "yid", "yid", "yid", ""),
+        Language639("Yoruba", "Yorùbá", "yo", "yor", "yor", "yor", ""),
+        Language639("Zhuang", "Saɯ cueŋƅ, Saw cuengh", "za", "zha", "zha", "zha", ""),
+        Language639("Zulu", "isiZulu", "zu", "zul", "zul", "zul", ""),
+    )
+}
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/UnshortenUrl.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/UnshortenUrl.kt
index b13e88e547e..1a9867f5023 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/UnshortenUrl.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/UnshortenUrl.kt
@@ -6,7 +6,7 @@ import com.lagradost.nicehttp.NiceResponse
 import java.net.URI
 import java.net.URLDecoder
 
-//Code heavily based on unshortenit.py form kodiondemand /addon
+// Code heavily based on unshortenit.py form kodiondemand /addon
 
 object ShortLink {
     data class ShortUrl(
@@ -185,10 +185,10 @@ object ShortLink {
     }
 
     fun unshortenDavisonbarker(uri: String): String {
-        return URLDecoder.decode(uri.substringAfter("dest="))
+        return URLDecoder.decode(uri.substringAfter("dest="), "UTF-8")
     }
     suspend fun unshortenIsecure(uri: String): String {
         val doc = app.get(uri).document
         return doc.selectFirst("iframe")?.attr("src")?.trim()?: uri
     }
-}
+}
\ No newline at end of file
diff --git a/settings.gradle.kts b/settings.gradle.kts
index eabd9f0eed2..bd26f9f3499 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,4 +1,5 @@
 rootProject.name = "CloudStream"
 
 include(":app")
-include(":library")
\ No newline at end of file
+include(":library")
+include(":docs")
\ No newline at end of file