diff --git a/.github/locales.py b/.github/locales.py
index a74d7258834..6127d9d806e 100644
--- a/.github/locales.py
+++ b/.github/locales.py
@@ -1,14 +1,13 @@
 import re
 import glob
 import requests
-import os
 import lxml.etree as ET  # builtin library doesn't preserve comments
 
 
 SETTINGS_PATH = "app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt"
 START_MARKER = "/* begin language list */"
 END_MARKER = "/* end language list */"
-XML_NAME = "app/src/main/res/values-"
+XML_NAME = "app/src/main/res/values-b+"
 ISO_MAP_URL = "https://raw.githubusercontent.com/haliaeetus/iso-639/master/data/iso_639-1.min.json"
 INDENT = " "*4
 
@@ -21,29 +20,29 @@
 
 # Load already added langs
 languages = {}
-for lang in re.finditer(r'Triple\("(.*)", "(.*)", "(.*)"\)', rest):
-    flag, name, iso = lang.groups()
-    languages[iso] = (flag, name)
+for lang in re.finditer(r'Pair\("(.*)", "(.*)"\)', rest):
+    name, iso = lang.groups()
+    languages[iso] = name
 
 # Add not yet added langs
 for folder in glob.glob(f"{XML_NAME}*"):
-    iso = folder[len(XML_NAME):]
+    iso = folder[len(XML_NAME):].replace("+", "-")
     if iso not in languages.keys():
-        entry = iso_map.get(iso.lower(),{'nativeName':iso})
-        languages[iso] = ("", entry['nativeName'].split(',')[0])
+        entry = iso_map.get(iso.lower(), {'nativeName':iso}) # fallback to iso code if not found
+        languages[iso] = entry['nativeName'].split(',')[0] # first name if there are multiple
 
-# Create triples
-triples = []
-for iso in sorted(languages.keys()):
-    flag, name = languages[iso]
-    triples.append(f'{INDENT}Triple("{flag}", "{name}", "{iso}"),')
+# Create pairs
+pairs = []
+for iso in sorted(languages, key=lambda iso: languages[iso].lower()): # sort by language name
+    name = languages[iso]
+    pairs.append(f'{INDENT}Pair("{name}", "{iso}"),')
 
 # Update settings file
 open(SETTINGS_PATH, "w+",encoding='utf-8').write(
     before_src +
     START_MARKER +
     "\n" +
-    "\n".join(triples) +
+    "\n".join(pairs) +
     "\n" +
     END_MARKER +
     after_src
@@ -62,8 +61,5 @@
         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 f62f1ba055c..b5960d5d942 100644
--- a/.github/workflows/build_to_archive.yml
+++ b/.github/workflows/build_to_archive.yml
@@ -9,7 +9,10 @@ on:
       - '**/wcokey.txt'
   workflow_dispatch:
 
-concurrency: 
+permissions:
+  contents: read
+
+concurrency:
   group: "Archive-build"
   cancel-in-progress: true
 
@@ -24,6 +27,7 @@ jobs:
         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
@@ -31,14 +35,18 @@ jobs:
         app_id: ${{ secrets.GH_APP_ID }}
         private_key: ${{ secrets.GH_APP_KEY }}
         repository: "recloudstream/cloudstream-archive"
-    - uses: actions/checkout@v4
+
+    - uses: actions/checkout@v6
+
     - name: Set up JDK 17
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v5
       with:
-        java-version: '17'
-        distribution: 'adopt'
+        distribution: temurin
+        java-version: 17
+
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
+
     - name: Fetch keystore
       id: fetch_keystore
       run: |
@@ -49,25 +57,31 @@ jobs:
         KEY_PWD="$(cat keystore_password.txt)"
         echo "::add-mask::${KEY_PWD}"
         echo "key_pwd=$KEY_PWD" >> $GITHUB_OUTPUT
+
+    - name: Setup Gradle
+      uses: gradle/actions/setup-gradle@v5
+      with:
+        cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
+
     - name: Run Gradle
-      run: |
-        ./gradlew assemblePrerelease
+      run: ./gradlew assemblePrereleaseRelease
       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
+        MDL_API_KEY: ${{ secrets.MDL_API_KEY }}
+
+    - uses: actions/checkout@v6
       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"
-    
+      run: cp app/build/outputs/apk/prerelease/release/*.apk "archive/$(git rev-parse --short HEAD).apk"
+
     - name: Push archive
       run: |
         cd $GITHUB_WORKSPACE/archive
@@ -75,4 +89,4 @@ jobs:
         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
+        git push --force
diff --git a/.github/workflows/generate_dokka.yml b/.github/workflows/generate_dokka.yml
index 666e2ba1078..d67b8a519d7 100644
--- a/.github/workflows/generate_dokka.yml
+++ b/.github/workflows/generate_dokka.yml
@@ -1,19 +1,18 @@
 name: Dokka
 
-# https://docs.github.com/en/actions/learn-github-actions/workflow-syntax-for-github-actions#concurrency
-concurrency: 
-  group: "dokka"
-  cancel-in-progress: true
-
 on:
   push:
-    branches:
-      # choose your default branch
-      - master
-      - main
+    branches: [ master ]
     paths-ignore:
       - '*.md'
 
+permissions:
+  contents: read
+
+concurrency:
+  group: "dokka"
+  cancel-in-progress: true
+
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -25,32 +24,35 @@ jobs:
           app_id: ${{ secrets.GH_APP_ID }}
           private_key: ${{ secrets.GH_APP_KEY }}
           repository: "recloudstream/dokka"
+
       - name: Checkout
-        uses: actions/checkout@master
+        uses: actions/checkout@v6
         with:
           path: "src"
 
       - name: Checkout dokka
-        uses: actions/checkout@master
+        uses: actions/checkout@v6
         with:
           repository: "recloudstream/dokka"
           path: "dokka"
           token: ${{ steps.generate_token.outputs.token }}
-      
+
       - name: Clean old builds
         run: |
           cd $GITHUB_WORKSPACE/dokka/
           rm -rf "./app"
           rm -rf "./library"
 
-      - name: Setup JDK 17
-        uses: actions/setup-java@v4
+      - name: Set up JDK 17
+        uses: actions/setup-java@v5
         with:
+          distribution: temurin
           java-version: 17
-          distribution: 'adopt'
 
-      - name: Setup Android SDK
-        uses: android-actions/setup-android@v3
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v5
+        with:
+          cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
 
       - name: Generate Dokka
         run: |
@@ -59,8 +61,7 @@ jobs:
           ./gradlew docs:dokkaGeneratePublicationHtml
 
       - name: Copy Dokka
-        run: |
-          cp -r $GITHUB_WORKSPACE/src/docs/build/dokka/html/* $GITHUB_WORKSPACE/dokka/
+        run: cp -r $GITHUB_WORKSPACE/src/docs/build/dokka/html/* $GITHUB_WORKSPACE/dokka/
 
       - name: Push builds
         run: |
diff --git a/.github/workflows/issue_action.yml b/.github/workflows/issue_action.yml
index 88ab3656ce9..e354d657d50 100644
--- a/.github/workflows/issue_action.yml
+++ b/.github/workflows/issue_action.yml
@@ -4,6 +4,10 @@ on:
   issues:
     types: [opened]
 
+permissions:
+  contents: read
+  issues: write
+
 jobs:
   issue-moderator:
     runs-on: ubuntu-latest
@@ -14,6 +18,7 @@ jobs:
         with:
           app_id: ${{ secrets.GH_APP_ID }}
           private_key: ${{ secrets.GH_APP_KEY }}
+
       - name: Similarity analysis
         id: similarity
         uses: actions-cool/issues-similarity-analysis@v1
@@ -25,9 +30,10 @@ jobs:
             ### Your issue looks similar to these issues:
             Please close if duplicate.
           comment-body: '${index}. ${similarity} #${number}'
+
       - name: Label if possible duplicate
         if: steps.similarity.outputs.similar-issues-found =='true'
-        uses: actions/github-script@v7
+        uses: actions/github-script@v9
         with:
           github-token: ${{ steps.generate_token.outputs.token }}
           script: |
@@ -37,7 +43,9 @@ jobs:
               repo: context.repo.repo,
               labels: ["possible duplicate"]
             })
-      - uses: actions/checkout@v4
+
+      - uses: actions/checkout@v6
+
       - name: Automatically close issues that dont follow the issue template
         uses: lucasbento/auto-close-issues@v1.0.2
         with:
@@ -46,6 +54,7 @@ jobs:
             @${issue.user.login}: hello! :wave:
             This issue is being automatically closed because it does not follow the issue template." 
           closed-issues-label: "invalid"
+
       - name: Check if issue mentions a provider
         id: provider_check
         env:
@@ -55,6 +64,7 @@ jobs:
           pip3 install httpx
           RES="$(python3 ./check_issue.py)"
           echo "name=${RES}" >> $GITHUB_OUTPUT
+
       - name: Comment if issue mentions a provider
         if: steps.provider_check.outputs.name != 'none'
         uses: actions-cool/issues-helper@v3
@@ -66,9 +76,10 @@ jobs:
             Please do not report any provider bugs here. This repository does not contain any providers. Please find the appropriate repository and report your issue there or join the [discord](https://discord.gg/5Hus6fM).
             
             Found provider name: `${{ steps.provider_check.outputs.name }}`
+
       - name: Label if mentions provider
         if: steps.provider_check.outputs.name != 'none'
-        uses: actions/github-script@v7
+        uses: actions/github-script@v9
         with:
           github-token: ${{ steps.generate_token.outputs.token }}
           script: |
@@ -78,11 +89,10 @@ jobs:
               repo: context.repo.repo,
               labels: ["possible provider issue"]
             })
+
       - name: Add eyes reaction to all issues
         uses: actions-cool/emoji-helper@v1.0.0
         with:
           type: 'issue'
           token: ${{ steps.generate_token.outputs.token }}
           emoji: 'eyes'
-          
-          
diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml
index dd608b321e3..d9a20a04b2b 100644
--- a/.github/workflows/prerelease.yml
+++ b/.github/workflows/prerelease.yml
@@ -8,10 +8,13 @@ on:
       - '*.json'
       - '**/wcokey.txt'
 
-concurrency: 
+concurrency:
   group: "pre-release"
   cancel-in-progress: true
 
+permissions:
+  contents: write
+
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -23,14 +26,18 @@ jobs:
         app_id: ${{ secrets.GH_APP_ID }}
         private_key: ${{ secrets.GH_APP_KEY }}
         repository: "recloudstream/secrets"
-    - uses: actions/checkout@v4
+
+    - uses: actions/checkout@v6
+
     - name: Set up JDK 17
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v5
       with:
-        java-version: '17'
-        distribution: 'adopt'
+        distribution: temurin
+        java-version: 17
+
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
+
     - name: Fetch keystore
       id: fetch_keystore
       run: |
@@ -41,10 +48,14 @@ jobs:
         KEY_PWD="$(cat keystore_password.txt)"
         echo "::add-mask::${KEY_PWD}"
         echo "key_pwd=$KEY_PWD" >> $GITHUB_OUTPUT
+
+    - name: Setup Gradle
+      uses: gradle/actions/setup-gradle@v5
+      with:
+        cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
+
     - name: Run Gradle
-      run: |
-        ./gradlew assemblePrerelease build androidSourcesJar
-        ./gradlew makeJar # for classes.jar, has to be done after assemblePrerelease
+      run: ./gradlew assemblePrereleaseRelease androidSourcesJar makeJar
       env:
         SIGNING_KEY_ALIAS: "key0"
         SIGNING_KEY_PASSWORD: ${{ steps.fetch_keystore.outputs.key_pwd }}
@@ -52,8 +63,9 @@ jobs:
         SIMKL_CLIENT_ID: ${{ secrets.SIMKL_CLIENT_ID }}
         SIMKL_CLIENT_SECRET: ${{ secrets.SIMKL_CLIENT_SECRET }}
         MDL_API_KEY: ${{ secrets.MDL_API_KEY }}
+
     - name: Create pre-release
-      uses: "marvinpinto/action-automatic-releases@latest"
+      uses: marvinpinto/action-automatic-releases@latest
       with:
         repo_token: "${{ secrets.GITHUB_TOKEN }}"
         automatic_release_tag: "pre-release"
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 7f6dd412356..675ce3b2f77 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -2,22 +2,35 @@ name: Artifact Build
 
 on: [pull_request]
 
+permissions:
+  contents: read
+
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
+
     - name: Set up JDK 17
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v5
       with:
-        java-version: '17'
-        distribution: 'adopt'
+        distribution: temurin
+        java-version: 17
+
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
+
+    - name: Setup Gradle
+      uses: gradle/actions/setup-gradle@v5
+      with:
+        cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
+        cache-read-only: false
+
     - name: Run Gradle
-      run: ./gradlew assemblePrereleaseDebug
+      run: ./gradlew assemblePrereleaseDebug lint
+
     - name: Upload Artifact
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       with:
         name: pull-request-build
         path: "app/build/outputs/apk/prerelease/debug/*.apk"
diff --git a/.github/workflows/update_locales.yml b/.github/workflows/update_locales.yml
index ce140e55993..0a538d5d4da 100644
--- a/.github/workflows/update_locales.yml
+++ b/.github/workflows/update_locales.yml
@@ -1,17 +1,19 @@
 name: Fix locale issues
 
 on:
-  workflow_dispatch:
   push:
+    branches: [ master ]
     paths:
       - '**.xml'
-    branches:
-      - master
+  workflow_dispatch:
 
-concurrency: 
+concurrency:
   group: "locale"
   cancel-in-progress: true
 
+permissions:
+  contents: read
+
 jobs:
   create:
     runs-on: ubuntu-latest
@@ -23,15 +25,17 @@ jobs:
         app_id: ${{ secrets.GH_APP_ID }}
         private_key: ${{ secrets.GH_APP_KEY }}
         repository: "recloudstream/cloudstream"
-    - uses: actions/checkout@v4
+
+    - uses: actions/checkout@v6
       with:
         token: ${{ steps.generate_token.outputs.token }}
+
     - name: Install dependencies
-      run: |
-        pip3 install lxml
+      run: pip3 install lxml requests
+
     - name: Edit files
-      run: |
-        python3 .github/locales.py
+      run: python3 .github/locales.py
+
     - name: Commit to the repo
       run: |
         git config --local user.email "111277985+recloudstream[bot]@users.noreply.github.com"
diff --git a/.gitignore b/.gitignore
index 2ac6c9695ca..5fc9f0870b6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,3 @@
-*.iml
-.gradle
 /local.properties
 /.idea/caches
 /.idea/misc.xml
@@ -11,6 +9,220 @@
 .DS_Store
 /build
 /captures
-.externalNativeBuild
 .cxx
+.kotlin/*
+
+# Created by https://www.toptal.com/developers/gitignore/api/kotlin,java,android,androidstudio,visualstudiocode
+# Edit at https://www.toptal.com/developers/gitignore?templates=kotlin,java,android,androidstudio,visualstudiocode
+
+### Android ###
+# Gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
 local.properties
+
+# Log/OS Files
+*.log
+
+# Android Studio generated files and folders
+captures/
+.externalNativeBuild/
+.cxx/
+*.apk
+output.json
+
+# IntelliJ
+*.iml
+.idea/
+misc.xml
+deploymentTargetDropDown.xml
+render.experimental.xml
+
+# Keystore files
+*.jks
+*.keystore
+
+# Google Services (e.g. APIs or Firebase)
+google-services.json
+
+# Android Profiling
+*.hprof
+
+### Android Patch ###
+gen-external-apklibs
+
+# Replacement of .externalNativeBuild directories introduced
+# with Android Studio 3.5.
+
+### Java ###
+# Compiled class file
+*.class
+
+# Log file
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+replay_pid*
+
+### Kotlin ###
+# Compiled class file
+
+# Log file
+
+# BlueJ files
+
+# Mobile Tools for Java (J2ME)
+
+# Package Files #
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+
+### VisualStudioCode ###
+.vscode/*
+
+# Local History for Visual Studio Code
+.history/
+
+# Built Visual Studio Code Extensions
+*.vsix
+
+### VisualStudioCode Patch ###
+# Ignore all local history of files
+.history
+.ionide
+
+### AndroidStudio ###
+# Covers files to be ignored for android development using Android Studio.
+
+# Built application files
+*.ap_
+*.aab
+
+# Files for the ART/Dalvik VM
+*.dex
+
+# Java class files
+
+# Generated files
+bin/
+gen/
+out/
+
+# Gradle files
+.gradle
+
+# Signing files
+.signing/
+
+# Local configuration file (sdk path, etc)
+
+# Proguard folder generated by Eclipse
+proguard/
+
+# Log Files
+
+# Android Studio
+/*/build/
+/*/local.properties
+/*/out
+/*/*/build
+/*/*/production
+.navigation/
+*.ipr
+*~
+*.swp
+
+# Keystore files
+
+# Google Services (e.g. APIs or Firebase)
+# google-services.json
+
+# Android Patch
+
+# External native build folder generated in Android Studio 2.2 and later
+.externalNativeBuild
+
+# NDK
+obj/
+
+# IntelliJ IDEA
+*.iws
+/out/
+
+# User-specific configurations
+.idea/caches/
+.idea/libraries/
+.idea/shelf/
+.idea/workspace.xml
+.idea/tasks.xml
+.idea/.name
+.idea/compiler.xml
+.idea/copyright/profiles_settings.xml
+.idea/encodings.xml
+.idea/misc.xml
+.idea/modules.xml
+.idea/scopes/scope_settings.xml
+.idea/dictionaries
+.idea/vcs.xml
+.idea/jsLibraryMappings.xml
+.idea/datasources.xml
+.idea/dataSources.ids
+.idea/sqlDataSources.xml
+.idea/dynamic.xml
+.idea/uiDesigner.xml
+.idea/assetWizardSettings.xml
+.idea/gradle.xml
+.idea/jarRepositories.xml
+.idea/navEditor.xml
+
+# Legacy Eclipse project files
+.classpath
+.project
+.cproject
+.settings/
+
+# Mobile Tools for Java (J2ME)
+
+# Package Files #
+
+# virtual machine crash logs (Reference: http://www.java.com/en/download/help/error_hotspot.xml)
+
+## Plugin-specific files:
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Mongo Explorer plugin
+.idea/mongoSettings.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+### AndroidStudio Patch ###
+
+!/gradle/wrapper/gradle-wrapper.jar
+
+# End of https://www.toptal.com/developers/gitignore/api/kotlin,java,android,androidstudio,visualstudiocode
diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index 1eb497a9359..00000000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-CloudStream
\ No newline at end of file
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index 7643783a82f..00000000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <JetCodeStyleSettings>
-      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
-    </JetCodeStyleSettings>
-    <codeStyleSettings language="XML">
-      <option name="FORCE_REARRANGE_MODE" value="1" />
-      <indentOptions>
-        <option name="CONTINUATION_INDENT_SIZE" value="4" />
-      </indentOptions>
-      <arrangement>
-        <rules>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>xmlns:android</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>xmlns:.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:id</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:name</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>name</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>style</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>ANDROID_ATTRIBUTE_ORDER</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>.*</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-        </rules>
-      </arrangement>
-    </codeStyleSettings>
-    <codeStyleSettings language="kotlin">
-      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
-    </codeStyleSettings>
-  </code_scheme>
-</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index 79ee123c2b2..00000000000
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
deleted file mode 100644
index b589d56e9f2..00000000000
--- a/.idea/compiler.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="17" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/discord.xml b/.idea/discord.xml
deleted file mode 100644
index d8e95616687..00000000000
--- a/.idea/discord.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="DiscordProjectSettings">
-    <option name="show" value="PROJECT_FILES" />
-    <option name="description" value="" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
deleted file mode 100644
index d06216153db..00000000000
--- a/.idea/gradle.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleMigrationSettings" migrationVersion="1" />
-  <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>
-        <option name="resolveExternalAnnotations" value="false" />
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
deleted file mode 100644
index 333d49373bb..00000000000
--- a/.idea/jarRepositories.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RemoteRepositoriesConfiguration">
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Maven Central repository" />
-      <option name="url" value="https://repo1.maven.org/maven2" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="jboss.community" />
-      <option name="name" value="JBoss Community repository" />
-      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="BintrayJCenter" />
-      <option name="name" value="BintrayJCenter" />
-      <option name="url" value="https://jcenter.bintray.com/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="Google" />
-      <option name="name" value="Google" />
-      <option name="url" value="https://dl.google.com/dl/android/maven2/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="maven" />
-      <option name="name" value="maven" />
-      <option name="url" value="https://github.com/psiegman/mvn-repo/raw/master/releases" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="maven2" />
-      <option name="name" value="maven2" />
-      <option name="url" value="https://jitpack.io" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="MavenRepo" />
-      <option name="name" value="MavenRepo" />
-      <option name="url" value="https://repo.maven.apache.org/maven2/" />
-    </remote-repository>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/studiobot.xml b/.idea/studiobot.xml
deleted file mode 100644
index 9298202cbef..00000000000
--- a/.idea/studiobot.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?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/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 35eb1ddfbbc..00000000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
deleted file mode 100644
index 7282979ad72..00000000000
--- a/.vscode/settings.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "githubPullRequests.ignoredPullRequestBranches": [
-        "master"
-    ],
-    "java.configuration.updateBuildConfiguration": "interactive"
-}
\ No newline at end of file
diff --git a/AI-POLICY.md b/AI-POLICY.md
new file mode 100644
index 00000000000..5409393fb18
--- /dev/null
+++ b/AI-POLICY.md
@@ -0,0 +1,11 @@
+# AI Policy
+
+AI is a great tool. However, we want you to follow these rules regarding usage of AI in order to ensure the quality of both code and discussions.
+
+1. Always state any AI usage in pull requests and issues. 
+
+2. Always test code before making a pull request. We do not want to test your AI generated code. 
+
+3. Listen to humans over computers. Contributors to CloudStream know this codebase better than an AI. 
+
+4. You should be able to explain and fix any code you submit. We do in-depth reviews and will reject low effort contributions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 64fd1f873c9..ae530192998 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,53 +1,95 @@
 import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties
 import org.jetbrains.dokka.gradle.engine.parameters.KotlinPlatform
 import org.jetbrains.dokka.gradle.engine.parameters.VisibilityModifier
+import org.jetbrains.kotlin.gradle.dsl.JvmDefaultMode
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
 
 plugins {
-    id("com.android.application")
-    id("kotlin-android")
-    id("org.jetbrains.dokka")
+    alias(libs.plugins.android.application)
+    alias(libs.plugins.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 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
+
+abstract class GenerateGitHashTask : DefaultTask() {
+
+    @get:InputFile
+    @get:PathSensitive(PathSensitivity.RELATIVE)
+    abstract val headFile: RegularFileProperty
+
+    @get:InputDirectory
+    @get:PathSensitive(PathSensitivity.RELATIVE)
+    abstract val headsDir: DirectoryProperty
+
+    @get:OutputDirectory
+    abstract val outputDir: DirectoryProperty
+
+    @TaskAction
+    fun generate() {
+        val head = headFile.get().asFile
+
+        val hash = try {
+            if (head.exists()) {
+                // Read the commit hash from .git/HEAD
+                val headContent = head.readText().trim()
+                if (headContent.startsWith("ref:")) {
+                    val refPath = headContent.substring(5) // e.g., refs/heads/main
+                    val commitFile = File(head.parentFile, 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
+        } catch (_: Throwable) {
+            "" // Just set to an empty string if any exception occurs
+        }.take(7) // Get the short commit hash
+
+        val outFile = outputDir.file("git-hash.txt").get().asFile
+        outFile.parentFile.mkdirs()
+        outFile.writeText(hash)
     }
 }
 
+val generateGitHash = tasks.register<GenerateGitHashTask>("generateGitHash") {
+    val gitDir = layout.projectDirectory.dir("../.git")
+
+    headFile.set(gitDir.file("HEAD"))
+    headsDir.set(gitDir.dir("refs/heads"))
+
+    outputDir.set(layout.buildDirectory.dir("generated/git"))
+}
+
 android {
     @Suppress("UnstableApiUsage")
     testOptions {
         unitTests.isReturnDefaultValues = true
     }
 
-    viewBinding {
-        enable = true
+    // Looks like google likes to add metadata only they can read https://gitlab.com/IzzyOnDroid/repo/-/work_items/491
+    dependenciesInfo {
+        // Disables dependency metadata when building APKs.
+        includeInApk = false
+        // Disables dependency metadata when building Android App Bundles.
+        includeInBundle = false
+    }
+
+    androidComponents {
+        onVariants { variant ->
+            variant.sources.assets?.addGeneratedSourceDirectory(
+                generateGitHash,
+                GenerateGitHashTask::outputDir
+            )
+        }
     }
 
     signingConfigs {
-        if (prereleaseStoreFile != null) {
+        // We just use SIGNING_KEY_ALIAS here since it won't change
+        // so won't kill the configuration cache.
+        if (System.getenv("SIGNING_KEY_ALIAS") != null) {
             create("prerelease") {
-                storeFile = file(prereleaseStoreFile)
+                val tmpFilePath = System.getProperty("user.home") + "/work/_temp/keystore/"
+                val prereleaseStoreFile: File? = File(tmpFilePath).listFiles()?.first()
+
+                storeFile = prereleaseStoreFile?.let { file(it) }
                 storePassword = System.getenv("SIGNING_STORE_PASSWORD")
                 keyAlias = System.getenv("SIGNING_KEY_ALIAS")
                 keyPassword = System.getenv("SIGNING_KEY_PASSWORD")
@@ -61,12 +103,10 @@ android {
         applicationId = "com.lagradost.cloudstream3"
         minSdk = libs.versions.minSdk.get().toInt()
         targetSdk = libs.versions.targetSdk.get().toInt()
-        versionCode = 66
-        versionName = "4.5.2"
+        versionCode = 68
+        versionName = "4.7.0"
 
-        resValue("string", "app_version", "${defaultConfig.versionName}${versionNameSuffix ?: ""}")
-        resValue("string", "commit_hash", getGitCommitHash())
-        resValue("bool", "is_prerelease", "false")
+        manifestPlaceholders["target_sdk_version"] = libs.versions.targetSdk.get()
 
         // Reads local.properties
         val localProperties = gradleLocalProperties(rootDir, project.providers)
@@ -113,12 +153,9 @@ android {
     productFlavors {
         create("stable") {
             dimension = "state"
-            resValue("bool", "is_prerelease", "false")
         }
         create("prerelease") {
             dimension = "state"
-            resValue("bool", "is_prerelease", "true")
-            buildConfigField("boolean", "BETA", "true")
             applicationIdSuffix = ".prerelease"
             if (signingConfigs.names.contains("prerelease")) {
                 signingConfig = signingConfigs.getByName("prerelease")
@@ -136,13 +173,29 @@ android {
         targetCompatibility = JavaVersion.toVersion(javaTarget.target)
     }
 
+    java {
+        // Use Java 17 toolchain even if a higher JDK runs the build.
+        // We still use Java 8 for now which higher JDKs have deprecated.
+        toolchain {
+            languageVersion.set(JavaLanguageVersion.of(libs.versions.jdkToolchain.get()))
+        }
+    }
+
     lint {
-        abortOnError = false
         checkReleaseBuilds = false
     }
 
     buildFeatures {
         buildConfig = true
+        viewBinding = true
+    }
+
+    packaging {
+        jniLibs {
+            // Enables legacy JNI packaging to reduce APK size (similar to builds before minSdk 23).
+            // Note: This may increase app startup time slightly.
+            useLegacyPackaging = true
+        }
     }
 
     namespace = "com.lagradost.cloudstream3"
@@ -159,37 +212,37 @@ dependencies {
 
     // Android Core & Lifecycle
     implementation(libs.core.ktx)
+    implementation(libs.activity.ktx)
+    implementation(libs.annotation)
     implementation(libs.appcompat)
-    implementation(libs.bundles.navigationKtx)
-    implementation(libs.lifecycle.livedata.ktx)
-    implementation(libs.lifecycle.viewmodel.ktx)
+    implementation(libs.fragment.ktx)
+    implementation(libs.bundles.lifecycle)
+    implementation(libs.bundles.navigation)
+    implementation(libs.kotlinx.collections.immutable)
 
     // Design & UI
     implementation(libs.preference.ktx)
     implementation(libs.material)
     implementation(libs.constraintlayout)
-    implementation(libs.swiperefreshlayout)
 
     // Coil Image Loading
-    implementation(libs.coil)
-    implementation(libs.coil.network.okhttp)
+    implementation(libs.bundles.coil)
 
     // Media 3 (ExoPlayer)
     implementation(libs.bundles.media3)
     implementation(libs.video)
 
+    // FFmpeg Decoding
+    implementation(libs.bundles.nextlib)
+
+    // Anime-db for filler
+    implementation(libs.anime.db)
+
     // PlayBack
     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(libs.acra.core)
-    implementation(libs.acra.toast)
-
     // UI Stuff
     implementation(libs.shimmer) // Shimmering Effect (Loading Skeleton)
     implementation(libs.palette.ktx) // Palette for Images -> Colors
@@ -200,50 +253,32 @@ dependencies {
     implementation(libs.qrcode.kotlin) // QR Code for PIN Auth on TV
 
     // Extensions & Other Libs
+    implementation(libs.jsoup) // HTML Parser
     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
+    implementation(libs.conscrypt.android) // To Fix SSL Fu*kery on Android 9
+    implementation(libs.jackson.module.kotlin) // JSON Parser
+    implementation(libs.zipline)
 
     // Torrent Support
     implementation(libs.torrentserver)
 
     // Downloading & Networking
-    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.
-        val isDebug = gradle.startParameter.taskRequests.any { task ->
-            task.args.any { arg ->
-                arg.contains("debug", true)
-            }
-        }
-
-        this.extra.set("isDebug", isDebug)
-    })
+    implementation(project(":library"))
 }
 
 tasks.register<Jar>("androidSourcesJar") {
     archiveClassifier.set("sources")
-    from(android.sourceSets.getByName("main").java.srcDirs) // Full Sources
+    from(android.sourceSets.getByName("main").java.directories) // Full Sources
 }
 
 tasks.register<Copy>("copyJar") {
+    dependsOn("build", ":library:jvmJar")
     from(
         "build/intermediates/compile_app_classes_jar/prereleaseDebug/bundlePrereleaseDebugClassesToCompileJar",
         "../library/build/libs"
@@ -270,15 +305,22 @@ tasks.register<Jar>("makeJar") {
 tasks.withType<KotlinJvmCompile> {
     compilerOptions {
         jvmTarget.set(javaTarget)
-        freeCompilerArgs.add("-Xjvm-default=all-compatibility")
+        jvmDefault.set(JvmDefaultMode.ENABLE)
+        freeCompilerArgs.add("-Xannotation-default-target=param-property")
+        optIn.addAll(
+            "com.lagradost.cloudstream3.InternalAPI",
+            "com.lagradost.cloudstream3.Prerelease",
+        )
     }
 }
 
 dokka {
     moduleName = "App"
     dokkaSourceSets {
-        main {
+        configureEach {
+            suppress = name != "prereleaseDebug"
             analysisPlatform = KotlinPlatform.JVM
+            displayName = "JVM"
             documentedVisibilities(
                 VisibilityModifier.Public,
                 VisibilityModifier.Protected
diff --git a/app/lint.xml b/app/lint.xml
new file mode 100644
index 00000000000..b2f5e8f2bc3
--- /dev/null
+++ b/app/lint.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lint>
+    <!-- ByteOrderMark has errors in values-b+ja/strings.xml, but it's handled by weblate so we don't really care. -->
+    <issue id="ByteOrderMark" severity="ignore" />
+
+    <!-- We don't care about MissingTranslation since it's handled by weblate. -->
+    <issue id="MissingTranslation" severity="ignore" />
+
+    <!-- We only care about the source language here. -->
+    <issue id="StringFormatInvalid">
+        <ignore path="**/res/values-*/**" />
+    </issue>
+</lint>
diff --git a/app/src/androidTest/java/com/lagradost/cloudstream3/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/lagradost/cloudstream3/ExampleInstrumentedTest.kt
index 0adfc1faedf..4c5cdea5bee 100644
--- a/app/src/androidTest/java/com/lagradost/cloudstream3/ExampleInstrumentedTest.kt
+++ b/app/src/androidTest/java/com/lagradost/cloudstream3/ExampleInstrumentedTest.kt
@@ -136,14 +136,14 @@ class ExampleInstrumentedTest {
     @Test
     @Throws(AssertionError::class)
     fun providerCorrectData() {
-        val isoNames = SubtitleHelper.languages.map { it.ISO_639_1 }
-        Assert.assertFalse("ISO does not contain any languages", isoNames.isNullOrEmpty())
+        val langTagsIETF = SubtitleHelper.languages.map { it.IETF_tag }
+        Assert.assertFalse("IETFTagNames does not contain any languages", langTagsIETF.isNullOrEmpty())
         for (api in getAllProviders()) {
             Assert.assertTrue("Api does not contain a mainUrl", api.mainUrl != "NONE")
             Assert.assertTrue("Api does not contain a name", api.name != "NONE")
             Assert.assertTrue(
                 "Api ${api.name} does not contain a valid language code",
-                isoNames.contains(api.lang)
+                langTagsIETF.contains(api.lang)
             )
             Assert.assertTrue(
                 "Api ${api.name} does not contain any supported types",
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d960d910c6a..ee4c978f2be 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,8 +2,6 @@
 <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 -->
@@ -18,12 +16,53 @@
     <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 -->
-
+    <uses-permission android:name="com.android.providers.tv.permission.READ_EPG_DATA" />  <!-- We can use to read the tv channel list -->
     <!-- Required for OpenInAppAction and getting arbitrary Aniyomi packages  -->
     <uses-permission
         android:name="android.permission.QUERY_ALL_PACKAGES"
         tools:ignore="QueryAllPackagesPermission" />
 
+    <queries>
+        <!-- 
+            QUERY_ALL_PACKAGES does not work on some devices running Android 11+ (like Google TV 14), 
+            so we must explicitly specify the packages and intent patterns we query to ensure visibility.
+        -->
+        <!-- For external video players -->
+        <intent>
+            <action android:name="android.intent.action.VIEW" />
+            <data android:mimeType="video/*" />
+        </intent>
+        <intent>
+            <action android:name="android.intent.action.VIEW" />
+            <data android:mimeType="application/x-mpegURL" />
+        </intent>
+        <intent>
+            <action android:name="android.intent.action.VIEW" />
+            <data android:mimeType="application/vnd.apple.mpegurl" />
+        </intent>
+        <intent>
+            <action android:name="android.intent.action.VIEW" />
+            <data android:scheme="magnet" />
+        </intent>
+
+        <!-- Common players supported in actions/temp -->
+        <package android:name="org.videolan.vlc" />
+        <package android:name="org.videolan.vlc.debug" />
+        <package android:name="is.xyz.mpv" />
+        <package android:name="is.xyz.mpv.ytdl" />
+        <package android:name="app.marlboroadvance.mpvex" />
+        <package android:name="live.mehiz.mpvkt" />
+        <package android:name="live.mehiz.mpvkt.preview" />
+        <package android:name="com.brouken.player" />
+        <package android:name="dev.anilbeesetti.nextplayer" />
+        <package android:name="com.instantbits.cast.webvideo" />
+        <package android:name="com.gianlu.aria2android" />
+        
+        <!-- Torrent clients -->
+        <package android:name="org.proninyaroslav.libretorrent" />
+        <package android:name="com.biglybt.android.client" />
+    </queries>
+
     <!-- Fixes android tv fuckery -->
     <uses-feature
         android:name="android.hardware.touchscreen"
@@ -35,9 +74,8 @@
     <!-- Without the large heap Exoplayer buffering gets reset due to OOM. -->
     <!--TODO https://stackoverflow.com/questions/41799732/chromecast-button-not-visible-in-android-->
     <application
-        android:name=".AcraApplication"
+        android:name=".CloudStreamApp"
         android:allowBackup="true"
-        android:enableOnBackInvokedCallback="true"
         android:appCategory="video"
         android:banner="@mipmap/ic_banner"
         android:fullBackupContent="@xml/backup_descriptor"
@@ -45,11 +83,12 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:largeHeap="true"
+        android:pageSizeCompat="enabled"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         android:usesCleartextTraffic="true"
-        tools:targetApi="35">
+        tools:targetApi="${target_sdk_version}">
 
         <meta-data
             android:name="com.google.android.gms.cast.framework.OPTIONS_PROVIDER_CLASS_NAME"
@@ -110,14 +149,31 @@
         android:launchMode="singleTask"
         is a bit experimental, it makes loading repositories from browser still stay on the same page
         no idea about side effects
+
+        Not exported to prevent bypassing the AccountSelectActivity
         -->
         <activity
             android:name=".MainActivity"
             android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|keyboard|keyboardHidden|navigation|uiMode"
-            android:exported="true"
+            android:exported="false"
             android:launchMode="singleTask"
             android:resizeableActivity="true"
-            android:supportsPictureInPicture="true">
+            android:supportsPictureInPicture="true" />
+
+        <activity
+            android:name=".ui.account.AccountSelectActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|keyboard|keyboardHidden"
+            android:exported="true">
+            <intent-filter android:exported="true">
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
 
             <!-- cloudstreamplayer://encodedUrl?name=Dune -->
             <intent-filter>
@@ -144,7 +200,14 @@
 
                 <data android:scheme="cloudstreamrepo" />
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
 
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="csshare" />
+            </intent-filter>
             <!-- Allow searching with intents: cloudstreamsearch://Your%20Name -->
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
@@ -168,7 +231,7 @@
                 <data android:scheme="cloudstreamcontinuewatching" />
             </intent-filter>
 
-            <intent-filter>
+            <intent-filter android:autoVerify="false">
                 <action android:name="android.intent.action.VIEW" />
 
                 <category android:name="android.intent.category.DEFAULT" />
@@ -181,21 +244,6 @@
             </intent-filter>
         </activity>
 
-        <activity
-            android:name=".ui.account.AccountSelectActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|keyboard|keyboardHidden"
-            android:exported="true">
-            <intent-filter android:exported="true">
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-                <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-
         <receiver
             android:name=".receivers.VideoDownloadRestartReceiver"
             android:enabled="false"
@@ -211,6 +259,12 @@
             android:foregroundServiceType="dataSync"
             android:exported="false" />
 
+        <service
+            android:name=".services.DownloadQueueService"
+            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"
diff --git a/app/src/main/cpp/native-lib.cpp b/app/src/main/cpp/native-lib.cpp
deleted file mode 100644
index f4cb531faa1..00000000000
--- a/app/src/main/cpp/native-lib.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <jni.h>
-#include <csignal>
-#include <android/log.h>
-
-#define TAG "CloudStream Crash Handler"
-volatile sig_atomic_t gSignalStatus = 0;
-void handleNativeCrash(int signal) {
-    gSignalStatus = signal;
-}
-
-extern "C" JNIEXPORT void JNICALL
-Java_com_lagradost_cloudstream3_NativeCrashHandler_initNativeCrashHandler(JNIEnv *env, jobject) {
-    #define REGISTER_SIGNAL(X) signal(X, handleNativeCrash);
-    REGISTER_SIGNAL(SIGSEGV)
-    #undef REGISTER_SIGNAL
-}
-
-//extern "C" JNIEXPORT void JNICALL
-//Java_com_lagradost_cloudstream3_NativeCrashHandler_triggerNativeCrash(JNIEnv *env, jobject thiz) {
-//    int *p = nullptr;
-//    *p = 0;
-//}
-
-extern "C" JNIEXPORT int JNICALL
-Java_com_lagradost_cloudstream3_NativeCrashHandler_getSignalStatus(JNIEnv *env, jobject) {
-    //__android_log_print(ANDROID_LOG_INFO, TAG, "Got signal status %d", gSignalStatus);
-    return gSignalStatus;
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/AcraApplication.kt b/app/src/main/java/com/lagradost/cloudstream3/AcraApplication.kt
index 9f493fbbc75..bbe7d97debc 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/AcraApplication.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/AcraApplication.kt
@@ -1,233 +1,78 @@
 package com.lagradost.cloudstream3
 
-import android.app.Activity
-import android.app.Application
-import android.content.Context
-import android.content.ContextWrapper
-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.safe
-import com.lagradost.cloudstream3.mvvm.safeAsync
-import com.lagradost.cloudstream3.plugins.PluginManager
-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.AppContextUtils.openBrowser
-import com.lagradost.cloudstream3.utils.Coroutines.runOnMainThread
-import com.lagradost.cloudstream3.utils.DataStore.getKey
-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
-import org.acra.config.CoreConfiguration
-import org.acra.data.CrashReportData
-import org.acra.data.StringFormat
-import org.acra.ktx.initAcra
-import org.acra.sender.ReportSender
-import org.acra.sender.ReportSenderFactory
-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")
-        val url =
-            "https://docs.google.com/forms/d/e/$id/formResponse"
-        val data = mapOf(
-            "entry.$entry" to errorContent.toJSON()
-        )
-
-        thread { // to not run it on main thread
-            runBlocking {
-                safeAsync {
-                    app.post(url, data = data)
-                    //println("Report response: $post")
-                }
-            }
-        }
-
-        runOnMainThread { // to run it on main looper
-            safe {
-                Toast.makeText(context, R.string.acra_report_toast, Toast.LENGTH_SHORT).show()
-            }
-        }*/
-    }
-}
-
-class CustomSenderFactory : ReportSenderFactory {
-    override fun create(context: Context, config: CoreConfiguration): ReportSender {
-        return CustomReportSender()
-    }
-
-    override fun enabled(config: CoreConfiguration): Boolean {
-        return true
-    }
-}
-
-class ExceptionHandler(val errorFile: File, val onError: (() -> Unit)) :
-    Thread.UncaughtExceptionHandler {
-    override fun uncaughtException(thread: Thread, error: Throwable) {
-        ACRA.errorReporter.handleException(error)
-        try {
-            PrintStream(errorFile).use { ps ->
-                ps.println("Currently loading extension: ${PluginManager.currentlyLoading ?: "none"}")
-                ps.println("Fatal exception on thread ${thread.name} (${thread.id})")
-                error.printStackTrace(ps)
-            }
-        } catch (ignored: FileNotFoundException) {
-        }
-        try {
-            onError.invoke()
-        } catch (ignored: Exception) {
-        }
-        exitProcess(1)
-    }
-
+/**
+ * Deprecated alias for CloudStreamApp for backwards compatibility with plugins.
+ * Use CloudStreamApp instead.
+ */
+@Deprecated(
+    message = "AcraApplication is deprecated, use CloudStreamApp instead",
+    replaceWith = ReplaceWith("com.lagradost.cloudstream3.CloudStreamApp"),
+    level = DeprecationLevel.WARNING
+)
+class AcraApplication {
+	companion object {
+
+		@Deprecated(
+		    message = "AcraApplication is deprecated, use CloudStreamApp instead",
+		    replaceWith = ReplaceWith("com.lagradost.cloudstream3.CloudStreamApp.context"),
+		    level = DeprecationLevel.WARNING
+		)
+		val context get() = CloudStreamApp.context
+
+		@Deprecated(
+		    message = "AcraApplication is deprecated, use CloudStreamApp instead",
+		    replaceWith = ReplaceWith("com.lagradost.cloudstream3.CloudStreamApp.removeKeys(folder)"),
+		    level = DeprecationLevel.WARNING
+		)
+		fun removeKeys(folder: String): Int? =
+		    CloudStreamApp.removeKeys(folder)
+
+		@Deprecated(
+		    message = "AcraApplication is deprecated, use CloudStreamApp instead",
+		    replaceWith = ReplaceWith("com.lagradost.cloudstream3.CloudStreamApp.setKey(path, value)"),
+		    level = DeprecationLevel.WARNING
+		)
+		fun <T> setKey(path: String, value: T) =
+			CloudStreamApp.setKey(path, value)
+
+		@Deprecated(
+		    message = "AcraApplication is deprecated, use CloudStreamApp instead",
+		    replaceWith = ReplaceWith("com.lagradost.cloudstream3.CloudStreamApp.setKey(folder, path, value)"),
+		    level = DeprecationLevel.WARNING
+		)
+		fun <T> setKey(folder: String, path: String, value: T) =
+			CloudStreamApp.setKey(folder, path, value)
+
+		@Deprecated(
+		    message = "AcraApplication is deprecated, use CloudStreamApp instead",
+		    replaceWith = ReplaceWith("com.lagradost.cloudstream3.CloudStreamApp.getKey(path, defVal)"),
+		    level = DeprecationLevel.WARNING
+		)
+		inline fun <reified T : Any> getKey(path: String, defVal: T?): T? =
+			CloudStreamApp.getKey(path, defVal)
+
+		@Deprecated(
+		    message = "AcraApplication is deprecated, use CloudStreamApp instead",
+		    replaceWith = ReplaceWith("com.lagradost.cloudstream3.CloudStreamApp.getKey(path)"),
+		    level = DeprecationLevel.WARNING
+		)
+		inline fun <reified T : Any> getKey(path: String): T? =
+			CloudStreamApp.getKey(path)
+
+		@Deprecated(
+		    message = "AcraApplication is deprecated, use CloudStreamApp instead",
+		    replaceWith = ReplaceWith("com.lagradost.cloudstream3.CloudStreamApp.getKey(folder, path)"),
+		    level = DeprecationLevel.WARNING
+		)
+		inline fun <reified T : Any> getKey(folder: String, path: String): T? =
+		    CloudStreamApp.getKey(folder, path)
+
+		@Deprecated(
+		    message = "AcraApplication is deprecated, use CloudStreamApp instead",
+		    replaceWith = ReplaceWith("com.lagradost.cloudstream3.CloudStreamApp.getKey(folder, path, defVal)"),
+		    level = DeprecationLevel.WARNING
+		)
+		inline fun <reified T : Any> getKey(folder: String, path: String, defVal: T?): T? =
+			CloudStreamApp.getKey(folder, path, defVal)
+	}
 }
-
-class AcraApplication : Application(), SingletonImageLoader.Factory {
-
-    override fun onCreate() {
-        super.onCreate()
-        // 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))
-        }.also {
-            exceptionHandler = it
-            Thread.setDefaultUncaughtExceptionHandler(it)
-        }
-    }
-
-    override fun attachBaseContext(base: Context?) {
-        super.attachBaseContext(base)
-        context = base
-
-        initAcra {
-            //core configuration:
-            buildConfigClass = BuildConfig::class.java
-            reportFormat = StringFormat.JSON
-
-            reportContent = listOf(
-                ReportField.BUILD_CONFIG, ReportField.USER_CRASH_DATE,
-                ReportField.ANDROID_VERSION, ReportField.PHONE_MODEL,
-                ReportField.STACK_TRACE,
-            )
-
-            // removed this due to bug when starting the app, moved it to when it actually crashes
-            //each plugin you chose above can be configured in a block like this:
-            /*toast {
-                text = getString(R.string.acra_report_toast)
-                //opening this block automatically enables the plugin.
-            }*/
-        }
-    }
-
-    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? {
-            return when (this) {
-                is Activity -> this
-                is ContextWrapper -> baseContext.getActivity()
-                else -> null
-            }
-        }
-
-        private var _context: WeakReference<Context>? = null
-        var context
-            get() = _context?.get()
-            private set(value) {
-                _context = WeakReference(value)
-                setContext(WeakReference(value))
-            }
-
-        fun <T : Any> getKeyClass(path: String, valueType: Class<T>): T? {
-            return context?.getKey(path, valueType)
-        }
-
-        fun <T : Any> setKeyClass(path: String, value: T) {
-            context?.setKey(path, value)
-        }
-
-        fun removeKeys(folder: String): Int? {
-            return context?.removeKeys(folder)
-        }
-
-        fun <T> setKey(path: String, value: T) {
-            context?.setKey(path, value)
-        }
-
-        fun <T> setKey(folder: String, path: String, value: T) {
-            context?.setKey(folder, path, value)
-        }
-
-        inline fun <reified T : Any> getKey(path: String, defVal: T?): T? {
-            return context?.getKey(path, defVal)
-        }
-
-        inline fun <reified T : Any> getKey(path: String): T? {
-            return context?.getKey(path)
-        }
-
-        inline fun <reified T : Any> getKey(folder: String, path: String): T? {
-            return context?.getKey(folder, path)
-        }
-
-        inline fun <reified T : Any> getKey(folder: String, path: String, defVal: T?): T? {
-            return context?.getKey(folder, path, defVal)
-        }
-
-        fun getKeys(folder: String): List<String>? {
-            return context?.getKeys(folder)
-        }
-
-        fun removeKey(folder: String, path: String) {
-            context?.removeKey(folder, path)
-        }
-
-        fun removeKey(path: String) {
-            context?.removeKey(path)
-        }
-
-        /**
-         * If fallbackWebview is true and a fragment is supplied then it will open a webview with the url if the browser fails.
-         * */
-        fun openBrowser(url: String, fallbackWebview: Boolean = false, fragment: Fragment? = null) {
-            context?.openBrowser(url, fallbackWebview, fragment)
-        }
-
-        /** Will fallback to webview if in TV layout */
-        fun openBrowser(url: String, activity: FragmentActivity?) {
-            openBrowser(
-                url,
-                isLayout(TV or EMULATOR),
-                activity?.supportFragmentManager?.fragments?.lastOrNull()
-            )
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/CloudStreamApp.kt b/app/src/main/java/com/lagradost/cloudstream3/CloudStreamApp.kt
new file mode 100644
index 00000000000..a9cd9c01edd
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/CloudStreamApp.kt
@@ -0,0 +1,181 @@
+package com.lagradost.cloudstream3
+
+import android.app.Activity
+import android.app.Application
+import android.content.Context
+import android.content.ContextWrapper
+import android.content.Intent
+import android.os.Build
+import android.widget.Toast
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentActivity
+import coil3.ImageLoader
+import coil3.PlatformContext
+import coil3.SingletonImageLoader
+import com.lagradost.api.setContext
+import com.lagradost.cloudstream3.BuildConfig
+import com.lagradost.cloudstream3.mvvm.safe
+import com.lagradost.cloudstream3.mvvm.safeAsync
+import com.lagradost.cloudstream3.plugins.PluginManager
+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.AppContextUtils.openBrowser
+import com.lagradost.cloudstream3.utils.AppDebug
+import com.lagradost.cloudstream3.utils.Coroutines.runOnMainThread
+import com.lagradost.cloudstream3.utils.DataStore.getKey
+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.buildImageLoader
+import kotlinx.coroutines.runBlocking
+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 ExceptionHandler(
+    val errorFile: File,
+    val onError: (() -> Unit)
+) : Thread.UncaughtExceptionHandler {
+
+    override fun uncaughtException(thread: Thread, error: Throwable) {
+        try {
+            val threadId = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.BAKLAVA) {
+                thread.threadId()
+            } else {
+                @Suppress("DEPRECATION")
+                thread.id
+            }
+
+            PrintStream(errorFile).use { ps ->
+                ps.println("Currently loading extension: ${PluginManager.currentlyLoading ?: "none"}")
+                ps.println("Fatal exception on thread ${thread.name} ($threadId)")
+                error.printStackTrace(ps)
+            }
+        } catch (_: FileNotFoundException) {
+        }
+        try {
+            onError()
+        } catch (_: Exception) {
+        }
+        exitProcess(1)
+    }
+}
+
+class CloudStreamApp : Application(), SingletonImageLoader.Factory {
+
+    override fun onCreate() {
+        super.onCreate()
+        // If we want to initialize Coil as early as possible, maybe when
+        // loading an image or GIF in a splash screen activity.
+        // buildImageLoader(applicationContext)
+
+        ExceptionHandler(filesDir.resolve("last_error")) {
+            val intent = context!!.packageManager.getLaunchIntentForPackage(context!!.packageName)
+            startActivity(Intent.makeRestartActivityTask(intent!!.component))
+        }.also {
+            exceptionHandler = it
+            Thread.setDefaultUncaughtExceptionHandler(it)
+        }
+
+        AppDebug.isDebug = BuildConfig.DEBUG
+    }
+
+    override fun attachBaseContext(base: Context?) {
+        super.attachBaseContext(base)
+        context = base
+    }
+
+    override fun newImageLoader(context: PlatformContext): ImageLoader {
+        // Coil module will be initialized globally when first loadImage() is invoked.
+        return buildImageLoader(applicationContext)
+    }
+
+    companion object {
+        var exceptionHandler: ExceptionHandler? = null
+
+        /** Use to get Activity from Context. */
+        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
+            get() = _context?.get()
+            private set(value) {
+                _context = WeakReference(value)
+                setContext(WeakReference(value))
+            }
+
+        fun <T : Any> getKeyClass(path: String, valueType: Class<T>): T? {
+            return context?.getKey(path, valueType)
+        }
+
+        fun <T : Any> setKeyClass(path: String, value: T) {
+            context?.setKey(path, value)
+        }
+
+        fun removeKeys(folder: String): Int? {
+            return context?.removeKeys(folder)
+        }
+
+        fun <T> setKey(path: String, value: T) {
+            context?.setKey(path, value)
+        }
+
+        fun <T> setKey(folder: String, path: String, value: T) {
+            context?.setKey(folder, path, value)
+        }
+
+        inline fun <reified T : Any> getKey(path: String, defVal: T?): T? {
+            return context?.getKey(path, defVal)
+        }
+
+        inline fun <reified T : Any> getKey(path: String): T? {
+            return context?.getKey(path)
+        }
+
+        inline fun <reified T : Any> getKey(folder: String, path: String): T? {
+            return context?.getKey(folder, path)
+        }
+
+        inline fun <reified T : Any> getKey(folder: String, path: String, defVal: T?): T? {
+            return context?.getKey(folder, path, defVal)
+        }
+
+        fun getKeys(folder: String): List<String>? {
+            return context?.getKeys(folder)
+        }
+
+        fun removeKey(folder: String, path: String) {
+            context?.removeKey(folder, path)
+        }
+
+        fun removeKey(path: String) {
+            context?.removeKey(path)
+        }
+
+        /** If fallbackWebView is true and a fragment is supplied then it will open a WebView with the URL if the browser fails. */
+        fun openBrowser(url: String, fallbackWebView: Boolean = false, fragment: Fragment? = null) {
+            context?.openBrowser(url, fallbackWebView, fragment)
+        }
+
+        /** Will fall back to WebView if in TV or emulator layout. */
+        fun openBrowser(url: String, activity: FragmentActivity?) {
+            openBrowser(
+                url,
+                isLayout(TV or EMULATOR),
+                activity?.supportFragmentManager?.fragments?.lastOrNull()
+            )
+        }
+    }
+}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt
index 9a8e274f5ab..ed0aaf9b761 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt
@@ -1,13 +1,16 @@
 package com.lagradost.cloudstream3
 
-import android.Manifest
+import android.annotation.SuppressLint
 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.Manifest
 import android.os.Build
+import android.os.Handler
+import android.os.Looper
 import android.util.DisplayMetrics
 import android.util.Log
 import android.view.Gravity
@@ -24,34 +27,41 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.SearchView
 import androidx.core.content.ContextCompat
 import androidx.core.view.children
+import androidx.core.view.isNotEmpty
 import androidx.preference.PreferenceManager
 import com.google.android.gms.cast.framework.CastSession
 import com.google.android.material.chip.ChipGroup
 import com.google.android.material.navigationrail.NavigationRailView
-import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
-import com.lagradost.cloudstream3.AcraApplication.Companion.removeKey
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.getKey
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.removeKey
 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.syncproviders.AccountManager
+import com.lagradost.cloudstream3.ui.home.HomeChildItemAdapter
+import com.lagradost.cloudstream3.ui.home.ParentItemAdapter
+import com.lagradost.cloudstream3.ui.player.PlayerPipHelper.isPIPPossible
 import com.lagradost.cloudstream3.ui.player.Torrent
-import com.lagradost.cloudstream3.ui.settings.Globals.TV
+import com.lagradost.cloudstream3.ui.result.ActorAdaptor
+import com.lagradost.cloudstream3.ui.result.EpisodeAdapter
+import com.lagradost.cloudstream3.ui.result.ImageAdapter
+import com.lagradost.cloudstream3.ui.search.SearchAdapter
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
-import com.lagradost.cloudstream3.utils.UiText
+import com.lagradost.cloudstream3.ui.settings.Globals.TV
 import com.lagradost.cloudstream3.ui.settings.Globals.updateTv
+import com.lagradost.cloudstream3.ui.settings.extensions.PluginAdapter
 import com.lagradost.cloudstream3.utils.AppContextUtils.isRtl
 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
-import com.lagradost.cloudstream3.utils.UIHelper.shouldShowPIPMode
+import com.lagradost.cloudstream3.utils.UIHelper.showInputMethod
 import com.lagradost.cloudstream3.utils.UIHelper.toPx
-import org.schabi.newpipe.extractor.NewPipe
+import com.lagradost.cloudstream3.utils.UiText
 import java.lang.ref.WeakReference
 import java.util.Locale
 import kotlin.math.max
 import kotlin.math.min
+import org.schabi.newpipe.extractor.NewPipe
 
 enum class FocusDirection {
     Start,
@@ -91,17 +101,24 @@ object CommonActivity {
         get() {
             return min(displayMetrics.widthPixels, displayMetrics.heightPixels)
         }
+    val screenWidthWithOrientation: Int
+        get() {
+            return displayMetrics.widthPixels
+        }
+    val screenHeightWithOrientation: Int
+        get() {
+            return displayMetrics.heightPixels
+        }
 
-
-    var canEnterPipMode: Boolean = false
-    var canShowPipMode: Boolean = false
+    var isPipDesired: Boolean = false
     var isInPIPMode: Boolean = false
 
     val onColorSelectedEvent = Event<Pair<Int, Int>>()
     val onDialogDismissedEvent = Event<Int>()
 
-    var playerEventListener: ((PlayerEventType) -> Unit)? = null
     var keyEventListener: ((Pair<KeyEvent?, Boolean>) -> Boolean)? = null
+    var appliedTheme: Int = 0
+    var appliedColor: Int = 0
 
     private var currentToast: Toast? = null
 
@@ -174,23 +191,35 @@ object CommonActivity {
             currentToast = toast
             toast.show()
 
+            val handler = Handler(Looper.getMainLooper())
+            val ref = WeakReference(toast)
+
+            /* Clean up activity leak */
+            handler.postDelayed({
+                if (ref.get() == currentToast) {
+                    currentToast = null
+                }
+            }, 10_000)
+
         } catch (e: Exception) {
             logError(e)
         }
     }
 
     /**
-     * Not all languages can be fetched from locale with a code.
-     * This map allows sidestepping the default Locale(languageCode)
-     * when setting the app language.
-     **/
-    val appLanguageExceptions = hashMapOf(
-        "zh-rTW" to Locale.TRADITIONAL_CHINESE
-    )
-
-    fun setLocale(context: Context?, languageCode: String?) {
-        if (context == null || languageCode == null) return
-        val locale = appLanguageExceptions[languageCode] ?: Locale(languageCode)
+     * Set locale
+     * @param languageTag shall a IETF BCP 47 conformant tag.
+     * Check [com.lagradost.cloudstream3.utils.SubtitleHelper].
+     *
+     * See locales on:
+     * https://github.com/unicode-org/cldr-json/blob/main/cldr-json/cldr-core/availableLocales.json
+     * https://www.iana.org/assignments/language-subtag-registry/language-subtag-registry
+     * https://android.googlesource.com/platform/frameworks/base/+/android-16.0.0_r2/core/res/res/values/locale_config.xml
+     * https://iso639-3.sil.org/code_tables/639/data/all
+     */
+    fun setLocale(context: Context?, languageTag: String?) {
+        if (context == null || languageTag == null) return
+        val locale = Locale.forLanguageTag(languageTag)
         val resources: Resources = context.resources
         val config = resources.configuration
         Locale.setDefault(locale)
@@ -198,6 +227,7 @@ object CommonActivity {
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
             context.createConfigurationContext(config)
+
         @Suppress("DEPRECATION")
         resources.updateConfiguration(
             config,
@@ -214,18 +244,11 @@ object CommonActivity {
     fun init(act: Activity) {
         setActivityInstance(act)
         ioSafe { Torrent.deleteAllFiles() }
-
         val componentActivity = activity as? ComponentActivity ?: return
 
-        //https://stackoverflow.com/questions/52594181/how-to-know-if-user-has-disabled-picture-in-picture-feature-permission
-        //https://developer.android.com/guide/topics/ui/picture-in-picture
-        canShowPipMode =
-            Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && // OS SUPPORT
-                    componentActivity.packageManager.hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE) && // HAS FEATURE, MIGHT BE BLOCKED DUE TO POWER DRAIN
-                    componentActivity.hasPIPPermission() // CHECK IF FEATURE IS ENABLED IN SETTINGS
-
         componentActivity.updateLocale()
         componentActivity.updateTv()
+        AccountManager.initMainAPI()
         NewPipe.init(DownloaderTestImpl.getInstance())
 
         MainActivity.activityResultLauncher =
@@ -238,7 +261,7 @@ object CommonActivity {
                         ?: return@registerForActivityResult
                     action.onResultSafe(act, result.data)
                     removeKey("last_click_action")
-                    removeKey("last_opened_id")
+                    removeKey("last_opened")
                 }
             }
 
@@ -260,13 +283,15 @@ object CommonActivity {
         }
     }
 
+    /** Enters pip mode if it is both possible and desired to do so*/
     private fun Activity.enterPIPMode() {
-        if (!shouldShowPIPMode(canEnterPipMode) || !canShowPipMode) return
+        if (!isPipDesired || !this.isPIPPossible()) return
+
         try {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                 try {
                     enterPictureInPictureMode(PictureInPictureParams.Builder().build())
-                } catch (e: Exception) {
+                } catch (_: Exception) {
                     // Use fallback just in case
                     @Suppress("DEPRECATION")
                     enterPictureInPictureMode()
@@ -282,10 +307,10 @@ object CommonActivity {
         }
     }
 
-    fun onUserLeaveHint(act: Activity?) {
-        if (canEnterPipMode && canShowPipMode) {
-            act?.enterPIPMode()
-        }
+    fun onUserLeaveHint(act: Activity) {
+        // On Android 12 and later we use setAutoEnterEnabled() instead.
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) return
+        act.enterPIPMode()
     }
 
     fun updateTheme(act: Activity) {
@@ -325,6 +350,10 @@ object CommonActivity {
                 "Monet" -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S)
                     R.style.MonetMode else R.style.AppTheme
 
+                "Dracula" -> R.style.DraculaMode
+                "Lavender" -> R.style.LavenderMode
+                "SilentBlue" -> R.style.SilentBlueMode
+
                 else -> R.style.AppTheme
             }
 
@@ -360,6 +389,8 @@ object CommonActivity {
 
         act.theme.applyStyle(currentTheme, true)
         act.theme.applyStyle(currentOverlayTheme, true)
+        appliedTheme = currentTheme
+        appliedColor = currentOverlayTheme
         act.updateTv()
         if (isLayout(TV)) act.theme.applyStyle(R.style.AppThemeTvOverlay, true)
         act.theme.applyStyle(
@@ -392,8 +423,7 @@ object CommonActivity {
 
     private fun View.hasContent(): Boolean {
         return isShown && when (this) {
-            //is RecyclerView -> this.childCount > 0
-            is ViewGroup -> this.childCount > 0
+            is ViewGroup -> this.isNotEmpty()
             else -> true
         }
     }
@@ -423,7 +453,7 @@ object CommonActivity {
         // if cant focus but visible then break and let android decide
         // the exception if is the view is a parent and has children that wants focus
         val hasChildrenThatWantsFocus = (next as? ViewGroup)?.let { parent ->
-            parent.descendantFocusability == ViewGroup.FOCUS_AFTER_DESCENDANTS && parent.childCount > 0
+            parent.descendantFocusability == ViewGroup.FOCUS_AFTER_DESCENDANTS && parent.isNotEmpty()
         } ?: false
         if (!next.isFocusable && shown && !hasChildrenThatWantsFocus) return null
 
@@ -502,87 +532,7 @@ object CommonActivity {
 
 
     fun onKeyDown(act: Activity?, keyCode: Int, event: KeyEvent?): Boolean? {
-
-        // 149 keycode_numpad 5
-        val playerEvent = when (keyCode) {
-            KeyEvent.KEYCODE_FORWARD, KeyEvent.KEYCODE_D, KeyEvent.KEYCODE_MEDIA_SKIP_FORWARD, KeyEvent.KEYCODE_MEDIA_FAST_FORWARD -> {
-                PlayerEventType.SeekForward
-            }
-
-            KeyEvent.KEYCODE_A, KeyEvent.KEYCODE_MEDIA_SKIP_BACKWARD, KeyEvent.KEYCODE_MEDIA_REWIND -> {
-                PlayerEventType.SeekBack
-            }
-
-            KeyEvent.KEYCODE_MEDIA_NEXT, KeyEvent.KEYCODE_BUTTON_R1, KeyEvent.KEYCODE_N, KeyEvent.KEYCODE_NUMPAD_2, KeyEvent.KEYCODE_CHANNEL_UP -> {
-                PlayerEventType.NextEpisode
-            }
-
-            KeyEvent.KEYCODE_MEDIA_PREVIOUS, KeyEvent.KEYCODE_BUTTON_L1, KeyEvent.KEYCODE_B, KeyEvent.KEYCODE_NUMPAD_1, KeyEvent.KEYCODE_CHANNEL_DOWN -> {
-                PlayerEventType.PrevEpisode
-            }
-
-            KeyEvent.KEYCODE_MEDIA_PAUSE -> {
-                PlayerEventType.Pause
-            }
-
-            KeyEvent.KEYCODE_MEDIA_PLAY, KeyEvent.KEYCODE_BUTTON_START -> {
-                PlayerEventType.Play
-            }
-
-            KeyEvent.KEYCODE_L, KeyEvent.KEYCODE_NUMPAD_7, KeyEvent.KEYCODE_7 -> {
-                PlayerEventType.Lock
-            }
-
-            KeyEvent.KEYCODE_H, KeyEvent.KEYCODE_MENU -> {
-                PlayerEventType.ToggleHide
-            }
-
-            KeyEvent.KEYCODE_M, KeyEvent.KEYCODE_VOLUME_MUTE -> {
-                PlayerEventType.ToggleMute
-            }
-
-            KeyEvent.KEYCODE_S, KeyEvent.KEYCODE_NUMPAD_9, KeyEvent.KEYCODE_9 -> {
-                PlayerEventType.ShowMirrors
-            }
-            // OpenSubtitles shortcut
-            KeyEvent.KEYCODE_O, KeyEvent.KEYCODE_NUMPAD_8, KeyEvent.KEYCODE_8 -> {
-                PlayerEventType.SearchSubtitlesOnline
-            }
-
-            KeyEvent.KEYCODE_E, KeyEvent.KEYCODE_NUMPAD_3, KeyEvent.KEYCODE_3 -> {
-                PlayerEventType.ShowSpeed
-            }
-
-            KeyEvent.KEYCODE_R, KeyEvent.KEYCODE_NUMPAD_0, KeyEvent.KEYCODE_0 -> {
-                PlayerEventType.Resize
-            }
-
-            KeyEvent.KEYCODE_C, KeyEvent.KEYCODE_NUMPAD_4, KeyEvent.KEYCODE_4 -> {
-                PlayerEventType.SkipOp
-            }
-
-            KeyEvent.KEYCODE_V, KeyEvent.KEYCODE_NUMPAD_5, KeyEvent.KEYCODE_5 -> {
-                PlayerEventType.SkipCurrentChapter
-            }
-
-            KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE, KeyEvent.KEYCODE_P, KeyEvent.KEYCODE_SPACE, KeyEvent.KEYCODE_NUMPAD_ENTER, KeyEvent.KEYCODE_ENTER -> { // space is not captured due to navigation
-                PlayerEventType.PlayPauseToggle
-            }
-
-            else -> return null
-        }
-        val listener = playerEventListener
-        if (listener != null) {
-            listener.invoke(playerEvent)
-            return true
-        }
         return null
-
-        //when (keyCode) {
-        //    KeyEvent.KEYCODE_DPAD_CENTER -> {
-        //        println("DPAD PRESSED")
-        //    }
-        //}
     }
 
     /** overrides focus and custom key events */
@@ -619,6 +569,7 @@ object CommonActivity {
 
                 else -> null
             }
+
             // println("NEXT FOCUS : $nextView")
             if (nextView != null) {
                 nextView.requestFocus()
@@ -626,10 +577,13 @@ object CommonActivity {
                 return true
             }
 
+            // TODO: Figure out why removing the check for SearchAutoComplete seems
+            // to break focus on TV as it shouldn't need to be used.
+            @SuppressLint("RestrictedApi")
             if (keyCode == KeyEvent.KEYCODE_DPAD_CENTER &&
                 (act.currentFocus is SearchView || act.currentFocus is SearchView.SearchAutoComplete)
             ) {
-                UIHelper.showInputMethod(act.currentFocus?.findFocus())
+                showInputMethod(act.currentFocus?.findFocus())
             }
 
             //println("Keycode: $keyCode")
@@ -638,7 +592,6 @@ object CommonActivity {
             //    "Got Keycode $keyCode | ${KeyEvent.keyCodeToString(keyCode)} \n ${event?.action}",
             //    Toast.LENGTH_LONG
             //)
-
         }
 
         // if someone else want to override the focus then don't handle the event as it is already
diff --git a/app/src/main/java/com/lagradost/cloudstream3/HeaderDecorationBindingAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/HeaderDecorationBindingAdapter.kt
deleted file mode 100644
index 045a7963ad0..00000000000
--- a/app/src/main/java/com/lagradost/cloudstream3/HeaderDecorationBindingAdapter.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.lagradost.cloudstream3
-
-import android.view.LayoutInflater
-import androidx.annotation.LayoutRes
-import androidx.recyclerview.widget.RecyclerView
-import com.lagradost.cloudstream3.ui.HeaderViewDecoration
-
-fun setHeaderDecoration(view: RecyclerView, @LayoutRes headerViewRes: Int) {
-    val headerView = LayoutInflater.from(view.context).inflate(headerViewRes, null)
-    view.addItemDecoration(HeaderViewDecoration(headerView))
-}
\ 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 7f5c499ffdc..8a98bd2972e 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
@@ -9,7 +9,6 @@ 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.Bundle
 import android.util.AttributeSet
 import android.util.Log
@@ -24,15 +23,16 @@ 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
 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.content.edit
+import androidx.core.net.toUri
 import androidx.core.view.children
+import androidx.core.view.get
 import androidx.core.view.isGone
 import androidx.core.view.isInvisible
 import androidx.core.view.isVisible
@@ -50,6 +50,7 @@ import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.LinearSnapHelper
 import androidx.recyclerview.widget.RecyclerView
+import androidx.viewpager2.widget.ViewPager2
 import com.google.android.gms.cast.framework.CastContext
 import com.google.android.gms.cast.framework.Session
 import com.google.android.gms.cast.framework.SessionManager
@@ -63,9 +64,9 @@ import com.jaredrummler.android.colorpicker.ColorPickerDialogListener
 import com.lagradost.cloudstream3.APIHolder.allProviders
 import com.lagradost.cloudstream3.APIHolder.apis
 import com.lagradost.cloudstream3.APIHolder.initAll
-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.CloudStreamApp.Companion.getKey
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.removeKey
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.setKey
 import com.lagradost.cloudstream3.CommonActivity.loadThemes
 import com.lagradost.cloudstream3.CommonActivity.onColorSelectedEvent
 import com.lagradost.cloudstream3.CommonActivity.onDialogDismissedEvent
@@ -90,14 +91,13 @@ import com.lagradost.cloudstream3.plugins.PluginManager.___DO_NOT_CALL_FROM_A_PL
 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
 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.inAppAuths
+import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.APP_STRING_SHARE
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.localListApi
 import com.lagradost.cloudstream3.syncproviders.SyncAPI
 import com.lagradost.cloudstream3.ui.APIRepository
@@ -119,6 +119,7 @@ import com.lagradost.cloudstream3.ui.search.SearchResultBuilder
 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.isLandscape
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
 import com.lagradost.cloudstream3.ui.settings.Globals.updateTv
 import com.lagradost.cloudstream3.ui.settings.SettingsGeneral
@@ -156,17 +157,20 @@ 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.InAppUpdater.runAutoUpdate
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialog
 import com.lagradost.cloudstream3.utils.SnackbarHelper.showSnackbar
+import com.lagradost.cloudstream3.utils.TvChannelUtils
 import com.lagradost.cloudstream3.utils.UIHelper.changeStatusBarState
 import com.lagradost.cloudstream3.utils.UIHelper.checkWrite
-import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
+import com.lagradost.cloudstream3.utils.UIHelper.enableEdgeToEdgeCompat
+import com.lagradost.cloudstream3.utils.UIHelper.fixSystemBarsPadding
 import com.lagradost.cloudstream3.utils.UIHelper.getResourceColor
 import com.lagradost.cloudstream3.utils.UIHelper.hideKeyboard
 import com.lagradost.cloudstream3.utils.UIHelper.navigate
 import com.lagradost.cloudstream3.utils.UIHelper.requestRW
+import com.lagradost.cloudstream3.utils.UIHelper.setNavigationBarColorCompat
 import com.lagradost.cloudstream3.utils.UIHelper.toPx
 import com.lagradost.cloudstream3.utils.USER_PROVIDER_API
 import com.lagradost.cloudstream3.utils.USER_SELECTED_HOMEPAGE_API
@@ -184,7 +188,9 @@ import java.nio.charset.Charset
 import kotlin.math.abs
 import kotlin.math.absoluteValue
 import kotlin.system.exitProcess
-
+import com.lagradost.cloudstream3.utils.downloader.DownloadQueueManager
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.cancel
 
 class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCallback {
     companion object {
@@ -194,6 +200,21 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
         const val ANIMATED_OUTLINE: Boolean = false
         var lastError: String? = null
 
+        /** Update lastError variable based on error file, to check if app crashed.
+         * Can be called multiple times without changing the lastError variable changing.
+         **/
+        fun setLastError(context: Context) {
+            if (lastError != null) return
+
+            val errorFile = context.filesDir.resolve("last_error")
+            if (errorFile.exists() && errorFile.isFile) {
+                lastError = errorFile.readText(Charset.defaultCharset())
+                errorFile.delete()
+            } else {
+                lastError = null
+            }
+        }
+
         private const val FILE_DELETE_KEY = "FILES_TO_DELETE_KEY"
         const val API_NAME_EXTRA_KEY = "API_NAME_EXTRA_KEY"
 
@@ -255,7 +276,6 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
          * @return true if the str has launched an app task (be it successful or not)
          * @param isWebview does not handle providers and opening download page if true. Can still add repos and login.
          * */
-        @Suppress("DEPRECATION_ERROR")
         fun handleAppIntentUrl(
             activity: FragmentActivity?,
             str: String?,
@@ -275,28 +295,29 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
                         loadRepository(realUrl)
                         return true
                     } else if (str.contains(APP_STRING)) {
-                        for (api in OAuth2Apis) {
-                            if (str.contains("/${api.redirectUrl}")) {
+                        for (api in AccountManager.allApis) {
+                            if (api.isValidRedirectUrl(str)) {
                                 ioSafe {
                                     Log.i(TAG, "handleAppIntent $str")
-                                    val isSuccessful = api.handleRedirect(str)
-
-                                    if (isSuccessful) {
-                                        Log.i(TAG, "authenticated ${api.name}")
-                                    } else {
-                                        Log.i(TAG, "failed to authenticate ${api.name}")
-                                    }
-
-                                    this@with.runOnUiThread {
-                                        try {
-                                            showToast(
-                                                getString(if (isSuccessful) R.string.authenticated_user else R.string.authenticated_user_fail).format(
-                                                    api.name
-                                                )
-                                            )
-                                        } catch (e: Exception) {
-                                            logError(e) // format might fail
+                                    try {
+                                        val isSuccessful = api.login(str)
+                                        if (isSuccessful) {
+                                            Log.i(TAG, "authenticated ${api.name}")
+                                        } else {
+                                            Log.i(TAG, "failed to authenticate ${api.name}")
                                         }
+                                        showToast(
+                                            if (isSuccessful) {
+                                                txt(R.string.authenticated_user, api.name)
+                                            } else {
+                                                txt(R.string.authenticated_user_fail, api.name)
+                                            }
+                                        )
+                                    } catch (t: Throwable) {
+                                        logError(t)
+                                        showToast(
+                                            txt(R.string.authenticated_user_fail, api.name)
+                                        )
                                     }
                                 }
                                 return true
@@ -331,7 +352,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
                         activity?.findViewById<NavigationRailView>(R.id.nav_rail_view)?.selectedItemId =
                             R.id.navigation_search
                     } else if (safeURI(str)?.scheme == APP_STRING_PLAYER) {
-                        val uri = Uri.parse(str)
+                        val uri = str.toUri()
                         val name = uri.getQueryParameter("name")
                         val url = URLDecoder.decode(uri.authority, "UTF-8")
 
@@ -341,7 +362,8 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
                                 LinkGenerator(
                                     listOf(BasicLink(url, name)),
                                     extract = true,
-                                )
+                                    id = url.hashCode()
+                                ), 0
                             )
                         )
                     } else if (safeURI(str)?.scheme == APP_STRING_RESUME_WATCHING) {
@@ -357,6 +379,20 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
                                 START_ACTION_RESUME_LATEST
                             )
                         }
+                    } else if (str.startsWith(APP_STRING_SHARE)) {
+                        try {
+                            val data = str.substringAfter("$APP_STRING_SHARE:")
+                            val parts = data.split("?", limit = 2)
+                            loadResult(
+                                String(base64DecodeArray(parts[1]), Charsets.UTF_8),
+                                String(base64DecodeArray(parts[0]), Charsets.UTF_8),
+                                ""
+                            )
+                            return true
+                        } catch (e: Exception) {
+                            showToast("Invalid Uri", Toast.LENGTH_SHORT)
+                            return false
+                        }
                     } else if (!isWebview) {
                         if (str.startsWith(DOWNLOAD_NAVIGATE_TO)) {
                             this.navigate(R.id.navigation_downloads)
@@ -385,9 +421,29 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
                 }
                 return false
             }
+
+
+        fun centerView(view: View?) {
+            if (view == null) return
+            try {
+                Log.v(TAG, "centerView: $view")
+                val r = Rect(0, 0, 0, 0)
+                view.getDrawingRect(r)
+                val x = r.centerX()
+                val y = r.centerY()
+                val dx = r.width() / 2 //screenWidth / 2
+                val dy = screenHeight / 2
+                val r2 = Rect(x - dx, y - dy, x + dx, y + dy)
+                view.requestRectangleOnScreen(r2, false)
+                // TvFocus.current =TvFocus.current.copy(y=y.toFloat())
+            } catch (_: Throwable) {
+            }
+        }
     }
 
+
     var lastPopup: SearchResponse? = null
+    var lastPopupJob: Job? = null
     fun loadPopup(result: SearchResponse, load: Boolean = true) {
         lastPopup = result
         val syncName = syncViewModel.syncName(result.apiName)
@@ -403,7 +459,8 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
             syncViewModel.clear()
         }
 
-        if (load) {
+        lastPopupJob?.cancel()
+        lastPopupJob = if (load) {
             viewModel.load(
                 this, result.url, result.apiName, false, if (getApiDubstatusSettings()
                         .contains(DubStatus.Dubbed)
@@ -450,6 +507,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
             R.id.navigation_downloads,
             R.id.navigation_settings,
             R.id.navigation_download_child,
+            R.id.navigation_download_queue,
             R.id.navigation_subtitles,
             R.id.navigation_chrome_subtitles,
             R.id.navigation_settings_player,
@@ -464,7 +522,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
         ).contains(destination.id)
 
 
-        val dontPush = listOf(
+        /*val dontPush = listOf(
             R.id.navigation_home,
             R.id.navigation_search,
             R.id.navigation_results_phone,
@@ -495,25 +553,19 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
             }
 
             layoutParams = params
-        }
-
-        val landscape = when (resources.configuration.orientation) {
-            Configuration.ORIENTATION_LANDSCAPE -> {
-                true
-            }
-
-            Configuration.ORIENTATION_PORTRAIT -> {
-                isLayout(TV or EMULATOR)
-            }
-
-            else -> {
-                false
-            }
-        }
+        }*/
 
         binding?.apply {
-            navRailView.isVisible = isNavVisible && landscape
-            navView.isVisible = isNavVisible && !landscape
+            navRailView.isVisible = isNavVisible && isLandscape()
+            navView.isVisible = isNavVisible && !isLandscape()
+            navHostFragment.apply {
+                val marginPx = resources.getDimensionPixelSize(R.dimen.nav_rail_view_width)
+                layoutParams =
+                    (navHostFragment.layoutParams as ViewGroup.MarginLayoutParams).apply {
+                        marginStart =
+                            if (isNavVisible && isLandscape() && isLayout(TV or EMULATOR)) marginPx else 0
+                    }
+            }
 
             /**
              * We need to make sure if we return to a sub-fragment,
@@ -521,7 +573,11 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
              * highlight the wrong one in UI.
              */
             when (destination.id) {
-                in listOf(R.id.navigation_downloads, R.id.navigation_download_child) -> {
+                in listOf(
+                    R.id.navigation_downloads,
+                    R.id.navigation_download_child,
+                    R.id.navigation_download_queue
+                ) -> {
                     navRailView.menu.findItem(R.id.navigation_downloads).isChecked = true
                     navView.menu.findItem(R.id.navigation_downloads).isChecked = true
                 }
@@ -643,7 +699,9 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
             .setNegativeButton(R.string.no) { _, _ -> /*NO-OP*/ }
             .setPositiveButton(R.string.yes) { _, _ ->
                 if (dontShowAgainCheck.isChecked) {
-                    settingsManager.edit().putInt(getString(R.string.confirm_exit_key), 1).commit()
+                    settingsManager.edit(commit = true) {
+                        putInt(getString(R.string.confirm_exit_key), 1)
+                    }
                 }
                 // finish() causes a bug on some TVs where player
                 // may keep playing after closing the app.
@@ -668,10 +726,11 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
         broadcastIntent.setClass(this, VideoDownloadRestartReceiver::class.java)
         this.sendBroadcast(broadcastIntent)
         afterPluginsLoadedEvent -= ::onAllPluginsLoaded
+        detachBackPressedCallback("MainActivityDefault")
         super.onDestroy()
     }
 
-    override fun onNewIntent(intent: Intent?) {
+    override fun onNewIntent(intent: Intent) {
         handleAppIntent(intent)
         super.onNewIntent(intent)
     }
@@ -680,6 +739,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
         if (intent == null) return
         val str = intent.dataString
         loadCache()
+
         handleAppIntentUrl(this, str, false, intent.extras)
     }
 
@@ -698,6 +758,36 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
         // Check if we are already at the selected destination
         if (navController.currentDestination?.id == destinationId) return false
 
+        // Make all nav buttons focus on this specific view when nextFocusRightId
+        val targetView = when (destinationId) {
+            // Please note that if R.id.navigation_home is readded, then it will only take affect when
+            // navigation to home for the second time as onNavDestinationSelected will not get called
+            // when first loading up the app
+
+            // R.id.navigation_home -> R.id.home_preview_change_api
+            R.id.navigation_search -> R.id.main_search
+            R.id.navigation_library -> R.id.main_search
+            R.id.navigation_downloads -> R.id.download_appbar
+            else -> null
+        }
+        if (targetView != null && isLayout(TV or EMULATOR)) {
+            val fromView = binding?.navRailView
+            if (fromView != null) {
+                fromView.nextFocusRightId = targetView
+
+                for (focusView in arrayOf(
+                    R.id.navigation_downloads,
+                    R.id.navigation_home,
+                    R.id.navigation_search,
+                    R.id.navigation_library,
+                    R.id.navigation_settings,
+                )) {
+                    fromView.findViewById<View?>(focusView)?.nextFocusRightId = targetView
+                }
+            }
+        }
+
+
         val builder = NavOptions.Builder().setLaunchSingleTop(true).setRestoreState(true)
             .setEnterAnim(R.anim.enter_anim)
             .setExitAnim(R.anim.exit_anim)
@@ -719,6 +809,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
         }
     }
 
+
     private val pluginsLock = Mutex()
     private fun onAllPluginsLoaded(success: Boolean = false) {
         ioSafe {
@@ -769,6 +860,8 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
 
     private fun hidePreviewPopupDialog() {
         bottomPreviewPopup.dismissSafe(this)
+        lastPopupJob?.cancel()
+        lastPopupJob = null
         bottomPreviewPopup = null
         bottomPreviewBinding = null
     }
@@ -1088,35 +1181,14 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
         }
     }
 
-    private fun centerView(view: View?) {
-        if (view == null) return
-        try {
-            Log.v(TAG, "centerView: $view")
-            val r = Rect(0, 0, 0, 0)
-            view.getDrawingRect(r)
-            val x = r.centerX()
-            val y = r.centerY()
-            val dx = r.width() / 2 //screenWidth / 2
-            val dy = screenHeight / 2
-            val r2 = Rect(x - dx, y - dy, x + dx, y + dy)
-            view.requestRectangleOnScreen(r2, false)
-            // TvFocus.current =TvFocus.current.copy(y=y.toFloat())
-        } catch (_: Throwable) {
-        }
-    }
-
-    @Suppress("DEPRECATION_ERROR")
     override fun onCreate(savedInstanceState: Bundle?) {
-        app.initClient(this)
+        app.initClient(this, ignoreSSL = false)
+        @OptIn(UnsafeSSL::class)
+        insecureApp.initClient(this, ignoreSSL = true)
+
         val settingsManager = PreferenceManager.getDefaultSharedPreferences(this)
 
-        val errorFile = filesDir.resolve("last_error")
-        if (errorFile.exists() && errorFile.isFile) {
-            lastError = errorFile.readText(Charset.defaultCharset())
-            errorFile.delete()
-        } else {
-            lastError = null
-        }
+        setLastError(this)
 
         val settingsForProvider = SettingsJson()
         settingsForProvider.enableAdult =
@@ -1125,6 +1197,8 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
         MainAPI.settingsForProvider = settingsForProvider
 
         loadThemes(this)
+        enableEdgeToEdgeCompat()
+        setNavigationBarColorCompat(R.attr.primaryGrayBackground)
         updateLocale()
         super.onCreate(savedInstanceState)
         try {
@@ -1145,6 +1219,8 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
             val lastAppAutoBackup: String = getKey("VERSION_NAME") ?: ""
             if (appVer != lastAppAutoBackup) {
                 setKey("VERSION_NAME", BuildConfig.VERSION_NAME)
+                if (lastAppAutoBackup.isEmpty()) return@safe
+
                 safe {
                     backup(this)
                 }
@@ -1176,7 +1252,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
                 if (isLayout(TV)) {
                     // Put here any button you don't want focusing it to center the view
                     val exceptionButtons = listOf(
-                        R.id.home_preview_play_btt,
+                        //R.id.home_preview_play_btt,
                         R.id.home_preview_info_btt,
                         R.id.home_preview_hidden_next_focus,
                         R.id.home_preview_hidden_prev_focus,
@@ -1208,6 +1284,22 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
             null
         }
 
+        binding?.apply {
+            fixSystemBarsPadding(
+                navView,
+                heightResId = R.dimen.nav_view_height,
+                padTop = false,
+                overlayCutout = false
+            )
+
+            fixSystemBarsPadding(
+                navRailView,
+                widthResId = R.dimen.nav_rail_view_width,
+                padRight = false,
+                padTop = false
+            )
+        }
+
         // overscan
         val padding = settingsManager.getInt(getString(R.string.overscan_key), 0).toPx
         binding?.homeRoot?.setPadding(padding, padding, padding, padding)
@@ -1298,6 +1390,9 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
                         false
                     )
                 }
+
+// Add your channel creation here
+
             }
         } else {
             val builder: AlertDialog.Builder = AlertDialog.Builder(this)
@@ -1535,18 +1630,6 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
 
         // init accounts
         ioSafe {
-            for (api in accountManagers) {
-                api.init()
-            }
-
-            inAppAuths.amap { api ->
-                try {
-                    api.initialize()
-                } catch (e: Exception) {
-                    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
@@ -1599,10 +1682,6 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
             if (navDestination.matchDestination(R.id.navigation_home)) {
                 attachBackPressedCallback("MainActivity") {
                     showConfirmExitDialog(settingsManager)
-                    @Suppress("DEPRECATION")
-                    window?.navigationBarColor =
-                        colorFromAttribute(R.attr.primaryGrayBackground)
-                    updateLocale()
                 }
             } else detachBackPressedCallback("MainActivity")
         }
@@ -1630,17 +1709,27 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
                     navController
                 )
             }
+
         }
 
         binding?.navRailView?.apply {
-            itemRippleColor = rippleColor
-            itemActiveIndicatorColor = rippleColor
+            if (isLayout(PHONE)) {
+                itemRippleColor = rippleColor
+                itemActiveIndicatorColor = rippleColor
+            } else {
+                val rippleColor = ColorStateList.valueOf(getResourceColor(R.attr.textColor, 1.0f))
+                val rippleColorTransparent =
+                    ColorStateList.valueOf(getResourceColor(R.attr.textColor, 0.2f))
+                itemSpacing = 12.toPx // expandedItemSpacing does not have an attr
+                itemRippleColor = rippleColorTransparent
+                itemActiveIndicatorColor = rippleColor
+            }
             setupWithNavController(navController)
-            if (isLayout(TV or EMULATOR)) {
+            /*if (isLayout(TV or EMULATOR)) {
                 background?.alpha = 200
             } else {
                 background?.alpha = 255
-            }
+            }*/
 
             setOnItemSelectedListener { item ->
                 onNavDestinationSelected(
@@ -1649,6 +1738,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
                 )
             }
 
+
             fun noFocus(view: View) {
                 view.tag = view.context.getString(R.string.tv_no_focus_tag)
                 (view as? ViewGroup)?.let {
@@ -1687,6 +1777,104 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
             }
         }
 
+        val rail = binding?.navRailView
+        if (rail != null) {
+            binding?.navRailView?.labelVisibilityMode =
+                NavigationRailView.LABEL_VISIBILITY_UNLABELED
+            //val focus = mutableSetOf<Int>()
+
+            var prevId: Int? = null
+            var prevView: View? = null
+
+            // The genius engineers at google did not actually 
+            // write a nextFocus for the navrail
+            rail.findViewById<View?>(R.id.navigation_settings)?.nextFocusDownId =
+                R.id.nav_footer_profile_card
+            for (id in arrayOf(
+                R.id.navigation_home,
+                R.id.navigation_search,
+                R.id.navigation_library,
+                R.id.navigation_downloads,
+                R.id.navigation_settings
+            )) {
+                val view = rail.findViewById<View?>(id) ?: continue
+                prevId?.let { view.nextFocusUpId = it }
+                prevView?.nextFocusDownId = id
+
+                prevView = view
+                prevId = id
+                // Uncomment for focus expand
+                /*if (!isLayout(TV)) {
+                    view.onFocusChangeListener = null
+                } else {
+                    view.onFocusChangeListener =
+                        View.OnFocusChangeListener { v, hasFocus ->
+                            if (hasFocus) {
+                                focus += id
+                                binding?.navRailView?.labelVisibilityMode =
+                                    NavigationRailView.LABEL_VISIBILITY_LABELED
+                                binding?.navRailView?.expand()
+                            } else {
+                                focus -= id
+                                v.post {
+                                    if (focus.isEmpty()) {
+                                        binding?.navRailView?.labelVisibilityMode =
+                                            NavigationRailView.LABEL_VISIBILITY_UNLABELED
+                                        binding?.navRailView?.collapse()
+                                    }
+                                }
+                            }
+                        }
+                }*/
+            }
+        }
+
+        // Navigation button long click functionality to scroll to top
+        for (view in listOf(binding?.navView, binding?.navRailView)) {
+            view?.findViewById<View?>(R.id.navigation_home)?.setOnLongClickListener {
+                val recycler = binding?.root?.findViewById<RecyclerView?>(R.id.home_master_recycler)
+                recycler?.smoothScrollToPosition(0)
+                return@setOnLongClickListener recycler != null
+            }
+
+            view?.findViewById<View?>(R.id.navigation_library)?.setOnLongClickListener {
+                val viewPager = binding?.root?.findViewById<ViewPager2?>(R.id.viewpager)
+                    ?: return@setOnLongClickListener false
+                try {
+                    val children = (viewPager[0] as? RecyclerView)?.children
+                        ?: return@setOnLongClickListener false
+                    for (child in children) {
+                        child.findViewById<RecyclerView?>(R.id.page_recyclerview)
+                            ?.smoothScrollToPosition(0)
+                    }
+                } catch (_: IndexOutOfBoundsException) {
+                } catch (t: Throwable) {
+                    logError(t)
+                }
+                return@setOnLongClickListener true
+            }
+
+            view?.findViewById<View?>(R.id.navigation_search)?.setOnLongClickListener {
+                for (recyclerId in arrayOf(
+                    R.id.search_master_recycler,
+                    R.id.search_autofit_results,
+                    R.id.search_history_recycler
+                )) {
+                    val recycler = binding?.root?.findViewById<RecyclerView?>(recyclerId)
+                        ?: return@setOnLongClickListener false
+                    recycler.smoothScrollToPosition(0)
+                }
+                return@setOnLongClickListener true
+            }
+
+            view?.findViewById<View?>(R.id.navigation_downloads)?.setOnLongClickListener {
+                val recycler: RecyclerView? = binding?.root?.findViewById(R.id.download_list)
+                    ?: binding?.root?.findViewById(R.id.download_child_list)
+                recycler?.smoothScrollToPosition(0)
+                return@setOnLongClickListener recycler != null
+            }
+        }
+
         loadCache()
         updateHasTrailers()
         /*nav_view.setOnNavigationItemSelectedListener { item ->
@@ -1753,7 +1941,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
          fun buildMediaQueueItem(video: String): MediaQueueItem {
            // val movieMetadata = MediaMetadata(MediaMetadata.MEDIA_TYPE_PHOTO)
             //movieMetadata.putString(MediaMetadata.KEY_TITLE, "CloudStream")
-            val mediaInfo = MediaInfo.Builder(Uri.parse(video).toString())
+            val mediaInfo = MediaInfo.Builder(video.toUri().toString())
                 .setStreamType(MediaInfo.STREAM_TYPE_NONE)
                 .setContentType(MimeTypes.IMAGE_JPEG)
                // .setMetadata(movieMetadata).build()
@@ -1815,6 +2003,17 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
             migrateResumeWatching()
         }
 
+        main {
+            val channelId =
+                TvChannelUtils.getChannelId(this@MainActivity, getString(R.string.app_name))
+            if (channelId == null) {
+                Log.d("TvChannel", "Channel not found, creating")
+                TvChannelUtils.createTvChannel(this@MainActivity)
+            } else {
+                Log.d("TvChannel", "Channel ID: $channelId")
+            }
+        }
+
         getKey<String>(USER_SELECTED_HOMEPAGE_API)?.let { homepage ->
             DataStoreHelper.currentHomePage = homepage
             removeKey(USER_SELECTED_HOMEPAGE_API)
@@ -1846,23 +2045,14 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
 //            }
 //        }
 
-        onBackPressedDispatcher.addCallback(
-            this,
-            object : OnBackPressedCallback(true) {
-                override fun handleOnBackPressed() {
-                    @Suppress("DEPRECATION")
-                    window?.navigationBarColor = colorFromAttribute(R.attr.primaryGrayBackground)
-                    updateLocale()
-
-                    // If we don't disable we end up in a loop with default behavior calling
-                    // this callback as well, so we disable it, run default behavior,
-                    // then re-enable this callback so it can be used for next back press.
-                    isEnabled = false
-                    onBackPressedDispatcher.onBackPressed()
-                    isEnabled = true
-                }
-            }
-        )
+        attachBackPressedCallback("MainActivityDefault") {
+            setNavigationBarColorCompat(R.attr.primaryGrayBackground)
+            updateLocale()
+            runDefault()
+        }
+
+        // Start the download queue
+        DownloadQueueManager.init(this)
     }
 
     /** Biometric stuff **/
@@ -1885,4 +2075,4 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
             false
         }
     }
-}
\ 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
index cc64a6d394d..ac912cbeb41 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/actions/OpenInAppAction.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/actions/OpenInAppAction.kt
@@ -6,8 +6,8 @@ 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.CloudStreamApp.Companion.getKey
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.setKey
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.ui.result.LinkLoadingResult
@@ -21,7 +21,8 @@ import java.io.File
 
 fun updateDurationAndPosition(position: Long, duration: Long) {
     if (position <= 0 || duration <= 0) return
-    DataStoreHelper.setViewPos(getKey("last_opened_id"), position, duration)
+    val episode = getKey<ResultEpisode>("last_opened") ?: return
+    DataStoreHelper.setViewPosAndResume(episode.id, position, duration, episode, null)
     ResultFragment.updateUI()
 }
 
@@ -98,7 +99,7 @@ abstract class OpenInAppAction(
             intent.component = ComponentName(packageName, intentClass)
         }
         putExtra(context, intent, video, result, index)
-        setKey("last_opened_id", video.id)
+        setKey("last_opened", video)
         launchResult(intent)
     }
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/actions/VideoClickAction.kt b/app/src/main/java/com/lagradost/cloudstream3/actions/VideoClickAction.kt
index 8407fa7a42a..4843b7617a2 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/actions/VideoClickAction.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/actions/VideoClickAction.kt
@@ -16,12 +16,14 @@ import com.lagradost.cloudstream3.actions.temp.BiglyBTPackage
 import com.lagradost.cloudstream3.actions.temp.CopyClipboardAction
 import com.lagradost.cloudstream3.actions.temp.JustPlayerPackage
 import com.lagradost.cloudstream3.actions.temp.LibreTorrentPackage
+import com.lagradost.cloudstream3.actions.temp.MpvExPackage
 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.NextPlayerPackage
 import com.lagradost.cloudstream3.actions.temp.PlayInBrowserAction
+import com.lagradost.cloudstream3.actions.temp.PlayMirrorAction
 import com.lagradost.cloudstream3.actions.temp.ViewM3U8Action
 import com.lagradost.cloudstream3.actions.temp.VlcNightlyPackage
 import com.lagradost.cloudstream3.actions.temp.VlcPackage
@@ -46,9 +48,11 @@ object VideoClickActionHolder {
         PlayInBrowserAction(),
         CopyClipboardAction(),
         ViewM3U8Action(),
+        PlayMirrorAction(),
         // main support external apps
         VlcPackage(),
         MpvPackage(),
+        MpvExPackage(),
         NextPlayerPackage(),
         JustPlayerPackage(),
         FcastAction(),
diff --git a/app/src/main/java/com/lagradost/cloudstream3/actions/temp/CloudStreamPackage.kt b/app/src/main/java/com/lagradost/cloudstream3/actions/temp/CloudStreamPackage.kt
index d7f69db2c88..d414b611783 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/actions/temp/CloudStreamPackage.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/actions/temp/CloudStreamPackage.kt
@@ -5,8 +5,8 @@ import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import com.fasterxml.jackson.annotation.JsonProperty
-import com.lagradost.cloudstream3.BuildConfig
 import com.lagradost.cloudstream3.actions.OpenInAppAction
+import com.lagradost.cloudstream3.BuildConfig
 import com.lagradost.cloudstream3.ui.player.ExtractorUri
 import com.lagradost.cloudstream3.ui.player.SubtitleData
 import com.lagradost.cloudstream3.ui.player.SubtitleOrigin
@@ -18,8 +18,10 @@ import com.lagradost.cloudstream3.utils.DrmExtractorLink
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.ExtractorLinkPlayList
 import com.lagradost.cloudstream3.utils.ExtractorLinkType
-import com.lagradost.cloudstream3.utils.Qualities
 import com.lagradost.cloudstream3.utils.newExtractorLink
+import com.lagradost.cloudstream3.utils.Qualities
+import com.lagradost.cloudstream3.utils.SubtitleHelper.fromCodeToLangTagIETF
+import com.lagradost.cloudstream3.utils.SubtitleHelper.fromLanguageToTagIETF
 import com.lagradost.cloudstream3.utils.txt
 
 /**
@@ -122,7 +124,9 @@ class CloudStreamPackage : OpenInAppAction(
             originalName = name ?: "Unknown",
             headers = headers,
             origin = SubtitleOrigin.URL,
-            languageCode = null,
+            languageCode = fromCodeToLangTagIETF(name) ?:
+                           fromLanguageToTagIETF(name, true) ?:
+                           name,
         )
     }
 
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
index 102f0ac8bb3..faae3921240 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/actions/temp/MpvKtPackage.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/actions/temp/MpvKtPackage.kt
@@ -3,7 +3,6 @@ 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
@@ -45,7 +44,7 @@ open class MpvKtPackage(
 
         intent.apply {
             putExtra("subs", result.subs.map { it.url.toUri() }.toTypedArray())
-            setDataAndType(Uri.parse(link.url), "video/*")
+            setDataAndType(link.url.toUri(), "video/*")
 
             // m3u8 plays, but changing sources feature is not available
             // makeTempM3U8Intent(activity, this, result)
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
index 68e619c92c8..cd49eb994e0 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/actions/temp/MpvPackage.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/actions/temp/MpvPackage.kt
@@ -3,7 +3,6 @@ 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
@@ -18,6 +17,9 @@ 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
 
+//https://github.com/marlboro-advance/mpvEx
+class MpvExPackage: MpvPackage("mpvEx","app.marlboroadvance.mpvex","app.marlboroadvance.mpvex.ui.player.PlayerActivity")
+
 class MpvYTDLPackage : MpvPackage("MPV YTDL", "is.xyz.mpv.ytdl") {
     override val sourceTypes = setOf(
         ExtractorLinkType.VIDEO,
@@ -26,10 +28,10 @@ class MpvYTDLPackage : MpvPackage("MPV YTDL", "is.xyz.mpv.ytdl") {
     )
 }
 
-open class MpvPackage(appName: String = "MPV", packageName: String = "is.xyz.mpv"): OpenInAppAction(
+open class MpvPackage(appName: String = "MPV", packageName: String = "is.xyz.mpv",intentClass:String = "is.xyz.mpv.MPVActivity"): OpenInAppAction(
     txt(appName),
     packageName,
-    "is.xyz.mpv.MPVActivity"
+    intentClass
 ) {
     override val oneSource = true // mpv has poor playlist support on TV
     override suspend fun putExtra(
@@ -44,7 +46,7 @@ open class MpvPackage(appName: String = "MPV", packageName: String = "is.xyz.mpv
             putExtra("title", video.name)
 
             if (index != null) {
-                setDataAndType(Uri.parse(result.links.getOrNull(index)?.url ?: return), "video/*")
+                setDataAndType((result.links.getOrNull(index)?.url ?: return).toUri(), "video/*")
             } else {
                 makeTempM3U8Intent(context, this, result)
             }
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
index 7c1b68c054e..bfd2926bf1c 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/actions/temp/PlayInBrowserAction.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/actions/temp/PlayInBrowserAction.kt
@@ -2,7 +2,7 @@ package com.lagradost.cloudstream3.actions.temp
 
 import android.content.Context
 import android.content.Intent
-import android.net.Uri
+import androidx.core.net.toUri
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.actions.VideoClickAction
 import com.lagradost.cloudstream3.ui.result.LinkLoadingResult
@@ -33,7 +33,7 @@ class PlayInBrowserAction: VideoClickAction() {
     ) {
         val link = result.links.getOrNull(index ?: 0) ?: return
         val i = Intent(Intent.ACTION_VIEW)
-        i.data = Uri.parse(link.url)
+        i.data = link.url.toUri()
         launch(i)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/actions/temp/PlayMirrorAction.kt b/app/src/main/java/com/lagradost/cloudstream3/actions/temp/PlayMirrorAction.kt
new file mode 100644
index 00000000000..56512377bae
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/actions/temp/PlayMirrorAction.kt
@@ -0,0 +1,65 @@
+package com.lagradost.cloudstream3.actions.temp
+
+import android.app.Activity
+import android.content.Context
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.actions.VideoClickAction
+import com.lagradost.cloudstream3.ui.player.ExtractorUri
+import com.lagradost.cloudstream3.ui.player.GeneratorPlayer
+import com.lagradost.cloudstream3.ui.player.LOADTYPE_INAPP
+import com.lagradost.cloudstream3.ui.player.SubtitleData
+import com.lagradost.cloudstream3.ui.player.VideoGenerator
+import com.lagradost.cloudstream3.ui.result.LinkLoadingResult
+import com.lagradost.cloudstream3.ui.result.ResultEpisode
+import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.ExtractorLinkType
+import com.lagradost.cloudstream3.utils.UIHelper.navigate
+import com.lagradost.cloudstream3.utils.txt
+
+class PlayMirrorAction : VideoClickAction() {
+    override val name = txt(R.string.episode_action_play_mirror)
+
+    override val oneSource = true
+
+    override val isPlayer = true
+
+    override val sourceTypes: Set<ExtractorLinkType> = LOADTYPE_INAPP
+
+    override fun shouldShow(context: Context?, video: ResultEpisode?) = true
+
+    override suspend fun runAction(
+        context: Context?,
+        video: ResultEpisode,
+        result: LinkLoadingResult,
+        index: Int?
+    ) {
+        //Implemented a generator to handle the single
+        val activity = context as? Activity ?: return
+        val link = index?.let { result.links[it] }
+        val generatorMirror = object : VideoGenerator<ResultEpisode>(listOf(video)) {
+            override val hasCache: Boolean = false
+            override val canSkipLoading: Boolean = false
+            override fun getId(index: Int): Int = video.id
+
+            override suspend fun generateLinks(
+                clearCache: Boolean,
+                sourceTypes: Set<ExtractorLinkType>,
+                callback: (Pair<ExtractorLink?, ExtractorUri?>) -> Unit,
+                subtitleCallback: (SubtitleData) -> Unit,
+                offset: Int,
+                isCasting: Boolean
+            ): Boolean {
+                index?.let { callback(link to null) }
+                result.subs.forEach { subtitle -> subtitleCallback(subtitle) }
+                return true
+            }
+        }
+
+        activity.navigate(
+            R.id.global_to_navigation_player,
+            GeneratorPlayer.newInstance(
+                generatorMirror, 0, result.syncData
+            )
+        )
+    }
+}
\ 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
index e1fc22d3c56..46b46a2c2fe 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/actions/temp/VlcPackage.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/actions/temp/VlcPackage.kt
@@ -6,7 +6,7 @@ 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.CloudStreamApp.Companion.getKey
 import com.lagradost.cloudstream3.actions.OpenInAppAction
 import com.lagradost.cloudstream3.actions.makeTempM3U8Intent
 import com.lagradost.cloudstream3.actions.updateDurationAndPosition
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
index 9f7eee7b820..963221bb343 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/actions/temp/WebVideoCastPackage.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/actions/temp/WebVideoCastPackage.kt
@@ -3,7 +3,6 @@ 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
@@ -38,7 +37,7 @@ class WebVideoCastPackage: OpenInAppAction(
         val link = result.links[index ?: 0]
 
         intent.apply {
-            setDataAndType(Uri.parse(link.url), "video/*")
+            setDataAndType(link.url.toUri(), "video/*")
 
             val title = video.name ?: video.headerName
 
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
index e3916df01c6..1036a70557c 100644
--- 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
@@ -1,7 +1,7 @@
 package com.lagradost.cloudstream3.actions.temp.fcast
 
 import android.content.Context
-import com.lagradost.cloudstream3.AcraApplication.Companion.getActivity
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.getActivity
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.USER_AGENT
 import com.lagradost.cloudstream3.actions.VideoClickAction
diff --git a/app/src/main/java/com/lagradost/cloudstream3/actions/temp/fcast/FcastManager.kt b/app/src/main/java/com/lagradost/cloudstream3/actions/temp/fcast/FcastManager.kt
index 282ef834eb2..e2cf4f002f6 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/actions/temp/fcast/FcastManager.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/actions/temp/fcast/FcastManager.kt
@@ -7,6 +7,7 @@ import android.net.nsd.NsdServiceInfo
 import android.os.Build
 import android.os.ext.SdkExtensions
 import android.util.Log
+import com.lagradost.cloudstream3.mvvm.safe
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 
 class FcastManager {
@@ -72,52 +73,66 @@ class FcastManager {
         }
 
         override fun onServiceFound(serviceInfo: NsdServiceInfo?) {
-            if (serviceInfo == null) return
+            // Safe here as, java.lang.NoClassDefFoundError: Failed resolution of: Landroid/net/nsd/NsdManager$ServiceInfoCallback
+            safe {
+                if (serviceInfo == null) return@safe
+
+                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")
+                            }
 
-            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 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 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 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
+                        override fun onServiceResolved(serviceInfo: NsdServiceInfo?) {
+                            if (serviceInfo == null) return
 
-                        synchronized(_currentDevices) {
-                            _currentDevices.add(PublicDeviceInfo(serviceInfo))
-                        }
+                            synchronized(_currentDevices) {
+                                _currentDevices.add(PublicDeviceInfo(serviceInfo))
+                            }
 
-                        Log.d(
-                            tag,
-                            "Service found: ${serviceInfo.serviceName}, Net: ${serviceInfo.host.hostAddress}"
-                        )
-                    }
-                })
+                            Log.d(
+                                tag,
+                                "Service found: ${serviceInfo.serviceName}, Net: ${serviceInfo.host.hostAddress}"
+                            )
+                        }
+                    })
+                }
             }
         }
 
@@ -168,8 +183,9 @@ class PublicDeviceInfo(serviceInfo: NsdServiceInfo) {
     val host: String? = if (
         Build.VERSION.SDK_INT >= Build.VERSION_CODES.R &&
         SdkExtensions.getExtensionVersion(
-            Build.VERSION_CODES.TIRAMISU) >= 7
-        ) {
+            Build.VERSION_CODES.TIRAMISU
+        ) >= 7
+    ) {
         serviceInfo.hostAddresses.firstOrNull()?.hostAddress
     } else {
         @Suppress("DEPRECATION")
diff --git a/app/src/main/java/com/lagradost/cloudstream3/mvvm/Lifecycle.kt b/app/src/main/java/com/lagradost/cloudstream3/mvvm/Lifecycle.kt
index 3df5197cd00..482ec05fc1b 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/mvvm/Lifecycle.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/mvvm/Lifecycle.kt
@@ -1,16 +1,68 @@
 package com.lagradost.cloudstream3.mvvm
 
+import android.view.View
+import androidx.activity.ComponentActivity
+import androidx.core.view.doOnAttach
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.LiveData
+import androidx.lifecycle.findViewTreeLifecycleOwner
+import androidx.viewbinding.ViewBinding
+import com.lagradost.cloudstream3.ui.BaseFragment
 
 /** NOTE: Only one observer at a time per value */
-fun <T> LifecycleOwner.observe(liveData: LiveData<T>, action: (t: T) -> Unit) {
-    liveData.removeObservers(this)
-    liveData.observe(this) { it?.let { t -> action(t) } }
+fun <T> ComponentActivity.observe(liveData: LiveData<T>, action: (T) -> Unit) {
+    observeNullable(liveData) { t -> t?.run(action) }
 }
 
 /** NOTE: Only one observer at a time per value */
-fun <T> LifecycleOwner.observeNullable(liveData: LiveData<T>, action: (t: T) -> Unit) {
+fun <T> ComponentActivity.observeNullable(liveData: LiveData<T>, action: (T?) -> Unit) {
     liveData.removeObservers(this)
-    liveData.observe(this) { action(it) }
+    liveData.observe(this, action)
+}
+
+/** NOTE: Only one observer at a time per value */
+fun <T, V : ViewBinding> BaseFragment<V>.observe(liveData: LiveData<T>, action: (T) -> Unit) {
+    observeNullable(liveData) { t -> t?.run(action) }
+}
+
+/**
+ * Attaches an observable to the root binding, instead of the fragment. This is more efficient as
+ * it will not call observe if the view is in the background.
+ *
+ * NOTE: Only one observer at a time per value
+ * */
+fun <T, V : ViewBinding> BaseFragment<V>.observeNullable(
+    liveData: LiveData<T>, action: (T?) -> Unit
+) {
+    val root = this.binding?.root
+    if (root == null) {
+        liveData.removeObservers(this)
+        liveData.observe(this, action)
+    } else {
+        root.doOnAttach { view ->
+            // On attach should make findViewTreeLifecycleOwner non-null, but use "this" just in case
+            val owner: LifecycleOwner = view.findViewTreeLifecycleOwner() ?: this@observeNullable
+            liveData.removeObservers(owner)
+            liveData.observe(owner, action)
+        }
+    }
 }
+
+/** NOTE: Only one observer at a time per value */
+fun <T> View.observe(liveData: LiveData<T>, action: (T) -> Unit) {
+    observeNullable(liveData) { t -> t?.run(action) }
+}
+
+/** NOTE: Only one observer at a time per value */
+fun <T> View.observeNullable(liveData: LiveData<T>, action: (T?) -> Unit) {
+    doOnAttach { view ->
+        // On attach should make findViewTreeLifecycleOwner non-null
+        val owner: LifecycleOwner? = view.findViewTreeLifecycleOwner()
+        if(owner == null) {
+            debugException { "Expected non-null findViewTreeLifecycleOwner" }
+            return@doOnAttach
+        }
+        liveData.removeObservers(owner)
+        liveData.observe(owner, action)
+    }
+}
\ No newline at end of file
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 ec486d61db6..6234297d080 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/network/RequestsHelper.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/network/RequestsHelper.kt
@@ -2,6 +2,7 @@ package com.lagradost.cloudstream3.network
 
 import android.content.Context
 import androidx.preference.PreferenceManager
+import com.lagradost.cloudstream3.Prerelease
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.USER_AGENT
 import com.lagradost.cloudstream3.mvvm.safe
@@ -15,11 +16,26 @@ import org.conscrypt.Conscrypt
 import java.io.File
 import java.security.Security
 
+// Backwards compatible constructor, mark as deprecated later
 fun Requests.initClient(context: Context) {
     this.baseClient = buildDefaultClient(context)
 }
 
+/** Only use ignoreSSL if you know what you are doing*/
+@Prerelease
+fun Requests.initClient(context: Context, ignoreSSL: Boolean = false) {
+    this.baseClient = buildDefaultClient(context, ignoreSSL)
+}
+
+
+// Backwards compatible constructor, mark as deprecated later
 fun buildDefaultClient(context: Context): OkHttpClient {
+    return buildDefaultClient(context, false)
+}
+
+/** Only use ignoreSSL if you know what you are doing*/
+@Prerelease
+fun buildDefaultClient(context: Context, ignoreSSL: Boolean = false): OkHttpClient {
     safe { Security.insertProviderAt(Conscrypt.newProvider(), 1) }
     
     val settingsManager = PreferenceManager.getDefaultSharedPreferences(context)
@@ -27,7 +43,11 @@ fun buildDefaultClient(context: Context): OkHttpClient {
     val baseClient = OkHttpClient.Builder()
         .followRedirects(true)
         .followSslRedirects(true)
-        .ignoreAllSSLErrors()
+        .apply {
+            if (ignoreSSL) {
+                ignoreAllSSLErrors()
+            }
+        }
         .cache(
             // Note that you need to add a ResponseInterceptor to make this 100% active.
             // The server response dictates if and when stuff should be cached.
@@ -52,11 +72,6 @@ fun buildDefaultClient(context: Context): OkHttpClient {
     return baseClient
 }
 
-//val Request.cookies: Map<String, String>
-//    get() {
-//        return this.headers.getCookies("Cookie")
-//    }
-
 private val DEFAULT_HEADERS = mapOf("user-agent" to USER_AGENT)
 
 /**
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 1cffa7c1bfb..eae14a6c0c3 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt
@@ -13,6 +13,7 @@ import android.os.Build
 import android.os.Environment
 import android.util.Log
 import android.widget.Toast
+import androidx.annotation.WorkerThread
 import androidx.core.app.ActivityCompat
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
@@ -20,15 +21,17 @@ import androidx.fragment.app.FragmentActivity
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.APIHolder
 import com.lagradost.cloudstream3.APIHolder.removePluginMapping
-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.CloudStreamApp.Companion.getKey
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.removeKey
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.setKey
 import com.lagradost.cloudstream3.CommonActivity.showToast
+import com.lagradost.cloudstream3.InternalAPI
 import com.lagradost.cloudstream3.MainAPI
 import com.lagradost.cloudstream3.MainAPI.Companion.settingsForProvider
 import com.lagradost.cloudstream3.MainActivity.Companion.afterPluginsLoadedEvent
+import com.lagradost.cloudstream3.MainActivity.Companion.lastError
 import com.lagradost.cloudstream3.PROVIDER_STATUS_DOWN
 import com.lagradost.cloudstream3.PROVIDER_STATUS_OK
 import com.lagradost.cloudstream3.R
@@ -43,6 +46,7 @@ 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.plugins.RepositoryManager.sha256
 import com.lagradost.cloudstream3.ui.settings.extensions.REPOSITORIES_KEY
 import com.lagradost.cloudstream3.ui.settings.extensions.RepositoryData
 import com.lagradost.cloudstream3.utils.AppContextUtils.getApiProviderLangSettings
@@ -51,7 +55,7 @@ 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.downloader.DownloadFileManagement.sanitizeFilename
 import com.lagradost.cloudstream3.utils.extractorApis
 import com.lagradost.cloudstream3.utils.txt
 import dalvik.system.PathClassLoader
@@ -76,6 +80,7 @@ data class PluginData(
     @JsonProperty("filePath") val filePath: String,
     @JsonProperty("version") val version: Int,
 ) {
+    @WorkerThread
     fun toSitePlugin(): SitePlugin {
         return SitePlugin(
             this.filePath,
@@ -90,7 +95,9 @@ data class PluginData(
             null,
             null,
             null,
-            File(this.filePath).length()
+            File(this.filePath).length(),
+            // No file hash for local plugins. Local plugins have no use for the hash, and it's expensive to compute.
+            null
         )
     }
 }
@@ -258,12 +265,8 @@ object PluginManager {
      * DO NOT USE THIS IN A PLUGIN! It may case an infinite recursive loop lagging or crashing everyone's devices.
      * If you use it from a plugin, do not expect a stable jvmName, SO DO NOT USE IT!
      */
-    @Suppress("FunctionName", "DEPRECATION_ERROR")
-    @Deprecated(
-        "Calling this function from a plugin will lead to crashes, use loadPlugin and unloadPlugin",
-        replaceWith = ReplaceWith("loadPlugin"),
-        level = DeprecationLevel.ERROR
-    )
+    @Suppress("FunctionName")
+    @InternalAPI
     @Throws
     suspend fun ___DO_NOT_CALL_FROM_A_PLUGIN_updateAllOnlinePluginsAndLoadThem(activity: Activity) {
         assertNonRecursiveCallstack()
@@ -304,6 +307,7 @@ object PluginManager {
                 downloadPlugin(
                     activity,
                     pluginData.onlineData.second.url,
+                    pluginData.onlineData.second.fileHash,
                     pluginData.savedData.internalName,
                     File(pluginData.savedData.filePath),
                     true
@@ -339,12 +343,8 @@ object PluginManager {
      * DO NOT USE THIS IN A PLUGIN! It may case an infinite recursive loop lagging or crashing everyone's devices.
      * If you use it from a plugin, do not expect a stable jvmName, SO DO NOT USE IT!
      */
-    @Suppress("FunctionName", "DEPRECATION_ERROR")
-    @Deprecated(
-        "Calling this function from a plugin will lead to crashes, use loadPlugin and unloadPlugin",
-        replaceWith = ReplaceWith("loadPlugin"),
-        level = DeprecationLevel.ERROR
-    )
+    @Suppress("FunctionName")
+    @InternalAPI
     @Throws
     suspend fun ___DO_NOT_CALL_FROM_A_PLUGIN_downloadNotExistingPluginsAndLoad(
         activity: Activity,
@@ -419,6 +419,7 @@ object PluginManager {
             downloadPlugin(
                 activity,
                 pluginData.onlineData.second.url,
+                pluginData.onlineData.second.fileHash,
                 pluginData.savedData.internalName,
                 pluginData.onlineData.first,
                 !pluginData.isDisabled
@@ -453,12 +454,8 @@ object PluginManager {
      * DO NOT USE THIS IN A PLUGIN! It may case an infinite recursive loop lagging or crashing everyone's devices.
      * If you use it from a plugin, do not expect a stable jvmName, SO DO NOT USE IT!
      */
-    @Suppress("FunctionName", "DEPRECATION_ERROR")
-    @Deprecated(
-        "Calling this function from a plugin will lead to crashes, use loadPlugin and unloadPlugin",
-        replaceWith = ReplaceWith("loadPlugin"),
-        level = DeprecationLevel.ERROR
-    )
+    @Suppress("FunctionName")
+    @InternalAPI
     @Throws
     suspend fun ___DO_NOT_CALL_FROM_A_PLUGIN_loadAllOnlinePlugins(context: Context) {
         assertNonRecursiveCallstack()
@@ -479,13 +476,9 @@ object PluginManager {
      * DO NOT USE THIS IN A PLUGIN! It may case an infinite recursive loop lagging or crashing everyone's devices.
      * If you use it from a plugin, do not expect a stable jvmName, SO DO NOT USE IT!
      */
-    @Suppress("FunctionName", "DEPRECATION_ERROR")
+    @Suppress("FunctionName")
+    @InternalAPI
     @Throws
-    @Deprecated(
-        "Calling this function from a plugin will lead to crashes, use loadPlugin and unloadPlugin",
-        replaceWith = ReplaceWith("loadPlugin"),
-        level = DeprecationLevel.ERROR
-    )
     suspend fun ___DO_NOT_CALL_FROM_A_PLUGIN_hotReloadAllLocalPlugins(activity: FragmentActivity?) {
         assertNonRecursiveCallstack()
 
@@ -504,12 +497,8 @@ object PluginManager {
      * DO NOT USE THIS IN A PLUGIN! It may case an infinite recursive loop lagging or crashing everyone's devices.
      * If you use it from a plugin, do not expect a stable jvmName, SO DO NOT USE IT!
      */
-    @Suppress("FunctionName", "DEPRECATION_ERROR")
-    @Deprecated(
-        "Calling this function from a plugin will lead to crashes, use loadPlugin and unloadPlugin",
-        replaceWith = ReplaceWith("loadPlugin"),
-        level = DeprecationLevel.ERROR
-    )
+    @Suppress("FunctionName")
+    @InternalAPI
     @Throws
     suspend fun ___DO_NOT_CALL_FROM_A_PLUGIN_loadAllLocalPlugins(context: Context, forceReload: Boolean) {
         assertNonRecursiveCallstack()
@@ -572,6 +561,11 @@ object PluginManager {
         afterPluginsLoadedEvent.invoke(forceReload)
     }
 
+    /** @return true if safe mode is enabled in any possible way. */
+    fun isSafeMode(): Boolean {
+        return checkSafeModeFile() || lastError != null
+    }
+
     /**
      * This can be used to override any extension loading to fix crashes!
      * @return true if safe mode file is present
@@ -704,16 +698,25 @@ object PluginManager {
             APIHolder.allProviders.removeIf { provider: MainAPI -> provider.sourcePlugin == plugin.filename }
         }
 
-        extractorApis.removeIf { provider: ExtractorApi -> provider.sourcePlugin == plugin.filename }
+        synchronized(extractorApis) {
+            extractorApis.removeIf { provider: ExtractorApi -> provider.sourcePlugin == plugin.filename }
+        }
 
         synchronized(VideoClickActionHolder.allVideoClickActions) {
             VideoClickActionHolder.allVideoClickActions.removeIf { action: VideoClickAction -> action.sourcePlugin == plugin.filename }
         }
 
-        classLoaders.values.removeIf { v -> v == plugin }
+        synchronized(classLoaders) {
+            classLoaders.values.removeIf { v -> v == plugin }
+        }
 
-        plugins.remove(absolutePath)
-        urlPlugins.values.removeIf { v -> v == plugin }
+        synchronized(plugins) {
+            plugins.remove(absolutePath)
+        }
+
+        synchronized(urlPlugins) {
+            urlPlugins.values.removeIf { v -> v == plugin }
+        }
     }
 
     /**
@@ -743,25 +746,27 @@ object PluginManager {
     suspend fun downloadPlugin(
         activity: Activity,
         pluginUrl: String,
+        pluginHash: String?,
         internalName: String,
         repositoryUrl: String,
         loadPlugin: Boolean
     ): Boolean {
         val file = getPluginPath(activity, internalName, repositoryUrl)
-        return downloadPlugin(activity, pluginUrl, internalName, file, loadPlugin)
+        return downloadPlugin(activity, pluginUrl, pluginHash, internalName, file, loadPlugin)
     }
 
     suspend fun downloadPlugin(
         activity: Activity,
         pluginUrl: String,
+        pluginHash: String?,
         internalName: String,
         file: File,
-        loadPlugin: Boolean
+        loadPlugin: Boolean,
     ): Boolean {
         try {
             Log.d(TAG, "Downloading plugin: $pluginUrl to ${file.absolutePath}")
             // The plugin file needs to be salted with the repository url hash as to allow multiple repositories with the same internal plugin names
-            val newFile = downloadPluginToFile(pluginUrl, file) ?: return false
+            val newFile = downloadPluginToFile(activity, pluginUrl, file, pluginHash) ?: return false
 
             val data = PluginData(
                 internalName,
@@ -808,13 +813,9 @@ object PluginManager {
      * DO NOT USE THIS IN A PLUGIN! It may case an infinite recursive loop lagging or crashing everyone's devices.
      * If you use it from a plugin, do not expect a stable jvmName, SO DO NOT USE IT!
      */
-    @Suppress("FunctionName", "DEPRECATION_ERROR")
+    @Suppress("FunctionName")
+    @InternalAPI
     @Throws
-    @Deprecated(
-        "Calling this function from a plugin will lead to crashes, use loadPlugin and unloadPlugin",
-        replaceWith = ReplaceWith("loadPlugin"),
-        level = DeprecationLevel.ERROR
-    )
     suspend fun ___DO_NOT_CALL_FROM_A_PLUGIN_manuallyReloadAndUpdatePlugins(activity: Activity) {
         assertNonRecursiveCallstack()
 
@@ -853,6 +854,7 @@ object PluginManager {
                 if (downloadPlugin(
                         activity,
                         pluginData.onlineData.second.url,
+                        pluginData.onlineData.second.fileHash,
                         pluginData.savedData.internalName,
                         existingFile,
                         true
@@ -951,4 +953,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 d92e81acdee..07d6aaa37bc 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/plugins/RepositoryManager.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/plugins/RepositoryManager.kt
@@ -1,10 +1,11 @@
 package com.lagradost.cloudstream3.plugins
 
 import android.content.Context
+import androidx.annotation.WorkerThread
 import com.fasterxml.jackson.annotation.JsonProperty
-import com.lagradost.cloudstream3.AcraApplication.Companion.context
-import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
-import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.context
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.getKey
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.setKey
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.amap
 import com.lagradost.cloudstream3.app
@@ -18,16 +19,19 @@ import com.lagradost.cloudstream3.ui.settings.extensions.RepositoryData
 import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
-import java.io.BufferedInputStream
 import java.io.File
-import java.io.InputStream
-import java.io.OutputStream
+import java.nio.file.AtomicMoveNotSupportedException
+import java.nio.file.Files
+import java.nio.file.StandardCopyOption
+import java.security.MessageDigest
+import java.util.concurrent.atomic.AtomicInteger
 
 /**
  * Comes with the app, always available in the app, non removable.
  * */
 
 data class Repository(
+    @JsonProperty("iconUrl") val iconUrl: String?,
     @JsonProperty("name") val name: String,
     @JsonProperty("description") val description: String?,
     @JsonProperty("manifestVersion") val manifestVersion: Int,
@@ -61,10 +65,12 @@ data class SitePlugin(
     @JsonProperty("repositoryUrl") val repositoryUrl: String?,
     // These types are yet to be mapped and used, ignore for now
     @JsonProperty("tvTypes") val tvTypes: List<String>?,
+    // Most often a language tag like "en" or "zh-TW"
     @JsonProperty("language") val language: String?,
     @JsonProperty("iconUrl") val iconUrl: String?,
     // Automatically generated by the gradle plugin
     @JsonProperty("fileSize") val fileSize: Long?,
+    @JsonProperty("fileHash") val fileHash: String?,
 )
 
 
@@ -73,7 +79,26 @@ object RepositoryManager {
     val PREBUILT_REPOSITORIES: Array<RepositoryData> by lazy {
         getKey("PREBUILT_REPOSITORIES") ?: emptyArray()
     }
-    private 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_.-]+)/(.*)$")
+
+
+    /** Returns a SHA-256 string of the file content.
+     * Example: "sha256-b70462c264cb7f90fc2860a8e58d7544ce747ff347d1d11fa093623901853573" **/
+    @WorkerThread
+    fun sha256(file: File): String {
+        val digest = MessageDigest.getInstance("SHA-256")
+
+        file.inputStream().use { fis ->
+            val buffer = ByteArray(8192)
+            var read = fis.read(buffer)
+            while (read != -1) {
+                digest.update(buffer, 0, read)
+                read = fis.read(buffer)
+            }
+        }
+        return "sha256-" + digest.digest().joinToString("") { "%02x".format(it) }
+    }
 
     /* Convert raw.githubusercontent.com urls to cdn.jsdelivr.net if enabled in settings */
     fun convertRawGitUrl(url: String): String {
@@ -138,21 +163,52 @@ object RepositoryManager {
         }.flatten()
     }
 
+
     suspend fun downloadPluginToFile(
+        context: Context,
         pluginUrl: String,
-        file: File
+        file: File,
+        expectedFileHash: String?
     ): File? {
         return safeAsync {
-            file.mkdirs()
+            val parentDir = file.parentFile ?: return@safeAsync null
+            parentDir.mkdirs()
 
-            // Overwrite if exists
-            if (file.exists()) {
-                file.delete()
-            }
-            file.createNewFile()
+            // Prevent corrupting the plugin file if the operation fails
+            val tempFile = File.createTempFile(file.name, ".tmp", context.cacheDir)
 
             val body = app.get(convertRawGitUrl(pluginUrl)).okhttpResponse.body
-            write(body.byteStream(), file.outputStream())
+
+            body.byteStream().use { body ->
+                tempFile.outputStream().use { fileSteam ->
+                    body.copyTo(fileSteam)
+                }
+            }
+
+            if (expectedFileHash != null) {
+                val downloadHash = sha256(tempFile)
+                if (expectedFileHash != downloadHash) {
+                    tempFile.delete()
+                    throw IllegalStateException("Extension hash mismatch when validating '${file.name}'! Expected: '$expectedFileHash', got: '$downloadHash'.")
+                }
+            }
+
+            // We prefer the operation to be atomic
+            try {
+                Files.move(
+                    tempFile.toPath(),
+                    file.toPath(),
+                    StandardCopyOption.REPLACE_EXISTING,
+                    StandardCopyOption.ATOMIC_MOVE
+                )
+            } catch (_: AtomicMoveNotSupportedException) {
+                Files.move(
+                    tempFile.toPath(),
+                    file.toPath(),
+                    StandardCopyOption.REPLACE_EXISTING
+                )
+            }
+
             file
         }
     }
@@ -200,13 +256,4 @@ object RepositoryManager {
 
         PluginManager.deleteRepositoryData(file.absolutePath)
     }
-
-    private fun write(stream: InputStream, output: OutputStream) {
-        val input = BufferedInputStream(stream)
-        val dataBuffer = ByteArray(512)
-        var readBytes: Int
-        while (input.read(dataBuffer).also { readBytes = it } != -1) {
-            output.write(dataBuffer, 0, readBytes)
-        }
-    }
 }
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 d1b702f4ce3..85a806f0b12 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/plugins/VotingApi.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/plugins/VotingApi.kt
@@ -2,9 +2,9 @@ package com.lagradost.cloudstream3.plugins
 
 import android.util.Log
 import android.widget.Toast
-import com.lagradost.cloudstream3.AcraApplication.Companion.context
-import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
-import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.context
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.getKey
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.setKey
 import com.lagradost.cloudstream3.R
 import java.security.MessageDigest
 import com.lagradost.cloudstream3.app
@@ -12,87 +12,76 @@ import com.lagradost.cloudstream3.utils.Coroutines.main
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 
-object VotingApi { // please do not cheat the votes lol
-    private const val LOGKEY = "VotingApi"
+object VotingApi {
 
-    private const val API_DOMAIN = "https://counterapi.com/api"
+    private const val LOGKEY = "VotingApi"
+    private const val API_DOMAIN = "https://api.countify.xyz"
 
-    private fun transformUrl(url: String): String = // dont touch or all votes get reset
+    private fun transformUrl(url: String): String =
         MessageDigest
             .getInstance("SHA-256")
             .digest("${url}#funny-salt".toByteArray())
             .fold("") { str, it -> str + "%02x".format(it) }
 
-    suspend fun SitePlugin.getVotes(): Int {
-        return getVotes(url)
-    }
-
-    fun SitePlugin.hasVoted(): Boolean {
-        return hasVoted(url)
-    }
-
-    suspend fun SitePlugin.vote(): Int {
-        return vote(url)
-    }
+    suspend fun SitePlugin.getVotes(): Int = getVotes(url)
+    fun SitePlugin.hasVoted(): Boolean = hasVoted(url)
+    suspend fun SitePlugin.vote(): Int = vote(url)
+    fun SitePlugin.canVote(): Boolean = canVote(this.url)
 
-    fun SitePlugin.canVote(): Boolean {
-        return canVote(this.url)
-    }
-
-    // Plugin url to Int
     private val votesCache = mutableMapOf<String, Int>()
 
-    private fun getRepository(pluginUrl: String) = pluginUrl
-        .split("/")
-        .drop(2)
-        .take(3)
-        .joinToString("-")
-
     private suspend fun readVote(pluginUrl: String): Int {
-        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
+        val id = transformUrl(pluginUrl)
+        val url = "$API_DOMAIN/get-total/$id"
+        Log.d(LOGKEY, "Requesting GET: $url")
+        return app.get(url).parsedSafe<CountifyResult>()?.count ?: 0
     }
 
     private suspend fun writeVote(pluginUrl: String): Boolean {
-        val url = "${API_DOMAIN}/cs-${getRepository(pluginUrl)}/vote/${transformUrl(pluginUrl)}"
-        Log.d(LOGKEY, "Requesting: $url")
-        return app.get(url).parsedSafe<Result>()?.value != null
+        val id = transformUrl(pluginUrl)
+        val url = "$API_DOMAIN/increment/$id"
+        Log.d(LOGKEY, "Requesting POST: $url")
+        return app.post(url, emptyMap<String, String>())
+            .parsedSafe<CountifyResult>()?.count != null
     }
 
     suspend fun getVotes(pluginUrl: String): Int =
-            votesCache[pluginUrl] ?: readVote(pluginUrl).also {
-                votesCache[pluginUrl] = it
-            }
+        votesCache[pluginUrl] ?: readVote(pluginUrl).also {
+            votesCache[pluginUrl] = it
+        }
 
     fun hasVoted(pluginUrl: String) =
         getKey("cs3-votes/${transformUrl(pluginUrl)}") ?: false
 
-    fun canVote(pluginUrl: String): Boolean {
-        return PluginManager.urlPlugins.contains(pluginUrl)
-    }
+    fun canVote(pluginUrl: String): Boolean =
+        PluginManager.urlPlugins.contains(pluginUrl)
 
     private val voteLock = Mutex()
+
     suspend fun vote(pluginUrl: String): Int {
-        // Prevent multiple requests at the same time.
         voteLock.withLock {
             if (!canVote(pluginUrl)) {
                 main {
-                    Toast.makeText(context, R.string.extension_install_first, Toast.LENGTH_SHORT)
-                        .show()
+                    Toast.makeText(
+                        context,
+                        R.string.extension_install_first,
+                        Toast.LENGTH_SHORT
+                    ).show()
                 }
                 return getVotes(pluginUrl)
             }
 
             if (hasVoted(pluginUrl)) {
                 main {
-                    Toast.makeText(context, R.string.already_voted, Toast.LENGTH_SHORT)
-                        .show()
+                    Toast.makeText(
+                        context,
+                        R.string.already_voted,
+                        Toast.LENGTH_SHORT
+                    ).show()
                 }
                 return getVotes(pluginUrl)
             }
 
-
             if (writeVote(pluginUrl)) {
                 setKey("cs3-votes/${transformUrl(pluginUrl)}", true)
                 votesCache[pluginUrl] = votesCache[pluginUrl]?.plus(1) ?: 1
@@ -102,7 +91,8 @@ object VotingApi { // please do not cheat the votes lol
         }
     }
 
-    private data class Result(
-        val value: Int?
+    private data class CountifyResult(
+        val id: String? = null,
+        val count: Int? = null
     )
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/services/DownloadQueueService.kt b/app/src/main/java/com/lagradost/cloudstream3/services/DownloadQueueService.kt
new file mode 100644
index 00000000000..e07747a860c
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/services/DownloadQueueService.kt
@@ -0,0 +1,279 @@
+package com.lagradost.cloudstream3.services
+
+import android.Manifest
+import android.app.Service
+import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC
+import android.os.Build.VERSION.SDK_INT
+import android.os.IBinder
+import android.util.Log
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationManagerCompat
+import androidx.core.app.PendingIntentCompat
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.removeKey
+import com.lagradost.cloudstream3.MainActivity
+import com.lagradost.cloudstream3.MainActivity.Companion.lastError
+import com.lagradost.cloudstream3.MainActivity.Companion.setLastError
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.mvvm.debugAssert
+import com.lagradost.cloudstream3.mvvm.debugWarning
+import com.lagradost.cloudstream3.mvvm.logError
+import com.lagradost.cloudstream3.mvvm.safe
+import com.lagradost.cloudstream3.plugins.PluginManager
+import com.lagradost.cloudstream3.utils.AppContextUtils.createNotificationChannel
+import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
+import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute
+import com.lagradost.cloudstream3.utils.downloader.DownloadQueueManager
+import com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager
+import com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager.KEY_RESUME_IN_QUEUE
+import com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager.KEY_RESUME_PACKAGES
+import com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager.downloadEvent
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.FlowPreview
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.debounce
+import kotlinx.coroutines.flow.takeWhile
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.flow.updateAndGet
+import kotlinx.coroutines.withTimeoutOrNull
+import kotlin.system.measureTimeMillis
+import kotlin.time.Duration.Companion.milliseconds
+import kotlin.time.Duration.Companion.seconds
+
+class DownloadQueueService : Service() {
+    companion object {
+        const val TAG = "DownloadQueueService"
+        const val DOWNLOAD_QUEUE_CHANNEL_ID = "cloudstream3.download.queue"
+        const val DOWNLOAD_QUEUE_CHANNEL_NAME = "Download queue service"
+        const val DOWNLOAD_QUEUE_CHANNEL_DESCRIPTION = "App download queue notification."
+        const val DOWNLOAD_QUEUE_NOTIFICATION_ID = 917194232 // Random unique
+        @Volatile
+        var isRunning = false
+
+        fun getIntent(
+            context: Context,
+        ): Intent {
+            return Intent(context, DownloadQueueService::class.java)
+        }
+
+        private val _downloadInstances: MutableStateFlow<List<VideoDownloadManager.EpisodeDownloadInstance>> =
+            MutableStateFlow(emptyList())
+
+        /** Flow of all active downloads, not queued. May temporarily contain completed or failed EpisodeDownloadInstances.
+         * Completed or failed instances are automatically removed by the download queue service.
+         *
+         */
+        val downloadInstances: StateFlow<List<VideoDownloadManager.EpisodeDownloadInstance>> =
+            _downloadInstances
+
+        private val totalDownloadFlow =
+            downloadInstances.combine(DownloadQueueManager.queue) { instances, queue ->
+                instances to queue
+            }
+                .combine(VideoDownloadManager.currentDownloads) { (instances, queue), currentDownloads ->
+                    Triple(instances, queue, currentDownloads)
+                }
+    }
+
+
+    private val baseNotification by lazy {
+        val intent = Intent(this, MainActivity::class.java)
+        val pendingIntent =
+            PendingIntentCompat.getActivity(this, 0, intent, 0, false)
+
+        val activeDownloads = resources.getQuantityString(R.plurals.downloads_active, 0).format(0)
+        val activeQueue = resources.getQuantityString(R.plurals.downloads_queued, 0).format(0)
+
+        NotificationCompat.Builder(this, DOWNLOAD_QUEUE_CHANNEL_ID)
+            .setOngoing(true) // Make it persistent
+            .setAutoCancel(false)
+            .setColorized(false)
+            .setOnlyAlertOnce(true)
+            .setSilent(true)
+            .setShowWhen(false)
+            // If low priority then the notification might not show :(
+            .setPriority(NotificationCompat.PRIORITY_DEFAULT)
+            .setColor(this.colorFromAttribute(R.attr.colorPrimary))
+            .setContentText(activeDownloads)
+            .setSubText(activeQueue)
+            .setContentIntent(pendingIntent)
+            .setSmallIcon(R.drawable.download_icon_load)
+    }
+
+
+    private fun updateNotification(context: Context, downloads: Int, queued: Int) {
+        if (context.checkSelfPermission(Manifest.permission.POST_NOTIFICATIONS)
+            != PackageManager.PERMISSION_GRANTED
+        ) return
+
+        val activeDownloads =
+            resources.getQuantityString(R.plurals.downloads_active, downloads).format(downloads)
+        val activeQueue =
+            resources.getQuantityString(R.plurals.downloads_queued, queued).format(queued)
+
+        val newNotification = baseNotification
+            .setContentText(activeDownloads)
+            .setSubText(activeQueue)
+            .build()
+
+        safe {
+            NotificationManagerCompat.from(context)
+                .notify(DOWNLOAD_QUEUE_NOTIFICATION_ID, newNotification)
+        }
+    }
+
+    // We always need to listen to events, even before the download is launched.
+    // Stopping link loading is an event which can trigger before downloading.
+    val downloadEventListener = { event: Pair<Int, VideoDownloadManager.DownloadActionType> ->
+        when (event.second) {
+            VideoDownloadManager.DownloadActionType.Stop -> {
+                removeKey(KEY_RESUME_PACKAGES, event.first.toString())
+                removeKey(KEY_RESUME_IN_QUEUE, event.first.toString())
+                DownloadQueueManager.cancelDownload(event.first)
+            }
+
+            else -> {}
+        }
+    }
+
+    @OptIn(ExperimentalCoroutinesApi::class, FlowPreview::class)
+    override fun onCreate() {
+        isRunning = true
+        val context: Context = this // To make code more readable
+
+        Log.d(TAG, "Download queue service started.")
+        this.createNotificationChannel(
+            DOWNLOAD_QUEUE_CHANNEL_ID,
+            DOWNLOAD_QUEUE_CHANNEL_NAME,
+            DOWNLOAD_QUEUE_CHANNEL_DESCRIPTION
+        )
+        if (SDK_INT >= 29) {
+            startForeground(
+                DOWNLOAD_QUEUE_NOTIFICATION_ID,
+                baseNotification.build(),
+                FOREGROUND_SERVICE_TYPE_DATA_SYNC
+            )
+        } else {
+            startForeground(DOWNLOAD_QUEUE_NOTIFICATION_ID, baseNotification.build())
+        }
+
+        downloadEvent += downloadEventListener
+
+        val queueJob = ioSafe {
+            // Ensure this is up to date to prevent race conditions with MainActivity launches
+            setLastError(context)
+            // Early return, to prevent waiting for plugins in safe mode
+            if (lastError != null) return@ioSafe
+
+            // Try to ensure all plugins are loaded before starting the downloader.
+            // To prevent infinite stalls we use a timeout of 15 seconds, it is judged as long enough
+            val timeout = 15.seconds
+            val timeTaken = withTimeoutOrNull(timeout) {
+                measureTimeMillis {
+                    while (!(PluginManager.loadedOnlinePlugins && PluginManager.loadedLocalPlugins)) {
+                        delay(100.milliseconds)
+                    }
+                }
+            }
+
+            debugWarning({ timeTaken == null || timeTaken > 3_000 }, {
+                "Abnormally long downloader startup time of: ${timeTaken ?: timeout.inWholeMilliseconds}ms"
+            })
+            debugAssert({ timeTaken == null }, { "Downloader startup should not time out" })
+
+            totalDownloadFlow
+                .debounce { (instances, queue) ->
+                    // Filter away incorrect transient queue states.
+                    // For example when we pop the queue and add a download instance there exists a transient state where
+                    // there is no queue and no download instances (leading to an early exit)
+                    if (instances.isEmpty() && queue.isEmpty()) {
+                        500.milliseconds
+                    } else {
+                        0.milliseconds
+                    }
+                }
+                .takeWhile { (instances, queue) ->
+                    // Stop if destroyed
+                    isRunning
+                            // Run as long as there is a queue to process
+                            && (instances.isNotEmpty() || queue.isNotEmpty())
+                            // Run as long as there are no app crashes
+                            && lastError == null
+                }
+                .collect { (_, queue, currentDownloads) ->
+                    // Remove completed or failed
+                    val newInstances = _downloadInstances.updateAndGet { currentInstances ->
+                        currentInstances.filterNot { it.isCompleted || it.isFailed || it.isCancelled }
+                    }
+
+                    val maxDownloads = VideoDownloadManager.maxConcurrentDownloads(context)
+                    val currentInstanceCount = newInstances.size
+
+                    val newDownloads = minOf(
+                        // Cannot exceed the max downloads
+                        maxOf(0, maxDownloads - currentInstanceCount),
+                        // Cannot start more downloads than the queue size
+                        queue.size
+                    )
+
+                    // Cant start multiple downloads at once. If this is rerun it may start too many downloads.
+                    if (newDownloads > 0) {
+                        _downloadInstances.update { instances ->
+                            val downloadInstance = DownloadQueueManager.popQueue(context)
+                            if (downloadInstance != null) {
+                                downloadInstance.startDownload()
+                                instances + downloadInstance
+                            } else {
+                                instances
+                            }
+                        }
+                    }
+
+                    // The downloads actually displayed to the user with a notification
+                    val currentVisualDownloads =
+                        currentDownloads.size + newInstances.count {
+                            currentDownloads.contains(it.downloadQueueWrapper.id)
+                                .not()
+                        }
+                    // Just the queue
+                    val currentVisualQueue = queue.size
+
+                    updateNotification(context, currentVisualDownloads, currentVisualQueue)
+                }
+        }
+
+        // Stop self regardless of job outcome
+        queueJob.invokeOnCompletion { throwable ->
+            if (throwable != null) {
+                logError(throwable)
+            }
+            safe {
+                stopSelf()
+            }
+        }
+    }
+
+    override fun onDestroy() {
+        Log.d(TAG, "Download queue service stopped.")
+        downloadEvent -= downloadEventListener
+        isRunning = false
+        super.onDestroy()
+    }
+
+    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+        return START_STICKY // We want the service restarted if its killed
+    }
+
+    override fun onBind(intent: Intent?): IBinder? = null
+
+    override fun onTimeout(reason: Int) {
+        stopSelf()
+        Log.e(TAG, "Service stopped due to timeout: $reason")
+    }
+
+}
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 fc31c1f3e0d..7134650ed4e 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/services/SubscriptionWorkManager.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/services/SubscriptionWorkManager.kt
@@ -22,7 +22,7 @@ import com.lagradost.cloudstream3.utils.DataStoreHelper
 import com.lagradost.cloudstream3.utils.DataStoreHelper.getAllSubscriptions
 import com.lagradost.cloudstream3.utils.DataStoreHelper.getDub
 import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute
-import com.lagradost.cloudstream3.utils.VideoDownloadManager.getImageBitmapFromUrl
+import com.lagradost.cloudstream3.utils.downloader.DownloadUtils.getImageBitmapFromUrl
 import kotlinx.coroutines.withTimeoutOrNull
 import java.util.concurrent.TimeUnit
 
@@ -97,7 +97,7 @@ class SubscriptionWorkManager(val context: Context, workerParams: WorkerParamete
                 .build()
         )
     }
-    @Suppress("DEPRECATION_ERROR")
+
     override suspend fun doWork(): Result {
         try {
 //        println("Update subscriptions!")
diff --git a/app/src/main/java/com/lagradost/cloudstream3/services/VideoDownloadService.kt b/app/src/main/java/com/lagradost/cloudstream3/services/VideoDownloadService.kt
index 6151a0edd20..d63b18cdc97 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/services/VideoDownloadService.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/services/VideoDownloadService.kt
@@ -2,12 +2,13 @@ package com.lagradost.cloudstream3.services
 import android.app.Service
 import android.content.Intent
 import android.os.IBinder
-import com.lagradost.cloudstream3.utils.VideoDownloadManager
+import com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
 
+/** Handle notification actions such as pause/resume downloads */
 class VideoDownloadService : Service() {
 
     private val downloadScope = CoroutineScope(Dispatchers.Default)
@@ -42,19 +43,3 @@ class VideoDownloadService : Service() {
         super.onDestroy()
     }
 }
-//    override fun onHandleIntent(intent: Intent?) {
-//        if (intent != null) {
-//            val id = intent.getIntExtra("id", -1)
-//            val type = intent.getStringExtra("type")
-//            if (id != -1 && type != null) {
-//                val state = when (type) {
-//                    "resume" -> VideoDownloadManager.DownloadActionType.Resume
-//                    "pause" -> VideoDownloadManager.DownloadActionType.Pause
-//                    "stop" -> VideoDownloadManager.DownloadActionType.Stop
-//                    else -> return
-//                }
-//                VideoDownloadManager.downloadEvent.invoke(Pair(id, state))
-//            }
-//        }
-//    }
-//}
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 bfc6dacb65e..9e6f241fb95 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/subtitles/AbstractSubProvider.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/subtitles/AbstractSubProvider.kt
@@ -1,18 +1,9 @@
 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
@@ -20,116 +11,6 @@ import okio.source
 import java.io.File
 import java.util.zip.ZipInputStream
 
-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)
-        }
-    }
-}
-
-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
@@ -210,4 +91,3 @@ class SubtitleResource {
     }
 }
 
-interface AbstractSubApi : AbstractSubProvider, AuthAPI
\ No newline at end of file
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 2e14c3c46fd..3bc5f273397 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/AccountManager.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/AccountManager.kt
@@ -1,149 +1,165 @@
-package com.lagradost.cloudstream3.syncproviders
-
-import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
-import com.lagradost.cloudstream3.AcraApplication.Companion.removeKeys
-import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
-import com.lagradost.cloudstream3.LoadResponse
-import com.lagradost.cloudstream3.syncproviders.providers.*
-import java.util.concurrent.TimeUnit
-
-abstract class AccountManager(private val defIndex: Int) : AuthAPI {
-    companion object {
-        val malApi = MALApi(0).also { api ->
-            LoadResponse.Companion.malIdPrefix = api.idPrefix
-        }
-        val aniListApi = AniListApi(0).also { api ->
-            LoadResponse.Companion.aniListIdPrefix = api.idPrefix
-        }
-        val simklApi = SimklApi(0).also { api ->
-            LoadResponse.Companion.simklIdPrefix = api.idPrefix
-        }
-        val openSubtitlesApi = OpenSubtitlesApi(0)
-        val addic7ed = Addic7ed()
-        val subDlApi = SubDlApi(0)
-        val localListApi = LocalList()
-        val subSourceApi = SubSourceApi()
-
-        // used to login via app intent
-        val OAuth2Apis
-            get() = listOf<OAuth2API>(
-                malApi, aniListApi, simklApi
-            )
-
-        // this needs init with context and can be accessed in settings
-        val accountManagers
-            get() = listOf(
-                malApi, aniListApi, openSubtitlesApi, subDlApi, simklApi //nginxApi
-            )
-
-        // used for active syncing
-        val SyncApis
-            get() = listOf(
-                SyncRepo(malApi), SyncRepo(aniListApi), SyncRepo(localListApi), SyncRepo(simklApi)
-            )
-
-        val inAppAuths
-            get() = listOf<InAppAuthAPIManager>(
-                openSubtitlesApi,
-                subDlApi
-                )//, nginxApi)
-
-        val subtitleProviders
-            get() = listOf(
-                openSubtitlesApi,
-                addic7ed,
-                subDlApi,
-                subSourceApi
-            )
-
-        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 APP_STRING_SEARCH = "cloudstreamsearch"
-
-        // Instantly resume watching a show
-        const val APP_STRING_RESUME_WATCHING = "cloudstreamcontinuewatching"
-
-        val unixTime: Long
-            get() = System.currentTimeMillis() / 1000L
-        val unixTimeMs: Long
-            get() = System.currentTimeMillis()
-
-        const val MAX_STALE = 60 * 10
-
-        fun secondsToReadable(seconds: Int, completedValue: String): String {
-            var secondsLong = seconds.toLong()
-            val days = TimeUnit.SECONDS
-                .toDays(secondsLong)
-            secondsLong -= TimeUnit.DAYS.toSeconds(days)
-
-            val hours = TimeUnit.SECONDS
-                .toHours(secondsLong)
-            secondsLong -= TimeUnit.HOURS.toSeconds(hours)
-
-            val minutes = TimeUnit.SECONDS
-                .toMinutes(secondsLong)
-            secondsLong -= TimeUnit.MINUTES.toSeconds(minutes)
-            if (minutes < 0) {
-                return completedValue
-            }
-            //println("$days $hours $minutes")
-            return "${if (days != 0L) "$days" + "d " else ""}${if (hours != 0L) "$hours" + "h " else ""}${minutes}m"
-        }
-    }
-
-    var accountIndex = defIndex
-    private var lastAccountIndex = defIndex
-    protected val accountId get() = "${idPrefix}_account_$accountIndex"
-    private val accountActiveKey get() = "${idPrefix}_active"
-
-    // int array of all accounts indexes
-    private val accountsKey get() = "${idPrefix}_accounts"
-
-    protected fun removeAccountKeys() {
-        removeKeys(accountId)
-        val accounts = getAccounts()?.toMutableList() ?: mutableListOf()
-        accounts.remove(accountIndex)
-        setKey(accountsKey, accounts.toIntArray())
-
-        init()
-    }
-
-    fun getAccounts(): IntArray? {
-        return getKey(accountsKey, intArrayOf())
-    }
-
-    fun init() {
-        accountIndex = getKey(accountActiveKey, defIndex)!!
-        val accounts = getAccounts()
-        if (accounts?.isNotEmpty() == true && this.loginInfo() == null) {
-            accountIndex = accounts.first()
-        }
-    }
-
-    protected fun switchToNewAccount() {
-        val accounts = getAccounts()
-        lastAccountIndex = accountIndex
-        accountIndex = (accounts?.maxOrNull() ?: 0) + 1
-    }
-    protected fun switchToOldAccount() {
-        accountIndex = lastAccountIndex
-    }
-
-    protected fun registerAccount() {
-        setKey(accountActiveKey, accountIndex)
-        val accounts = getAccounts()?.toMutableList() ?: mutableListOf()
-        if (!accounts.contains(accountIndex)) {
-            accounts.add(accountIndex)
-        }
-
-        setKey(accountsKey, accounts.toIntArray())
-    }
-
-    fun changeAccount(index: Int) {
-        accountIndex = index
-        setKey(accountActiveKey, index)
-    }
-}
+package com.lagradost.cloudstream3.syncproviders
+
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.getKey
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.setKey
+import com.lagradost.cloudstream3.LoadResponse
+import com.lagradost.cloudstream3.syncproviders.providers.Addic7ed
+import com.lagradost.cloudstream3.syncproviders.providers.AniListApi
+import com.lagradost.cloudstream3.syncproviders.providers.KitsuApi
+import com.lagradost.cloudstream3.syncproviders.providers.LocalList
+import com.lagradost.cloudstream3.syncproviders.providers.MALApi
+import com.lagradost.cloudstream3.syncproviders.providers.OpenSubtitlesApi
+import com.lagradost.cloudstream3.syncproviders.providers.SimklApi
+import com.lagradost.cloudstream3.syncproviders.providers.SubDlApi
+import com.lagradost.cloudstream3.syncproviders.providers.SubSourceApi
+import com.lagradost.cloudstream3.utils.DataStoreHelper
+import com.lagradost.cloudstream3.utils.videoskip.AnimeSkipAuth
+import java.util.concurrent.TimeUnit
+
+abstract class AccountManager {
+    companion object {
+        const val NONE_ID: Int = -1
+        val malApi = MALApi()
+        val kitsuApi = KitsuApi()
+        val aniListApi = AniListApi()
+        val simklApi = SimklApi()
+        val localListApi = LocalList()
+
+        val openSubtitlesApi = OpenSubtitlesApi()
+        val addic7ed = Addic7ed()
+        val subDlApi = SubDlApi()
+        val subSourceApi = SubSourceApi()
+        val animeSkipApi = AnimeSkipAuth()
+
+        var cachedAccounts: MutableMap<String, Array<AuthData>>
+        var cachedAccountIds: MutableMap<String, Int>
+
+        const val ACCOUNT_TOKEN = "auth_tokens"
+        const val ACCOUNT_IDS = "auth_ids"
+
+        fun accounts(prefix: String): Array<AuthData> {
+            require(prefix != "NONE")
+            return getKey<Array<AuthData>>(
+                ACCOUNT_TOKEN,
+                "${prefix}/${DataStoreHelper.currentAccount}"
+            ) ?: arrayOf()
+        }
+
+        fun updateAccounts(prefix: String, array: Array<AuthData>) {
+            require(prefix != "NONE")
+            setKey(ACCOUNT_TOKEN, "${prefix}/${DataStoreHelper.currentAccount}", array)
+            synchronized(cachedAccounts) {
+                cachedAccounts[prefix] = array
+            }
+        }
+
+        fun updateAccountsId(prefix: String, id: Int) {
+            require(prefix != "NONE")
+            setKey(ACCOUNT_IDS, "${prefix}/${DataStoreHelper.currentAccount}", id)
+            synchronized(cachedAccountIds) {
+                cachedAccountIds[prefix] = id
+            }
+        }
+
+        val allApis = arrayOf(
+            SyncRepo(malApi),
+            SyncRepo(kitsuApi),
+            SyncRepo(aniListApi),
+            SyncRepo(simklApi),
+            SyncRepo(localListApi),
+            SubtitleRepo(openSubtitlesApi),
+            SubtitleRepo(addic7ed),
+            SubtitleRepo(subDlApi),
+            PlainAuthRepo(animeSkipApi)
+        )
+
+        fun updateAccountIds() {
+            val ids = mutableMapOf<String, Int>()
+            for (api in allApis) {
+                ids.put(
+                    api.idPrefix,
+                    getKey<Int>(
+                        ACCOUNT_IDS,
+                        "${api.idPrefix}/${DataStoreHelper.currentAccount}",
+                        NONE_ID
+                    ) ?: NONE_ID
+                )
+            }
+            synchronized(cachedAccountIds) {
+                cachedAccountIds = ids
+            }
+        }
+
+        init {
+            val data = mutableMapOf<String, Array<AuthData>>()
+            val ids = mutableMapOf<String, Int>()
+            for (api in allApis) {
+                data.put(api.idPrefix, accounts(api.idPrefix))
+                ids.put(
+                    api.idPrefix,
+                    getKey<Int>(
+                        ACCOUNT_IDS,
+                        "${api.idPrefix}/${DataStoreHelper.currentAccount}",
+                        NONE_ID
+                    ) ?: NONE_ID
+                )
+            }
+            cachedAccounts = data
+            cachedAccountIds = ids
+        }
+
+        // I do not want to place this in the init block as JVM initialization order is weird, and it may cause exceptions
+        // accessing other classes
+        fun initMainAPI() {
+            LoadResponse.malIdPrefix = malApi.idPrefix
+            LoadResponse.kitsuIdPrefix = kitsuApi.idPrefix
+            LoadResponse.aniListIdPrefix = aniListApi.idPrefix
+            LoadResponse.simklIdPrefix = simklApi.idPrefix
+        }
+
+        val subtitleProviders = arrayOf(
+            SubtitleRepo(openSubtitlesApi),
+            SubtitleRepo(addic7ed),
+            SubtitleRepo(subDlApi)
+        )
+        val syncApis = arrayOf(
+            SyncRepo(malApi),
+            SyncRepo(kitsuApi),
+            SyncRepo(aniListApi),
+            SyncRepo(simklApi),
+            SyncRepo(localListApi)
+        )
+
+        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 APP_STRING_SEARCH = "cloudstreamsearch"
+
+        // Instantly resume watching a show
+        const val APP_STRING_RESUME_WATCHING = "cloudstreamcontinuewatching"
+
+        const val APP_STRING_SHARE = "csshare"
+
+        fun secondsToReadable(seconds: Int, completedValue: String): String {
+            var secondsLong = seconds.toLong()
+            val days = TimeUnit.SECONDS
+                .toDays(secondsLong)
+            secondsLong -= TimeUnit.DAYS.toSeconds(days)
+
+            val hours = TimeUnit.SECONDS
+                .toHours(secondsLong)
+            secondsLong -= TimeUnit.HOURS.toSeconds(hours)
+
+            val minutes = TimeUnit.SECONDS
+                .toMinutes(secondsLong)
+            secondsLong -= TimeUnit.MINUTES.toSeconds(minutes)
+            if (minutes < 0) {
+                return completedValue
+            }
+            //println("$days $hours $minutes")
+            return "${if (days != 0L) "$days" + "d " else ""}${if (hours != 0L) "$hours" + "h " else ""}${minutes}m"
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/AuthAPI.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/AuthAPI.kt
index 8b085bc0b83..83a7a09847c 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/AuthAPI.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/AuthAPI.kt
@@ -1,23 +1,282 @@
 package com.lagradost.cloudstream3.syncproviders
 
-interface AuthAPI {
-    val name: String
-    val icon: Int?
+import android.util.Base64
+import androidx.annotation.WorkerThread
+import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.cloudstream3.APIHolder.unixTime
+import com.lagradost.cloudstream3.ActorData
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.getKey
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.openBrowser
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.setKey
+import com.lagradost.cloudstream3.CommonActivity.showToast
+import com.lagradost.cloudstream3.ErrorLoadingException
+import com.lagradost.cloudstream3.LoadResponse
+import com.lagradost.cloudstream3.NextAiring
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.Score
+import com.lagradost.cloudstream3.SearchQuality
+import com.lagradost.cloudstream3.SearchResponse
+import com.lagradost.cloudstream3.ShowStatus
+import com.lagradost.cloudstream3.TvType
+import com.lagradost.cloudstream3.mvvm.Resource
+import com.lagradost.cloudstream3.mvvm.logError
+import com.lagradost.cloudstream3.mvvm.safe
+import com.lagradost.cloudstream3.mvvm.safeApiCall
+import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.APP_STRING
+import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.NONE_ID
+import com.lagradost.cloudstream3.syncproviders.providers.Addic7ed
+import com.lagradost.cloudstream3.syncproviders.providers.AniListApi
+import com.lagradost.cloudstream3.syncproviders.providers.LocalList
+import com.lagradost.cloudstream3.syncproviders.providers.MALApi
+import com.lagradost.cloudstream3.syncproviders.providers.KitsuApi
+import com.lagradost.cloudstream3.syncproviders.providers.OpenSubtitlesApi
+import com.lagradost.cloudstream3.syncproviders.providers.SimklApi
+import com.lagradost.cloudstream3.syncproviders.providers.SubDlApi
+import com.lagradost.cloudstream3.syncproviders.providers.SubSourceApi
+import com.lagradost.cloudstream3.ui.SyncWatchType
+import com.lagradost.cloudstream3.ui.library.ListSorting
+import com.lagradost.cloudstream3.utils.AppContextUtils.splitQuery
+import com.lagradost.cloudstream3.utils.Coroutines.threadSafeListOf
+import com.lagradost.cloudstream3.utils.DataStoreHelper
+import com.lagradost.cloudstream3.utils.UiText
+import com.lagradost.cloudstream3.utils.txt
+import me.xdrop.fuzzywuzzy.FuzzySearch
+import java.net.URL
+import java.security.SecureRandom
+import java.util.Date
+import java.util.concurrent.TimeUnit
 
-    val requiresLogin: Boolean
+data class AuthLoginPage(
+    /** The website to open to authenticate */
+    val url: String,
+    /**
+     * State/control code to verify against the redirectUrl to make sure the request is valid.
+     * This parameter will be saved, and then used in AuthAPI::login.
+     * */
+    val payload: String? = null,
+)
 
-    val createAccountUrl : String?
+data class AuthToken(
+    /**
+     * This is the general access tokens/api token representing a logged in user.
+     *
+     * `Access tokens are the thing that applications use to make API requests on behalf of a user.`
+     * */
+    @JsonProperty("accessToken")
+    val accessToken: String? = null,
+    /**
+     * For OAuth a special refresh token is issues to refresh the access token.
+     * */
+    @JsonProperty("refreshToken")
+    val refreshToken: String? = null,
+    /** In UnixTime (sec) when it expires */
+    @JsonProperty("accessTokenLifetime")
+    val accessTokenLifetime: Long? = null,
+    /** In UnixTime (sec) when it expires */
+    @JsonProperty("refreshTokenLifetime")
+    val refreshTokenLifetime: Long? = null,
+    /** Sometimes AuthToken needs to be customized to store e.g. username/password,
+     * this acts as a catch all to store text or JSON data. */
+    @JsonProperty("payload")
+    val payload: String? = null,
+) {
+    fun isAccessTokenExpired(marginSec: Long = 10L) =
+        accessTokenLifetime != null && (System.currentTimeMillis() / 1000) + marginSec >= accessTokenLifetime
 
-    // don't change this as all keys depend on it
-    val idPrefix: String
+    fun isRefreshTokenExpired(marginSec: Long = 10L) =
+        refreshTokenLifetime != null && (System.currentTimeMillis() / 1000) + marginSec >= refreshTokenLifetime
+}
 
-    // if this returns null then you are not logged in
-    fun loginInfo(): LoginInfo?
-    fun logOut()
+data class AuthUser(
+    /** Account display-name, can also be email if name does not exist */
+    @JsonProperty("name")
+    val name: String?,
+    /** Unique account identifier,
+     * if a subsequent login is done then it will be refused if another account with the same id exists*/
+    @JsonProperty("id")
+    val id: Int,
+    /** Profile picture URL */
+    @JsonProperty("profilePicture")
+    val profilePicture: String? = null,
+    /** Profile picture Headers of the URL */
+    @JsonProperty("profilePictureHeader")
+    val profilePictureHeaders: Map<String, String>? = null
+)
 
+/**
+ * Stores all information that should be used to authorize access.
+ * Be aware that token and user may change independently when a refresh is needed,
+ * and as such there should be no strong pairing between the two.
+ *
+ * Any local set/get key should use user.id.toString(),
+ * as token.accessToken (even hashed) is unsecure, and will rotate.
+ * */
+data class AuthData(
+    @JsonProperty("user")
+    val user: AuthUser,
+    @JsonProperty("token")
+    val token: AuthToken,
+)
+
+data class AuthPinData(
+    val deviceCode: String,
+    val userCode: String,
+    /** QR Code url */
+    val verificationUrl: String,
+    /** In seconds */
+    val expiresIn: Int,
+    /** Check if the code has been verified interval */
+    val interval: Int,
+)
+
+/** The login field requirements to display to the user */
+data class AuthLoginRequirement(
+    val password: Boolean = false,
+    val username: Boolean = false,
+    val email: Boolean = false,
+    val server: Boolean = false,
+)
+
+/** What the user responds to the AuthLoginRequirement */
+data class AuthLoginResponse(
+    @JsonProperty("password")
+    val password: String?,
+    @JsonProperty("username")
+    val username: String?,
+    @JsonProperty("email")
+    val email: String?,
+    @JsonProperty("server")
+    val server: String?,
+)
+
+/** Stateless Authentication class used for all personalized content */
+abstract class AuthAPI {
+    open val name: String = "NONE"
+    open val idPrefix: String = "NONE"
+
+    /** Drawable icon of the service */
+    open val icon: Int? = null
+
+    /** If this service requires an account to use */
+    open val requiresLogin: Boolean = true
+
+    /** Link to a website for creating a new account */
+    open val createAccountUrl: String? = null
+
+    /** The sensitive redirect URL from OAuth should contain "/redirectUrlIdentifier" to trigger the login */
+    open val redirectUrlIdentifier: String? = null
+
+    /** Has OAuth2 login support, including login, loginRequest and refreshToken */
+    open val hasOAuth2: Boolean = false
+
+    /** Has on device pin support, aka login with a QR code */
+    open val hasPin: Boolean = false
+
+    /** Has in app login support, aka login with a dialog */
+    open val hasInApp: Boolean = false
+
+    /** The requirements to login in app */
+    open val inAppLoginRequirement: AuthLoginRequirement? = null
+
+    companion object {
+        val unixTime: Long
+            get() = System.currentTimeMillis() / 1000L
+        val unixTimeMs: Long
+            get() = System.currentTimeMillis()
+
+        fun splitRedirectUrl(redirectUrl: String): Map<String, String> {
+            return splitQuery(
+                URL(
+                    redirectUrl.replace(APP_STRING, "https").replace("/#", "?")
+                )
+            )
+        }
+
+        fun generateCodeVerifier(): String {
+            // It is recommended to use a URL-safe string as code_verifier.
+            // See section 4 of RFC 7636 for more details.
+            val secureRandom = SecureRandom()
+            val codeVerifierBytes = ByteArray(96) // base64 has 6bit per char; (8/6)*96 = 128
+            secureRandom.nextBytes(codeVerifierBytes)
+            return Base64.encodeToString(codeVerifierBytes, Base64.DEFAULT).trimEnd('=')
+                .replace("+", "-")
+                .replace("/", "_").replace("\n", "")
+        }
+    }
+
+    /** Is this url a valid redirect url for this service? */
+    @Throws
+    open fun isValidRedirectUrl(url: String): Boolean =
+        redirectUrlIdentifier != null && url.contains("/$redirectUrlIdentifier")
+
+    /** OAuth2 login from a valid redirectUrl, and payload given in loginRequest */
+    @Throws
+    open suspend fun login(redirectUrl: String, payload: String?): AuthToken? =
+        throw NotImplementedError()
+
+    /** OAuth2 login request, asking the service to provide a url to open in the browser */
+    @Throws
+    open fun loginRequest(): AuthLoginPage? = throw NotImplementedError()
+
+    /** Pin login request, asking the service to provide an verificationUrl to display with a QR code */
+    @Throws
+    open suspend fun pinRequest(): AuthPinData? = throw NotImplementedError()
+
+    /** OAuth2 token refresh, this ensures that all token passed to other functions will be valid */
+    @Throws
+    open suspend fun refreshToken(token: AuthToken): AuthToken? = throw NotImplementedError()
+
+    /** Pin login, this will be called periodically while logging in to check if the pin has been verified by the user */
+    @Throws
+    open suspend fun login(payload: AuthPinData): AuthToken? = throw NotImplementedError()
+
+    /** In app login */
+    @Throws
+    open suspend fun login(form: AuthLoginResponse): AuthToken? = throw NotImplementedError()
+
+    /** Get the visible user account */
+    @Throws
+    open suspend fun user(token: AuthToken?): AuthUser? = throw NotImplementedError()
+
+    /**
+     * An optional security measure to make sure that even if an attacker gets ahold of the token, it will be invalid.
+     *
+     * Note that this will currently only be called *once* on logout,
+     * and as such any network issues it will fail silently, and the token will not be revoked.
+     **/
+    @Throws
+    open suspend fun invalidateToken(token: AuthToken): Nothing = throw NotImplementedError()
+
+    @Throws
+    @Deprecated("Please use the new API for AuthAPI", level = DeprecationLevel.ERROR)
+    fun toRepo(): AuthRepo = when (this) {
+        is SubtitleAPI -> SubtitleRepo(this)
+        is SyncAPI -> SyncRepo(this)
+        else -> throw NotImplementedError("Unknown inheritance from AuthAPI")
+    }
+
+    @Suppress("DEPRECATION_ERROR")
+    @Deprecated("Please use the new API for AuthAPI", level = DeprecationLevel.ERROR)
+    fun loginInfo(): LoginInfo? {
+        return this.toRepo().authUser()?.let { user ->
+            LoginInfo(
+                profilePicture = user.profilePicture,
+                name = user.name,
+                accountIndex = -1,
+            )
+        }
+    }
+
+    @Deprecated("Please use the new API for AuthAPI", level = DeprecationLevel.ERROR)
+    suspend fun getPersonalLibrary(): SyncAPI.LibraryMetadata? {
+        @Suppress("DEPRECATION_ERROR")
+        return (this.toRepo() as? SyncRepo)?.library()?.getOrThrow()
+    }
+
+    @Deprecated("Please use the new API for AuthAPI", level = DeprecationLevel.ERROR)
     class LoginInfo(
         val profilePicture: String? = null,
         val name: String?,
         val accountIndex: Int,
     )
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/AuthRepo.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/AuthRepo.kt
new file mode 100644
index 00000000000..645a19e3a60
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/AuthRepo.kt
@@ -0,0 +1,168 @@
+package com.lagradost.cloudstream3.syncproviders
+
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.openBrowser
+import com.lagradost.cloudstream3.CommonActivity.showToast
+import com.lagradost.cloudstream3.ErrorLoadingException
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.mvvm.logError
+import com.lagradost.cloudstream3.mvvm.safe
+import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.NONE_ID
+import com.lagradost.cloudstream3.utils.txt
+
+/** General-purpose repo */
+class PlainAuthRepo(api: AuthAPI) : AuthRepo(api)
+
+/** Safe abstraction for AuthAPI that provides both a catching interface, and automatic token management. */
+abstract class AuthRepo(open val api: AuthAPI) {
+    fun isValidRedirectUrl(url: String) = safe { api.isValidRedirectUrl(url) } ?: false
+    val idPrefix get() = api.idPrefix
+    val name get() = api.name
+    val icon get() = api.icon
+    val requiresLogin get() = api.requiresLogin
+    val createAccountUrl get() = api.createAccountUrl
+    val hasOAuth2 get() = api.hasOAuth2
+    val hasPin get() = api.hasPin
+    val hasInApp get() = api.hasInApp
+    val inAppLoginRequirement get() = api.inAppLoginRequirement
+    val isAvailable get() = !api.requiresLogin || authUser() != null
+
+    companion object {
+        private val oauthPayload: MutableMap<String, String?> = mutableMapOf()
+    }
+
+    @Throws
+    protected suspend fun freshAuth(): AuthData? {
+        val data = authData() ?: return null
+        if (data.token.isAccessTokenExpired()) {
+            val newToken = api.refreshToken(data.token) ?: return null
+            val newAuth = AuthData(user = data.user, token = newToken)
+            refreshUser(newAuth)
+            return newAuth
+        }
+        return data
+    }
+
+    @Throws
+    fun openOAuth2Page(): Boolean {
+        val page = api.loginRequest() ?: return false
+        synchronized(oauthPayload) {
+            oauthPayload.put(idPrefix, page.payload)
+        }
+        openBrowser(page.url)
+        return true
+    }
+
+    fun openOAuth2PageWithToast() {
+        try {
+            if (!openOAuth2Page()) {
+                showToast(txt(R.string.authenticated_user_fail, api.name))
+            }
+        } catch (t: Throwable) {
+            logError(t)
+            if (t is ErrorLoadingException && t.message != null) {
+                showToast(t.message)
+                return
+            }
+            showToast(txt(R.string.authenticated_user_fail, api.name))
+        }
+    }
+
+    suspend fun logout(from: AuthUser) {
+        val currentAccounts = AccountManager.accounts(idPrefix)
+        val (newAccounts, oldAccounts) = currentAccounts.partition { it.user.id != from.id }
+        if (newAccounts.size < currentAccounts.size) {
+            AccountManager.updateAccounts(idPrefix, newAccounts.toTypedArray())
+            AccountManager.updateAccountsId(idPrefix, 0)
+        }
+
+        for (oldAccount in oldAccounts) {
+            try {
+                api.invalidateToken(oldAccount.token)
+            } catch (_: NotImplementedError) {
+                // no-op
+            } catch (t: Throwable) {
+                logError(t)
+            }
+        }
+    }
+
+    fun refreshUser(newAuth: AuthData) {
+        val currentAccounts = AccountManager.accounts(idPrefix)
+        val newAccounts = currentAccounts.map {
+            if (it.user.id == newAuth.user.id) {
+                newAuth
+            } else {
+                it
+            }
+        }.toTypedArray()
+        AccountManager.updateAccounts(idPrefix, newAccounts)
+    }
+
+    fun authData(): AuthData? = synchronized(AccountManager.cachedAccountIds) {
+        AccountManager.cachedAccountIds[idPrefix]?.let { id ->
+            AccountManager.cachedAccounts[idPrefix]?.firstOrNull { data -> data.user.id == id }
+        }
+    }
+
+    fun authToken(): AuthToken? = authData()?.token
+
+    fun authUser(): AuthUser? = authData()?.user
+
+    val accounts
+        get() = synchronized(AccountManager.cachedAccounts) {
+            AccountManager.cachedAccounts[idPrefix] ?: emptyArray()
+        }
+    var accountId
+        get() = synchronized(AccountManager.cachedAccountIds) {
+            AccountManager.cachedAccountIds[idPrefix] ?: NONE_ID
+        }
+        set(value) {
+            AccountManager.updateAccountsId(idPrefix, value)
+        }
+
+    @Throws
+    suspend fun pinRequest() =
+        api.pinRequest()
+
+    @Throws
+    private suspend fun setupLogin(token: AuthToken): Boolean {
+        val user = api.user(token) ?: return false
+
+        val newAccount = AuthData(
+            token = token,
+            user = user,
+        )
+
+        val currentAccounts = AccountManager.accounts(idPrefix)
+        if (currentAccounts.any { it.user.id == newAccount.user.id }) {
+            throw ErrorLoadingException("Already logged into this account")
+        }
+
+        val newAccounts = currentAccounts + newAccount
+        AccountManager.updateAccounts(idPrefix, newAccounts)
+        AccountManager.updateAccountsId(idPrefix, user.id)
+        if (this is SyncRepo) {
+            requireLibraryRefresh = true
+        }
+        return true
+    }
+
+    @Throws
+    suspend fun login(form: AuthLoginResponse): Boolean {
+        return setupLogin(api.login(form) ?: return false)
+    }
+
+    @Throws
+    suspend fun login(payload: AuthPinData): Boolean {
+        return setupLogin(api.login(payload) ?: return false)
+    }
+
+    @Throws
+    suspend fun login(redirectUrl: String): Boolean {
+        return setupLogin(
+            api.login(
+                redirectUrl,
+                synchronized(oauthPayload) { oauthPayload[api.idPrefix] }) ?: return false
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/BackupAPI.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/BackupAPI.kt
new file mode 100644
index 00000000000..5efb88e5b74
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/BackupAPI.kt
@@ -0,0 +1,14 @@
+package com.lagradost.cloudstream3.syncproviders
+
+/** Work in progress */
+abstract class BackupAPI : AuthAPI() {
+    open val filename : String = "cloudstream-backup.json"
+
+    /** Get the backup file as a JSON string from the remote storage. Return null if not found/empty */
+    @Throws
+    open suspend fun downloadFile(auth: AuthData?) : String? = throw NotImplementedError()
+
+    /** Get the backup file as a JSON string from the remote storage. */
+    @Throws
+    open suspend fun uploadFile(auth: AuthData?, data : String) : String? = throw NotImplementedError()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/InAppAuthAPI.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/InAppAuthAPI.kt
deleted file mode 100644
index 8b6fdf463cf..00000000000
--- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/InAppAuthAPI.kt
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.lagradost.cloudstream3.syncproviders
-
-import androidx.annotation.WorkerThread
-
-interface InAppAuthAPI : AuthAPI {
-    data class LoginData(
-        val username: String? = null,
-        val password: String? = null,
-        val server: String? = null,
-        val email: String? = null,
-    )
-
-    // this is for displaying the UI
-    val requiresPassword: Boolean
-    val requiresUsername: Boolean
-    val requiresServer: Boolean
-    val requiresEmail: Boolean
-
-    // if this is false we can assume that getLatestLoginData returns null and wont be called
-    // this is used in case for some reason it is not preferred to store any login data besides the "token" or encrypted data
-    val storesPasswordInPlainText: Boolean
-
-    // return true if logged in successfully
-    suspend fun login(data: LoginData): Boolean
-
-    // used to fill the UI if you want to edit any data about your login info
-    fun getLatestLoginData(): LoginData?
-}
-
-abstract class InAppAuthAPIManager(defIndex: Int) : AccountManager(defIndex), InAppAuthAPI {
-    override val requiresPassword = false
-    override val requiresUsername = false
-    override val requiresEmail = false
-    override val requiresServer = false
-    override val storesPasswordInPlainText = true
-    override val requiresLogin = true
-
-    // runs on startup
-    @WorkerThread
-    open suspend fun initialize() {
-    }
-
-    override fun logOut() {
-        throw NotImplementedError()
-    }
-
-    override val idPrefix: String
-        get() = throw NotImplementedError()
-
-    override val name: String
-        get() = throw NotImplementedError()
-
-    override val icon: Int? = null
-
-    override suspend fun login(data: InAppAuthAPI.LoginData): Boolean {
-        throw NotImplementedError()
-    }
-
-    override fun getLatestLoginData(): InAppAuthAPI.LoginData? {
-        throw NotImplementedError()
-    }
-
-    override fun loginInfo(): AuthAPI.LoginInfo? {
-        throw NotImplementedError()
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/OAuth2API.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/OAuth2API.kt
deleted file mode 100644
index 3d0bb9402cc..00000000000
--- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/OAuth2API.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.lagradost.cloudstream3.syncproviders
-
-import androidx.fragment.app.FragmentActivity
-
-interface OAuth2API : AuthAPI {
-    val key: String
-    val redirectUrl: String
-    val supportDeviceAuth: Boolean
-
-    suspend fun handleRedirect(url: String) : Boolean
-    fun authenticate(activity: FragmentActivity?)
-    suspend fun getDevicePin() : PinAuthData? {
-        return null
-    }
-
-    suspend fun handleDeviceAuth(pinAuthData: PinAuthData) : Boolean {
-        return false
-    }
-
-    data class PinAuthData(
-        val deviceCode: String,
-        val userCode: String,
-        val verificationUrl: String,
-        val expiresIn: Int,
-        val interval: Int,
-    )
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/SubtitleAPI.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/SubtitleAPI.kt
new file mode 100644
index 00000000000..a1149b5f8f8
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/SubtitleAPI.kt
@@ -0,0 +1,37 @@
+package com.lagradost.cloudstream3.syncproviders
+
+import androidx.annotation.WorkerThread
+import com.lagradost.cloudstream3.subtitles.AbstractSubtitleEntities.SubtitleEntity
+import com.lagradost.cloudstream3.subtitles.AbstractSubtitleEntities.SubtitleSearch
+import com.lagradost.cloudstream3.subtitles.SubtitleResource
+
+/**
+ * Stateless subtitle class for external subtitles.
+ *
+ * All non-null `AuthToken` will be non-expired when each function is called.
+ */
+abstract class SubtitleAPI : AuthAPI() {
+    @WorkerThread
+    @Throws
+    open suspend fun search(auth: AuthData?, query: SubtitleSearch): List<SubtitleEntity>? =
+        throw NotImplementedError()
+
+    @WorkerThread
+    @Throws
+    open suspend fun load(auth: AuthData?, subtitle: SubtitleEntity): String? =
+        throw NotImplementedError()
+
+    @WorkerThread
+    @Throws
+    open suspend fun SubtitleResource.getResources(auth: AuthData?, subtitle: SubtitleEntity) {
+        this.addUrl(load(auth, subtitle))
+    }
+
+    @WorkerThread
+    @Throws
+    suspend fun resource(auth: AuthData?, subtitle: SubtitleEntity): SubtitleResource {
+        return SubtitleResource().apply {
+            this.getResources(auth, subtitle)
+        }
+    }
+}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/SubtitleRepo.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/SubtitleRepo.kt
new file mode 100644
index 00000000000..7a93f96f697
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/SubtitleRepo.kt
@@ -0,0 +1,89 @@
+package com.lagradost.cloudstream3.syncproviders
+
+import androidx.annotation.WorkerThread
+import com.lagradost.cloudstream3.APIHolder.unixTime
+import com.lagradost.cloudstream3.ErrorLoadingException
+import com.lagradost.cloudstream3.subtitles.AbstractSubtitleEntities.SubtitleEntity
+import com.lagradost.cloudstream3.subtitles.AbstractSubtitleEntities.SubtitleSearch
+import com.lagradost.cloudstream3.subtitles.SubtitleResource
+import com.lagradost.cloudstream3.utils.Coroutines.threadSafeListOf
+
+/** Stateless safe abstraction of SubtitleAPI */
+class SubtitleRepo(override val api: SubtitleAPI) : AuthRepo(api) {
+    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
+    }
+
+    @WorkerThread
+    suspend fun resource(data: SubtitleEntity): Result<SubtitleResource> = runCatching {
+        synchronized(resourceCache) {
+            for (item in resourceCache) {
+                // 20 min save
+                if (item.query == data && (unixTime - item.unixTime) < 60 * 20) {
+                    return@runCatching item.response
+                }
+            }
+        }
+
+        val returnValue = api.resource(freshAuth(), 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): Result<List<SubtitleEntity>> {
+        return runCatching {
+            synchronized(searchCache) {
+                for (item in searchCache) {
+                    // 120 min save
+                    if (item.query == query && (unixTime - item.unixTime) < 60 * 120) {
+                        return@runCatching item.response
+                    }
+                }
+            }
+
+            val returnValue =
+                api.search(freshAuth(), query) ?: emptyList()
+
+            // 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
+        }
+    }
+}
+
diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/SyncApi.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/SyncAPI.kt
similarity index 64%
rename from app/src/main/java/com/lagradost/cloudstream3/syncproviders/SyncApi.kt
rename to app/src/main/java/com/lagradost/cloudstream3/syncproviders/SyncAPI.kt
index 9d43685c830..e5f9aca8493 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/SyncApi.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/SyncAPI.kt
@@ -1,170 +1,194 @@
-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.utils.UiText
-import me.xdrop.fuzzywuzzy.FuzzySearch
-import java.util.Date
-
-interface SyncAPI : OAuth2API {
-    /**
-     * Set this to true if the user updates something on the list like watch status or score
-     **/
-    var requireLibraryRefresh: Boolean
-    val mainUrl: String
-
-    /**
-     * Allows certain providers to open pages from
-     * library links.
-     **/
-    val syncIdName: SyncIdName
-
-    /**
-    -1 -> None
-    0 -> Watching
-    1 -> Completed
-    2 -> OnHold
-    3 -> Dropped
-    4 -> PlanToWatch
-    5 -> ReWatching
-     */
-    suspend fun score(id: String, status: AbstractSyncStatus): Boolean
-
-    suspend fun getStatus(id: String): AbstractSyncStatus?
-
-    suspend fun getResult(id: String): SyncResult?
-
-    suspend fun search(name: String): List<SyncSearchResult>?
-
-    suspend fun getPersonalLibrary(): LibraryMetadata?
-
-    fun getIdFromUrl(url: String): String
-
-    data class SyncSearchResult(
-        override val name: String,
-        override val apiName: String,
-        var syncId: String,
-        override val url: String,
-        override var posterUrl: String?,
-        override var type: TvType? = null,
-        override var quality: SearchQuality? = null,
-        override var posterHeaders: Map<String, String>? = null,
-        override var id: Int? = null,
-    ) : SearchResponse
-
-    abstract class AbstractSyncStatus {
-        abstract var status: SyncWatchType
-
-        /** 1-10 */
-        abstract var score: Int?
-        abstract var watchedEpisodes: Int?
-        abstract var isFavorite: Boolean?
-        abstract var maxEpisodes: Int?
-    }
-
-
-    data class SyncStatus(
-        override var status: SyncWatchType,
-        /** 1-10 */
-        override var score: Int?,
-        override var watchedEpisodes: Int?,
-        override var isFavorite: Boolean? = null,
-        override var maxEpisodes: Int? = null,
-    ) : AbstractSyncStatus()
-
-    data class SyncResult(
-        /**Used to verify*/
-        var id: String,
-
-        var totalEpisodes: Int? = null,
-
-        var title: String? = null,
-        /**1-1000*/
-        var publicScore: Int? = null,
-        /**In minutes*/
-        var duration: Int? = null,
-        var synopsis: String? = null,
-        var airStatus: ShowStatus? = null,
-        var nextAiring: NextAiring? = null,
-        var studio: List<String>? = null,
-        var genres: List<String>? = null,
-        var synonyms: List<String>? = null,
-        var trailers: List<String>? = null,
-        var isAdult: Boolean? = null,
-        var posterUrl: String? = null,
-        var backgroundPosterUrl: String? = null,
-
-        /** In unixtime */
-        var startDate: Long? = null,
-        /** In unixtime */
-        var endDate: Long? = null,
-        var recommendations: List<SyncSearchResult>? = null,
-        var nextSeason: SyncSearchResult? = null,
-        var prevSeason: SyncSearchResult? = null,
-        var actors: List<ActorData>? = null,
-    )
-
-
-    data class Page(
-        val title: UiText, var items: List<LibraryItem>
-    ) {
-        fun sort(method: ListSorting?, query: String? = null) {
-            items = when (method) {
-                ListSorting.Query ->
-                    if (query != null) {
-                        items.sortedBy {
-                            -FuzzySearch.partialRatio(
-                                query.lowercase(), it.name.lowercase()
-                            )
-                        }
-                    } else items
-                ListSorting.RatingHigh -> items.sortedBy { -(it.personalRating ?: 0) }
-                ListSorting.RatingLow -> items.sortedBy { (it.personalRating ?: 0) }
-                ListSorting.AlphabeticalA -> items.sortedBy { it.name }
-                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
-            }
-        }
-    }
-
-    data class LibraryMetadata(
-        val allLibraryLists: List<LibraryList>,
-        val supportedListSorting: Set<ListSorting>
-    )
-
-    data class LibraryList(
-        val name: UiText,
-        val items: List<LibraryItem>
-    )
-
-    data class LibraryItem(
-        override val name: String,
-        override val url: String,
-        /**
-         * Unique unchanging string used for data storage.
-         * This should be the actual id when you change scores and status
-         * since score changes from library might get added in the future.
-         **/
-        val syncId: String,
-        val episodesCompleted: Int?,
-        val episodesTotal: Int?,
-        /** Out of 100 */
-        val personalRating: Int?,
-        val lastUpdatedUnixTime: Long?,
-        override val apiName: String,
-        override var type: TvType?,
-        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
-    ) : SearchResponse
+package com.lagradost.cloudstream3.syncproviders
+
+import androidx.annotation.WorkerThread
+import com.lagradost.cloudstream3.ActorData
+import com.lagradost.cloudstream3.NextAiring
+import com.lagradost.cloudstream3.Score
+import com.lagradost.cloudstream3.SearchQuality
+import com.lagradost.cloudstream3.SearchResponse
+import com.lagradost.cloudstream3.ShowStatus
+import com.lagradost.cloudstream3.TvType
+import com.lagradost.cloudstream3.ui.SyncWatchType
+import com.lagradost.cloudstream3.ui.library.ListSorting
+import com.lagradost.cloudstream3.utils.UiText
+import me.xdrop.fuzzywuzzy.FuzzySearch
+import java.util.Date
+
+/**
+ * Stateless synchronization class, used for syncing status about a specific movie/show.
+ *
+ * All non-null `AuthToken` will be non-expired when each function is called.
+ */
+abstract class SyncAPI : AuthAPI() {
+    /**
+     * Set this to true if the user updates something on the list like watch status or score
+     **/
+    open var requireLibraryRefresh: Boolean = true
+    open val mainUrl: String = "NONE"
+
+    /** Currently unused, but will be used to correctly render the UI.
+     * This should specify what sync watch types can be used with this service. */
+    open val supportedWatchTypes: Set<SyncWatchType> = SyncWatchType.entries.toSet()
+    /**
+     * Allows certain providers to open pages from
+     * library links.
+     **/
+    open val syncIdName: SyncIdName? = null
+
+    /** Modify the current status of an item */
+    @Throws
+    @WorkerThread
+    open suspend fun updateStatus(
+        auth: AuthData?,
+        id: String,
+        newStatus: AbstractSyncStatus
+    ): Boolean = throw NotImplementedError()
+
+    /** Get the current status of an item */
+    @Throws
+    @WorkerThread
+    open suspend fun status(auth: AuthData?, id: String): AbstractSyncStatus? =
+        throw NotImplementedError()
+
+    /** Get metadata about an item */
+    @Throws
+    @WorkerThread
+    open suspend fun load(auth: AuthData?, id: String): SyncResult? = throw NotImplementedError()
+
+    /** Search this service for any results for a given query */
+    @Throws
+    @WorkerThread
+    open suspend fun search(auth: AuthData?, query: String): List<SyncSearchResult>? =
+        throw NotImplementedError()
+
+    /** Get the current library/bookmarks of this service */
+    @Throws
+    @WorkerThread
+    open suspend fun library(auth: AuthData?): LibraryMetadata? = throw NotImplementedError()
+
+    /** Helper function, may be used in the future */
+    @Throws
+    open fun urlToId(url: String): String? = null
+
+    data class SyncSearchResult(
+        override val name: String,
+        override val apiName: String,
+        var syncId: String,
+        override val url: String,
+        override var posterUrl: String?,
+        override var type: TvType? = null,
+        override var quality: SearchQuality? = null,
+        override var posterHeaders: Map<String, String>? = null,
+        override var id: Int? = null,
+        override var score: Score? = null,
+    ) : SearchResponse
+
+    abstract class AbstractSyncStatus {
+        abstract var status: SyncWatchType
+        abstract var score: Score?
+        abstract var watchedEpisodes: Int?
+        abstract var isFavorite: Boolean?
+        abstract var maxEpisodes: Int?
+    }
+
+    data class SyncStatus(
+        override var status: SyncWatchType,
+        override var score: Score?,
+        override var watchedEpisodes: Int?,
+        override var isFavorite: Boolean? = null,
+        override var maxEpisodes: Int? = null,
+    ) : AbstractSyncStatus()
+
+    data class SyncResult(
+        /**Used to verify*/
+        var id: String,
+
+        var totalEpisodes: Int? = null,
+
+        var title: String? = null,
+        var publicScore: Score? = null,
+        /**In minutes*/
+        var duration: Int? = null,
+        var synopsis: String? = null,
+        var airStatus: ShowStatus? = null,
+        var nextAiring: NextAiring? = null,
+        var studio: List<String>? = null,
+        var genres: List<String>? = null,
+        var synonyms: List<String>? = null,
+        var trailers: List<String>? = null,
+        var isAdult: Boolean? = null,
+        var posterUrl: String? = null,
+        var backgroundPosterUrl: String? = null,
+
+        /** In unixtime */
+        var startDate: Long? = null,
+        /** In unixtime */
+        var endDate: Long? = null,
+        var recommendations: List<SyncSearchResult>? = null,
+        var nextSeason: SyncSearchResult? = null,
+        var prevSeason: SyncSearchResult? = null,
+        var actors: List<ActorData>? = null,
+    )
+
+    data class Page(
+        val title: UiText, var items: List<LibraryItem>
+    ) {
+        fun sort(method: ListSorting?, query: String? = null) {
+            items = when (method) {
+                ListSorting.Query ->
+                    if (query != null) {
+                        items.sortedBy {
+                            -FuzzySearch.partialRatio(
+                                query.lowercase(), it.name.lowercase()
+                            )
+                        }
+                    } else items
+
+                ListSorting.RatingHigh -> items.sortedBy { -(it.personalRating?.toInt(100) ?: 0) }
+                ListSorting.RatingLow -> items.sortedBy { (it.personalRating?.toInt(100) ?: 0) }
+                ListSorting.AlphabeticalA -> items.sortedBy { it.name }
+                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
+            }
+        }
+    }
+
+    data class LibraryMetadata(
+        val allLibraryLists: List<LibraryList>,
+        val supportedListSorting: Set<ListSorting>
+    )
+
+    data class LibraryList(
+        val name: UiText,
+        val items: List<LibraryItem>
+    )
+
+    data class LibraryItem(
+        override val name: String,
+        override val url: String,
+        /**
+         * Unique unchanging string used for data storage.
+         * This should be the actual id when you change scores and status
+         * since score changes from library might get added in the future.
+         **/
+        val syncId: String,
+        val episodesCompleted: Int?,
+        val episodesTotal: Int?,
+        val personalRating: Score?,
+        val lastUpdatedUnixTime: Long?,
+        override val apiName: String,
+        override var type: TvType?,
+        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,
+        override var score: Score? = null,
+        val tags: List<String>? = null
+    ) : SearchResponse
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/SyncRepo.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/SyncRepo.kt
index df88eeb71ef..de82624fc7e 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/SyncRepo.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/SyncRepo.kt
@@ -1,48 +1,30 @@
-package com.lagradost.cloudstream3.syncproviders
-
-import com.lagradost.cloudstream3.ErrorLoadingException
-import com.lagradost.cloudstream3.mvvm.Resource
-import com.lagradost.cloudstream3.mvvm.safe
-import com.lagradost.cloudstream3.mvvm.safeApiCall
-
-class SyncRepo(private val repo: SyncAPI) {
-    val idPrefix = repo.idPrefix
-    val name = repo.name
-    val icon = repo.icon
-    val mainUrl = repo.mainUrl
-    val requiresLogin = repo.requiresLogin
-    val syncIdName = repo.syncIdName
-    var requireLibraryRefresh: Boolean
-        get() = repo.requireLibraryRefresh
-        set(value) {
-            repo.requireLibraryRefresh = value
-        }
-
-    suspend fun score(id: String, status: SyncAPI.AbstractSyncStatus): Resource<Boolean> {
-        return safeApiCall { repo.score(id, status) }
-    }
-
-    suspend fun getStatus(id: String): Resource<SyncAPI.AbstractSyncStatus> {
-        return safeApiCall { repo.getStatus(id) ?: throw ErrorLoadingException("No data") }
-    }
-
-    suspend fun getResult(id: String): Resource<SyncAPI.SyncResult> {
-        return safeApiCall { repo.getResult(id) ?: throw ErrorLoadingException("No data") }
-    }
-
-    suspend fun search(query: String): Resource<List<SyncAPI.SyncSearchResult>> {
-        return safeApiCall { repo.search(query) ?: throw ErrorLoadingException() }
-    }
-
-    suspend fun getPersonalLibrary(): Resource<SyncAPI.LibraryMetadata> {
-        return safeApiCall { repo.getPersonalLibrary() ?: throw ErrorLoadingException() }
-    }
-
-    fun hasAccount(): Boolean {
-        return safe { repo.loginInfo() != null } ?: false
-    }
-
-    fun getIdFromUrl(url: String): String? = safe {
-        repo.getIdFromUrl(url)
-    }
-}
\ No newline at end of file
+package com.lagradost.cloudstream3.syncproviders
+
+/** Stateless safe abstraction of SyncAPI */
+class SyncRepo(override val api: SyncAPI) : AuthRepo(api) {
+    val syncIdName = api.syncIdName
+    var requireLibraryRefresh: Boolean
+        get() = api.requireLibraryRefresh
+        set(value) {
+            api.requireLibraryRefresh = value
+        }
+
+    suspend fun updateStatus(id: String, newStatus: SyncAPI.AbstractSyncStatus): Result<Boolean> =
+        runCatching {
+            val status = api.updateStatus(freshAuth() ?: return@runCatching false, id, newStatus)
+            requireLibraryRefresh = true
+            status
+        }
+
+    suspend fun status(id: String): Result<SyncAPI.AbstractSyncStatus?> = runCatching {
+        api.status(freshAuth(), id)
+    }
+
+    suspend fun load(id: String): Result<SyncAPI.SyncResult?> = runCatching {
+        api.load(freshAuth(), id)
+    }
+
+    suspend fun library(): Result<SyncAPI.LibraryMetadata?> = runCatching {
+        api.library(freshAuth())
+    }
+}
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 db4676393ab..144efff99ce 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
@@ -1,108 +1,205 @@
 package com.lagradost.cloudstream3.syncproviders.providers
 
-import com.lagradost.cloudstream3.TvType
+import com.lagradost.cloudstream3.AllLanguagesName
 import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.subtitles.AbstractSubApi
-import com.lagradost.cloudstream3.subtitles.AbstractSubtitleEntities
-import com.lagradost.cloudstream3.utils.SubtitleHelper
+import com.lagradost.cloudstream3.subtitles.AbstractSubtitleEntities.SubtitleEntity
+import com.lagradost.cloudstream3.subtitles.AbstractSubtitleEntities.SubtitleSearch
+import com.lagradost.cloudstream3.syncproviders.AuthData
+import com.lagradost.cloudstream3.syncproviders.SubtitleAPI
+import com.lagradost.cloudstream3.TvType
+import com.lagradost.cloudstream3.utils.SubtitleHelper.fromTagToEnglishLanguageName
 
-class Addic7ed : AbstractSubApi {
+class Addic7ed : SubtitleAPI() {
     override val name = "Addic7ed"
     override val idPrefix = "addic7ed"
     override val requiresLogin = false
-    override val icon: Nothing? = null
-    override val createAccountUrl: Nothing? = null
-
-    override fun loginInfo(): Nothing? = null
-
-    override fun logOut() {}
 
     companion object {
         const val HOST = "https://www.addic7ed.com"
         const val TAG = "ADDIC7ED"
     }
 
-    private fun fixUrl(url: String): String {
+    private fun String.fixUrl(): String {
+        val url = this
         return if (url.startsWith("/")) HOST + url
         else if (!url.startsWith("http")) "$HOST/$url"
         else url
-
     }
 
-    override suspend fun search(query: AbstractSubtitleEntities.SubtitleSearch): List<AbstractSubtitleEntities.SubtitleEntity> {
-        val lang = query.lang
-        val queryLang = SubtitleHelper.fromTwoLettersToLanguage(lang.toString())
-        val queryText = query.query.trim()
+    override suspend fun search(
+        auth: AuthData?,
+        query: SubtitleSearch
+    ): List<SubtitleEntity>? {
+        val langTagIETF = query.lang ?: AllLanguagesName
+        val langNumAddic7ed =
+            langTagIETF2Addic7ed[langTagIETF]?.first ?: 0 // all languages = 0
+        val langName =
+            langTagIETF2Addic7ed[langTagIETF]?.second ?:
+            fromTagToEnglishLanguageName(langTagIETF) ?:
+            "Completed" // this bypasses language filtering
+        val title = query.query.trim()
         val epNum = query.epNumber ?: 0
         val seasonNum = query.seasonNumber ?: 0
         val yearNum = query.year ?: 0
+        val searchQuery = if (seasonNum > 0) "$title $seasonNum $epNum" else title
+        var downloadPage = ""
 
-        fun cleanResources(
-            results: MutableList<AbstractSubtitleEntities.SubtitleEntity>,
-            name: String,
-            link: String,
-            headers: Map<String, String>,
+        fun newSubtitleEntity (
+            displayName: String?,
+            link: String?,
             isHearingImpaired: Boolean
-        ) {
-            results.add(
-                AbstractSubtitleEntities.SubtitleEntity(
-                    idPrefix = idPrefix,
-                    name = name,
-                    lang = queryLang.toString(),
-                    data = link,
-                    source = this.name,
-                    type = if (seasonNum > 0) TvType.TvSeries else TvType.Movie,
-                    epNumber = epNum,
-                    seasonNumber = seasonNum,
-                    year = yearNum,
-                    headers = headers,
-                    isHearingImpaired = isHearingImpaired
-                )
+        ): SubtitleEntity? {
+            if (displayName.isNullOrBlank() || link.isNullOrBlank()) return null
+            return SubtitleEntity(
+                idPrefix = this.idPrefix,
+                name = displayName,
+                lang = langTagIETF,
+                data = link,
+                source = this.name,
+                type = if (seasonNum > 0) TvType.TvSeries else TvType.Movie,
+                epNumber = epNum,
+                seasonNumber = seasonNum,
+                year = yearNum,
+                headers = mapOf("referer" to "$HOST/"),
+                isHearingImpaired = isHearingImpaired
             )
         }
 
-        val title = queryText.substringBefore("(").trim()
-        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
-        else if (!hostDocument.select("table.tabel")
-                .isNullOrEmpty()
-        ) searchResult = hostDocument.select("a:contains($title)").attr("href").toString()
-        else {
-            val show =
-                hostDocument.selectFirst("#sl button")?.attr("onmouseup")?.substringAfter("(")
-                    ?.substringBefore(",")
+        val response = app.get(url = "$HOST/search.php?search=$searchQuery&Submit=Search")
+        val hostDocument = response.document
+
+        // 1st case: found one movie or episode. Redirected to $HOST/movie/1234 or $HOST/serie/show-name/$seasonNum/$epNum/ep-name
+        if (response.url.contains("/movie/") || response.url.contains("/serie/"))
+            downloadPage = response.url
+
+        // 2nd case: found tv series ep list. Redirected to $HOST/show/1234
+        else if (response.url.contains("/show/")) {
+            val showId = response.url.substringAfterLast("/")
             val doc = app.get(
-                "$HOST/ajax_loadShow.php?show=$show&season=$seasonNum&langs=&hd=undefined&hi=undefined",
+                "$HOST/ajax_loadShow.php?show=$showId&season=$seasonNum&langs=|$langNumAddic7ed|&hd=0&hi=0",
                 referer = "$HOST/"
             ).document
-            doc.select("#season tr:contains($queryLang)").mapNotNull { node ->
-                if (node.selectFirst("td")?.text()
-                        ?.toIntOrNull() == seasonNum && node.select("td:eq(1)")
-                        .text()
-                        .toIntOrNull() == epNum
-                ) searchResult = fixUrl(node.select("a").attr("href"))
+
+            // get direct subtitles links from list
+            return doc.select("#season tbody tr").mapNotNull { node ->
+                if (node.select("td:eq(1)").text().toIntOrNull() == epNum)
+                    newSubtitleEntity(
+                        displayName = node.select("td:eq(2)").text() + "\n" + node.select("td:eq(4)").text(),
+                        link = node.selectFirst("a[href~=updated\\/|original\\/]")?.attr("href")?.fixUrl(),
+                        isHearingImpaired = node.select("td:eq(6)").text().isNotEmpty()
+                    )
+                else null
             }
+        // 3rd case: found several or no results. Still in $HOST/search.php?search=title
+        } else {// (response.url.contains("/search.php"))
+            downloadPage = hostDocument.select("table.tabel a").selectFirst({
+                // tv series
+                if (seasonNum > 0) "a[href~=serie\\/.+\\/$seasonNum\\/$epNum\\/\\w]"
+                // movie + year
+                else if( yearNum > 0) "a[href~=movie\\/]:contains($yearNum)"
+                // movie
+                else "a[href~=movie\\/]"
+            }())?.attr("href")?.fixUrl() ?: return null
         }
-        val results = mutableListOf<AbstractSubtitleEntities.SubtitleEntity>()
-        val document = app.get(
-            url = fixUrl(searchResult),
-        ).document
 
-        document.select(".tabel95 .tabel95 tr:contains($queryLang)").mapNotNull { node ->
-            val name = if (seasonNum > 0) "${document.select(".titulo").text().replace("Subtitle","").trim()}${
-                node.parent()!!.select(".NewsTitle").text().substringAfter("Version").substringBefore(", Duration")
-            }" else "${document.select(".titulo").text().replace("Subtitle","").trim()}${node.parent()!!.select(".NewsTitle").text().substringAfter("Version").substringBefore(", Duration")}"
-            val link = fixUrl(node.select("a.buttonDownload").attr("href"))
+        // filter download page by language. Do not work for movies :/
+        if (downloadPage.contains("/serie/"))
+            downloadPage = downloadPage.substringBeforeLast("/") + "/$langNumAddic7ed"
+        val doc = app.get(url = downloadPage).document
+
+        // get subtitles links from download page
+        return doc.select(".tabel95 .tabel95 tr:has(.language):contains($langName)").mapNotNull { node ->
+            val displayName =
+                doc.selectFirst("span.titulo")?.text()?.substringBefore(" Subtitle") + "\n" +
+                node.parent()!!.select(".NewsTitle").text().substringAfter("Version ").substringBefore(", Duration")
+            val link =
+                node.selectFirst("a[href~=updated\\/|original\\/]")?.attr("href")?.fixUrl()
             val isHearingImpaired =
-                !node.parent()!!.select("tr:last-child [title=\"Hearing Impaired\"]").isNullOrEmpty()
-            cleanResources(results, name, link, mapOf("referer" to "$HOST/"), isHearingImpaired)
+                node.parent()!!.select("tr:last-child [title=\"Hearing Impaired\"]").isNotEmpty()
+
+            newSubtitleEntity(displayName, link, isHearingImpaired)
         }
-        return results
     }
 
-    override suspend fun load(data: AbstractSubtitleEntities.SubtitleEntity): String {
-        return data.data
+    override suspend fun load(
+        auth: AuthData?,
+        subtitle: SubtitleEntity
+    ): String? {
+        return subtitle.data
     }
+
+    // Missing (?_?)
+    // Pair("2", ""),
+    // Pair("3", ""),
+    // Pair("33", ""),
+    // Pair("34", ""),
+    // Do not modify unless Addic7ed changes them!
+    // as they are the exact values from their website
+    private val langTagIETF2Addic7ed = mapOf(
+        "ar"      to Pair("38", "Arabic"),
+        "az"      to Pair("48", "Azerbaijani"),
+        "bg"      to Pair("35", "Bulgarian"),
+        "bn"      to Pair("47", "Bengali"),
+        "bs"      to Pair("44", "Bosnian"),
+        "ca"      to Pair("12", "Català"),
+        "cs"      to Pair("14", "Czech"),
+        "cy"      to Pair("65", "Welsh"),
+        "da"      to Pair("30", "Danish"),
+        "de"      to Pair("11", "German"),
+        "el"      to Pair("27", "Greek"),
+        "en"      to Pair("1", "English"),
+        "es-419"  to Pair("6", "Spanish (Latin America)"),
+        "es-ar"   to Pair("69", "Spanish (Argentina)"),
+        "es-es"   to Pair("5", "Spanish (Spain)"),
+        "es"      to Pair("4", "Spanish"),
+        "et"      to Pair("54", "Estonian"),
+        "eu"      to Pair("13", "Euskera"),
+        "fa"      to Pair("43", "Persian"),
+        "fi"      to Pair("28", "Finnish"),
+        "fr-ca"   to Pair("53", "French (Canadian)"),
+        "fr"      to Pair("8", "French"),
+        "gl"      to Pair("15", "Galego"),
+        "he"      to Pair("23", "Hebrew"),
+        "hi"      to Pair("55", "Hindi"),
+        "hr"      to Pair("31", "Croatian"),
+        "hu"      to Pair("20", "Hungarian"),
+        "hy"      to Pair("50", "Armenian"),
+        "id"      to Pair("37", "Indonesian"),
+        "is"      to Pair("56", "Icelandic"),
+        "it"      to Pair("7", "Italian"),
+        "ja"      to Pair("32", "Japanese"),
+        "kn"      to Pair("66", "Kannada"),
+        "ko"      to Pair("42", "Korean"),
+        "lt"      to Pair("58", "Lithuanian"),
+        "lv"      to Pair("57", "Latvian"),
+        "mk"      to Pair("49", "Macedonian"),
+        "ml"      to Pair("67", "Malayalam"),
+        "mr"      to Pair("62", "Marathi"),
+        "ms"      to Pair("40", "Malay"),
+        "nl"      to Pair("17", "Dutch"),
+        "no"      to Pair("29", "Norwegian"),
+        "pl"      to Pair("21", "Polish"),
+        "pt-br"   to Pair("10", "Portuguese (Brazilian)"),
+        "pt"      to Pair("9", "Portuguese"),
+        "ro"      to Pair("26", "Romanian"),
+        "ru"      to Pair("19", "Russian"),
+        "si"      to Pair("60", "Sinhala"),
+        "sk"      to Pair("25", "Slovak"),
+        "sl"      to Pair("22", "Slovenian"),
+        "sq"      to Pair("52", "Albanian"),
+        "sr-latn" to Pair("36", "Serbian (Latin)"),
+        "sr"      to Pair("39", "Serbian (Cyrillic)"),
+        "sv"      to Pair("18", "Swedish"),
+        "ta"      to Pair("59", "Tamil"),
+        "te"      to Pair("63", "Telugu"),
+        "th"      to Pair("46", "Thai"),
+        "tl"      to Pair("68", "Tagalog"),
+        "tlh"     to Pair("61", "Klingon"),
+        "tr"      to Pair("16", "Turkish"),
+        "uk"      to Pair("51", "Ukrainian"),
+        "vi"      to Pair("45", "Vietnamese"),
+        "yue"     to Pair("64", "Cantonese"),
+        "zh-hans" to Pair("41", "Chinese (Simplified)"),
+        "zh-hant" to Pair("24", "Chinese (Traditional)"),
+    )
 }
\ No newline at end of file
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 f8e82409522..7a46b411376 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
@@ -1,92 +1,89 @@
 package com.lagradost.cloudstream3.syncproviders.providers
 
 import androidx.annotation.StringRes
-import androidx.fragment.app.FragmentActivity
 import com.fasterxml.jackson.annotation.JsonProperty
-import com.lagradost.cloudstream3.*
-import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
-import com.lagradost.cloudstream3.AcraApplication.Companion.openBrowser
-import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
+import com.lagradost.cloudstream3.Actor
+import com.lagradost.cloudstream3.ActorData
+import com.lagradost.cloudstream3.ActorRole
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.getKey
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.setKey
+import com.lagradost.cloudstream3.ErrorLoadingException
+import com.lagradost.cloudstream3.NextAiring
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.Score
+import com.lagradost.cloudstream3.TvType
+import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.mvvm.logError
-import com.lagradost.cloudstream3.mvvm.safeAsync
-import com.lagradost.cloudstream3.syncproviders.AccountManager
-import com.lagradost.cloudstream3.syncproviders.AuthAPI
+import com.lagradost.cloudstream3.syncproviders.AuthData
+import com.lagradost.cloudstream3.syncproviders.AuthLoginPage
+import com.lagradost.cloudstream3.syncproviders.AuthToken
+import com.lagradost.cloudstream3.syncproviders.AuthUser
 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.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 com.lagradost.cloudstream3.utils.txt
 import java.net.URLEncoder
 import java.util.Locale
 
-class AniListApi(index: Int) : AccountManager(index), SyncAPI {
+class AniListApi : SyncAPI() {
     override var name = "AniList"
-    override val key = "6871"
-    override val redirectUrl = "anilistlogin"
     override val idPrefix = "anilist"
+
+    val key = "6871"
+    override val redirectUrlIdentifier = "anilistlogin"
     override var requireLibraryRefresh = true
-    override val supportDeviceAuth = false
+    override val hasOAuth2 = true
     override var mainUrl = "https://anilist.co"
     override val icon = R.drawable.ic_anilist_icon
-    override val requiresLogin = false
     override val createAccountUrl = "$mainUrl/signup"
     override val syncIdName = SyncIdName.Anilist
 
-    override fun loginInfo(): AuthAPI.LoginInfo? {
-        // context.getUser(true)?.
-        getKey<AniListUser>(accountId, ANILIST_USER_KEY)?.let { user ->
-            return AuthAPI.LoginInfo(
-                profilePicture = user.picture,
-                name = user.name,
-                accountIndex = accountIndex
-            )
-        }
-        return null
-    }
+    override fun loginRequest(): AuthLoginPage? =
+        AuthLoginPage("https://anilist.co/api/v2/oauth/authorize?client_id=$key&response_type=token")
 
-    override fun logOut() {
-        requireLibraryRefresh = true
-        removeAccountKeys()
+    override suspend fun login(redirectUrl: String, payload: String?): AuthToken? {
+        val sanitizer = splitRedirectUrl(redirectUrl)
+        val token = AuthToken(
+            accessToken = sanitizer["access_token"] ?: throw ErrorLoadingException("No access token"),
+            //refreshToken = sanitizer["refresh_token"],
+            accessTokenLifetime = unixTime + sanitizer["expires_in"]!!.toLong(),
+        )
+        return token
     }
 
-    override fun authenticate(activity: FragmentActivity?) {
-        val request = "https://anilist.co/api/v2/oauth/authorize?client_id=$key&response_type=token"
-        openBrowser(request, activity)
+    // https://docs.anilist.co/guide/auth/
+    override suspend fun refreshToken(token: AuthToken): AuthToken? {
+        // AniList access tokens are long-lived. They will remain valid for 1 year from the time they are issued.
+        // Refresh tokens are not currently supported. Once a token expires, you will need to re-authenticate your users.
+        return super.refreshToken(token)
     }
 
-    override suspend fun handleRedirect(url: String): Boolean {
-        val sanitizer =
-            splitQuery(URL(url.replace(APP_STRING, "https").replace("/#", "?"))) // FIX ERROR
-        val token = sanitizer["access_token"]!!
-        val expiresIn = sanitizer["expires_in"]!!
-
-        val endTime = unixTime + expiresIn.toLong()
+    override suspend fun user(token: AuthToken?): AuthUser? {
+        val user = getUser(token ?: return null)
+            ?: throw ErrorLoadingException("Unable to fetch user data")
 
-        switchToNewAccount()
-        setKey(accountId, ANILIST_UNIXTIME_KEY, endTime)
-        setKey(accountId, ANILIST_TOKEN_KEY, token)
-        val user = getUser()
-        requireLibraryRefresh = true
-        return user != null
+        return AuthUser(
+            id = user.id,
+            name = user.name,
+            profilePicture = user.picture,
+        )
     }
 
-    override fun getIdFromUrl(url: String): String {
-        return url.removePrefix("$mainUrl/anime/").removeSuffix("/")
-    }
+    override fun urlToId(url: String): String? =
+        url.removePrefix("$mainUrl/anime/").removeSuffix("/")
+
 
     private fun getUrlFromId(id: Int): String {
         return "$mainUrl/anime/$id"
     }
 
-    override suspend fun search(name: String): List<SyncAPI.SyncSearchResult>? {
+    override suspend fun search(auth : AuthData?, query: String): List<SyncAPI.SyncSearchResult>? {
         val data = searchShows(name) ?: return null
         return data.data?.page?.media?.map {
             SyncAPI.SyncSearchResult(
@@ -99,7 +96,7 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI {
         }
     }
 
-    override suspend fun getResult(id: String): SyncAPI.SyncResult {
+    override suspend fun load(auth : AuthData?, 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
@@ -141,7 +138,7 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI {
                     }
                 )
             },
-            publicScore = season.averageScore?.times(100),
+            publicScore = Score.from100(season.averageScore),
             recommendations = season.recommendations?.edges?.mapNotNull { rec ->
                 val recMedia = rec.node.mediaRecommendation
                 SyncAPI.SyncSearchResult(
@@ -161,12 +158,12 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI {
         )
     }
 
-    override suspend fun getStatus(id: String): SyncAPI.AbstractSyncStatus? {
+    override suspend fun status(auth : AuthData?, id: String): SyncAPI.AbstractSyncStatus? {
         val internalId = id.toIntOrNull() ?: return null
-        val data = getDataAboutId(internalId) ?: return null
+        val data = getDataAboutId(auth ?: return null, internalId) ?: return null
 
         return SyncAPI.SyncStatus(
-            score = data.score,
+            score = Score.from100(data.score),
             watchedEpisodes = data.progress,
             status = SyncWatchType.fromInternalId(data.type?.value ?: return null),
             isFavorite = data.isFavourite,
@@ -174,24 +171,25 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI {
         )
     }
 
-    override suspend fun score(id: String, status: SyncAPI.AbstractSyncStatus): Boolean {
+    override suspend fun updateStatus(
+        auth: AuthData?,
+        id: String,
+        newStatus: AbstractSyncStatus
+    ): Boolean {
         return postDataAboutId(
+            auth ?: return false,
             id.toIntOrNull() ?: return false,
-            fromIntToAnimeStatus(status.status.internalId),
-            status.score,
-            status.watchedEpisodes
-        ).also {
-            requireLibraryRefresh = requireLibraryRefresh || it
-        }
+            fromIntToAnimeStatus(newStatus.status.internalId),
+            newStatus.score,
+            newStatus.watchedEpisodes
+        )
     }
 
     companion object {
+        const val MAX_STALE = 60 * 10
         private val aniListStatusString =
             arrayOf("CURRENT", "COMPLETED", "PAUSED", "DROPPED", "PLANNING", "REPEATING")
 
-        const val ANILIST_UNIXTIME_KEY: String = "anilist_unixtime" // When token expires
-        const val ANILIST_TOKEN_KEY: String = "anilist_token" // anilist token for api
-        const val ANILIST_USER_KEY: String = "anilist_user" // user data like profile
         const val ANILIST_CACHED_LIST: String = "anilist_cached_list"
 
         private fun fixName(name: String): String {
@@ -461,21 +459,7 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI {
         }
     }
 
-    fun initGetUser() {
-        if (getAuth() == null) return
-        ioSafe {
-            getUser()
-        }
-    }
-
-    private fun checkToken(): Boolean {
-        return unixTime > getKey(
-            accountId,
-            ANILIST_UNIXTIME_KEY, 0L
-        )!!
-    }
-
-    private suspend fun getDataAboutId(id: Int): AniListTitleHolder? {
+    private suspend fun getDataAboutId(auth : AuthData, id: Int): AniListTitleHolder? {
         val q =
             """query (${'$'}id: Int = $id) { # Define which variables will be used in the query (id)
                 Media (id: ${'$'}id, type: ANIME) { # Insert our variables into the query arguments (id) (type: ANIME is hard-coded in the query)
@@ -485,7 +469,7 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI {
                     mediaListEntry {
                         progress
                         status
-                        score (format: POINT_10)
+                        score (format: POINT_100)
                     }
                     title {
                         english
@@ -494,7 +478,7 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI {
                 }
             }"""
 
-        val data = postApi(q, true)
+        val data = postApi(auth.token, q, true)
         val d = parseJson<GetDataRoot>(data ?: return null)
 
         val main = d.data?.media
@@ -522,37 +506,24 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI {
 
     }
 
-    private fun getAuth(): String? {
-        return getKey(
-            accountId,
-            ANILIST_TOKEN_KEY
-        )
+    private suspend fun postApi(token : AuthToken, q: String, cache: Boolean = false): String? {
+        return app.post(
+            "https://graphql.anilist.co/",
+            headers = mapOf(
+                "Authorization" to "Bearer ${token.accessToken ?: return null}",
+                if (cache) "Cache-Control" to "max-stale=$MAX_STALE" else "Cache-Control" to "no-cache"
+            ),
+            cacheTime = 0,
+            data = mapOf(
+                "query" to URLEncoder.encode(
+                    q,
+                    "UTF-8"
+                )
+            ), //(if (vars == null) mapOf("query" to q) else mapOf("query" to q, "variables" to vars))
+            timeout = 5 // REASONABLE TIMEOUT
+        ).text.replace("\\/", "/")
     }
 
-    private suspend fun postApi(q: String, cache: Boolean = false): String? {
-        return safeAsync {
-            if (!checkToken()) {
-                app.post(
-                    "https://graphql.anilist.co/",
-                    headers = mapOf(
-                        "Authorization" to "Bearer " + (getAuth()
-                            ?: return@safeAsync null),
-                        if (cache) "Cache-Control" to "max-stale=$MAX_STALE" else "Cache-Control" to "no-cache"
-                    ),
-                    cacheTime = 0,
-                    data = mapOf(
-                        "query" to URLEncoder.encode(
-                            q,
-                            "UTF-8"
-                        )
-                    ), //(if (vars == null) mapOf("query" to q) else mapOf("query" to q, "variables" to vars))
-                    timeout = 5 // REASONABLE TIMEOUT
-                ).text.replace("\\/", "/")
-            } else {
-                null
-            }
-        }
-    }
 
     data class MediaRecommendation(
         @JsonProperty("id") val id: Int,
@@ -624,7 +595,7 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI {
                 this.media.id.toString(),
                 this.progress,
                 this.media.episodes,
-                this.score,
+                Score.from100(this.score),
                 this.updatedAt.toLong(),
                 "AniList",
                 TvType.Anime,
@@ -652,27 +623,23 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI {
         @JsonProperty("MediaListCollection") val mediaListCollection: MediaListCollection
     )
 
-    private fun getAniListListCached(): Array<Lists>? {
-        return getKey(ANILIST_CACHED_LIST) as? Array<Lists>
-    }
-
-    private suspend fun getAniListAnimeListSmart(): Array<Lists>? {
-        if (getAuth() == null) return null
-
-        if (checkToken()) return null
+    private suspend fun getAniListAnimeListSmart(auth: AuthData): Array<Lists>? {
         return if (requireLibraryRefresh) {
-            val list = getFullAniListList()?.data?.mediaListCollection?.lists?.toTypedArray()
+            val list = getFullAniListList(auth)?.data?.mediaListCollection?.lists?.toTypedArray()
             if (list != null) {
-                setKey(ANILIST_CACHED_LIST, list)
+                setKey(ANILIST_CACHED_LIST, auth.user.id.toString(), list)
             }
             list
         } else {
-            getAniListListCached()
+            getKey<Array<Lists>>(
+                ANILIST_CACHED_LIST,
+                auth.user.id.toString()
+            ) as? Array<Lists>
         }
     }
 
-    override suspend fun getPersonalLibrary(): SyncAPI.LibraryMetadata {
-        val list = getAniListAnimeListSmart()?.groupBy {
+    override suspend fun library(auth : AuthData?): SyncAPI.LibraryMetadata? {
+        val list = getAniListAnimeListSmart(auth ?: return null)?.groupBy {
             convertAniListStringToStatus(it.status ?: "").stringRes
         }?.mapValues { group ->
             group.value.map { it.entries.map { entry -> entry.toLibraryItem() } }.flatten()
@@ -699,10 +666,8 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI {
         )
     }
 
-    private suspend fun getFullAniListList(): FullAnilistList? {
-        /** WARNING ASSUMES ONE USER! **/
-
-        val userID = getKey<AniListUser>(accountId, ANILIST_USER_KEY)?.id ?: return null
+    private suspend fun getFullAniListList(auth : AuthData): FullAnilistList? {
+        val userID = auth.user.id
         val mediaType = "ANIME"
 
         val query = """
@@ -745,11 +710,11 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI {
                     }
                     }
             """
-        val text = postApi(query)
+        val text = postApi(auth.token, query)
         return text?.toKotlinObject()
     }
 
-    suspend fun toggleLike(id: Int): Boolean {
+    suspend fun toggleLike(auth : AuthData, id: Int): Boolean {
         val q = """mutation (${'$'}animeId: Int = $id) {
 				ToggleFavourite (animeId: ${'$'}animeId) {
 					anime {
@@ -762,7 +727,7 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI {
 					}
 				}
 			}"""
-        val data = postApi(q)
+        val data = postApi(auth.token, q)
         return data != ""
     }
 
@@ -772,15 +737,17 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI {
     data class MediaListId(@JsonProperty("id") val id: Long? = null)
 
     private suspend fun postDataAboutId(
+        auth : AuthData,
         id: Int,
         type: AniListStatusType,
-        score: Int?,
+        score: Score?,
         progress: Int?
     ): Boolean {
+        val userID = auth.user.id
+
         val q =
             // Delete item if status type is None
             if (type == AniListStatusType.None) {
-                val userID = getKey<AniListUser>(accountId, ANILIST_USER_KEY)?.id ?: return false
                 // Get list ID for deletion
                 val idQuery = """
                   query MediaList(${'$'}userId: Int = $userID, ${'$'}mediaId: Int = $id) {
@@ -789,7 +756,7 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI {
                     }
                   }
                 """
-                val response = postApi(idQuery)
+                val response = postApi(auth.token, idQuery)
                 val listId =
                     tryParseJson<MediaListItemRoot>(response)?.data?.mediaList?.id ?: return false
                 """
@@ -805,7 +772,7 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI {
                         0,
                         type.value
                     )]
-                }, ${if (score != null) "${'$'}scoreRaw: Int = ${score * 10}" else ""} , ${if (progress != null) "${'$'}progress: Int = $progress" else ""}) {
+                }, ${if (score != null) "${'$'}scoreRaw: Int = ${score.toInt(100)}" else ""} , ${if (progress != null) "${'$'}progress: Int = $progress" else ""}) {
                     SaveMediaListEntry (mediaId: ${'$'}id, status: ${'$'}status, scoreRaw: ${'$'}scoreRaw, progress: ${'$'}progress) {
                         id
                         status
@@ -815,11 +782,11 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI {
                 }"""
             }
 
-        val data = postApi(q)
+        val data = postApi(auth.token, q)
         return data != ""
     }
 
-    private suspend fun getUser(setSettings: Boolean = true): AniListUser? {
+    private suspend fun getUser(token : AuthToken): AniListUser? {
         val q = """
 				{
   					Viewer {
@@ -837,23 +804,15 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI {
                         }
   					}
 				}"""
-        val data = postApi(q)
+        val data = postApi(token, q)
         if (data.isNullOrBlank()) return null
         val userData = parseJson<AniListRoot>(data)
-        val u = userData.data?.viewer
+        val u = userData.data?.viewer ?: return null
         val user = AniListUser(
-            u?.id,
-            u?.name,
-            u?.avatar?.large,
+            u.id,
+            u.name,
+            u.avatar?.large,
         )
-        if (setSettings) {
-            setKey(accountId, ANILIST_USER_KEY, user)
-            registerAccount()
-        }
-        /* // TODO FIX FAVS
-        for(i in u.favourites.anime.nodes) {
-            println("FFAV:" + i.id)
-        }*/
         return user
     }
 
@@ -1048,8 +1007,8 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI {
     )
 
     data class AniListViewer(
-        @JsonProperty("id") val id: Int?,
-        @JsonProperty("name") val name: String?,
+        @JsonProperty("id") val id: Int,
+        @JsonProperty("name") val name: String,
         @JsonProperty("avatar") val avatar: AniListAvatar?,
         @JsonProperty("favourites") val favourites: AniListFavourites?,
     )
@@ -1063,8 +1022,8 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI {
     )
 
     data class AniListUser(
-        @JsonProperty("id") val id: Int?,
-        @JsonProperty("name") val name: String?,
+        @JsonProperty("id") val id: Int,
+        @JsonProperty("name") val name: String,
         @JsonProperty("picture") val picture: String?,
     )
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/DropboxApi.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/DropboxApi.kt
deleted file mode 100644
index 94537ea3367..00000000000
--- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/DropboxApi.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.lagradost.cloudstream3.syncproviders.providers
-
-import androidx.fragment.app.FragmentActivity
-import com.lagradost.cloudstream3.syncproviders.AuthAPI
-import com.lagradost.cloudstream3.syncproviders.OAuth2API
-
-//TODO dropbox sync
-class Dropbox : OAuth2API {
-    override val idPrefix = "dropbox"
-    override var name = "Dropbox"
-    override val key = "zlqsamadlwydvb2"
-    override val redirectUrl = "dropboxlogin"
-    override val requiresLogin = true
-    override val supportDeviceAuth = false
-    override val createAccountUrl: String? = null
-
-    override val icon: Int
-        get() = TODO("Not yet implemented")
-
-    override fun authenticate(activity: FragmentActivity?) {
-        TODO("Not yet implemented")
-    }
-
-    override suspend fun handleRedirect(url: String): Boolean {
-        TODO("Not yet implemented")
-    }
-
-    override fun logOut() {
-        TODO("Not yet implemented")
-    }
-
-    override fun loginInfo(): AuthAPI.LoginInfo? {
-        TODO("Not yet implemented")
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/KitsuApi.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/KitsuApi.kt
index 724d72163b0..29c3c0c1793 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/KitsuApi.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/KitsuApi.kt
@@ -1,8 +1,680 @@
 package com.lagradost.cloudstream3.syncproviders.providers
 
+
+import androidx.annotation.StringRes
 import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.getKey
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.setKey
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.Score
+import com.lagradost.cloudstream3.ShowStatus
+import com.lagradost.cloudstream3.TvType
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.mvvm.logError
+import com.lagradost.cloudstream3.syncproviders.AuthData
+import com.lagradost.cloudstream3.syncproviders.AuthLoginRequirement
+import com.lagradost.cloudstream3.syncproviders.AuthLoginResponse
+import com.lagradost.cloudstream3.syncproviders.AuthToken
+import com.lagradost.cloudstream3.syncproviders.AuthUser
+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.utils.AppUtils.toJson
+import com.lagradost.cloudstream3.utils.txt
+import okhttp3.Interceptor
+import okhttp3.Request
+import okhttp3.RequestBody.Companion.toRequestBody
+import okhttp3.Response
+import java.text.SimpleDateFormat
+import java.time.Instant
+import java.time.LocalDate
+import java.time.format.DateTimeFormatter
+import java.util.Date
+import java.util.Locale
+
+const val KITSU_MAX_SEARCH_LIMIT = 20
+
+class KitsuApi: SyncAPI() {
+    override var name = "Kitsu"
+    override val idPrefix = "kitsu"
+
+    private val apiUrl = "https://kitsu.io/api/edge"
+    private val fallbackApiUrl = "https://kitsu.app/api/edge"
+    private val oauthUrl = "https://kitsu.io/api/oauth"
+    private val fallbackOauthUrl = "https://kitsu.app/api/oauth"
+    override val hasInApp = true
+    override val mainUrl = "https://kitsu.app"
+    override val icon = R.drawable.kitsu_icon
+    override val syncIdName = SyncIdName.Kitsu
+    override val createAccountUrl = mainUrl
+
+    override val supportedWatchTypes = setOf(
+        SyncWatchType.WATCHING,
+        SyncWatchType.COMPLETED,
+        SyncWatchType.PLANTOWATCH,
+        SyncWatchType.DROPPED,
+        SyncWatchType.ONHOLD,
+        SyncWatchType.NONE
+    )
+
+    override val inAppLoginRequirement = AuthLoginRequirement(
+        password = true,
+        email = true
+    )
+
+    private class FallbackInterceptor(private val apiUrl: String, private val fallbackApiUrl: String) : Interceptor {
+        override fun intercept(chain: Interceptor.Chain): Response {
+            val request: Request = chain.request()
+
+            try {
+
+                val response = chain.proceed(request);
+
+                if (response.isSuccessful) return response
+
+                response.close()
+
+            } catch (_: Exception) {
+            }
+
+            val fallbackRequest: Request = request.newBuilder()
+                .url(request.url.toString().replaceFirst(apiUrl, fallbackApiUrl))
+                .build()
+
+            return chain.proceed(fallbackRequest)
+
+        }
+    }
+
+    private val apiFallbackInterceptor = FallbackInterceptor(apiUrl, fallbackApiUrl)
+    private val oauthFallbackInterceptor = FallbackInterceptor(oauthUrl, fallbackOauthUrl)
+
+    override suspend fun login(form: AuthLoginResponse): AuthToken? {
+        val username = form.email ?: return null
+        val password = form.password ?: return null
+
+        val grantType = "password"
+
+        val token = app.post(
+            "$oauthUrl/token",
+            data = mapOf(
+                "grant_type" to grantType,
+                "username" to username,
+                "password" to password
+            ),
+            interceptor = oauthFallbackInterceptor
+        ).parsed<ResponseToken>()
+
+        return AuthToken(
+            accessTokenLifetime = unixTime + token.expiresIn.toLong(),
+            refreshToken = token.refreshToken,
+            accessToken = token.accessToken,
+        )
+    }
+
+    override suspend fun refreshToken(token: AuthToken): AuthToken {
+        val res = app.post(
+            "$oauthUrl/token",
+            data = mapOf(
+                "grant_type" to "refresh_token",
+                "refresh_token" to token.refreshToken!!
+            ),
+            interceptor = oauthFallbackInterceptor
+        ).parsed<ResponseToken>()
+
+        return AuthToken(
+            accessToken = res.accessToken,
+            refreshToken = res.refreshToken,
+            accessTokenLifetime = unixTime + res.expiresIn.toLong()
+        )
+    }
+
+    override suspend fun user(token: AuthToken?): AuthUser? {
+        val user = app.get(
+            "$apiUrl/users?filter[self]=true",
+            headers = mapOf(
+                "Authorization" to "Bearer ${token?.accessToken ?: return null}"
+            ), cacheTime = 0,
+            interceptor = apiFallbackInterceptor
+        ).parsed<KitsuResponse>()
+
+        if (user.data.isEmpty()) {
+           return null
+        }
+
+        return AuthUser(
+            id = user.data[0].id.toInt(),
+            name = user.data[0].attributes.name,
+            profilePicture = user.data[0].attributes.avatar?.original
+        )
+    }
+
+    override suspend fun search(auth: AuthData?, query: String): List<SyncSearchResult>? {
+        val auth = auth?.token?.accessToken ?: return null
+        val animeSelectedFields = arrayOf("titles","canonicalTitle","posterImage","episodeCount")
+        val url = "$apiUrl/anime?filter[text]=$query&page[limit]=$KITSU_MAX_SEARCH_LIMIT&fields[anime]=${animeSelectedFields.joinToString(",")}"
+
+        val res = app.get(
+            url, headers = mapOf(
+                "Authorization" to "Bearer $auth",
+            ), cacheTime = 0,
+            interceptor = apiFallbackInterceptor
+        ).parsed<KitsuResponse>()
+
+        return res.data.map {
+            val attributes = it.attributes
+
+            val title = attributes.canonicalTitle ?: attributes.titles?.enJp ?: attributes.titles?.jaJp ?: "No title"
+
+            SyncSearchResult(
+                title,
+                this.name,
+                it.id,
+                "$mainUrl/anime/${it.id}/",
+                attributes.posterImage?.large ?: attributes.posterImage?.medium
+            )
+        }
+    }
+
+    override suspend fun load(auth : AuthData?, id: String): SyncResult? {
+        val auth = auth?.token?.accessToken ?: return null
+        if (id.toIntOrNull() == null) {
+            return null
+        }
+
+        data class KitsuResponse(
+            @field:JsonProperty(value = "data")
+            val data: KitsuNode,
+        )
+
+        val url =
+            "$apiUrl/anime/$id"
+
+        val anime = app.get(
+            url, headers = mapOf(
+                "Authorization" to "Bearer $auth"
+            ),
+            interceptor = apiFallbackInterceptor
+        ).parsed<KitsuResponse>().data.attributes
+
+        return SyncResult(
+            id = id,
+            totalEpisodes = anime.episodeCount,
+            title = anime.canonicalTitle ?: anime.titles?.enJp ?: anime.titles?.jaJp.orEmpty(),
+            publicScore =  Score.from(anime.ratingTwenty.toString(), 20),
+            duration = anime.episodeLength,
+            synopsis = anime.synopsis,
+            airStatus = when(anime.status) {
+                "finished" -> ShowStatus.Completed
+                "current" -> ShowStatus.Ongoing
+                else -> null
+            },
+            nextAiring = null,
+            studio = null,
+            genres = null,
+            trailers = null,
+            startDate = LocalDate.parse(anime.startDate).toEpochDay(),
+            endDate = LocalDate.parse(anime.endDate).toEpochDay(),
+            recommendations = null,
+            nextSeason =null,
+            prevSeason = null,
+            actors = null,
+        )
+
+    }
+
+    override suspend fun status(auth : AuthData?, id: String): AbstractSyncStatus? {
+        val accessToken = auth?.token?.accessToken ?: return null
+        val userId = auth.user.id
+
+        val selectedFields = arrayOf("status","ratingTwenty", "progress")
+
+        val url =
+            "$apiUrl/library-entries?filter[userId]=$userId&filter[animeId]=$id&fields[libraryEntries]=${selectedFields.joinToString(",")}"
+
+        val anime = app.get(
+            url, headers = mapOf(
+                "Authorization" to "Bearer $accessToken"
+            ),
+            interceptor = apiFallbackInterceptor
+        ).parsed<KitsuResponse>().data.firstOrNull()?.attributes
+
+        if (anime == null) {
+            return SyncStatus(
+                score = null,
+                status = SyncWatchType.NONE,
+                isFavorite = null,
+                watchedEpisodes = null
+            )
+        }
+
+        return SyncStatus(
+            score = Score.from(anime.ratingTwenty.toString(), 20),
+            status = SyncWatchType.fromInternalId(kitsuStatusAsString.indexOf(anime.status)),
+            isFavorite = null,
+            watchedEpisodes = anime.progress,
+        )
+    }
+    suspend fun getAnimeIdByTitle(title: String): String? {
+
+        val animeSelectedFields = arrayOf("titles","canonicalTitle")
+        val url = "$apiUrl/anime?filter[text]=$title&page[limit]=$KITSU_MAX_SEARCH_LIMIT&fields[anime]=${animeSelectedFields.joinToString(",")}"
+
+        val res = app.get(url, interceptor = apiFallbackInterceptor).parsed<KitsuResponse>()
+
+        return res.data.firstOrNull()?.id
+
+    }
+
+    override fun urlToId(url: String): String? =
+        Regex("""/anime/((.*)/|(.*))""").find(url)?.groupValues?.first()
+
+    override suspend fun updateStatus(
+        auth : AuthData?,
+        id: String,
+        newStatus: AbstractSyncStatus
+    ): Boolean {
+
+        return setScoreRequest(
+            auth ?: return false,
+            id.toIntOrNull() ?: return false,
+            fromIntToAnimeStatus(newStatus.status),
+            newStatus.score?.toInt(20),
+            newStatus.watchedEpisodes
+        )
+    }
+
+    private suspend fun setScoreRequest(
+        auth : AuthData,
+        id: Int,
+        status: KitsuStatusType? = null,
+        score: Int? = null,
+        numWatchedEpisodes: Int? = null,
+    ): Boolean {
+
+        val libraryEntryId = getAnimeLibraryEntryId(auth, id)
+
+        // Exists entry for anime in library
+        if (libraryEntryId != null) {
+
+            // Delete anime from library
+            if (status == null || status == KitsuStatusType.None) {
+
+                val res = app.delete(
+                    "$apiUrl/library-entries/$libraryEntryId",
+                    headers = mapOf(
+                        "Authorization" to "Bearer ${auth.token.accessToken}"
+                    ),
+                    interceptor = apiFallbackInterceptor
+                )
+
+
+                return res.isSuccessful
+
+            }
+
+            return setScoreRequest(
+                auth,
+                libraryEntryId,
+                kitsuStatusAsString[maxOf(0, status.value)],
+                score,
+                numWatchedEpisodes
+            )
+
+        }
+
+        val data = mapOf(
+            "data" to mapOf(
+                "type" to "libraryEntries",
+                "attributes" to mapOf(
+                    "ratingTwenty" to score,
+                    "progress" to numWatchedEpisodes,
+                    "status" to if (status == null) null else kitsuStatusAsString[maxOf(0, status.value)],
+                ),
+                "relationships" to mapOf(
+                    "anime" to mapOf(
+                        "data" to mapOf(
+                            "type" to "anime",
+                            "id" to id.toString()
+                        )
+                    ),
+                    "user" to mapOf(
+                        "data" to mapOf(
+                            "type" to "users",
+                            "id" to auth.user.id
+                        )
+                    )
+                )
+            )
+        )
+
+        val res = app.post(
+            "$apiUrl/library-entries",
+            headers = mapOf(
+                "content-type" to "application/vnd.api+json",
+                "Authorization" to "Bearer ${auth.token.accessToken}"
+            ),
+            requestBody = data.toJson().toRequestBody(),
+            interceptor = apiFallbackInterceptor
+        )
+
+        return res.isSuccessful
+
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    private suspend fun setScoreRequest(
+        auth : AuthData,
+        id: Int,
+        status: String? = null,
+        score: Int? = null,
+        numWatchedEpisodes: Int? = null,
+    ):  Boolean {
+        val data = mapOf(
+            "data" to mapOf(
+                "type" to "libraryEntries",
+                "id" to id.toString(),
+                "attributes" to mapOf(
+                    "ratingTwenty" to score,
+                    "progress" to numWatchedEpisodes,
+                    "status" to status
+                )
+            )
+        )
+
+        val res = app.patch(
+            "$apiUrl/library-entries/$id",
+            headers = mapOf(
+                "content-type" to "application/vnd.api+json",
+                "Authorization" to "Bearer ${auth.token.accessToken}"
+            ),
+            requestBody = data.toJson().toRequestBody(),
+            interceptor = apiFallbackInterceptor
+        )
+
+
+        return res.isSuccessful
+
+    }
+
+    private suspend fun getAnimeLibraryEntryId(auth: AuthData, id: Int): Int? {
+
+        val userId = auth.user.id
+
+        val res = app.get(
+            "$apiUrl/library-entries?filter[userId]=$userId&filter[animeId]=$id",
+            headers = mapOf(
+                "Authorization" to "Bearer ${auth.token.accessToken}"
+            ),
+            interceptor = apiFallbackInterceptor
+        ).parsed<KitsuResponse>().data.firstOrNull() ?: return null
+
+        return res.id.toInt()
+
+    }
+
+    override suspend fun library(auth : AuthData?): LibraryMetadata? {
+        val list = getKitsuAnimeListSmart(auth ?: return null)?.groupBy {
+            convertToStatus(it.attributes.status ?: "").stringRes
+        }?.mapValues { group ->
+            group.value.map { it.toLibraryItem() }
+        } ?: emptyMap()
+
+        // To fill empty lists when Kitsu does not return them
+        val baseMap =
+            KitsuStatusType.entries.filter { it.value >= 0 }.associate {
+                it.stringRes to emptyList<LibraryItem>()
+            }
+
+        return LibraryMetadata(
+            (baseMap + list).map { LibraryList(txt(it.key), it.value) },
+            setOf(
+                ListSorting.AlphabeticalA,
+                ListSorting.AlphabeticalZ,
+                ListSorting.UpdatedNew,
+                ListSorting.UpdatedOld,
+                ListSorting.ReleaseDateNew,
+                ListSorting.ReleaseDateOld,
+                ListSorting.RatingHigh,
+                ListSorting.RatingLow,
+            )
+        )
+    }
+
+    private suspend fun getKitsuAnimeListSmart(auth : AuthData): Array<KitsuNode>? {
+        return if (requireLibraryRefresh) {
+            val list = getKitsuAnimeList(auth.token, auth.user.id)
+            setKey(KITSU_CACHED_LIST, auth.user.id.toString(), list)
+            list
+        } else {
+            getKey<Array<KitsuNode>>(KITSU_CACHED_LIST, auth.user.id.toString()) as? Array<KitsuNode>
+        }
+    }
+
+    private suspend fun getKitsuAnimeList(token: AuthToken, userId: Int): Array<KitsuNode> {
+
+        val animeSelectedFields = arrayOf("titles","canonicalTitle","posterImage","synopsis","startDate","episodeCount")
+        val libraryEntriesSelectedFields = arrayOf("progress","rating","updatedAt", "status")
+        val limit = 500
+        var url = "$apiUrl/library-entries?filter[userId]=$userId&filter[kind]=anime&include=anime&page[limit]=$limit&page[offset]=0&fields[anime]=${animeSelectedFields.joinToString(",")}&fields[libraryEntries]=${libraryEntriesSelectedFields.joinToString(",")}"
+
+        val fullList = mutableListOf<KitsuNode>()
+
+        while (true) {
+
+            val data: KitsuResponse = getKitsuAnimeListSlice(token, url)
+
+            data.data.forEachIndexed { index, value ->
+                value.anime = data.included?.get(index)
+            }
+
+            fullList.addAll(data.data)
+
+            url = data.links?.next ?: break
+        }
+
+
+        return fullList.toTypedArray()
+    }
+
+    private suspend fun getKitsuAnimeListSlice(token: AuthToken, url: String): KitsuResponse {
+        val res = app.get(
+            url, headers = mapOf(
+                "Authorization" to "Bearer ${token.accessToken}",
+            ),
+            interceptor = apiFallbackInterceptor
+        ).parsed<KitsuResponse>()
+        return res
+    }
+
+
+    data class ResponseToken(
+        @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 KitsuNode(
+        @JsonProperty("id") val id: String,
+        @JsonProperty("attributes") val attributes: KitsuNodeAttributes,
+        /* User list anime node */
+        @JsonProperty("relationships") val relationships: KitsuRelationships?,
+        var anime: KitsuAnimeData?
+    ) {
+        fun toLibraryItem(): LibraryItem {
+
+            val animeItem = this.anime
+
+            val numEpisodes = animeItem?.attributes?.episodeCount
+
+            val startDate = animeItem?.attributes?.startDate
+
+            val posterImage = animeItem?.attributes?.posterImage
+
+            val canonicalTitle = animeItem?.attributes?.canonicalTitle
+            val titles = animeItem?.attributes?.titles
+
+            val animeId = animeItem?.id
+
+            val synopsis: String? = animeItem?.attributes?.synopsis
+
+            return LibraryItem(
+                canonicalTitle ?: titles?.enJp ?: titles?.jaJp.orEmpty(),
+                "https://kitsu.app/anime/${animeId}/",
+                this.id,
+                this.attributes.progress,
+                numEpisodes,
+                Score.from(this.attributes.ratingTwenty.toString(), 20),
+                parseDateLong(this.attributes.updatedAt),
+                "Kitsu",
+                TvType.Anime,
+                posterImage?.large ?: posterImage?.medium,
+                null,
+                null,
+                plot = synopsis,
+                releaseDate = if (startDate == null) null else try {
+                    Date.from(
+                        Instant.from(
+                            DateTimeFormatter.ofPattern(if (startDate.length == 4) "yyyy" else if (startDate.length == 7) "yyyy-MM" else "yyyy-MM-dd")
+                                .parse(startDate)
+                        )
+                    )
+                } catch (_: RuntimeException) {
+                    null
+                }
+            )
+        }
+
+    }
+
+    data class KitsuAnimeAttributes(
+        @JsonProperty("titles") val titles: KitsuTitles?,
+        @JsonProperty("canonicalTitle") val canonicalTitle: String?,
+        @JsonProperty("posterImage") val posterImage: KitsuPosterImage?,
+        @JsonProperty("synopsis") val synopsis: String?,
+        @JsonProperty("startDate") val startDate: String?,
+        @JsonProperty("endDate") val endDate: String?,
+        @JsonProperty("episodeCount") val episodeCount: Int?,
+        @JsonProperty("episodeLength") val episodeLength: Int?,
+    )
+
+    data class KitsuAnimeData(
+        @JsonProperty("id") val id: String,
+        @JsonProperty("attributes") val attributes: KitsuAnimeAttributes,
+    )
+
+
+    data class KitsuNodeAttributes(
+        /* General attributes */
+        @JsonProperty("titles") val titles: KitsuTitles?,
+        @JsonProperty("canonicalTitle") val canonicalTitle: String?,
+        @JsonProperty("posterImage") val posterImage: KitsuPosterImage?,
+        @JsonProperty("synopsis") val synopsis: String?,
+        @JsonProperty("startDate") val startDate: String?,
+        @JsonProperty("endDate") val endDate: String?,
+        @JsonProperty("episodeCount") val episodeCount: Int?,
+        @JsonProperty("episodeLength") val episodeLength: Int?,
+        /* User attributes */
+        @JsonProperty("name") val name: String?,
+        @JsonProperty("location") val location: String?,
+        @JsonProperty("createdAt") val createdAt: String?,
+        @JsonProperty("avatar") val avatar: KitsuUserAvatar?,
+        /* User list anime attributes */
+        @JsonProperty("progress") val progress: Int?,
+        @JsonProperty("ratingTwenty") val ratingTwenty: Float?,
+        @JsonProperty("updatedAt") val updatedAt: String?,
+        @JsonProperty("status") val status: String?,
+    )
+
+    data class KitsuRelationships(
+        @JsonProperty("anime") val anime: KitsuRelationshipsAnime?
+    )
+
+    data class KitsuRelationshipsAnime(
+        @JsonProperty("links") val links: KitsuLinks?
+    )
+
+    data class KitsuPosterImage(
+        @JsonProperty("large") val large: String?,
+        @JsonProperty("medium") val medium: String?,
+    )
+
+    data class KitsuTitles(
+        @JsonProperty("en_jp") val enJp: String?,
+        @JsonProperty("ja_jp") val jaJp: String?
+    )
+
+    data class KitsuUserAvatar(
+        @JsonProperty("original") val original: String?
+    )
+
+    data class KitsuLinks(
+        /* Pagination */
+        @JsonProperty("first") val first: String?,
+        @JsonProperty("next") val next: String?,
+        @JsonProperty("last") val last: String?,
+        /* Relationships */
+        @JsonProperty("related") val related: String?
+    )
+
+    data class KitsuResponse(
+        @JsonProperty("links") val links: KitsuLinks?,
+        @JsonProperty("data") val data: List<KitsuNode>,
+        /* When requesting related info (User library entry -> anime) */
+        @JsonProperty("included") val included: List<KitsuAnimeData>?,
+    )
+
+
+    companion object {
+
+        const val KITSU_CACHED_LIST: String = "kitsu_cached_list"
+        private fun parseDateLong(string: String?): Long? {
+            return try {
+                SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ", Locale.getDefault()).parse(
+                    string ?: return null
+                )?.time?.div(1000)
+            } catch (e: Exception) {
+                null
+            }
+        }
+
+        private val kitsuStatusAsString =
+            arrayOf("current", "completed", "on_hold", "dropped", "planned")
+        private fun fromIntToAnimeStatus(inp: SyncWatchType): KitsuStatusType {
+            return when (inp) {
+                SyncWatchType.NONE ->  KitsuStatusType.None
+                SyncWatchType.WATCHING ->  KitsuStatusType.Watching
+                SyncWatchType.COMPLETED ->  KitsuStatusType.Completed
+                SyncWatchType.ONHOLD ->  KitsuStatusType.OnHold
+                SyncWatchType.DROPPED ->  KitsuStatusType.Dropped
+                SyncWatchType.PLANTOWATCH ->  KitsuStatusType.PlanToWatch
+                SyncWatchType.REWATCHING ->  KitsuStatusType.Watching
+            }
+        }
+
+        enum class KitsuStatusType(var value: Int, @StringRes val stringRes: Int) {
+            Watching(0, R.string.type_watching),
+            Completed(1, R.string.type_completed),
+            OnHold(2, R.string.type_on_hold),
+            Dropped(3, R.string.type_dropped),
+            PlanToWatch(4, R.string.type_plan_to_watch),
+            None(-1, R.string.type_none)
+        }
+
+        private fun convertToStatus(string: String): KitsuStatusType {
+            return when (string) {
+                "current" ->  KitsuStatusType.Watching
+                "completed" ->  KitsuStatusType.Completed
+                "on_hold" ->  KitsuStatusType.OnHold
+                "dropped" ->  KitsuStatusType.Dropped
+                "planned" ->  KitsuStatusType.PlanToWatch
+                else ->  KitsuStatusType.None
+            }
+        }
+    }
+}
 
 // modified code from from https://github.com/saikou-app/saikou/blob/main/app/src/main/java/ani/saikou/others/Kitsu.kt
 // GNU General Public License v3.0 https://github.com/saikou-app/saikou/blob/main/LICENSE.md
@@ -142,4 +814,4 @@ query {
             val canonical: String? = null
         )
     }
-}
\ No newline at end of file
+}
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 2b51f7efdf6..8f0d7ca6dac 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
@@ -1,13 +1,11 @@
 package com.lagradost.cloudstream3.syncproviders.providers
 
-import androidx.fragment.app.FragmentActivity
 import com.lagradost.cloudstream3.R
-import com.lagradost.cloudstream3.syncproviders.AuthAPI
+import com.lagradost.cloudstream3.syncproviders.AuthData
 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.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
@@ -16,56 +14,19 @@ import com.lagradost.cloudstream3.utils.DataStoreHelper.getAllSubscriptions
 import com.lagradost.cloudstream3.utils.DataStoreHelper.getAllWatchStateIds
 import com.lagradost.cloudstream3.utils.DataStoreHelper.getBookmarkedData
 import com.lagradost.cloudstream3.utils.DataStoreHelper.getResultWatchState
+import com.lagradost.cloudstream3.utils.txt
 
-class LocalList : SyncAPI {
+class LocalList : SyncAPI() {
     override val name = "Local"
+    override val idPrefix = "local"
+
     override val icon: Int = R.drawable.ic_baseline_storage_24
     override val requiresLogin = false
-    override val supportDeviceAuth = false
-    override val createAccountUrl: Nothing? = null
-    override val idPrefix = "local"
+    override val createAccountUrl = null
     override var requireLibraryRefresh = true
-
-    override fun loginInfo(): AuthAPI.LoginInfo {
-        return AuthAPI.LoginInfo(
-            null,
-            null,
-            0
-        )
-    }
-
-    override fun logOut() {
-
-    }
-
-    override val key: String = ""
-    override val redirectUrl = ""
-    override suspend fun handleRedirect(url: String): Boolean {
-        return true
-    }
-
-    override fun authenticate(activity: FragmentActivity?) {
-    }
-
-    override val mainUrl = ""
     override val syncIdName = SyncIdName.LocalList
-    override suspend fun score(id: String, status: SyncAPI.AbstractSyncStatus): Boolean {
-        return true
-    }
-
-    override suspend fun getStatus(id: String): SyncAPI.AbstractSyncStatus? {
-        return null
-    }
 
-    override suspend fun getResult(id: String): SyncAPI.SyncResult? {
-        return null
-    }
-
-    override suspend fun search(name: String): List<SyncAPI.SyncSearchResult>? {
-        return null
-    }
-
-    override suspend fun getPersonalLibrary(): SyncAPI.LibraryMetadata? {
+    override suspend fun library(auth : AuthData?): SyncAPI.LibraryMetadata? {
         val watchStatusIds = ioWork {
             getAllWatchStateIds()?.map { id ->
                 Pair(id, getResultWatchState(id))
@@ -102,9 +63,10 @@ class LocalList : SyncAPI {
             val result = if (isTrueTv) {
                 baseMap + watchStatusMap + favoritesMap
             } else {
-                val subscriptionsMap = mapOf(R.string.subscription_list_name to getAllSubscriptions().mapNotNull {
-                    it.toLibraryItem()
-                })
+                val subscriptionsMap =
+                    mapOf(R.string.subscription_list_name to getAllSubscriptions().mapNotNull {
+                        it.toLibraryItem()
+                    })
 
                 baseMap + watchStatusMap + subscriptionsMap + favoritesMap
             }
@@ -112,8 +74,8 @@ class LocalList : SyncAPI {
             result
         }
 
-        return SyncAPI.LibraryMetadata(
-            list.map { SyncAPI.LibraryList(txt(it.key), it.value) },
+        return LibraryMetadata(
+            list.map { LibraryList(txt(it.key), it.value) },
             setOf(
                 ListSorting.AlphabeticalA,
                 ListSorting.AlphabeticalZ,
@@ -127,8 +89,4 @@ class LocalList : SyncAPI {
             )
         )
     }
-
-    override fun getIdFromUrl(url: String): String {
-        return url
-    }
 }
\ No newline at end of file
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 4836eca131d..ba0195be6b8 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
@@ -1,87 +1,112 @@
 package com.lagradost.cloudstream3.syncproviders.providers
 
-import android.util.Base64
 import androidx.annotation.StringRes
-import androidx.fragment.app.FragmentActivity
 import com.fasterxml.jackson.annotation.JsonProperty
-import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
-import com.lagradost.cloudstream3.AcraApplication.Companion.openBrowser
-import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.getKey
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.setKey
 import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.Score
 import com.lagradost.cloudstream3.ShowStatus
 import com.lagradost.cloudstream3.TvType
 import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.mvvm.logError
-import com.lagradost.cloudstream3.syncproviders.AccountManager
-import com.lagradost.cloudstream3.syncproviders.AuthAPI
+import com.lagradost.cloudstream3.syncproviders.AuthData
+import com.lagradost.cloudstream3.syncproviders.AuthLoginPage
+import com.lagradost.cloudstream3.syncproviders.AuthToken
+import com.lagradost.cloudstream3.syncproviders.AuthUser
 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.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.DataStore.toKotlinObject
-import java.net.URL
-import java.security.SecureRandom
-import java.text.ParseException
+import com.lagradost.cloudstream3.utils.txt
 import java.text.SimpleDateFormat
 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
 
-class MALApi(index: Int) : AccountManager(index), SyncAPI {
+class MALApi : SyncAPI() {
     override var name = "MAL"
-    override val key = "1714d6f2f4f7cc19644384f8c4629910"
-    override val redirectUrl = "mallogin"
     override val idPrefix = "mal"
-    override var mainUrl = "https://myanimelist.net"
+
+    val key = "1714d6f2f4f7cc19644384f8c4629910"
     private val apiUrl = "https://api.myanimelist.net"
+    override val hasOAuth2 = true
+    override val redirectUrlIdentifier: String? = "mallogin"
+    override val mainUrl = "https://myanimelist.net"
     override val icon = R.drawable.mal_logo
-    override val requiresLogin = false
-    override val supportDeviceAuth = false
     override val syncIdName = SyncIdName.MyAnimeList
-    override var requireLibraryRefresh = true
     override val createAccountUrl = "$mainUrl/register.php"
 
-    override fun logOut() {
-        requireLibraryRefresh = true
-        removeAccountKeys()
-    }
+    override val supportedWatchTypes = setOf(
+        SyncWatchType.WATCHING,
+        SyncWatchType.COMPLETED,
+        SyncWatchType.PLANTOWATCH,
+        SyncWatchType.DROPPED,
+        SyncWatchType.ONHOLD,
+        SyncWatchType.NONE
+    )
 
-    override fun loginInfo(): AuthAPI.LoginInfo? {
-        getKey<MalUser>(accountId, MAL_USER_KEY)?.let { user ->
-            return AuthAPI.LoginInfo(
-                profilePicture = user.picture,
-                name = user.name,
-                accountIndex = accountIndex
-            )
+    data class PayLoad(
+        val requestId: Int,
+        val codeVerifier: String
+    )
+
+    override suspend fun login(redirectUrl: String, payload: String?): AuthToken? {
+        val payloadData = parseJson<PayLoad>(payload!!)
+        val sanitizer = splitRedirectUrl(redirectUrl)
+        val state = sanitizer["state"]!!
+
+        if (state != "RequestID${payloadData.requestId}") {
+            return null
         }
-        return null
+
+        val currentCode = sanitizer["code"]!!
+
+        val token = app.post(
+            "$mainUrl/v1/oauth2/token",
+            data = mapOf(
+                "client_id" to key,
+                "code" to currentCode,
+                "code_verifier" to payloadData.codeVerifier,
+                "grant_type" to "authorization_code"
+            )
+        ).parsed<ResponseToken>()
+        return AuthToken(
+            accessTokenLifetime = unixTime + token.expiresIn.toLong(),
+            refreshToken = token.refreshToken,
+            accessToken = token.accessToken
+        )
     }
 
-    private fun getAuth(): String? {
-        return getKey(
-            accountId,
-            MAL_TOKEN_KEY
+    override suspend fun user(token: AuthToken?): AuthUser? {
+        val user = app.get(
+            "$apiUrl/v2/users/@me",
+            headers = mapOf(
+                "Authorization" to "Bearer ${token?.accessToken ?: return null}"
+            ), cacheTime = 0
+        ).parsed<MalUser>()
+        return AuthUser(
+            id = user.id,
+            name = user.name,
+            profilePicture = user.picture
         )
     }
 
-    override suspend fun search(name: String): List<SyncAPI.SyncSearchResult> {
+    override suspend fun search(auth : AuthData?, query: String): List<SyncAPI.SyncSearchResult>? {
+        val auth = auth?.token?.accessToken ?: return null
         val url = "$apiUrl/v2/anime?q=$name&limit=$MAL_MAX_SEARCH_LIMIT"
-        val auth = getAuth() ?: return emptyList()
         val res = app.get(
             url, headers = mapOf(
                 "Authorization" to "Bearer $auth",
             ), cacheTime = 0
-        ).text
-        return parseJson<MalSearch>(res).data.map {
+        ).parsed<MalSearch>()
+        return res.data.map {
             val node = it.node
             SyncAPI.SyncSearchResult(
                 node.title,
@@ -93,19 +118,21 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI {
         }
     }
 
-    override fun getIdFromUrl(url: String): String {
-        return Regex("""/anime/((.*)/|(.*))""").find(url)!!.groupValues.first()
-    }
+    override fun urlToId(url: String): String? =
+        Regex("""/anime/((.*)/|(.*))""").find(url)!!.groupValues.first()
 
-    override suspend fun score(id: String, status: SyncAPI.AbstractSyncStatus): Boolean {
+    override suspend fun updateStatus(
+        auth : AuthData?,
+        id: String,
+        newStatus: SyncAPI.AbstractSyncStatus
+    ): Boolean {
         return setScoreRequest(
+            auth?.token ?: return false,
             id.toIntOrNull() ?: return false,
-            fromIntToAnimeStatus(status.status.internalId),
-            status.score,
-            status.watchedEpisodes
-        ).also {
-            requireLibraryRefresh = requireLibraryRefresh || it
-        }
+            fromIntToAnimeStatus(newStatus.status),
+            newStatus.score?.toInt(10),
+            newStatus.watchedEpisodes
+        )
     }
 
     data class MalAnime(
@@ -198,14 +225,14 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI {
         )
     }
 
-    override suspend fun getResult(id: String): SyncAPI.SyncResult? {
+    override suspend fun load(auth : AuthData?, id: String): SyncAPI.SyncResult? {
+        val auth = auth?.token?.accessToken ?: return null
         val internalId = id.toIntOrNull() ?: return null
         val url =
             "$apiUrl/v2/anime/$internalId?fields=id,title,main_picture,alternative_titles,start_date,end_date,synopsis,mean,rank,popularity,num_list_users,num_scoring_users,nsfw,created_at,updated_at,media_type,status,genres,my_list_status,num_episodes,start_season,broadcast,source,average_episode_duration,rating,pictures,background,related_anime,related_manga,recommendations,studios,statistics"
 
-        val auth = getAuth()
         val res = app.get(
-            url, headers = if (auth == null) emptyMap() else mapOf(
+            url, headers = mapOf(
                 "Authorization" to "Bearer $auth"
             )
         ).text
@@ -214,7 +241,7 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI {
                 id = internalId.toString(),
                 totalEpisodes = malAnime.numEpisodes,
                 title = malAnime.title,
-                publicScore = malAnime.mean?.toFloat()?.times(1000)?.toInt(),
+                publicScore = Score.from10(malAnime.mean),
                 duration = malAnime.averageEpisodeDuration,
                 synopsis = malAnime.synopsis,
                 airStatus = when (malAnime.status) {
@@ -244,13 +271,20 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI {
         }
     }
 
-    override suspend fun getStatus(id: String): SyncAPI.SyncStatus? {
-        val internalId = id.toIntOrNull() ?: return null
+    override suspend fun status(auth : AuthData?, id: String): SyncAPI.AbstractSyncStatus? {
+        val auth = auth?.token?.accessToken ?: return null
+
+        // https://myanimelist.net/apiconfig/references/api/v2#operation/anime_anime_id_get
+        val url =
+            "$apiUrl/v2/anime/$id?fields=id,title,num_episodes,my_list_status"
+        val data = app.get(
+            url, headers = mapOf(
+                "Authorization" to "Bearer $auth"
+            ), cacheTime = 0
+        ).parsed<SmallMalAnime>().myListStatus
 
-        val data =
-            getDataAboutMalId(internalId)?.myListStatus //?: throw ErrorLoadingException("No my_list_status")
         return SyncAPI.SyncStatus(
-            score = data?.score,
+            score = Score.from10(data?.score),
             status = SyncWatchType.fromInternalId(malStatusAsString.indexOf(data?.status)),
             isFavorite = null,
             watchedEpisodes = data?.numEpisodesWatched,
@@ -261,14 +295,17 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI {
         private val malStatusAsString =
             arrayOf("watching", "completed", "on_hold", "dropped", "plan_to_watch")
 
-        const val MAL_USER_KEY: String = "mal_user" // user data like profile
         const val MAL_CACHED_LIST: String = "mal_cached_list"
-        const val MAL_UNIXTIME_KEY: String = "mal_unixtime" // When token expires
-        const val MAL_REFRESH_TOKEN_KEY: String = "mal_refresh_token" // refresh token
-        const val MAL_TOKEN_KEY: String = "mal_token" // anilist token for api
 
         fun convertToStatus(string: String): MalStatusType {
-            return fromIntToAnimeStatus(malStatusAsString.indexOf(string))
+            return when (string) {
+                "watching" -> MalStatusType.Watching
+                "completed" -> MalStatusType.Completed
+                "on_hold" -> MalStatusType.OnHold
+                "dropped" -> MalStatusType.Dropped
+                "plan_to_watch" -> MalStatusType.PlanToWatch
+                else -> MalStatusType.None
+            }
         }
 
         enum class MalStatusType(var value: Int, @StringRes val stringRes: Int) {
@@ -280,16 +317,15 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI {
             None(-1, R.string.type_none)
         }
 
-        private fun fromIntToAnimeStatus(inp: Int): MalStatusType {//= AniListStatusType.values().first { it.value == inp }
+        private fun fromIntToAnimeStatus(inp: SyncWatchType): MalStatusType {//= AniListStatusType.values().first { it.value == inp }
             return when (inp) {
-                -1 -> MalStatusType.None
-                0 -> MalStatusType.Watching
-                1 -> MalStatusType.Completed
-                2 -> MalStatusType.OnHold
-                3 -> MalStatusType.Dropped
-                4 -> MalStatusType.PlanToWatch
-                5 -> MalStatusType.Watching
-                else -> MalStatusType.None
+                SyncWatchType.NONE -> MalStatusType.None
+                SyncWatchType.WATCHING -> MalStatusType.Watching
+                SyncWatchType.COMPLETED -> MalStatusType.Completed
+                SyncWatchType.ONHOLD -> MalStatusType.OnHold
+                SyncWatchType.DROPPED -> MalStatusType.Dropped
+                SyncWatchType.PLANTOWATCH -> MalStatusType.PlanToWatch
+                SyncWatchType.REWATCHING -> MalStatusType.Watching
             }
         }
 
@@ -304,86 +340,39 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI {
         }
     }
 
-    override suspend fun handleRedirect(url: String): Boolean {
-        val sanitizer =
-            splitQuery(URL(url.replace(APP_STRING, "https").replace("/#", "?"))) // FIX ERROR
-        val state = sanitizer["state"]!!
-        if (state == "RequestID$requestId") {
-            val currentCode = sanitizer["code"]!!
-
-            val res = app.post(
-                "$mainUrl/v1/oauth2/token",
-                data = mapOf(
-                    "client_id" to key,
-                    "code" to currentCode,
-                    "code_verifier" to codeVerifier,
-                    "grant_type" to "authorization_code"
-                )
-            ).text
-
-            if (res.isNotBlank()) {
-                switchToNewAccount()
-                storeToken(res)
-                val user = getMalUser()
-                requireLibraryRefresh = true
-                return user != null
-            }
-        }
-        return false
-    }
-
-    override fun authenticate(activity: FragmentActivity?) {
-        // It is recommended to use a URL-safe string as code_verifier.
-        // See section 4 of RFC 7636 for more details.
-
-        val secureRandom = SecureRandom()
-        val codeVerifierBytes = ByteArray(96) // base64 has 6bit per char; (8/6)*96 = 128
-        secureRandom.nextBytes(codeVerifierBytes)
-        codeVerifier =
-            Base64.encodeToString(codeVerifierBytes, Base64.DEFAULT).trimEnd('=').replace("+", "-")
-                .replace("/", "_").replace("\n", "")
+    override fun loginRequest(): AuthLoginPage? {
+        val codeVerifier = generateCodeVerifier()
+        val requestId = ++requestIdCounter
         val codeChallenge = codeVerifier
         val request =
             "$mainUrl/v1/oauth2/authorize?response_type=code&client_id=$key&code_challenge=$codeChallenge&state=RequestID$requestId"
-        openBrowser(request, activity)
-    }
 
-    private var requestId = 0
-    private var codeVerifier = ""
-
-    private fun storeToken(response: String) {
-        try {
-            if (response != "") {
-                val token = parseJson<ResponseToken>(response)
-                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) {
-            logError(e)
-        }
+        return AuthLoginPage(
+            url = request,
+            payload = PayLoad(requestId, codeVerifier).toJson()
+        )
     }
 
-    private suspend fun refreshToken() {
-        try {
-            val res = app.post(
-                "$mainUrl/v1/oauth2/token",
-                data = mapOf(
-                    "client_id" to key,
-                    "grant_type" to "refresh_token",
-                    "refresh_token" to getKey(
-                        accountId,
-                        MAL_REFRESH_TOKEN_KEY
-                    )!!
-                )
-            ).text
-            storeToken(res)
-        } catch (e: Exception) {
-            logError(e)
-        }
+    override suspend fun refreshToken(token: AuthToken): AuthToken? {
+        val res = app.post(
+            "$mainUrl/v1/oauth2/token",
+            data = mapOf(
+                "client_id" to key,
+                "grant_type" to "refresh_token",
+                "refresh_token" to token.refreshToken!!
+            )
+        ).parsed<ResponseToken>()
+
+        return AuthToken(
+            accessToken = res.accessToken,
+            refreshToken = res.refreshToken,
+            accessTokenLifetime = unixTime + res.expiresIn.toLong()
+        )
     }
 
+    private var requestIdCounter = 0
+
+
     private val allTitles = hashMapOf<Int, MalTitleHolder>()
 
     data class MalList(
@@ -441,7 +430,7 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI {
                 this.node.id.toString(),
                 this.listStatus?.numEpisodesWatched,
                 this.node.numEpisodes,
-                this.listStatus?.score?.times(10),
+                Score.from10(this.listStatus?.score),
                 parseDateLong(this.listStatus?.updatedAt),
                 "MAL",
                 TvType.Anime,
@@ -449,12 +438,16 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI {
                 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)
+                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}
+                } catch (_: RuntimeException) {
+                    null
+                }
             )
         }
     }
@@ -484,23 +477,8 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI {
         @JsonProperty("start_time") val startTime: String?
     )
 
-    private fun getMalAnimeListCached(): Array<Data>? {
-        return getKey(MAL_CACHED_LIST) as? Array<Data>
-    }
-
-    private suspend fun getMalAnimeListSmart(): Array<Data>? {
-        if (getAuth() == null) return null
-        return if (requireLibraryRefresh) {
-            val list = getMalAnimeList()
-            setKey(MAL_CACHED_LIST, list)
-            list
-        } else {
-            getMalAnimeListCached()
-        }
-    }
-
-    override suspend fun getPersonalLibrary(): SyncAPI.LibraryMetadata {
-        val list = getMalAnimeListSmart()?.groupBy {
+    override suspend fun library(auth : AuthData?): LibraryMetadata? {
+        val list = getMalAnimeListSmart(auth ?: return null)?.groupBy {
             convertToStatus(it.listStatus?.status ?: "").stringRes
         }?.mapValues { group ->
             group.value.map { it.toLibraryItem() }
@@ -527,13 +505,22 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI {
         )
     }
 
-    private suspend fun getMalAnimeList(): Array<Data> {
-        checkMalToken()
+    private suspend fun getMalAnimeListSmart(auth : AuthData): Array<Data>? {
+        return if (requireLibraryRefresh) {
+            val list = getMalAnimeList(auth.token)
+            setKey(MAL_CACHED_LIST, auth.user.id.toString(), list)
+            list
+        } else {
+            getKey<Array<Data>>(MAL_CACHED_LIST, auth.user.id.toString()) as? Array<Data>
+        }
+    }
+
+    private suspend fun getMalAnimeList(token: AuthToken): Array<Data> {
         var offset = 0
         val fullList = mutableListOf<Data>()
         val offsetRegex = Regex("""offset=(\d+)""")
         while (true) {
-            val data: MalList = getMalAnimeListSlice(offset) ?: break
+            val data: MalList = getMalAnimeListSlice(token, offset) ?: break
             fullList.addAll(data.data)
             offset =
                 data.paging.next?.let { offsetRegex.find(it)?.groupValues?.get(1)?.toInt() }
@@ -542,128 +529,29 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI {
         return fullList.toTypedArray()
     }
 
-    private suspend fun getMalAnimeListSlice(offset: Int = 0): MalList? {
+    private suspend fun getMalAnimeListSlice(token: AuthToken, offset: Int = 0): MalList? {
         val user = "@me"
-        val auth = getAuth() ?: return null
         // Very lackluster docs
         // https://myanimelist.net/apiconfig/references/api/v2#operation/users_user_id_animelist_get
         val url =
             "$apiUrl/v2/users/$user/animelist?fields=list_status,num_episodes,media_type,status,start_date,end_date,synopsis,alternative_titles,mean,genres,rank,num_list_users,nsfw,average_episode_duration,num_favorites,popularity,num_scoring_users,start_season,favorites_info,broadcast,created_at,updated_at&nsfw=1&limit=100&offset=$offset"
         val res = app.get(
             url, headers = mapOf(
-                "Authorization" to "Bearer $auth",
+                "Authorization" to "Bearer ${token.accessToken}",
             ), cacheTime = 0
         ).text
         return res.toKotlinObject()
     }
 
-    private suspend fun getDataAboutMalId(id: Int): SmallMalAnime? {
-        // https://myanimelist.net/apiconfig/references/api/v2#operation/anime_anime_id_get
-        val url =
-            "$apiUrl/v2/anime/$id?fields=id,title,num_episodes,my_list_status"
-        val res = app.get(
-            url, headers = mapOf(
-                "Authorization" to "Bearer " + (getAuth() ?: return null)
-            ), cacheTime = 0
-        ).text
-
-        return parseJson<SmallMalAnime>(res)
-    }
-
-    suspend fun setAllMalData() {
-        val user = "@me"
-        var isDone = false
-        var index = 0
-        allTitles.clear()
-        checkMalToken()
-        while (!isDone) {
-            val res = app.get(
-                "$apiUrl/v2/users/$user/animelist?fields=list_status&limit=1000&offset=${index * 1000}",
-                headers = mapOf(
-                    "Authorization" to "Bearer " + (getAuth() ?: return)
-                ), cacheTime = 0
-            ).text
-            val values = parseJson<MalRoot>(res)
-            val titles =
-                values.data.map { MalTitleHolder(it.listStatus, it.node.id, it.node.title) }
-            for (t in titles) {
-                allTitles[t.id] = t
-            }
-            isDone = titles.size < 1000
-            index++
-        }
-    }
-
-    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", Locale.getDefault()).parse(it)
-                        ?.before(Date.from(Instant.now())) != false
-                ) return@convertJapanTimeToTimeRemaining null
-            }
-        } catch (e: ParseException) {
-            logError(e)
-        }
-
-        // Unparseable date: "2021 7 4 other null"
-        // Weekday: other, date: null
-        if (date.contains("null") || date.contains("other")) {
-            return null
-        }
-
-        val currentDate = Calendar.getInstance()
-        val currentMonth = currentDate.get(Calendar.MONTH) + 1
-        val currentWeek = currentDate.get(Calendar.WEEK_OF_MONTH)
-        val currentYear = currentDate.get(Calendar.YEAR)
-
-        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
-        val timeDiff = (parsedDate.time - System.currentTimeMillis()) / 1000
-
-        // if it has already aired this week add a week to the timer
-        val updatedTimeDiff =
-            if (timeDiff > -60 * 60 * 24 * 7 && timeDiff < 0) timeDiff + 60 * 60 * 24 * 7 else timeDiff
-        return secondsToReadable(updatedTimeDiff.toInt(), "Now")
-
-    }
-
-    private suspend fun checkMalToken() {
-        if (unixTime > (getKey(
-                accountId,
-                MAL_UNIXTIME_KEY
-            ) ?: 0L)
-        ) {
-            refreshToken()
-        }
-    }
-
-    private suspend fun getMalUser(setSettings: Boolean = true): MalUser? {
-        checkMalToken()
-        val res = app.get(
-            "$apiUrl/v2/users/@me",
-            headers = mapOf(
-                "Authorization" to "Bearer " + (getAuth() ?: return null)
-            ), cacheTime = 0
-        ).text
-
-        val user = parseJson<MalUser>(res)
-        if (setSettings) {
-            setKey(accountId, MAL_USER_KEY, user)
-            registerAccount()
-        }
-        return user
-    }
-
     private suspend fun setScoreRequest(
+        token: AuthToken,
         id: Int,
         status: MalStatusType? = null,
         score: Int? = null,
         numWatchedEpisodes: Int? = null,
     ): Boolean {
         val res = setScoreRequest(
+            token,
             id,
             if (status == null) null else malStatusAsString[maxOf(0, status.value)],
             score,
@@ -686,6 +574,7 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI {
 
     @Suppress("UNCHECKED_CAST")
     private suspend fun setScoreRequest(
+        token: AuthToken,
         id: Int,
         status: String? = null,
         score: Int? = null,
@@ -700,7 +589,7 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI {
         return app.put(
             "$apiUrl/v2/anime/$id/my_list_status",
             headers = mapOf(
-                "Authorization" to "Bearer " + (getAuth() ?: return null)
+                "Authorization" to "Bearer ${token.accessToken}"
             ),
             data = data
         ).text
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 2e28f19455b..4b17fdb2920 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/OpenSubtitlesApi.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/OpenSubtitlesApi.kt
@@ -2,56 +2,44 @@ package com.lagradost.cloudstream3.syncproviders.providers
 
 import android.util.Log
 import com.fasterxml.jackson.annotation.JsonProperty
-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.app
 import com.lagradost.cloudstream3.ErrorLoadingException
 import com.lagradost.cloudstream3.R
-import com.lagradost.cloudstream3.TvType
-import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.mvvm.logError
-import com.lagradost.cloudstream3.subtitles.AbstractSubApi
 import com.lagradost.cloudstream3.subtitles.AbstractSubtitleEntities
-import com.lagradost.cloudstream3.syncproviders.AuthAPI
-import com.lagradost.cloudstream3.syncproviders.InAppAuthAPI
-import com.lagradost.cloudstream3.syncproviders.InAppAuthAPIManager
+import com.lagradost.cloudstream3.syncproviders.AuthData
+import com.lagradost.cloudstream3.syncproviders.AuthLoginRequirement
+import com.lagradost.cloudstream3.syncproviders.AuthLoginResponse
+import com.lagradost.cloudstream3.syncproviders.AuthToken
+import com.lagradost.cloudstream3.syncproviders.AuthUser
+import com.lagradost.cloudstream3.syncproviders.SubtitleAPI
+import com.lagradost.cloudstream3.TvType
 import com.lagradost.cloudstream3.utils.AppUtils
-import okhttp3.Interceptor
-import okhttp3.Response
+import com.lagradost.cloudstream3.utils.AppUtils.parseJson
+import com.lagradost.cloudstream3.utils.AppUtils.toJson
+import com.lagradost.cloudstream3.utils.SubtitleHelper.fromCodeToLangTagIETF
+import com.lagradost.cloudstream3.utils.SubtitleHelper.fromCodeToOpenSubtitlesTag
 
-class OpenSubtitlesApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi {
-    override val idPrefix = "opensubtitles"
+class OpenSubtitlesApi : SubtitleAPI() {
     override val name = "OpenSubtitles"
+    override val idPrefix = "opensubtitles"
+
     override val icon = R.drawable.open_subtitles_icon
-    override val requiresPassword = true
-    override val requiresUsername = true
+    override val hasInApp = true
+    override val inAppLoginRequirement = AuthLoginRequirement(
+        password = true,
+        username = true,
+    )
+
     override val createAccountUrl = "https://www.opensubtitles.com/en/users/sign_up"
 
     companion object {
-        const val OPEN_SUBTITLES_USER_KEY: String = "open_subtitles_user" // user data like profile
         const val API_KEY = "uyBLgFD17MgrYmA0gSXoKllMJBelOYj2"
         const val HOST = "https://api.opensubtitles.com/api/v1"
         const val TAG = "OPENSUBS"
         const val COOLDOWN_DURATION: Long = 1000L * 30L // CoolDown if 429 error code in ms
         var currentCoolDown: Long = 0L
-        var currentSession: SubtitleOAuthEntity? = null
-    }
-
-    private val headerInterceptor = OpenSubtitleInterceptor()
-
-    /** Automatically adds required api headers */
-    private class OpenSubtitleInterceptor : Interceptor {
-        /** Required user agent! */
-        private val userAgent = "Cloudstream3 v0.2"
-        override fun intercept(chain: Interceptor.Chain): Response {
-            return chain.proceed(
-                chain.request().newBuilder()
-                    .removeHeader("user-agent")
-                    .addHeader("user-agent", userAgent)
-                    .addHeader("Api-Key", API_KEY)
-                    .build()
-            )
-        }
+        const val userAgent = "Cloudstream3 v0.2"
+        val headers = mapOf("user-agent" to userAgent, "Api-Key" to API_KEY)
     }
 
     private fun canDoRequest(): Boolean {
@@ -69,121 +57,53 @@ class OpenSubtitlesApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi
         throw ErrorLoadingException("Too many requests")
     }
 
-    private fun getAuthKey(): SubtitleOAuthEntity? {
-        return getKey(accountId, OPEN_SUBTITLES_USER_KEY)
-    }
-
-    private fun setAuthKey(data: SubtitleOAuthEntity?) {
-        if (data == null) removeKey(accountId, OPEN_SUBTITLES_USER_KEY)
-        currentSession = data
-        setKey(accountId, OPEN_SUBTITLES_USER_KEY, data)
+    override suspend fun refreshToken(token: AuthToken): AuthToken? {
+        return login(parseJson<AuthLoginResponse>(token.payload ?: return null))
     }
 
-    override fun loginInfo(): AuthAPI.LoginInfo? {
-        getAuthKey()?.let { user ->
-            return AuthAPI.LoginInfo(
-                profilePicture = null,
-                name = user.user,
-                accountIndex = accountIndex
-            )
-        }
-        return null
-    }
-
-    override fun getLatestLoginData(): InAppAuthAPI.LoginData? {
-        val current = getAuthKey() ?: return null
-        return InAppAuthAPI.LoginData(username = current.user, current.pass)
+    override suspend fun user(token: AuthToken?): AuthUser? {
+        val user = parseJson<AuthLoginResponse>(token?.payload ?: return null)
+        val username = user.username ?: return null
+        return AuthUser(
+            id = username.hashCode(),
+            name = username
+        )
     }
 
-    /*
-        Authorize app to connect to API, using username/password.
-        Required to run at startup.
-        Returns OAuth entity with valid access token.
-    */
-    override suspend fun initialize() {
-        currentSession = getAuthKey() ?: return // just in case the following fails
-        initLogin(currentSession?.user ?: return, currentSession?.pass ?: return)
-    }
+    override suspend fun login(form: AuthLoginResponse): AuthToken? {
+        val username = form.username ?: return null
+        val password = form.password ?: return null
 
-    override fun logOut() {
-        setAuthKey(null)
-        removeAccountKeys()
-        currentSession = getAuthKey()
-    }
-
-    private suspend fun initLogin(username: String, password: String): Boolean {
-        //Log.i(TAG, "DATA = [$username] [$password]")
         val response = app.post(
             url = "$HOST/login",
             headers = mapOf(
                 "Content-Type" to "application/json",
-            ),
+            ) + headers,
             json = mapOf(
                 "username" to username,
                 "password" to password
             ),
-            interceptor = headerInterceptor
+        ).parsed<OAuthToken>()
+
+        return AuthToken(
+            accessToken = response.token
+                ?: throw ErrorLoadingException("Invalid password or username"),
+            /// JWT token is valid 24 hours after successfully authentication of user
+            accessTokenLifetime = unixTime + 60 * 60 * 24,
+            payload = form.toJson()
         )
-        //Log.i(TAG, "Responsecode = ${response.code}")
-        //Log.i(TAG, "Result => ${response.text}")
-
-        if (response.isSuccessful) {
-            AppUtils.tryParseJson<OAuthToken>(response.text)?.let { token ->
-                setAuthKey(
-                    SubtitleOAuthEntity(
-                        user = username,
-                        pass = password,
-                        accessToken = token.token ?: run {
-                            return false
-                        })
-                )
-            }
-            return true
-        }
-        return false
-    }
-
-    override suspend fun login(data: InAppAuthAPI.LoginData): Boolean {
-        val username = data.username ?: throw ErrorLoadingException("Requires Username")
-        val password = data.password ?: throw ErrorLoadingException("Requires Password")
-        switchToNewAccount()
-        try {
-            if (initLogin(username, password)) {
-                registerAccount()
-                return true
-            }
-        } catch (e: Exception) {
-            logError(e)
-            switchToOldAccount()
-        }
-        switchToOldAccount()
-        return false
-    }
-
-    /**
-     * Some languages do not use the normal country codes on OpenSubtitles
-     * */
-    private val languageExceptions = mapOf<String, String>(
-//        "pt" to "pt-PT",
-//        "pt" to "pt-BR"
-    )
-
-    private fun fixLanguage(language: String?): String? {
-        return languageExceptions[language] ?: language
-    }
-
-    // O(n) but good enough, BiMap did not want to work properly
-    private fun fixLanguageReverse(language: String?): String? {
-        return languageExceptions.entries.firstOrNull { it.value == language }?.key ?: language
     }
 
     /**
      * Fetch subtitles using token authenticated on previous method (see authorize).
      * Returns list of Subtitles which user can select to download (see load).
      * */
-    override suspend fun search(query: AbstractSubtitleEntities.SubtitleSearch): List<AbstractSubtitleEntities.SubtitleEntity>? {
+    override suspend fun search(
+        auth : AuthData?,
+        query: AbstractSubtitleEntities.SubtitleSearch
+    ): List<AbstractSubtitleEntities.SubtitleEntity>? {
         throwIfCantDoRequest()
-        val fixedLang = fixLanguage(query.lang)
+        val langOpenSubTag = fromCodeToOpenSubtitlesTag(query.lang) ?: query.lang ?: ""
 
         val imdbId = query.imdbId?.replace("tt", "")?.toInt() ?: 0
         val queryText = query.query
@@ -196,17 +116,17 @@ 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=${langOpenSubTag}$yearQuery$epQuery$seasonQuery"
+            false -> "$HOST/subtitles?query=${queryText}&languages=${langOpenSubTag}$yearQuery$epQuery$seasonQuery"
         }
 
         val req = app.get(
             url = searchQueryUrl,
             headers = mapOf(
                 Pair("Content-Type", "application/json")
-            ),
-            interceptor = headerInterceptor
+            ) + headers,
         )
+        Log.i(TAG, "searchQueryUrl => ${searchQueryUrl}")
         Log.i(TAG, "Search Req => ${req.text}")
         if (!req.isSuccessful) {
             if (req.code == 429)
@@ -227,7 +147,7 @@ class OpenSubtitlesApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi
                 //Use any valid name/title in hierarchy
                 val name = filename ?: featureDetails?.movieName ?: featureDetails?.title
                 ?: featureDetails?.parentTitle ?: attr.release ?: query.query
-                val lang = fixLanguageReverse(attr.language) ?: ""
+                val langTagIETF = fromCodeToLangTagIETF(attr.language) ?: ""
                 val resEpNum = featureDetails?.episodeNumber ?: query.epNumber
                 val resSeasonNum = featureDetails?.seasonNumber ?: query.seasonNumber
                 val year = featureDetails?.year ?: query.year
@@ -241,7 +161,7 @@ class OpenSubtitlesApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi
                         AbstractSubtitleEntities.SubtitleEntity(
                             idPrefix = this.idPrefix,
                             name = name,
-                            lang = lang,
+                            lang = langTagIETF,
                             data = resultData,
                             type = type,
                             source = this.name,
@@ -261,7 +181,12 @@ class OpenSubtitlesApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi
         Process data returned from search.
         Returns string url for the subtitle file.
     */
-    override suspend fun load(data: AbstractSubtitleEntities.SubtitleEntity): String? {
+
+    override suspend fun load(
+        auth : AuthData?,
+        subtitle: AbstractSubtitleEntities.SubtitleEntity
+    ): String? {
+        if(auth == null) return null
         throwIfCantDoRequest()
 
         val req = app.post(
@@ -269,15 +194,14 @@ class OpenSubtitlesApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi
             headers = mapOf(
                 Pair(
                     "Authorization",
-                    "Bearer ${currentSession?.accessToken ?: throw ErrorLoadingException("No access token active in current session")}"
+                    "Bearer ${auth.token.accessToken ?: throw ErrorLoadingException("No access token active in current session")}"
                 ),
                 Pair("Content-Type", "application/json"),
                 Pair("Accept", "*/*")
-            ),
+            ) + headers,
             data = mapOf(
-                Pair("file_id", data.data)
-            ),
-            interceptor = headerInterceptor
+                Pair("file_id", subtitle.data)
+            )
         )
         Log.i(TAG, "Request result  => (${req.code}) ${req.text}")
         //Log.i(TAG, "Request headers => ${req.headers}")
@@ -294,13 +218,6 @@ class OpenSubtitlesApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi
         return null
     }
 
-
-    data class SubtitleOAuthEntity(
-        var user: String,
-        var pass: String,
-        var accessToken: String,
-    )
-
     data class OAuthToken(
         @JsonProperty("token") var token: String? = null,
         @JsonProperty("status") var status: Int? = null
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 519fb4c3a28..c4095e2d881 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
@@ -2,38 +2,36 @@ package com.lagradost.cloudstream3.syncproviders.providers
 
 import androidx.annotation.StringRes
 import androidx.core.net.toUri
-import androidx.fragment.app.FragmentActivity
 import com.fasterxml.jackson.annotation.JsonInclude
 import com.fasterxml.jackson.annotation.JsonProperty
-import com.lagradost.cloudstream3.AcraApplication
-import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
-import com.lagradost.cloudstream3.AcraApplication.Companion.getKeys
-import com.lagradost.cloudstream3.AcraApplication.Companion.openBrowser
-import com.lagradost.cloudstream3.AcraApplication.Companion.removeKey
-import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
 import com.lagradost.cloudstream3.BuildConfig
+import com.lagradost.cloudstream3.CloudStreamApp
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.getKey
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.getKeys
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.removeKey
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.setKey
 import com.lagradost.cloudstream3.LoadResponse.Companion.readIdFromString
 import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.Score
 import com.lagradost.cloudstream3.SimklSyncServices
 import com.lagradost.cloudstream3.TvType
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.mapper
-import com.lagradost.cloudstream3.mvvm.debugAssert
 import com.lagradost.cloudstream3.mvvm.debugPrint
 import com.lagradost.cloudstream3.mvvm.logError
-import com.lagradost.cloudstream3.mvvm.safeAsync
-import com.lagradost.cloudstream3.syncproviders.AccountManager
-import com.lagradost.cloudstream3.syncproviders.AuthAPI
-import com.lagradost.cloudstream3.syncproviders.OAuth2API
+import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.APP_STRING
+import com.lagradost.cloudstream3.syncproviders.AuthData
+import com.lagradost.cloudstream3.syncproviders.AuthLoginPage
+import com.lagradost.cloudstream3.syncproviders.AuthPinData
+import com.lagradost.cloudstream3.syncproviders.AuthToken
+import com.lagradost.cloudstream3.syncproviders.AuthUser
 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.utils.txt
 import com.lagradost.cloudstream3.utils.AppUtils.toJson
 import com.lagradost.cloudstream3.utils.DataStoreHelper.toYear
-import okhttp3.Interceptor
-import okhttp3.Response
+import com.lagradost.cloudstream3.utils.txt
 import java.math.BigInteger
 import java.security.SecureRandom
 import java.text.SimpleDateFormat
@@ -45,25 +43,22 @@ import kotlin.time.Duration
 import kotlin.time.DurationUnit
 import kotlin.time.toDuration
 
-class SimklApi(index: Int) : AccountManager(index), SyncAPI {
+class SimklApi : SyncAPI() {
     override var name = "Simkl"
-    override val key = "simkl-key"
-    override val redirectUrl = "simkl"
-    override val supportDeviceAuth = true
     override val idPrefix = "simkl"
+
+    val key = "simkl-key"
+    override val redirectUrlIdentifier = "simkl"
+    override val hasOAuth2 = true
+    override val hasPin = true
     override var requireLibraryRefresh = true
     override var mainUrl = "https://api.simkl.com"
     override val icon = R.drawable.simkl_logo
-    override val requiresLogin = false
     override val createAccountUrl = "$mainUrl/signup"
     override val syncIdName = SyncIdName.Simkl
-    private val token: String?
-        get() = getKey<String>(accountId, SIMKL_TOKEN_KEY).also {
-            debugAssert({ it == null }) { "No ${this.name} token!" }
-        }
 
     /** Automatically adds simkl auth headers */
-    private val interceptor = HeaderInterceptor()
+    // private val interceptor = HeaderInterceptor()
 
     /**
      * This is required to override the reported last activity as simkl activites
@@ -101,7 +96,7 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI {
 
         fun cleanOldCache() {
             getKeys(SIMKL_CACHE_KEY)?.forEach {
-                val isOld = AcraApplication.getKey<SimklCacheWrapper<Any>>(it)?.isFresh() == false
+                val isOld = CloudStreamApp.getKey<SimklCacheWrapper<Any>>(it)?.isFresh() == false
                 if (isOld) {
                     removeKey(it)
                 }
@@ -148,10 +143,6 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI {
     companion object {
         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"
-        const val SIMKL_USER_KEY: String = "simkl_user"
         const val SIMKL_CACHED_LIST: String = "simkl_cached_list"
         const val SIMKL_CACHED_LIST_TIME: String = "simkl_cached_time"
 
@@ -237,13 +228,23 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI {
 
         /** https://simkl.docs.apiary.io/#reference/users/settings/receive-settings */
         data class SettingsResponse(
-            val user: User
+            @JsonProperty("user")
+            val user: User,
+            @JsonProperty("account")
+            val account: Account,
         ) {
             data class User(
+                @JsonProperty("name")
                 val name: String,
                 /** Url */
+                @JsonProperty("avatar")
                 val avatar: String
             )
+
+            data class Account(
+                @JsonProperty("id")
+                val id: Int,
+            )
         }
 
         data class PinAuthResponse(
@@ -365,7 +366,7 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI {
         class SimklScoreBuilder private constructor() {
             data class Builder(
                 private var url: String? = null,
-                private var interceptor: Interceptor? = null,
+                private var headers: Map<String, String>? = null,
                 private var ids: MediaObject.Ids? = null,
                 private var score: Int? = null,
                 private var status: Int? = null,
@@ -374,7 +375,7 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI {
                 // Required for knowing if the status should be overwritten
                 private var onList: Boolean = false
             ) {
-                fun interceptor(interceptor: Interceptor) = apply { this.interceptor = interceptor }
+                fun token(token: AuthToken) = apply { this.headers = getHeaders(token) }
                 fun apiUrl(url: String) = apply { this.url = url }
                 fun ids(ids: MediaObject.Ids) = apply { this.ids = ids }
                 fun score(score: Int?, oldScore: Int?) = apply {
@@ -423,7 +424,7 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI {
 
                 suspend fun execute(): Boolean {
                     val time = getDateTime(unixTime)
-
+                    val headers = this.headers ?: emptyMap()
                     return if (this.status == SimklListStatusType.None.value) {
                         app.post(
                             "$url/sync/history/remove",
@@ -431,7 +432,7 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI {
                                 shows = listOf(HistoryMediaObject(ids = ids)),
                                 movies = emptyList()
                             ),
-                            interceptor = interceptor
+                            headers = headers
                         ).isSuccessful
                     } else {
                         val statusResponse = this.status?.let { setStatus ->
@@ -452,7 +453,7 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI {
                                         )
                                     ), movies = emptyList()
                                 ),
-                                interceptor = interceptor
+                                headers = headers
                             ).isSuccessful
                         } ?: true
 
@@ -469,7 +470,7 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI {
                                     ),
                                     movies = emptyList()
                                 ),
-                                interceptor = interceptor
+                                headers = headers
                             ).isSuccessful
                         } ?: true
 
@@ -496,7 +497,7 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI {
                                             )
                                         ), movies = emptyList()
                                     ),
-                                    interceptor = interceptor
+                                    headers = headers
                                 ).isSuccessful
                             } else {
                                 true
@@ -508,6 +509,9 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI {
             }
         }
 
+        fun getHeaders(token: AuthToken): Map<String, String> =
+            mapOf("Authorization" to "Bearer ${token.accessToken}", "simkl-api-key" to CLIENT_ID)
+
         suspend fun getEpisodes(
             simklId: Int?,
             type: String?,
@@ -664,7 +668,7 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI {
                         movie.ids.simkl.toString(),
                         this.watchedEpisodesCount,
                         this.totalEpisodesCount,
-                        this.userRating?.times(10),
+                        Score.from10(this.userRating),
                         getUnixTime(lastWatchedAt) ?: 0,
                         "Simkl",
                         TvType.Movie,
@@ -697,7 +701,7 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI {
                         show.ids.simkl.toString(),
                         this.watchedEpisodesCount,
                         this.totalEpisodesCount,
-                        this.userRating?.times(10),
+                        Score.from10(this.userRating),
                         getUnixTime(lastWatchedAt) ?: 0,
                         "Simkl",
                         TvType.Anime,
@@ -746,7 +750,7 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI {
     /**
      * Appends api keys to the requests
      **/
-    private inner class HeaderInterceptor : Interceptor {
+    /*private inner class HeaderInterceptor : Interceptor {
         override fun intercept(chain: Interceptor.Chain): Response {
             debugPrint { "${this@SimklApi.name} made request to ${chain.request().url}" }
             return chain.proceed(
@@ -757,14 +761,12 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI {
                     .build()
             )
         }
-    }
+    }*/
+
+    private suspend fun getUser(token: AuthToken): SettingsResponse =
+        app.post("$mainUrl/users/settings", headers = getHeaders(token))
+            .parsed<SettingsResponse>()
 
-    private suspend fun getUser(): SettingsResponse.User? {
-        return safeAsync {
-            app.post("$mainUrl/users/settings", interceptor = interceptor)
-                .parsedSafe<SettingsResponse>()?.user
-        }
-    }
 
     /**
      * Useful to get episodes on demand to prevent unnecessary requests.
@@ -782,7 +784,7 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI {
 
     class SimklSyncStatus(
         override var status: SyncWatchType,
-        override var score: Int?,
+        override var score: Score?,
         val oldScore: Int?,
         override var watchedEpisodes: Int?,
         val episodeConstructor: SimklEpisodeConstructor,
@@ -794,7 +796,8 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI {
         val oldStatus: String?
     ) : SyncAPI.AbstractSyncStatus()
 
-    override suspend fun getStatus(id: String): SyncAPI.AbstractSyncStatus? {
+    override suspend fun status(auth: AuthData?, id: String): SyncAPI.AbstractSyncStatus? {
+        if (auth == null) return null
         val realIds = readIdFromString(id)
 
         // Key which assumes all ids are the same each time :/
@@ -818,7 +821,7 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI {
             searchResult.hasEnded()
         )
 
-        val foundItem = getSyncListSmart()?.let { list ->
+        val foundItem = getSyncListSmart(auth)?.let { list ->
             listOf(list.shows, list.anime, list.movies).flatten().firstOrNull { show ->
                 realIds.any { (database, id) ->
                     show.getIds().matchesId(database, id)
@@ -836,7 +839,7 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI {
                     )
                 }
                     ?: return null,
-                score = foundItem.userRating,
+                score = Score.from10(foundItem.userRating),
                 watchedEpisodes = foundItem.watchedEpisodesCount,
                 maxEpisodes = searchResult.totalEpisodes,
                 episodeConstructor = episodeConstructor,
@@ -847,7 +850,7 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI {
         } else {
             return SimklSyncStatus(
                 status = SyncWatchType.fromInternalId(SimklListStatusType.None.value),
-                score = 0,
+                score = null,
                 watchedEpisodes = 0,
                 maxEpisodes = if (searchResult.type == "movie") 0 else searchResult.totalEpisodes,
                 episodeConstructor = episodeConstructor,
@@ -858,22 +861,26 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI {
         }
     }
 
-    override suspend fun score(id: String, status: SyncAPI.AbstractSyncStatus): Boolean {
+    override suspend fun updateStatus(
+        auth: AuthData?,
+        id: String,
+        newStatus: AbstractSyncStatus
+    ): Boolean {
         val parsedId = readIdFromString(id)
         lastScoreTime = unixTime
-        val simklStatus = status as? SimklSyncStatus
+        val simklStatus = newStatus as? SimklSyncStatus
 
         val builder = SimklScoreBuilder.Builder()
             .apiUrl(this.mainUrl)
-            .score(status.score, simklStatus?.oldScore)
+            .score(newStatus.score?.toInt(10), simklStatus?.oldScore)
             .status(
-                status.status.internalId,
-                (status as? SimklSyncStatus)?.oldStatus?.let { oldStatus ->
+                newStatus.status.internalId,
+                (newStatus as? SimklSyncStatus)?.oldStatus?.let { oldStatus ->
                     SimklListStatusType.entries.firstOrNull {
                         it.originalName == oldStatus
                     }?.value
                 })
-            .interceptor(interceptor)
+            .token(auth?.token ?: return false)
             .ids(MediaObject.Ids.fromMap(parsedId))
 
 
@@ -881,11 +888,12 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI {
         val episodes = simklStatus?.episodeConstructor?.getEpisodes()
 
         // All episodes if marked as completed
-        val watchedEpisodes = if (status.status.internalId == SimklListStatusType.Completed.value) {
-            episodes?.size
-        } else {
-            status.watchedEpisodes
-        }
+        val watchedEpisodes =
+            if (newStatus.status.internalId == SimklListStatusType.Completed.value) {
+                episodes?.size
+            } else {
+                newStatus.watchedEpisodes
+            }
 
         builder.episodes(episodes?.toList(), watchedEpisodes, simklStatus?.oldEpisodes)
 
@@ -906,39 +914,26 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI {
         ).parsedSafe()
     }
 
-    override suspend fun search(name: String): List<SyncAPI.SyncSearchResult>? {
+    override suspend fun search(auth: AuthData?, query: String): List<SyncAPI.SyncSearchResult>? {
         return app.get(
             "$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)
+    override fun loginRequest(): AuthLoginPage? {
+        val lastLoginState = BigInteger(130, SecureRandom()).toString(32)
         val url =
-            "https://simkl.com/oauth/authorize?response_type=code&client_id=$CLIENT_ID&redirect_uri=$APP_STRING://${redirectUrl}&state=$lastLoginState"
-        openBrowser(url, activity)
-    }
-
-    override fun loginInfo(): AuthAPI.LoginInfo? {
-        return getKey<SettingsResponse.User>(accountId, SIMKL_USER_KEY)?.let { user ->
-            AuthAPI.LoginInfo(
-                name = user.name,
-                profilePicture = user.avatar,
-                accountIndex = accountIndex
-            )
-        }
-    }
+            "https://simkl.com/oauth/authorize?response_type=code&client_id=$CLIENT_ID&redirect_uri=$APP_STRING://${redirectUrlIdentifier}&state=$lastLoginState"
 
-    override fun logOut() {
-        requireLibraryRefresh = true
-        removeAccountKeys()
+        return AuthLoginPage(
+            url = url,
+            payload = lastLoginState
+        )
     }
 
-    override suspend fun getResult(id: String): SyncAPI.SyncResult? {
-        return null
-    }
+    override suspend fun load(auth: AuthData?, id: String): SyncResult? = null
 
-    private suspend fun getSyncListSince(since: Long?): AllItemsResponse? {
+    private suspend fun getSyncListSince(auth: AuthData, since: Long?): AllItemsResponse? {
         val params = getDateTime(since)?.let {
             mapOf("date_from" to it)
         } ?: emptyMap()
@@ -947,23 +942,22 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI {
         return app.get(
             "$mainUrl/sync/all-items/",
             params = params,
-            interceptor = interceptor
+            headers = getHeaders(auth.token)
         ).parsedSafe()
     }
 
-    private suspend fun getActivities(): ActivitiesResponse? {
-        return app.post("$mainUrl/sync/activities", interceptor = interceptor).parsedSafe()
+    private suspend fun getActivities(token: AuthToken): ActivitiesResponse? {
+        return app.post("$mainUrl/sync/activities", headers = getHeaders(token)).parsedSafe()
     }
 
-    private fun getSyncListCached(): AllItemsResponse? {
-        return getKey(accountId, SIMKL_CACHED_LIST)
+    private fun getSyncListCached(auth: AuthData): AllItemsResponse? {
+        return getKey<AllItemsResponse>(SIMKL_CACHED_LIST, auth.user.id.toString())
     }
 
-    private suspend fun getSyncListSmart(): AllItemsResponse? {
-        if (token == null) return null
-
-        val activities = getActivities()
-        val lastCacheUpdate = getKey<Long>(accountId, SIMKL_CACHED_LIST_TIME)
+    private suspend fun getSyncListSmart(auth: AuthData): AllItemsResponse? {
+        val activities = getActivities(auth.token)
+        val userId = auth.user.id.toString()
+        val lastCacheUpdate = getKey<Long>(SIMKL_CACHED_LIST_TIME, auth.user.id.toString())
         val lastRemoval = listOf(
             activities?.tvShows?.removedFromList,
             activities?.anime?.removedFromList,
@@ -983,26 +977,28 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI {
         debugPrint { "Cache times: lastCacheUpdate=$lastCacheUpdate, lastRemoval=$lastRemoval, lastRealUpdate=$lastRealUpdate" }
         val list = if (lastCacheUpdate == null || lastCacheUpdate < lastRemoval) {
             debugPrint { "Full list update in ${this.name}." }
-            setKey(accountId, SIMKL_CACHED_LIST_TIME, lastRemoval)
-            getSyncListSince(null)
+            setKey(SIMKL_CACHED_LIST_TIME, userId, lastRemoval)
+            getSyncListSince(auth, null)
         } else if (lastCacheUpdate < lastRealUpdate || lastCacheUpdate < lastScoreTime) {
             debugPrint { "Partial list update in ${this.name}." }
-            setKey(accountId, SIMKL_CACHED_LIST_TIME, lastCacheUpdate)
-            AllItemsResponse.merge(getSyncListCached(), getSyncListSince(lastCacheUpdate))
+            setKey(SIMKL_CACHED_LIST_TIME, userId, lastCacheUpdate)
+            AllItemsResponse.merge(
+                getSyncListCached(auth),
+                getSyncListSince(auth, lastCacheUpdate)
+            )
         } else {
             debugPrint { "Cached list update in ${this.name}." }
-            getSyncListCached()
+            getSyncListCached(auth)
         }
         debugPrint { "List sizes: movies=${list?.movies?.size}, shows=${list?.shows?.size}, anime=${list?.anime?.size}" }
 
-        setKey(accountId, SIMKL_CACHED_LIST, list)
+        setKey(SIMKL_CACHED_LIST, userId, list)
 
         return list
     }
 
-
-    override suspend fun getPersonalLibrary(): SyncAPI.LibraryMetadata? {
-        val list = getSyncListSmart() ?: return null
+    override suspend fun library(auth: AuthData?): SyncAPI.LibraryMetadata? {
+        val list = getSyncListSmart(auth ?: return null) ?: return null
 
         val baseMap =
             SimklListStatusType.entries
@@ -1038,17 +1034,17 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI {
         )
     }
 
-    override fun getIdFromUrl(url: String): String {
+    override fun urlToId(url: String): String? {
         val simklUrlRegex = Regex("""https://simkl\.com/[^/]*/(\d+).*""")
         return simklUrlRegex.find(url)?.groupValues?.get(1) ?: ""
     }
 
-    override suspend fun getDevicePin(): OAuth2API.PinAuthData? {
+    override suspend fun pinRequest(): AuthPinData? {
         val pinAuthResp = app.get(
-            "$mainUrl/oauth/pin?client_id=$CLIENT_ID&redirect_uri=$APP_STRING://${redirectUrl}"
+            "$mainUrl/oauth/pin?client_id=$CLIENT_ID&redirect_uri=$APP_STRING://${redirectUrlIdentifier}"
         ).parsedSafe<PinAuthResponse>() ?: return null
 
-        return OAuth2API.PinAuthData(
+        return AuthPinData(
             deviceCode = pinAuthResp.deviceCode,
             userCode = pinAuthResp.userCode,
             verificationUrl = pinAuthResp.verificationUrl,
@@ -1057,56 +1053,38 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI {
         )
     }
 
-    override suspend fun handleDeviceAuth(pinAuthData: OAuth2API.PinAuthData): Boolean {
+    override suspend fun login(payload: AuthPinData): AuthToken? {
         val pinAuthResp = app.get(
-            "$mainUrl/oauth/pin/${pinAuthData.userCode}?client_id=$CLIENT_ID"
-        ).parsedSafe<PinExchangeResponse>() ?: return false
-
-        if (pinAuthResp.accessToken != null) {
-            switchToNewAccount()
-            setKey(accountId, SIMKL_TOKEN_KEY, pinAuthResp.accessToken)
-
-            val user = getUser()
-            if (user == null) {
-                removeKey(accountId, SIMKL_TOKEN_KEY)
-                switchToOldAccount()
-                return false
-            }
+            "$mainUrl/oauth/pin/${payload.userCode}?client_id=$CLIENT_ID"
+        ).parsedSafe<PinExchangeResponse>() ?: return null
 
-            setKey(accountId, SIMKL_USER_KEY, user)
-            registerAccount()
-            requireLibraryRefresh = true
-            return true
-        }
-        return false
+        return AuthToken(
+            accessToken = pinAuthResp.accessToken ?: return null,
+        )
     }
 
-    override suspend fun handleRedirect(url: String): Boolean {
-        val uri = url.toUri()
+    override suspend fun login(redirectUrl: String, payload: String?): AuthToken? {
+        val uri = redirectUrl.toUri()
         val state = uri.getQueryParameter("state")
         // Ensure consistent state
-        if (state != lastLoginState) return false
-        lastLoginState = ""
+        if (state != payload) return null
 
-        val code = uri.getQueryParameter("code") ?: return false
-        val token = app.post(
+        val code = uri.getQueryParameter("code") ?: return null
+        val tokenResponse = app.post(
             "$mainUrl/oauth/token", json = TokenRequest(code)
-        ).parsedSafe<TokenResponse>() ?: return false
-
-        switchToNewAccount()
-        setKey(accountId, SIMKL_TOKEN_KEY, token.accessToken)
-
-        val user = getUser()
-        if (user == null) {
-            removeKey(accountId, SIMKL_TOKEN_KEY)
-            switchToOldAccount()
-            return false
-        }
+        ).parsedSafe<TokenResponse>() ?: return null
 
-        setKey(accountId, SIMKL_USER_KEY, user)
-        registerAccount()
-        requireLibraryRefresh = true
+        return AuthToken(
+            accessToken = tokenResponse.accessToken,
+        )
+    }
 
-        return true
+    override suspend fun user(token: AuthToken?): AuthUser? {
+        val user = getUser(token ?: return null)
+        return AuthUser(
+            id = user.account.id,
+            name = user.user.name,
+            profilePicture = user.user.avatar
+        )
     }
 }
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 8dad1f88cfe..19122768e23 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
@@ -3,27 +3,33 @@ package com.lagradost.cloudstream3.syncproviders.providers
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.TvType
 import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.subtitles.AbstractSubProvider
 import com.lagradost.cloudstream3.subtitles.AbstractSubtitleEntities
 import com.lagradost.cloudstream3.subtitles.SubtitleResource
+import com.lagradost.cloudstream3.syncproviders.AuthData
+import com.lagradost.cloudstream3.syncproviders.SubtitleAPI
 import com.lagradost.cloudstream3.utils.AppUtils.parseJson
 import com.lagradost.cloudstream3.utils.AppUtils.toJson
 import com.lagradost.cloudstream3.utils.SubtitleHelper
 
-class SubSourceApi : AbstractSubProvider {
+class SubSourceApi : SubtitleAPI() {
+    override val name = "SubSource"
     override val idPrefix = "subsource"
-    val name = "SubSource"
+
+    override val requiresLogin = false
 
     companion object {
         const val APIURL = "https://api.subsource.net/api"
         const val DOWNLOADENDPOINT = "https://api.subsource.net/api/downloadSub"
     }
 
-    override suspend fun search(query: AbstractSubtitleEntities.SubtitleSearch): List<AbstractSubtitleEntities.SubtitleEntity>? {
+    override suspend fun search(
+        auth: AuthData?,
+        query: AbstractSubtitleEntities.SubtitleSearch
+    ): List<AbstractSubtitleEntities.SubtitleEntity>? {
 
         //Only supports Imdb Id search for now
         if (query.imdbId == null) return null
-        val queryLang = SubtitleHelper.fromTwoLettersToLanguage(query.lang!!)
+        val queryLang = SubtitleHelper.fromTagToEnglishLanguageName(query.lang)
         val type = if ((query.seasonNumber ?: 0) > 0) TvType.TvSeries else TvType.Movie
 
         val searchRes = app.post(
@@ -87,15 +93,17 @@ class SubSourceApi : AbstractSubProvider {
         }
     }
 
-    override suspend fun SubtitleResource.getResources(data: AbstractSubtitleEntities.SubtitleEntity) {
-
-        val parsedSub = parseJson<SubData>(data.data)
+    override suspend fun SubtitleResource.getResources(
+        auth: AuthData?,
+        subtitle: AbstractSubtitleEntities.SubtitleEntity
+    ) {
+        val parsedSub = parseJson<SubData>(subtitle.data)
 
         val subRes = app.post(
             url = "$APIURL/getSub",
             data = mapOf(
                 "movie" to parsedSub.movie,
-                "lang" to data.lang,
+                "lang" to subtitle.lang,
                 "id" to parsedSub.id
             )
         ).parsedSafe<SubTitleLink>() ?: return
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 9cec1e1cac4..1f1e6de4450 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
@@ -1,89 +1,71 @@
 package com.lagradost.cloudstream3.syncproviders.providers
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
-import com.lagradost.cloudstream3.AcraApplication.Companion.removeKey
-import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
-import com.lagradost.cloudstream3.ErrorLoadingException
-import com.lagradost.cloudstream3.R
-import com.lagradost.cloudstream3.TvType
 import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.mvvm.logError
-import com.lagradost.cloudstream3.subtitles.AbstractSubApi
+import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.subtitles.AbstractSubtitleEntities
 import com.lagradost.cloudstream3.subtitles.SubtitleResource
-import com.lagradost.cloudstream3.syncproviders.AuthAPI.LoginInfo
-import com.lagradost.cloudstream3.syncproviders.InAppAuthAPI
-import com.lagradost.cloudstream3.syncproviders.InAppAuthAPIManager
+import com.lagradost.cloudstream3.syncproviders.AuthData
+import com.lagradost.cloudstream3.syncproviders.AuthLoginRequirement
+import com.lagradost.cloudstream3.syncproviders.AuthLoginResponse
+import com.lagradost.cloudstream3.syncproviders.AuthToken
+import com.lagradost.cloudstream3.syncproviders.AuthUser
+import com.lagradost.cloudstream3.syncproviders.SubtitleAPI
+import com.lagradost.cloudstream3.TvType
 
-class SubDlApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi {
-    override val idPrefix = "subdl"
+class SubDlApi : SubtitleAPI() {
     override val name = "SubDL"
+    override val idPrefix = "subdl"
+
     override val icon = R.drawable.subdl_logo_big
-    override val requiresPassword = true
-    override val requiresEmail = true
+    override val hasInApp = true
+    override val inAppLoginRequirement = AuthLoginRequirement(password = true, email = true)
+    override val requiresLogin = true
     override val createAccountUrl = "https://subdl.com/panel/register"
 
     companion object {
         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"
-        var currentSession: SubtitleOAuthEntity? = null
     }
 
-    override suspend fun initialize() {
-        currentSession = getAuthKey()
-    }
-
-    override fun logOut() {
-        setAuthKey(null)
-        removeAccountKeys()
-        currentSession = getAuthKey()
-    }
+    override suspend fun login(form: AuthLoginResponse): AuthToken? {
+        val email = form.email ?: return null
+        val password = form.password ?: return null
+        val tokenResponse = app.post(
+            url = "$APIURL/login",
+            json = mapOf(
+                "email" to email,
+                "password" to password
+            )
+        ).parsed<OAuthTokenResponse>()
 
-    override suspend fun login(data: InAppAuthAPI.LoginData): Boolean {
-        val email = data.email ?: throw ErrorLoadingException("Requires Email")
-        val password = data.password ?: throw ErrorLoadingException("Requires Password")
-        switchToNewAccount()
-        try {
-            if (initLogin(email, password)) {
-                registerAccount()
-                return true
-            }
-        } catch (e: Exception) {
-            logError(e)
-            switchToOldAccount()
-        }
-        switchToOldAccount()
-        return false
-    }
+        val apiResponse = app.get(
+            url = "$APIURL/user/userApi",
+            headers = mapOf(
+                "Authorization" to "Bearer ${tokenResponse.token}"
+            )
+        ).parsed<ApiKeyResponse>()
 
-    override fun getLatestLoginData(): InAppAuthAPI.LoginData? {
-        val current = getAuthKey() ?: return null
-        return InAppAuthAPI.LoginData(
-            email = current.userEmail,
-            password = current.pass
-        )
+        return AuthToken(accessToken = apiResponse.apiKey, payload = email)
     }
 
-    override fun loginInfo(): LoginInfo? {
-        getAuthKey()?.let { user ->
-            return LoginInfo(
-                profilePicture = null,
-                name = user.name ?: user.userEmail,
-                accountIndex = accountIndex
-            )
-        }
-        return null
+    override suspend fun user(token: AuthToken?): AuthUser? {
+        val name = token?.payload ?: return null
+        return AuthUser(id = name.hashCode(), name = name)
     }
 
-    override suspend fun search(query: AbstractSubtitleEntities.SubtitleSearch): List<AbstractSubtitleEntities.SubtitleEntity>? {
-
+    override suspend fun search(
+        auth : AuthData?,
+        query: AbstractSubtitleEntities.SubtitleSearch
+    ): List<AbstractSubtitleEntities.SubtitleEntity>? {
+        if (auth == null) return null
+        val apiKey = auth.token.accessToken ?: return null
         val queryText = query.query
         val epNum = query.epNumber ?: 0
         val seasonNum = query.seasonNumber ?: 0
         val yearNum = query.year ?: 0
+        val langSubdlCode = langTagIETF2subdl[query.lang.toString()] ?: query.lang
 
         val idQuery = when {
             query.imdbId != null -> "&imdb_id=${query.imdbId}"
@@ -97,8 +79,8 @@ class SubDlApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi {
 
         val searchQueryUrl = when (idQuery) {
             //Use imdb/tmdb id to search if its valid
-            null -> "$APIENDPOINT?api_key=${currentSession?.apiKey}&film_name=$queryText&languages=${query.lang}$epQuery$seasonQuery$yearQuery"
-            else -> "$APIENDPOINT?api_key=${currentSession?.apiKey}$idQuery&languages=${query.lang}$epQuery$seasonQuery$yearQuery"
+            null -> "$APIENDPOINT?api_key=${apiKey}&film_name=$queryText&languages=$langSubdlCode$epQuery$seasonQuery$yearQuery"
+            else -> "$APIENDPOINT?api_key=${apiKey}$idQuery&languages=$langSubdlCode$epQuery$seasonQuery$yearQuery"
         }
 
         val req = app.get(
@@ -110,7 +92,9 @@ class SubDlApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi {
 
         return req.parsedSafe<ApiResponse>()?.subtitles?.map { subtitle ->
 
-            val lang = subtitle.lang.replaceFirstChar { it.uppercase() }
+            val langTagIETF =
+                langTagIETF2subdl.entries.find { it.value == subtitle.lang }?.key ?:
+                subtitle.lang
             val resEpNum = subtitle.episode ?: query.epNumber
             val resSeasonNum = subtitle.season ?: query.seasonNumber
             val type = if ((resSeasonNum ?: 0) > 0) TvType.TvSeries else TvType.Movie
@@ -118,7 +102,7 @@ class SubDlApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi {
             AbstractSubtitleEntities.SubtitleEntity(
                 idPrefix = this.idPrefix,
                 name = subtitle.releaseName,
-                lang = lang,
+                lang = langTagIETF,
                 data = "${DOWNLOADENDPOINT}${subtitle.url}",
                 type = type,
                 source = this.name,
@@ -129,58 +113,15 @@ class SubDlApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi {
         }
     }
 
-    override suspend fun SubtitleResource.getResources(data: AbstractSubtitleEntities.SubtitleEntity) {
-        this.addZipUrl(data.data) { name, _ ->
+    override suspend fun SubtitleResource.getResources(
+        auth: AuthData?,
+        subtitle: AbstractSubtitleEntities.SubtitleEntity
+    ) {
+        this.addZipUrl(subtitle.data) { name, _ ->
             name
         }
     }
 
-    private suspend fun initLogin(useremail: String, password: String): Boolean {
-
-        val tokenResponse = app.post(
-            url = "$APIURL/login",
-            json = mapOf(
-                "email" to useremail,
-                "password" to password
-            )
-        ).parsedSafe<OAuthTokenResponse>()
-
-        if (tokenResponse?.token == null) return false
-
-        val apiResponse = app.get(
-            url = "$APIURL/user/userApi",
-            headers = mapOf(
-                "Authorization" to "Bearer ${tokenResponse.token}"
-            )
-        ).parsedSafe<ApiKeyResponse>()
-
-        if (apiResponse?.ok == false) return false
-
-        setAuthKey(
-            SubtitleOAuthEntity(
-                userEmail = useremail,
-                pass = password,
-                name = tokenResponse.userData?.username ?: tokenResponse.userData?.name,
-                accessToken = tokenResponse.token,
-                apiKey = apiResponse?.apiKey
-            )
-        )
-        return true
-    }
-
-    private fun getAuthKey(): SubtitleOAuthEntity? {
-        return getKey(accountId, SUBDL_SUBTITLES_USER_KEY)
-    }
-
-    private fun setAuthKey(data: SubtitleOAuthEntity?) {
-        if (data == null) removeKey(
-            accountId,
-            SUBDL_SUBTITLES_USER_KEY
-        )
-        currentSession = data
-        setKey(accountId, SUBDL_SUBTITLES_USER_KEY, data)
-    }
-
     data class SubtitleOAuthEntity(
         @JsonProperty("userEmail") var userEmail: String,
         @JsonProperty("pass") var pass: String,
@@ -190,7 +131,7 @@ class SubDlApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi {
     )
 
     data class OAuthTokenResponse(
-        @JsonProperty("token") val token: String? = null,
+        @JsonProperty("token") val token: String,
         @JsonProperty("userData") val userData: UserData? = null,
         @JsonProperty("status") val status: Boolean? = null,
         @JsonProperty("message") val message: String? = null,
@@ -208,7 +149,7 @@ class SubDlApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi {
 
     data class ApiKeyResponse(
         @JsonProperty("ok") val ok: Boolean? = false,
-        @JsonProperty("api_key") val apiKey: String? = null,
+        @JsonProperty("api_key") val apiKey: String,
         @JsonProperty("usage") val usage: Usage? = null,
     )
 
@@ -236,13 +177,83 @@ class SubDlApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi {
     data class Subtitle(
         @JsonProperty("release_name") val releaseName: String,
         @JsonProperty("name") val name: String,
-        @JsonProperty("lang") val lang: String,
+        @JsonProperty("lang") val lang: String, // subdl language code
         @JsonProperty("author") val author: String? = null,
         @JsonProperty("url") val url: String? = null,
         @JsonProperty("subtitlePage") val subtitlePage: String? = null,
         @JsonProperty("season") val season: Int? = null,
         @JsonProperty("episode") val episode: Int? = null,
-        @JsonProperty("language") val language: String? = null,
+        @JsonProperty("language") val language: String? = null, // full language name
         @JsonProperty("hi") val hearingImpaired: Boolean? = null,
     )
+
+    // https://subdl.com/api-files/language_list.json
+    // most of it is IETF BPC 47 conformant tag
+    // but there are some exceptions
+    private val langTagIETF2subdl = mapOf(
+        "en-bg" to "BG_EN", // "Bulgarian_English"
+        "en-de" to "EN_DE", // "English_German"
+        "en-hu" to "HU_EN", // "Hungarian_English"
+        "en-nl" to "NL_EN", // "Dutch_English"
+        "pt-br" to "BR_PT", // "Brazillian Portuguese"
+        "zh-hant" to "ZH_BG", // "Big 5 code" -> traditional Chinese (?_?)
+        // "ar" to "AR", // "Arabic"
+        // "az" to "AZ", // "Azerbaijani"
+        // "be" to "BE", // "Belarusian"
+        // "bg" to "BG", // "Bulgarian"
+        // "bn" to "BN", // "Bengali"
+        // "bs" to "BS", // "Bosnian"
+        // "ca" to "CA", // "Catalan"
+        // "cs" to "CS", // "Czech"
+        // "da" to "DA", // "Danish"
+        // "de" to "DE", // "German"
+        // "el" to "EL", // "Greek"
+        // "en" to "EN", // "English"
+        // "eo" to "EO", // "Esperanto"
+        // "es" to "ES", // "Spanish"
+        // "et" to "ET", // "Estonian"
+        // "fa" to "FA", // "Farsi_Persian"
+        // "fi" to "FI", // "Finnish"
+        // "fr" to "FR", // "French"
+        // "he" to "HE", // "Hebrew"
+        // "hi" to "HI", // "Hindi"
+        // "hr" to "HR", // "Croatian"
+        // "hu" to "HU", // "Hungarian"
+        // "id" to "ID", // "Indonesian"
+        // "is" to "IS", // "Icelandic"
+        // "it" to "IT", // "Italian"
+        // "ja" to "JA", // "Japanese"
+        // "ka" to "KA", // "Georgian"
+        // "kl" to "KL", // "Greenlandic"
+        // "ko" to "KO", // "Korean"
+        // "ku" to "KU", // "Kurdish"
+        // "lt" to "LT", // "Lithuanian"
+        // "lv" to "LV", // "Latvian"
+        // "mk" to "MK", // "Macedonian"
+        // "ml" to "ML", // "Malayalam"
+        // "mni" to "MNI", // "Manipuri"
+        // "ms" to "MS", // "Malay"
+        // "my" to "MY", // "Burmese"
+        // "nl" to "NL", // "Dutch"
+        // "no" to "NO", // "Norwegian"
+        // "pl" to "PL", // "Polish"
+        // "pt" to "PT", // "Portuguese"
+        // "ro" to "RO", // "Romanian"
+        // "ru" to "RU", // "Russian"
+        // "si" to "SI", // "Sinhala"
+        // "sk" to "SK", // "Slovak"
+        // "sl" to "SL", // "Slovenian"
+        // "sq" to "SQ", // "Albanian"
+        // "sr" to "SR", // "Serbian"
+        // "sv" to "SV", // "Swedish"
+        // "ta" to "TA", // "Tamil"
+        // "te" to "TE", // "Telugu"
+        // "th" to "TH", // "Thai"
+        // "tl" to "TL", // "Tagalog"
+        // "tr" to "TR", // "Turkish"
+        // "uk" to "UK", // "Ukranian"
+        // "ur" to "UR", // "Urdu"
+        // "vi" to "VI", // "Vietnamese"
+        // "zh" to "ZH", // "Chinese BG code"
+    )
 }
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 492efacecae..93a79689e50 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/APIRepository.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/APIRepository.kt
@@ -9,13 +9,14 @@ import com.lagradost.cloudstream3.LoadResponse
 import com.lagradost.cloudstream3.MainAPI
 import com.lagradost.cloudstream3.MainActivity.Companion.afterPluginsLoadedEvent
 import com.lagradost.cloudstream3.MainPageRequest
-import com.lagradost.cloudstream3.SearchResponse
+import com.lagradost.cloudstream3.SearchResponseList
 import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.TvType
 import com.lagradost.cloudstream3.fixUrl
 import com.lagradost.cloudstream3.mvvm.Resource
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.mvvm.safeApiCall
+import com.lagradost.cloudstream3.newSearchResponseList
 import com.lagradost.cloudstream3.utils.Coroutines.threadSafeListOf
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import kotlinx.coroutines.CoroutineScope
@@ -28,7 +29,7 @@ class APIRepository(val api: MainAPI) {
         // 2 minute timeout to prevent bad extensions/extractors from hogging the resources
         // No real provider should take longer, so we hard kill them.
         private const val DEFAULT_TIMEOUT = 120_000L
-        private const val MAX_TIMEOUT = 4*DEFAULT_TIMEOUT
+        private const val MAX_TIMEOUT = 4 * DEFAULT_TIMEOUT
         private const val MIN_TIMEOUT = 5_000L
 
         var dubStatusActive = HashSet<DubStatus>()
@@ -58,8 +59,8 @@ class APIRepository(val api: MainAPI) {
         private var cacheIndex: Int = 0
         const val CACHE_SIZE = 20
 
-        fun getTimeout(desired : Long?) : Long {
-             return (desired ?: DEFAULT_TIMEOUT).coerceIn(MIN_TIMEOUT, MAX_TIMEOUT)
+        fun getTimeout(desired: Long?): Long {
+            return (desired ?: DEFAULT_TIMEOUT).coerceIn(MIN_TIMEOUT, MAX_TIMEOUT)
         }
     }
 
@@ -117,27 +118,29 @@ class APIRepository(val api: MainAPI) {
         }
     }
 
-    suspend fun search(query: String): Resource<List<SearchResponse>> {
+    suspend fun search(query: String, page: Int): Resource<SearchResponseList> {
         if (query.isEmpty())
-            return Resource.Success(emptyList())
+            return Resource.Success(newSearchResponseList(emptyList()))
 
         return safeApiCall {
             withTimeout(getTimeout(api.searchTimeoutMs)) {
-                (api.search(query)
+                (api.search(query, page)
                     ?: throw ErrorLoadingException())
-            //                .filter { typesActive.contains(it.type) }
-                    .toList()
+                //                .filter { typesActive.contains(it.type) }
             }
         }
     }
 
-    suspend fun quickSearch(query: String): Resource<List<SearchResponse>> {
+    suspend fun quickSearch(query: String): Resource<SearchResponseList> {
         if (query.isEmpty())
-            return Resource.Success(emptyList())
+            return Resource.Success(newSearchResponseList(emptyList()))
 
         return safeApiCall {
             withTimeout(getTimeout(api.quickSearchTimeoutMs)) {
-                api.quickSearch(query) ?: throw ErrorLoadingException()
+                newSearchResponseList(
+                    api.quickSearch(query) ?: throw ErrorLoadingException(),
+                    false
+                )
             }
         }
     }
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 e930961c550..4ebb7564ca3 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/BaseAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/BaseAdapter.kt
@@ -1,34 +1,55 @@
 package com.lagradost.cloudstream3.ui
 
+import android.content.Context
 import android.view.View
 import android.view.ViewGroup
+import android.widget.ImageView
 import androidx.core.view.children
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.viewModels
-import androidx.lifecycle.ViewModel
 import androidx.recyclerview.widget.AsyncDifferConfig
 import androidx.recyclerview.widget.AsyncListDiffer
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.RecyclerView.ViewHolder
 import androidx.viewbinding.ViewBinding
+import coil3.dispose
+import java.util.WeakHashMap
 import java.util.concurrent.CopyOnWriteArrayList
 
 open class ViewHolderState<T>(val view: ViewBinding) : ViewHolder(view.root) {
     open fun save(): T? = null
     open fun restore(state: T) = Unit
-    open fun onViewAttachedToWindow() = Unit
-    open fun onViewDetachedFromWindow() = Unit
-    open fun onViewRecycled() = Unit
 }
 
+abstract class NoStateAdapter<T : Any>(
+    diffCallback: DiffUtil.ItemCallback<T> = BaseDiffCallback()
+) : BaseAdapter<T, Any>(0, diffCallback)
 
-// Based of the concept https://github.com/brahmkshatriya/echo/blob/main/app%2Fsrc%2Fmain%2Fjava%2Fdev%2Fbrahmkshatriya%2Fecho%2Fui%2Fadapters%2FMediaItemsContainerAdapter.kt#L108-L154
-class StateViewModel : ViewModel() {
-    val layoutManagerStates = hashMapOf<Int, HashMap<Int, Any?>>()
+/** Creates a new shared pool, using the supplied lambda as a constructor.
+ *
+ * The reason for this complicated structure is that a pool should not be shared between contexts
+ * as it makes coil fuck up, and theming.
+ * */
+fun newSharedPool(lambda: RecyclerView.RecycledViewPool.() -> Unit = { }): Pair<WeakHashMap<Context, RecyclerView.RecycledViewPool>, RecyclerView.RecycledViewPool.() -> Unit> =
+    WeakHashMap<Context, RecyclerView.RecycledViewPool>() to lambda
+
+/** Sets the shared pool of the recyclerview */
+fun RecyclerView.setRecycledViewPool(pool: Pair<WeakHashMap<Context, RecyclerView.RecycledViewPool>, RecyclerView.RecycledViewPool.() -> Unit>) {
+    val ctx = context ?: return
+    synchronized(pool.first) {
+        this.setRecycledViewPool(pool.first.getOrPut(ctx) {
+            RecyclerView.RecycledViewPool().apply(pool.second)
+        })
+    }
 }
 
-abstract class NoStateAdapter<T : Any>(fragment: Fragment) : BaseAdapter<T, Any>(fragment, 0)
+/** Clears the shared pool of views */
+fun Pair<WeakHashMap<Context, RecyclerView.RecycledViewPool>, RecyclerView.RecycledViewPool.() -> Unit>.clear() {
+    synchronized(this.first) {
+        for (pool in this.first.values) {
+            pool?.clear()
+        }
+    }
+}
 
 /**
  * BaseAdapter is a persistent state stored adapter that supports headers and footers.
@@ -49,13 +70,14 @@ abstract class NoStateAdapter<T : Any>(fragment: Fragment) : BaseAdapter<T, Any>
 abstract class BaseAdapter<
         T : Any,
         S : Any>(
-    fragment: Fragment,
     val id: Int = 0,
     diffCallback: DiffUtil.ItemCallback<T> = BaseDiffCallback()
 ) : RecyclerView.Adapter<ViewHolderState<S>>() {
     open val footers: Int = 0
     open val headers: Int = 0
 
+    val immutableCurrentList: List<T> get() = mDiffer.currentList
+
     fun getItem(position: Int): T {
         return mDiffer.currentList[position]
     }
@@ -85,9 +107,33 @@ abstract class BaseAdapter<
         AsyncDifferConfig.Builder(diffCallback).build()
     )
 
-    open fun submitList(list: List<T>?) {
+    /**
+     * Instantly submits a **new and fresh** list. This means that no changes like moves are done as
+     * we assume the new list is not the same thing as the old list, nothing is shared.
+     *
+     * The views are rendered instantly as a result, so no fade/pop-ins or similar.
+     *
+     * Use `submitList` for general use, as that can reuse old views.
+     * */
+    open fun submitIncomparableList(list: List<T>?, commitCallback : Runnable? = null) {
+        // This leverages a quirk in the submitList function that has a fast case for null arrays
+        // What this implies is that as long as we do a double submit we can ensure no pop-ins,
+        // as the changes are the entire list instead of calculating deltas
+        submitList(null)
+        submitList(list, commitCallback)
+    }
+
+    /**
+     * @param commitCallback Optional runnable that is executed when the List is committed, if it is committed.
+     * This is needed for some tasks as submitList will use a background thread for diff
+     * */
+    open fun submitList(list: Collection<T>?, commitCallback : Runnable? = null) {
         // deep copy at least the top list, because otherwise adapter can go crazy
-        mDiffer.submitList(list?.let { CopyOnWriteArrayList(it) })
+        if (list.isNullOrEmpty()) {
+            mDiffer.submitList(null, commitCallback) // It is "faster" to submit null than emptyList()
+        } else {
+            mDiffer.submitList(CopyOnWriteArrayList(list), commitCallback)
+        }
     }
 
     override fun getItemCount(): Int {
@@ -101,16 +147,25 @@ abstract class BaseAdapter<
     open fun onBindFooter(holder: ViewHolderState<S>) = Unit
     open fun onBindHeader(holder: ViewHolderState<S>) = Unit
     open fun onCreateContent(parent: ViewGroup): ViewHolderState<S> = throw NotImplementedError()
+    open fun onCreateCustomContent(
+        parent: ViewGroup,
+        viewType: Int
+    ) = onCreateContent(parent)
+
     open fun onCreateFooter(parent: ViewGroup): ViewHolderState<S> = throw NotImplementedError()
-    open fun onCreateHeader(parent: ViewGroup): ViewHolderState<S> = throw NotImplementedError()
+    open fun onCreateCustomFooter(
+        parent: ViewGroup,
+        viewType: Int
+    ) = onCreateFooter(parent)
 
-    override fun onViewAttachedToWindow(holder: ViewHolderState<S>) {
-        holder.onViewAttachedToWindow()
-    }
+    open fun onCreateHeader(parent: ViewGroup): ViewHolderState<S> = throw NotImplementedError()
+    open fun onCreateCustomHeader(
+        parent: ViewGroup,
+        viewType: Int
+    ) = onCreateHeader(parent)
 
-    override fun onViewDetachedFromWindow(holder: ViewHolderState<S>) {
-        holder.onViewDetachedFromWindow()
-    }
+    override fun onViewAttachedToWindow(holder: ViewHolderState<S>) {}
+    override fun onViewDetachedFromWindow(holder: ViewHolderState<S>) {}
 
     @Suppress("UNCHECKED_CAST")
     fun save(recyclerView: RecyclerView) {
@@ -121,21 +176,20 @@ abstract class BaseAdapter<
         }
     }
 
-    fun clear() {
-        stateViewModel.layoutManagerStates[id]?.clear()
+    fun clearState() {
+        layoutManagerStates[id]?.clear()
     }
 
     @Suppress("UNCHECKED_CAST")
     private fun getState(holder: ViewHolderState<S>): S? =
-        stateViewModel.layoutManagerStates[id]?.get(holder.absoluteAdapterPosition) as? S
+        layoutManagerStates[id]?.get(holder.absoluteAdapterPosition) as? S
 
     private fun setState(holder: ViewHolderState<S>) {
-        if(id == 0) return
-
-        if (!stateViewModel.layoutManagerStates.contains(id)) {
-            stateViewModel.layoutManagerStates[id] = HashMap()
+        if (id == 0) return
+        if (!layoutManagerStates.contains(id)) {
+            layoutManagerStates[id] = HashMap()
         }
-        stateViewModel.layoutManagerStates[id]?.let { map ->
+        layoutManagerStates[id]?.let { map ->
             map[holder.absoluteAdapterPosition] = holder.save()
         }
     }
@@ -158,30 +212,40 @@ abstract class BaseAdapter<
         super.onDetachedFromRecyclerView(recyclerView)
     }
 
+    open fun customContentViewType(item: T): Int = 0
+    open fun customFooterViewType(): Int = 0
+    open fun customHeaderViewType(): Int = 0
+
     final override fun getItemViewType(position: Int): Int {
         if (position < headers) {
-            return HEADER
+            return HEADER or customHeaderViewType()
         }
-        if (position - headers >= mDiffer.currentList.size) {
-            return FOOTER
+        val realPosition = position - headers
+        if (realPosition >= mDiffer.currentList.size) {
+            return FOOTER or customFooterViewType()
         }
-
-        return CONTENT
+        return CONTENT or customContentViewType(getItem(realPosition))
     }
 
-    private val stateViewModel: StateViewModel by fragment.viewModels()
-
     final override fun onViewRecycled(holder: ViewHolderState<S>) {
         setState(holder)
-        holder.onViewRecycled()
+        onClearView(holder)
         super.onViewRecycled(holder)
     }
 
+    /** Same as onViewRecycled, but for the purpose of cleaning the view of any relevant data.
+     *
+     * If an item view has large or expensive data bound to it such as large bitmaps, this may be a good place to release those resources.
+     *
+     * Use this with `clearImage`
+     * */
+    open fun onClearView(holder: ViewHolderState<S>) {}
+
     final override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolderState<S> {
-        return when (viewType) {
-            CONTENT -> onCreateContent(parent)
-            HEADER -> onCreateHeader(parent)
-            FOOTER -> onCreateFooter(parent)
+        return when (viewType and TYPE_MASK) {
+            CONTENT -> onCreateCustomContent(parent, viewType and CUSTOM_MASK)
+            HEADER -> onCreateCustomHeader(parent, viewType and CUSTOM_MASK)
+            FOOTER -> onCreateCustomFooter(parent, viewType and CUSTOM_MASK)
             else -> throw NotImplementedError()
         }
     }
@@ -196,7 +260,7 @@ abstract class BaseAdapter<
             super.onBindViewHolder(holder, position, payloads)
             return
         }
-        when (getItemViewType(position)) {
+        when (getItemViewType(position) and TYPE_MASK) {
             CONTENT -> {
                 val realPosition = position - headers
                 val item = getItem(realPosition)
@@ -214,7 +278,7 @@ abstract class BaseAdapter<
     }
 
     final override fun onBindViewHolder(holder: ViewHolderState<S>, position: Int) {
-        when (getItemViewType(position)) {
+        when (getItemViewType(position) and TYPE_MASK) {
             CONTENT -> {
                 val realPosition = position - headers
                 val item = getItem(realPosition)
@@ -236,9 +300,20 @@ abstract class BaseAdapter<
     }
 
     companion object {
-        private const val HEADER: Int = 1
-        private const val FOOTER: Int = 2
-        private const val CONTENT: Int = 0
+        val layoutManagerStates = hashMapOf<Int, HashMap<Int, Any?>>()
+        fun clearImage(image: ImageView?) {
+            image?.dispose()
+        }
+
+        // Use the lowermost MASK_SIZE bits for the custom content,
+        // use the uppermost 32 - MASK_SIZE to the type
+        private const val MASK_SIZE = 28
+        private const val CUSTOM_MASK = (1 shl MASK_SIZE) - 1
+        private const val TYPE_MASK = CUSTOM_MASK.inv()
+        const val HEADER: Int = 3 shl MASK_SIZE
+        const val FOOTER: Int = 2 shl MASK_SIZE
+        /** For custom content, write `CONTENT or X` when calling setMaxRecycledViews  */
+        const val CONTENT: Int = 1 shl MASK_SIZE
     }
 }
 
@@ -248,5 +323,5 @@ class BaseDiffCallback<T : Any>(
 ) : DiffUtil.ItemCallback<T>() {
     override fun areItemsTheSame(oldItem: T, newItem: T): Boolean = itemSame(oldItem, newItem)
     override fun areContentsTheSame(oldItem: T, newItem: T): Boolean = contentSame(oldItem, newItem)
-    override fun getChangePayload(oldItem: T, newItem: T): Any = Any()
+    override fun getChangePayload(oldItem: T, newItem: T): Any? = Any()
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/BaseFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/BaseFragment.kt
new file mode 100644
index 00000000000..72955e7cf8c
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/BaseFragment.kt
@@ -0,0 +1,278 @@
+package com.lagradost.cloudstream3.ui
+
+import android.content.res.Configuration
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Toast
+import androidx.annotation.LayoutRes
+import androidx.fragment.app.DialogFragment
+import androidx.fragment.app.Fragment
+import androidx.preference.PreferenceFragmentCompat
+import androidx.viewbinding.ViewBinding
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+import com.lagradost.cloudstream3.CommonActivity.showToast
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.mvvm.logError
+import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setSystemBarsPadding
+import com.lagradost.cloudstream3.utils.txt
+
+/**
+ * A base Fragment class that simplifies ViewBinding usage and handles view inflation safely.
+ *
+ * This class allows two modes of creating ViewBinding:
+ * 1. Inflate: Using the standard `inflate()` method provided by generated ViewBinding classes.
+ * 2. Bind: Using `bind()` on an existing root view.
+ *
+ * It also provides hooks for:
+ * - Safe initialization of the binding (`onBindingCreated`)
+ * - Automatic padding adjustment for system bars (`fixPadding`)
+ * - Optional layout resource selection via `pickLayout()`
+ *
+ * @param T The type of ViewBinding for this Fragment.
+ * @param bindingCreator The strategy used to create the binding instance.
+ */
+private interface BaseFragmentHelper<T : ViewBinding> {
+    val bindingCreator: BaseFragment.BindingCreator<T>
+
+    var _binding: T?
+    val binding: T? get() = _binding
+
+    fun createBinding(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        val layoutId = pickLayout()
+        val root: View? = layoutId?.let { inflater.inflate(it, container, false) }
+        _binding = try {
+            when (val creator = bindingCreator) {
+                is BaseFragment.BindingCreator.Inflate -> creator.fn(inflater, container, false)
+                is BaseFragment.BindingCreator.Bind -> {
+                    if (root != null) creator.fn(root)
+                    else throw IllegalStateException("Root view is null for bind()")
+                }
+            }
+        } catch (t: Throwable) {
+            showToast(
+                txt(R.string.unable_to_inflate, t.message ?: ""),
+                Toast.LENGTH_LONG
+            )
+            logError(t)
+            null
+        }
+
+        return _binding?.root ?: root
+    }
+
+    /**
+     * Called after the fragment's view has been created.
+     *
+     * This method is `final` to ensure that the binding is properly initialized and
+     * system bar padding adjustments are applied before any subclass logic runs.
+     * Subclasses should use [onBindingCreated] instead of overriding this method directly.
+     */
+    fun onViewReady(view: View, savedInstanceState: Bundle?) {
+        fixLayout(view)
+        binding?.let { onBindingCreated(it, savedInstanceState) }
+    }
+
+    /**
+     * Called when the binding is safely created and view is ready.
+     * Can be overridden to provide fragment-specific initialization.
+     *
+     * @param binding The safely created ViewBinding.
+     * @param savedInstanceState Saved state bundle or null.
+     */
+    fun onBindingCreated(binding: T, savedInstanceState: Bundle?) {
+        onBindingCreated(binding)
+    }
+
+    /**
+     * Called when the binding is safely created and view is ready.
+     * Overload without savedInstanceState for convenience.
+     *
+     * @param binding The safely created ViewBinding.
+     */
+    fun onBindingCreated(binding: T) {}
+
+    /**
+     * Pick a layout resource ID for the fragment.
+     *
+     * Return `null` by default. Override to provide a layout resource when using
+     * `BindingCreator.Bind`. Not needed if using `BindingCreator.Inflate`.
+     *
+     * @return Layout resource ID or null.
+     */
+    @LayoutRes
+    fun pickLayout(): Int? = null
+
+    /**
+     * Ensures the layout of the root view is correctly adjusted for the current configuration.
+     *
+     * This may include applying padding for system bars, adjusting insets, or performing other
+     * layout updates. `fixLayout` should remain idempotent, as it can be called multiple
+     * times on the same view, such as during configuration changes (e.g. device rotation) or when
+     * the view is recreated.
+     *
+     * @param view The root view to adjust.
+     */
+    fun fixLayout(view: View)
+}
+
+abstract class BaseFragment<T : ViewBinding>(
+    override val bindingCreator: BindingCreator<T>
+) : Fragment(), BaseFragmentHelper<T> {
+    override var _binding: T? = null
+
+    /** Safer activity?.onBackPressedDispatcher?.onBackPressed() with fallback behavior instead of app crash */
+    fun dispatchBackPressed() {
+        try {
+            activity?.onBackPressedDispatcher?.onBackPressed()
+        } catch (_: IllegalStateException) {
+            // FragmentManager is already executing transactions, so try again
+            delayedDispatchBackPressed(5)
+        } catch (t: Throwable) {
+            logError(t)
+        }
+    }
+
+    /** Recursive back press when available */
+    private fun delayedDispatchBackPressed(remaining: Int) {
+        if (remaining <= 0) return
+        binding?.root?.postDelayed({
+            try {
+                activity?.onBackPressedDispatcher?.onBackPressed()
+            } catch (_: IllegalStateException) {
+                // FragmentManager is already executing transactions, so try again
+                delayedDispatchBackPressed(remaining - 1)
+            } catch (t: Throwable) {
+                logError(t)
+            }
+        }, 200)
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? = createBinding(inflater, container, savedInstanceState)
+
+    final override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        onViewReady(view, savedInstanceState)
+    }
+
+    /**
+     * Called when the device configuration changes (e.g., orientation).
+     * Re-applies system bar padding fixes to the root view to ensure it
+     * readjusts for orientation changes.
+     */
+    override fun onConfigurationChanged(newConfig: Configuration) {
+        super.onConfigurationChanged(newConfig)
+        view?.let { fixLayout(it) }
+    }
+
+    /** Cleans up the binding reference when the view is destroyed to avoid memory leaks. */
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+
+    /**
+     * Sealed class representing the two strategies for creating a ViewBinding instance.
+     */
+    sealed class BindingCreator<T : ViewBinding> {
+
+        /**
+         * Use the standard inflate() method for creating the binding.
+         *
+         * @param fn Lambda that inflates the binding.
+         */
+        class Inflate<T : ViewBinding>(
+            val fn: (LayoutInflater, ViewGroup?, Boolean) -> T
+        ) : BindingCreator<T>()
+
+        /**
+         * Use bind() on an existing root view to create the binding. This should
+         * be used if you are differing per device layouts, such as different
+         * layouts for TV and Phone.
+         *
+         * @param fn Lambda that binds the root view.
+         */
+        class Bind<T : ViewBinding>(
+            val fn: (View) -> T
+        ) : BindingCreator<T>()
+    }
+}
+
+abstract class BaseDialogFragment<T : ViewBinding>(
+    override val bindingCreator: BaseFragment.BindingCreator<T>
+) : DialogFragment(), BaseFragmentHelper<T> {
+    override var _binding: T? = null
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? = createBinding(inflater, container, savedInstanceState)
+
+    final override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        onViewReady(view, savedInstanceState)
+    }
+
+    /** @see [BaseFragment.onConfigurationChanged] for documentation. */
+    override fun onConfigurationChanged(newConfig: Configuration) {
+        super.onConfigurationChanged(newConfig)
+        view?.let { fixLayout(it) }
+    }
+
+    /** Cleans up the binding reference when the view is destroyed to avoid memory leaks. */
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+}
+
+abstract class BaseBottomSheetDialogFragment<T : ViewBinding>(
+    override val bindingCreator: BaseFragment.BindingCreator<T>
+) : BottomSheetDialogFragment(), BaseFragmentHelper<T> {
+    override var _binding: T? = null
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? = createBinding(inflater, container, savedInstanceState)
+
+    final override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        onViewReady(view, savedInstanceState)
+    }
+
+    /** @see [BaseFragment.onConfigurationChanged] for documentation. */
+    override fun onConfigurationChanged(newConfig: Configuration) {
+        super.onConfigurationChanged(newConfig)
+        view?.let { fixLayout(it) }
+    }
+
+    /** Cleans up the binding reference when the view is destroyed to avoid memory leaks. */
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+}
+
+abstract class BasePreferenceFragmentCompat() : PreferenceFragmentCompat() {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        setSystemBarsPadding()
+    }
+
+    override fun onConfigurationChanged(newConfig: Configuration) {
+        super.onConfigurationChanged(newConfig)
+        setSystemBarsPadding()
+    }
+}
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 e66b57ab1fc..f91d40f28e0 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/ControllerActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/ControllerActivity.kt
@@ -245,7 +245,12 @@ class SelectSourceController(val view: ImageView, val activity: ControllerActivi
                                             .setPlayPosition(startAt)
                                             .setAutoplay(true)
                                             .build()
-                                    awaitLinks(remoteMediaClient?.load(mediaItem, mediaLoadOptions)) {
+                                    awaitLinks(
+                                        remoteMediaClient?.load(
+                                            mediaItem,
+                                            mediaLoadOptions
+                                        )
+                                    ) {
                                         loadMirror(index + 1)
                                     }
                                 }
@@ -299,7 +304,13 @@ class SelectSourceController(val view: ImageView, val activity: ControllerActivi
                     val currentDuration = remoteMediaClient?.streamDuration
                     val currentPosition = remoteMediaClient?.approximateStreamPosition
                     if (currentDuration != null && currentPosition != null)
-                        DataStoreHelper.setViewPos(epData.id, currentPosition, currentDuration)
+                        DataStoreHelper.setViewPosAndResume(
+                            epData.id,
+                            currentPosition,
+                            currentDuration,
+                            epData,
+                            meta.episodes.getOrNull(index + 1)
+                        )
                 } catch (t: Throwable) {
                     logError(t)
                 }
@@ -315,7 +326,7 @@ class SelectSourceController(val view: ImageView, val activity: ControllerActivi
                         val isSuccessful = safeApiCall {
                             generator.generateLinks(
                                 clearCache = false,
-                                allowedTypes = LOADTYPE_CHROMECAST,
+                                sourceTypes = LOADTYPE_CHROMECAST,
                                 callback = {
                                     it.first?.let { link ->
                                         currentLinks.add(link)
@@ -323,7 +334,9 @@ class SelectSourceController(val view: ImageView, val activity: ControllerActivi
                                 }, subtitleCallback = {
                                     currentSubs.add(it)
                                 },
-                                isCasting = true)
+                                offset = 0,
+                                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 78ad2a6bfcb..30235853887 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/CustomRecyclerViews.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/CustomRecyclerViews.kt
@@ -3,6 +3,7 @@ package com.lagradost.cloudstream3.ui
 import android.content.Context
 import android.util.AttributeSet
 import android.view.View
+import androidx.core.content.withStyledAttributes
 import androidx.core.view.children
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
@@ -154,10 +155,9 @@ class AutofitRecyclerView @JvmOverloads constructor(context: Context, attrs: Att
 
     init {
         if (attrs != null) {
-            val attrsArray = intArrayOf(android.R.attr.columnWidth)
-            val array = context.obtainStyledAttributes(attrs, attrsArray)
-            columnWidth = array.getDimensionPixelSize(0, -1)
-            array.recycle()
+            context.withStyledAttributes(attrs, intArrayOf(android.R.attr.columnWidth)) {
+                columnWidth = getDimensionPixelSize(0, -1)
+            }
         }
 
         layoutManager = manager
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/EasterEggMonkeFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/EasterEggMonkeFragment.kt
index bf7f6b8fc42..9be86207759 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/EasterEggMonkeFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/EasterEggMonkeFragment.kt
@@ -4,17 +4,13 @@ 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
@@ -26,10 +22,9 @@ 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!!
+class EasterEggMonkeFragment : BaseFragment<FragmentEasterEggMonkeBinding>(
+    BaseFragment.BindingCreator.Inflate(FragmentEasterEggMonkeBinding::inflate)
+) {
 
     // planet of monks
     private val monkeys: List<Int> = listOf(
@@ -51,27 +46,20 @@ class EasterEggMonkeFragment : Fragment() {
     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)
+    override fun fixLayout(view: View) = Unit
 
+    override fun onBindingCreated(binding: FragmentEasterEggMonkeBinding) {
         activity?.hideSystemUI()
         spawningJob = lifecycleScope.launch {
             delay(1000)
             while (isActive) {
-                spawnMonkey()
+                spawnMonkey(binding)
                 delay(500)
             }
         }
     }
 
-    private fun spawnMonkey() {
+    private fun spawnMonkey(binding: FragmentEasterEggMonkeBinding) {
         val newMonkey = ImageView(context ?: return).apply {
             setImageResource(monkeys.random())
             isVisible = true
@@ -102,12 +90,12 @@ class EasterEggMonkeFragment : Fragment() {
         }
 
         @SuppressLint("ClickableViewAccessibility")
-        newMonkey.setOnTouchListener { view, event -> handleTouch(view, event) }
+        newMonkey.setOnTouchListener { view, event -> handleTouch(view, event, binding) }
 
-        startFloatingAnimation(newMonkey)
+        startFloatingAnimation(newMonkey, binding)
     }
 
-    private fun startFloatingAnimation(monkey: ImageView) {
+    private fun startFloatingAnimation(monkey: ImageView, binding: FragmentEasterEggMonkeBinding) {
         val floatUpAnimator = ObjectAnimator.ofFloat(
             monkey, View.TRANSLATION_Y, monkey.y, -monkey.height.toFloat()
         ).apply {
@@ -117,11 +105,8 @@ class EasterEggMonkeFragment : Fragment() {
 
         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)
-                }
+                binding.frame.removeView(monkey)
+                activeMonkeys.remove(monkey)
             }
         })
 
@@ -129,7 +114,11 @@ class EasterEggMonkeFragment : Fragment() {
         monkey.tag = floatUpAnimator
     }
 
-    private fun handleTouch(view: View, event: MotionEvent): Boolean {
+    private fun handleTouch(
+        view: View,
+        event: MotionEvent,
+        binding: FragmentEasterEggMonkeBinding
+    ): Boolean {
         val monkey = view as ImageView
         when (event.action) {
             MotionEvent.ACTION_DOWN -> {
@@ -143,17 +132,17 @@ class EasterEggMonkeFragment : Fragment() {
                 monkey.y = event.rawY - monkey.height / 2
 
                 // Check if monkey touches the screen edge
-                if (isTouchingEdge(monkey)) {
-                    removeMonkey(monkey)
+                if (isTouchingEdge(monkey, binding)) {
+                    removeMonkey(monkey, binding)
                 }
                 return true
             }
 
             MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> {
-                if (isTouchingEdge(monkey)) {
-                    removeMonkey(monkey)
+                if (isTouchingEdge(monkey, binding)) {
+                    removeMonkey(monkey, binding)
                 } else {
-                    startFloatingAnimation(monkey)
+                    startFloatingAnimation(monkey, binding)
                 }
                 return true
             }
@@ -161,12 +150,12 @@ class EasterEggMonkeFragment : Fragment() {
         return false
     }
 
-    private fun isTouchingEdge(monkey: ImageView): Boolean {
+    private fun isTouchingEdge(monkey: ImageView, binding: FragmentEasterEggMonkeBinding): 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) {
+    private fun removeMonkey(monkey: ImageView, binding: FragmentEasterEggMonkeBinding) {
         // Fade out and remove the monkey
         ObjectAnimator.ofFloat(monkey, View.ALPHA, 1f, 0f).apply {
             duration = 300
@@ -184,6 +173,5 @@ class EasterEggMonkeFragment : Fragment() {
         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/HeaderViewDecoration.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/HeaderViewDecoration.kt
deleted file mode 100644
index 40c03012a07..00000000000
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/HeaderViewDecoration.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.lagradost.cloudstream3.ui
-
-import android.graphics.Canvas
-import android.graphics.Rect
-import android.view.View
-import androidx.recyclerview.widget.RecyclerView
-
-class HeaderViewDecoration(private val customView: View) : RecyclerView.ItemDecoration() {
-    override fun onDraw(c: Canvas, parent: RecyclerView, state: RecyclerView.State) {
-        super.onDraw(c, parent, state)
-        customView.layout(parent.left, 0, parent.right, customView.measuredHeight)
-        for (i in 0 until parent.childCount) {
-            val view = parent.getChildAt(i)
-            if (parent.getChildAdapterPosition(view) == 0) {
-                c.save()
-                val height = customView.measuredHeight
-                val top = view.top - height
-                c.translate(0f, top.toFloat())
-                customView.draw(c)
-                c.restore()
-                break
-            }
-        }
-    }
-
-    override fun getItemOffsets(
-        outRect: Rect,
-        view: View,
-        parent: RecyclerView,
-        state: RecyclerView.State
-    ) {
-        if (parent.getChildAdapterPosition(view) == 0) {
-            customView.measure(
-                View.MeasureSpec.makeMeasureSpec(parent.measuredWidth, View.MeasureSpec.AT_MOST),
-                View.MeasureSpec.makeMeasureSpec(parent.measuredHeight, View.MeasureSpec.AT_MOST)
-            )
-            outRect.set(0, customView.measuredHeight, 0, 0)
-        } else {
-            outRect.setEmpty()
-        }
-    }
-}
\ 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 b6326eb366b..bd8541e6b26 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/MiniControllerFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/MiniControllerFragment.kt
@@ -7,12 +7,12 @@ import android.view.View
 import android.widget.LinearLayout
 import android.widget.ProgressBar
 import android.widget.RelativeLayout
+import androidx.core.content.withStyledAttributes
 import com.google.android.gms.cast.framework.media.widget.MiniControllerFragment
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.utils.UIHelper.adjustAlpha
 import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute
 import com.lagradost.cloudstream3.utils.UIHelper.toPx
-import java.lang.ref.WeakReference
 
 
 class MyMiniControllerFragment : MiniControllerFragment() {
@@ -25,26 +25,15 @@ class MyMiniControllerFragment : MiniControllerFragment() {
 
     // I KNOW, KINDA SPAGHETTI SOLUTION, BUT IT WORKS
     override fun onInflate(context: Context, attributeSet: AttributeSet, bundle: Bundle?) {
-        super.onInflate(context, attributeSet, bundle)
-
-        // somehow this leaks and I really dont know why, it seams like if you go back to a fragment with this, it leaks????
         if (currentColor == 0) {
-            WeakReference(
-                context.obtainStyledAttributes(
-                    attributeSet,
-                    R.styleable.CustomCast
-                )
-            ).apply {
-                if (get()
-                        ?.hasValue(R.styleable.CustomCast_customCastBackgroundColor) == true
-                ) {
-                    currentColor =
-                        get()
-                            ?.getColor(R.styleable.CustomCast_customCastBackgroundColor, 0) ?: 0
+            context.withStyledAttributes(attributeSet, R.styleable.CustomCast, 0, 0) {
+                if (hasValue(R.styleable.CustomCast_customCastBackgroundColor)) {
+                    currentColor = getColor(R.styleable.CustomCast_customCastBackgroundColor, 0)
                 }
-                get()?.recycle()
-            }.clear()
+            }
         }
+
+        super.onInflate(context, attributeSet, bundle)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
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 b778ba5a754..ec0ef5c6bfb 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/WatchType.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/WatchType.kt
@@ -18,15 +18,6 @@ enum class WatchType(val internalId: Int, @StringRes val stringRes: Int, @Drawab
 }
 
 enum class SyncWatchType(val internalId: Int, @StringRes val stringRes: Int, @DrawableRes val iconRes: Int) {
-    /*
-          -1 -> None
-          0 -> Watching
-          1 -> Completed
-          2 -> OnHold
-          3 -> Dropped
-          4 -> PlanToWatch
-          5 -> ReWatching
-          */
     NONE(-1, R.string.type_none, R.drawable.ic_baseline_add_24),
     WATCHING(0, R.string.type_watching, R.drawable.ic_baseline_bookmark_24),
     COMPLETED(1, R.string.type_completed, R.drawable.ic_baseline_bookmark_24),
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 5e2b97e57d5..0d951bf6a7a 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/WebviewFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/WebviewFragment.kt
@@ -1,17 +1,12 @@
 package com.lagradost.cloudstream3.ui
 
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 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
@@ -19,19 +14,18 @@ import com.lagradost.cloudstream3.databinding.FragmentWebviewBinding
 import com.lagradost.cloudstream3.network.WebViewResolver
 import com.lagradost.cloudstream3.utils.AppContextUtils.loadRepository
 
+class WebviewFragment : BaseFragment<FragmentWebviewBinding>(
+    BaseFragment.BindingCreator.Inflate(FragmentWebviewBinding::inflate)
+) {
 
-class WebviewFragment : Fragment() {
+    override fun fixLayout(view: View) = Unit
 
-    var binding: FragmentWebviewBinding? = null
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
+    override fun onBindingCreated(binding: FragmentWebviewBinding) {
         val url = arguments?.getString(WEBVIEW_URL) ?: "".also {
             findNavController().popBackStack()
         }
 
-        binding?.webView?.webViewClient = object : WebViewClient() {
-            @OptIn(UnstableApi::class)
+        binding.webView.webViewClient = object : WebViewClient() {
             override fun shouldOverrideUrlLoading(
                 view: WebView?,
                 request: WebResourceRequest?
@@ -46,28 +40,17 @@ class WebviewFragment : Fragment() {
                 return super.shouldOverrideUrlLoading(view, request)
             }
         }
-        binding?.webView?.apply {
+
+        binding.webView.apply {
             WebViewResolver.webViewUserAgent = settings.userAgentString
 
             addJavascriptInterface(RepoApi(activity), "RepoApi")
             settings.javaScriptEnabled = true
             settings.userAgentString = USER_AGENT
             settings.domStorageEnabled = true
-//        WebView.setWebContentsDebuggingEnabled(true)
 
             loadUrl(url)
         }
-
-    }
-
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        val localBinding = FragmentWebviewBinding.inflate(inflater, container, false)
-        binding = localBinding
-        // Inflate the layout for this fragment
-        return localBinding.root//inflater.inflate(R.layout.fragment_webview, container, false)
     }
 
     companion object {
@@ -84,4 +67,4 @@ class WebviewFragment : Fragment() {
             activity?.loadRepository(repoUrl)
         }
     }
-}
\ No newline at end of file
+}
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 1e7e0f11285..92d33d0f349 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
@@ -1,16 +1,17 @@
 package com.lagradost.cloudstream3.ui.account
 
+import android.os.Build
 import android.view.LayoutInflater
 import android.view.ViewGroup
 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.NoStateAdapter
+import com.lagradost.cloudstream3.ui.ViewHolderState
 import com.lagradost.cloudstream3.ui.account.AccountHelper.showAccountEditDialog
 import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
@@ -19,137 +20,174 @@ import com.lagradost.cloudstream3.utils.DataStoreHelper
 import com.lagradost.cloudstream3.utils.ImageLoader.loadImage
 
 class AccountAdapter(
-    private val accounts: List<DataStoreHelper.Account>,
     private val accountSelectCallback: (DataStoreHelper.Account) -> Unit,
     private val accountCreateCallback: (DataStoreHelper.Account) -> Unit,
     private val accountEditCallback: (DataStoreHelper.Account) -> Unit,
     private val accountDeleteCallback: (DataStoreHelper.Account) -> Unit
-) : RecyclerView.Adapter<AccountAdapter.AccountViewHolder>() {
+) : NoStateAdapter<DataStoreHelper.Account>() {
 
     companion object {
         const val VIEW_TYPE_SELECT_ACCOUNT = 0
-        const val VIEW_TYPE_ADD_ACCOUNT = 1
         const val VIEW_TYPE_EDIT_ACCOUNT = 2
     }
 
-    inner class AccountViewHolder(private val binding: ViewBinding) :
-        RecyclerView.ViewHolder(binding.root) {
 
-        fun bind(account: DataStoreHelper.Account?) {
-            when (binding) {
-                is AccountListItemBinding -> binding.apply {
-                    if (account == null) return@apply
+    override val footers: Int = 1
+    var viewType = VIEW_TYPE_SELECT_ACCOUNT
 
-                    val isTv = isLayout(TV or EMULATOR) || !root.isInTouchMode
-
-                    val isLastUsedAccount = account.keyIndex == DataStoreHelper.selectedKeyIndex
-
-                    accountName.text = account.name
-                    accountImage.loadImage(account.image)
-                    lockIcon.isVisible = account.lockPin != null
-                    outline.isVisible = !isTv && isLastUsedAccount
+    override fun customContentViewType(item: DataStoreHelper.Account): Int {
+        return viewType
+    }
 
-                    if (isTv) {
-                        // For emulator but this is fine on TV also
-                        root.isFocusableInTouchMode = true
-                        if (isLastUsedAccount) {
-                            root.requestFocus()
-                        }
+    override fun onBindContent(
+        holder: ViewHolderState<Any>,
+        item: DataStoreHelper.Account,
+        position: Int
+    ) {
+        when (val binding = holder.view) {
+            is AccountListItemBinding -> binding.apply {
+                val isTv = isLayout(TV or EMULATOR) || !root.isInTouchMode
+
+                val isLastUsedAccount = item.keyIndex == DataStoreHelper.selectedKeyIndex
+
+                accountName.text = item.name
+                accountImage.loadImage(item.image)
+                lockIcon.isVisible = item.lockPin != null
+                outline.isVisible = !isTv && isLastUsedAccount
+
+                if (isTv) {
+                    // For emulator but this is fine on TV also
+                    root.isFocusableInTouchMode = true
+                    if (isLastUsedAccount) {
+                        root.requestFocus()
+                    }
 
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
                         root.foreground = ContextCompat.getDrawable(
                             root.context,
                             R.drawable.outline_drawable
                         )
-                    } else {
-                        root.setOnLongClickListener {
-                            showAccountEditDialog(
-                                context = root.context,
-                                account = account,
-                                isNewAccount = false,
-                                accountEditCallback = { account -> accountEditCallback.invoke(account) },
-                                accountDeleteCallback = { account -> accountDeleteCallback.invoke(account) }
-                            )
-
-                            true
-                        }
                     }
+                } else {
+                    root.setOnLongClickListener {
+                        showAccountEditDialog(
+                            context = root.context,
+                            account = item,
+                            isNewAccount = false,
+                            accountEditCallback = { account ->
+                                accountEditCallback.invoke(
+                                    account
+                                )
+                            },
+                            accountDeleteCallback = { account ->
+                                accountDeleteCallback.invoke(
+                                    account
+                                )
+                            }
+                        )
 
-                    root.setOnClickListener {
-                        accountSelectCallback.invoke(account)
+                        true
                     }
                 }
 
-                is AccountListItemEditBinding -> binding.apply {
-                    if (account == null) return@apply
+                root.setOnClickListener {
+                    accountSelectCallback.invoke(item)
+                }
+            }
 
-                    val isTv = isLayout(TV or EMULATOR) || !root.isInTouchMode
+            is AccountListItemEditBinding -> binding.apply {
+                val isTv = isLayout(TV or EMULATOR) || !root.isInTouchMode
 
-                    val isLastUsedAccount = account.keyIndex == DataStoreHelper.selectedKeyIndex
+                val isLastUsedAccount = item.keyIndex == DataStoreHelper.selectedKeyIndex
 
-                    accountName.text = account.name
-                    accountImage.loadImage(account.image) {
-                        RoundedCornersTransformation(10f)
+                accountName.text = item.name
+                accountImage.loadImage(item.image) {
+                    RoundedCornersTransformation(10f)
+                }
+                lockIcon.isVisible = item.lockPin != null
+                outline.isVisible = !isTv && isLastUsedAccount
+
+                if (isTv) {
+                    // For emulator but this is fine on TV also
+                    root.isFocusableInTouchMode = true
+                    if (isLastUsedAccount) {
+                        root.requestFocus()
                     }
-                    lockIcon.isVisible = account.lockPin != null
-                    outline.isVisible = !isTv && isLastUsedAccount
-
-                    if (isTv) {
-                        // For emulator but this is fine on TV also
-                        root.isFocusableInTouchMode = true
-                        if (isLastUsedAccount) {
-                            root.requestFocus()
-                        }
 
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
                         root.foreground = ContextCompat.getDrawable(
                             root.context,
                             R.drawable.outline_drawable
                         )
                     }
-
-                    root.setOnClickListener {
-                        showAccountEditDialog(
-                            context = root.context,
-                            account = account,
-                            isNewAccount = false,
-                            accountEditCallback = { account -> accountEditCallback.invoke(account) },
-                            accountDeleteCallback = { account -> accountDeleteCallback.invoke(account) }
-                        )
-                    }
                 }
 
-                is AccountListItemAddBinding -> binding.apply {
-                    root.setOnClickListener {
-                        val remainingImages =
-                            DataStoreHelper.profileImages.toSet() - accounts.filter { it.customImage == null }
-                                .mapNotNull { DataStoreHelper.profileImages.getOrNull(it.defaultImageIndex) }.toSet()
-
-                        val image =
-                            DataStoreHelper.profileImages.indexOf(remainingImages.randomOrNull() ?: DataStoreHelper.profileImages.random())
-                        val keyIndex = (accounts.maxOfOrNull { it.keyIndex } ?: 0) + 1
-
-                        val accountName = root.context.getString(R.string.account)
-
-                        showAccountEditDialog(
-                            root.context,
-                            DataStoreHelper.Account(
-                                keyIndex = keyIndex,
-                                name = "$accountName $keyIndex",
-                                customImage = null,
-                                defaultImageIndex = image
-                            ),
-                            isNewAccount = true,
-                            accountEditCallback = { account -> accountCreateCallback.invoke(account) },
-                            accountDeleteCallback = {}
-                        )
-                    }
+                root.setOnClickListener {
+                    showAccountEditDialog(
+                        context = root.context,
+                        account = item,
+                        isNewAccount = false,
+                        accountEditCallback = { account -> accountEditCallback.invoke(account) },
+                        accountDeleteCallback = { account ->
+                            accountDeleteCallback.invoke(
+                                account
+                            )
+                        }
+                    )
                 }
             }
         }
     }
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): AccountViewHolder =
-        AccountViewHolder(
-            binding = when (viewType) {
+    override fun onBindFooter(holder: ViewHolderState<Any>) {
+        val binding = holder.view as? AccountListItemAddBinding ?: return
+        binding.apply {
+            root.setOnClickListener {
+                val accounts = this@AccountAdapter.immutableCurrentList
+
+                val remainingImages =
+                    DataStoreHelper.profileImages.toSet() - accounts.filter { it.customImage == null }
+                        .mapNotNull { DataStoreHelper.profileImages.getOrNull(it.defaultImageIndex) }
+                        .toSet()
+
+                val image =
+                    DataStoreHelper.profileImages.indexOf(
+                        remainingImages.randomOrNull()
+                            ?: DataStoreHelper.profileImages.random()
+                    )
+                val keyIndex = (accounts.maxOfOrNull { it.keyIndex } ?: 0) + 1
+
+                val accountName = root.context.getString(R.string.account)
+
+                showAccountEditDialog(
+                    root.context,
+                    DataStoreHelper.Account(
+                        keyIndex = keyIndex,
+                        name = "$accountName $keyIndex",
+                        customImage = null,
+                        defaultImageIndex = image
+                    ),
+                    isNewAccount = true,
+                    accountEditCallback = { account -> accountCreateCallback.invoke(account) },
+                    accountDeleteCallback = {}
+                )
+            }
+        }
+    }
+
+    override fun onCreateFooter(parent: ViewGroup): ViewHolderState<Any> {
+        return ViewHolderState(
+            AccountListItemAddBinding.inflate(
+                LayoutInflater.from(parent.context),
+                parent,
+                false
+            )
+        )
+    }
+
+    override fun onCreateContent(parent: ViewGroup): ViewHolderState<Any> {
+        return ViewHolderState(
+            when (viewType) {
                 VIEW_TYPE_SELECT_ACCOUNT -> {
                     AccountListItemBinding.inflate(
                         LayoutInflater.from(parent.context),
@@ -157,13 +195,7 @@ class AccountAdapter(
                         false
                     )
                 }
-                VIEW_TYPE_ADD_ACCOUNT -> {
-                    AccountListItemAddBinding.inflate(
-                        LayoutInflater.from(parent.context),
-                        parent,
-                        false
-                    )
-                }
+
                 VIEW_TYPE_EDIT_ACCOUNT -> {
                     AccountListItemEditBinding.inflate(
                         LayoutInflater.from(parent.context),
@@ -171,28 +203,9 @@ class AccountAdapter(
                         false
                     )
                 }
+
                 else -> throw IllegalArgumentException("Invalid view type")
             }
         )
-
-    override fun onBindViewHolder(holder: AccountViewHolder, position: Int) {
-        holder.bind(accounts.getOrNull(position))
-    }
-
-    var viewType = 0
-
-    override fun getItemViewType(position: Int): Int {
-        if (viewType != 0 && position != accounts.count()) {
-            return viewType
-        }
-
-        return when (position) {
-            accounts.count() -> VIEW_TYPE_ADD_ACCOUNT
-            else -> VIEW_TYPE_SELECT_ACCOUNT
-        }
-    }
-
-    override fun getItemCount(): Int {
-        return accounts.count() + 1
     }
 }
\ No newline at end of file
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 ce8d53609de..1d6b41e5baf 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
@@ -8,6 +8,7 @@ import android.text.Editable
 import android.view.LayoutInflater
 import android.view.inputmethod.EditorInfo
 import android.widget.TextView
+import android.widget.Toast
 import androidx.annotation.StringRes
 import androidx.appcompat.app.AlertDialog
 import androidx.core.view.isGone
@@ -16,12 +17,17 @@ import androidx.core.widget.doOnTextChanged
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import coil3.ImageLoader
+import coil3.request.ImageRequest
+import coil3.request.allowHardware
 import com.google.android.material.bottomsheet.BottomSheetDialog
-import com.lagradost.cloudstream3.AcraApplication.Companion.getActivity
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.getActivity
+import com.lagradost.cloudstream3.CommonActivity.showToast
 import com.lagradost.cloudstream3.MainActivity
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.databinding.AccountEditDialogBinding
 import com.lagradost.cloudstream3.databinding.AccountSelectLinearBinding
+import com.lagradost.cloudstream3.databinding.BottomInputDialogBinding
 import com.lagradost.cloudstream3.databinding.LockPinDialogBinding
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.mvvm.observe
@@ -94,6 +100,7 @@ object AccountHelper {
         binding.accountImage.loadImage(account.image)
         binding.accountImage.setOnClickListener {
             // Roll the image forwards once
+            currentEditAccount = currentEditAccount.copy(customImage = null)
             currentEditAccount =
                 currentEditAccount.copy(defaultImageIndex = (currentEditAccount.defaultImageIndex + 1) % DataStoreHelper.profileImages.size)
             binding.accountImage.loadImage(currentEditAccount.image)
@@ -156,6 +163,53 @@ object AccountHelper {
         }
 
         canSetPin = true
+
+        binding.editProfilePhotoButton.setOnClickListener({
+            val bottomSheetDialog = BottomSheetDialog(context)
+            val sheetBinding = BottomInputDialogBinding.inflate(LayoutInflater.from(context))
+            bottomSheetDialog.setContentView(sheetBinding.root)
+            bottomSheetDialog.show()
+
+            sheetBinding.apply {
+                text1.text = context.getString(R.string.edit_profile_image_title)
+                nginxTextInput.hint = context.getString(R.string.edit_profile_image_hint)
+
+                applyBtt.setOnClickListener({
+                    val url = sheetBinding.nginxTextInput.text.toString()
+                    if (url.isNotEmpty()) {
+                        val imageLoader = ImageLoader(context)
+                        val request = ImageRequest.Builder(context)
+                            .data(url)
+                            .allowHardware(false)
+                            .listener(
+                                onSuccess = { _, _ ->
+                                    currentEditAccount = currentEditAccount.copy(customImage = url)
+                                    binding.accountImage.loadImage(url)
+                                    showToast(
+                                        R.string.edit_profile_image_success,
+                                        Toast.LENGTH_SHORT
+                                    )
+                                    bottomSheetDialog.dismiss()
+                                },
+                                onError = { _, _ ->
+                                    showToast(
+                                        R.string.edit_profile_image_error_invalid,
+                                        Toast.LENGTH_SHORT
+                                    )
+                                }
+                            )
+                            .build()
+                        imageLoader.enqueue(request)
+                    } else {
+                        showToast(R.string.edit_profile_image_error_empty, Toast.LENGTH_SHORT)
+                    }
+                    bottomSheetDialog.dismissSafe()
+                })
+                sheetBinding.cancelBtt.setOnClickListener({
+                    bottomSheetDialog.dismissSafe()
+                })
+            }
+        })
     }
 
     fun showPinInputDialog(
@@ -338,7 +392,6 @@ object AccountHelper {
 
         activity.observe(viewModel.accounts) { liveAccounts ->
             recyclerView.adapter = AccountAdapter(
-                liveAccounts,
                 accountSelectCallback = { account ->
                     viewModel.handleAccountSelect(account, activity)
                     builder.dismissSafe()
@@ -346,7 +399,9 @@ object AccountHelper {
                 accountCreateCallback = { viewModel.handleAccountUpdate(it, activity) },
                 accountEditCallback = { viewModel.handleAccountUpdate(it, activity) },
                 accountDeleteCallback = { viewModel.handleAccountDelete(it, activity) }
-            )
+            ).apply {
+                submitList(liveAccounts)
+            }
 
             activity.observe(viewModel.selectedKeyIndex) { selectedKeyIndex ->
                 // Scroll to current account (which is focused by default)
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 a0647219e57..ad323c7d124 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
@@ -31,20 +31,22 @@ import com.lagradost.cloudstream3.utils.BiometricAuthenticator.startBiometricAut
 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.enableEdgeToEdgeCompat
+import com.lagradost.cloudstream3.utils.UIHelper.fixSystemBarsPadding
 import com.lagradost.cloudstream3.utils.UIHelper.openActivity
+import com.lagradost.cloudstream3.utils.UIHelper.setNavigationBarColorCompat
 
 class AccountSelectActivity : FragmentActivity(), BiometricCallback {
 
+    companion object {
+        var hasLoggedIn: Boolean = false
+    }
+
     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?
         val isEditingFromMainActivity = intent.getBooleanExtra(
@@ -52,8 +54,22 @@ class AccountSelectActivity : FragmentActivity(), BiometricCallback {
             false
         )
 
+        // Sometimes we start this activity when we have already logged in
+        // For example when using cloudstreamsearch://
+        // In those cases we want to just go to the main activity instantly
+        if (hasLoggedIn && !isEditingFromMainActivity) {
+            navigateToMainActivity()
+            return
+        }
+
+        loadThemes(this)
+
+        enableEdgeToEdgeCompat()
+        setNavigationBarColorCompat(R.attr.primaryBlackBackground)
+
         val settingsManager = PreferenceManager.getDefaultSharedPreferences(this)
-        val skipStartup = settingsManager.getBoolean(getString(R.string.skip_startup_account_select_key), false
+        val skipStartup = settingsManager.getBoolean(
+            getString(R.string.skip_startup_account_select_key), false
         ) || accounts.count() <= 1
 
         fun askBiometricAuth() {
@@ -89,10 +105,12 @@ class AccountSelectActivity : FragmentActivity(), BiometricCallback {
                 accountViewModel.handleAccountSelect(currentAccount, this, true)
             } else {
                 if (accounts.count() > 1) {
-                    showToast(this, getString(
-                        R.string.logged_account,
-                        currentAccount?.name
-                    ))
+                    showToast(
+                        this, getString(
+                            R.string.logged_account,
+                            currentAccount?.name
+                        )
+                    )
                 }
 
                 navigateToMainActivity()
@@ -105,12 +123,12 @@ class AccountSelectActivity : FragmentActivity(), BiometricCallback {
 
         val binding = ActivityAccountSelectBinding.inflate(layoutInflater)
         setContentView(binding.root)
+        fixSystemBarsPadding(binding.root, padTop = false)
 
         val recyclerView: AutofitRecyclerView = binding.accountRecyclerView
 
         observe(accountViewModel.accounts) { liveAccounts ->
             val adapter = AccountAdapter(
-                liveAccounts,
                 // Handle the selected account
                 accountSelectCallback = {
                     accountViewModel.handleAccountSelect(it, this)
@@ -118,7 +136,6 @@ class AccountSelectActivity : FragmentActivity(), BiometricCallback {
                 accountCreateCallback = { accountViewModel.handleAccountUpdate(it, this) },
                 accountEditCallback = {
                     accountViewModel.handleAccountUpdate(it, this)
-
                     // We came from MainActivity, return there
                     // and switch to the edited account
                     if (isEditingFromMainActivity) {
@@ -126,8 +143,10 @@ class AccountSelectActivity : FragmentActivity(), BiometricCallback {
                         navigateToMainActivity()
                     }
                 },
-                accountDeleteCallback = { accountViewModel.handleAccountDelete(it,this) }
-            )
+                accountDeleteCallback = { accountViewModel.handleAccountDelete(it, this) }
+            ).apply {
+                submitList(liveAccounts)
+            }
 
             recyclerView.adapter = adapter
 
@@ -182,16 +201,19 @@ class AccountSelectActivity : FragmentActivity(), BiometricCallback {
         askBiometricAuth()
     }
 
+    @SuppressLint("UnsafeIntentLaunch")
     private fun navigateToMainActivity() {
-        openActivity(MainActivity::class.java)
+        hasLoggedIn = true
+        // We want to propagate any intent we get here to MainActivity since this is just an intermediary
+        openActivity(MainActivity::class.java, baseIntent = intent)
         finish() // Finish the account selection activity
     }
 
     override fun onAuthenticationSuccess() {
-       Log.i(BiometricAuthenticator.TAG,"Authentication successful in AccountSelectActivity")
+        Log.i(BiometricAuthenticator.TAG, "Authentication successful in AccountSelectActivity")
     }
 
     override fun onAuthenticationError() {
         finish()
     }
-}
\ No newline at end of file
+}
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 af62a2b0826..96eaf52a773 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
@@ -4,8 +4,8 @@ import android.content.Context
 import androidx.lifecycle.LiveData
 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.CloudStreamApp.Companion.context
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.removeKeys
 import com.lagradost.cloudstream3.MainActivity
 import com.lagradost.cloudstream3.ui.account.AccountHelper.showPinInputDialog
 import com.lagradost.cloudstream3.utils.DataStoreHelper
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 a0e5cabc46a..1b48143a635 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,5 +1,6 @@
 package com.lagradost.cloudstream3.ui.download
 
+import android.annotation.SuppressLint
 import android.text.format.Formatter.formatShortFileSize
 import android.view.LayoutInflater
 import android.view.ViewGroup
@@ -7,19 +8,18 @@ import android.widget.CheckBox
 import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
 import androidx.recyclerview.widget.DiffUtil
-import androidx.recyclerview.widget.ListAdapter
-import androidx.recyclerview.widget.RecyclerView
 import androidx.viewbinding.ViewBinding
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.databinding.DownloadChildEpisodeBinding
 import com.lagradost.cloudstream3.databinding.DownloadHeaderEpisodeBinding
 import com.lagradost.cloudstream3.mvvm.logError
+import com.lagradost.cloudstream3.ui.NoStateAdapter
+import com.lagradost.cloudstream3.ui.ViewHolderState
 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.ImageLoader.loadImage
-import com.lagradost.cloudstream3.utils.VideoDownloadHelper
+import com.lagradost.cloudstream3.utils.downloader.DownloadObjects
 
 const val DOWNLOAD_ACTION_PLAY_FILE = 0
 const val DOWNLOAD_ACTION_DELETE_FILE = 1
@@ -27,6 +27,7 @@ const val DOWNLOAD_ACTION_RESUME_DOWNLOAD = 2
 const val DOWNLOAD_ACTION_PAUSE_DOWNLOAD = 3
 const val DOWNLOAD_ACTION_DOWNLOAD = 4
 const val DOWNLOAD_ACTION_LONG_CLICK = 5
+const val DOWNLOAD_ACTION_CANCEL_PENDING = 6
 
 const val DOWNLOAD_ACTION_GO_TO_CHILD = 0
 const val DOWNLOAD_ACTION_LOAD_RESULT = 1
@@ -34,22 +35,22 @@ const val DOWNLOAD_ACTION_LOAD_RESULT = 1
 sealed class VisualDownloadCached {
     abstract val currentBytes: Long
     abstract val totalBytes: Long
-    abstract val data: VideoDownloadHelper.DownloadCached
+    abstract val data: DownloadObjects.DownloadCached
     abstract var isSelected: Boolean
 
     data class Child(
         override val currentBytes: Long,
         override val totalBytes: Long,
-        override val data: VideoDownloadHelper.DownloadEpisodeCached,
+        override val data: DownloadObjects.DownloadEpisodeCached,
         override var isSelected: Boolean,
     ) : VisualDownloadCached()
 
     data class Header(
         override val currentBytes: Long,
         override val totalBytes: Long,
-        override val data: VideoDownloadHelper.DownloadHeaderCached,
+        override val data: DownloadObjects.DownloadHeaderCached,
         override var isSelected: Boolean,
-        val child: VideoDownloadHelper.DownloadEpisodeCached?,
+        val child: DownloadObjects.DownloadEpisodeCached?,
         val currentOngoingDownloads: Int,
         val totalDownloads: Int,
     ) : VisualDownloadCached()
@@ -57,19 +58,19 @@ sealed class VisualDownloadCached {
 
 data class DownloadClickEvent(
     val action: Int,
-    val data: VideoDownloadHelper.DownloadEpisodeCached
+    val data: DownloadObjects.DownloadEpisodeCached
 )
 
 data class DownloadHeaderClickEvent(
     val action: Int,
-    val data: VideoDownloadHelper.DownloadHeaderCached
+    val data: DownloadObjects.DownloadHeaderCached
 )
 
 class DownloadAdapter(
     private val onHeaderClickEvent: (DownloadHeaderClickEvent) -> Unit,
     private val onItemClickEvent: (DownloadClickEvent) -> Unit,
     private val onItemSelectionChanged: (Int, Boolean) -> Unit,
-) : ListAdapter<VisualDownloadCached, DownloadAdapter.DownloadViewHolder>(DiffCallback()) {
+) : NoStateAdapter<VisualDownloadCached>(DiffCallback()) {
 
     private var isMultiDeleteState: Boolean = false
 
@@ -78,112 +79,224 @@ class DownloadAdapter(
         private const val VIEW_TYPE_CHILD = 1
     }
 
-    inner class DownloadViewHolder(
-        private val binding: ViewBinding
-    ) : RecyclerView.ViewHolder(binding.root) {
 
-        fun bind(card: VisualDownloadCached?) {
-            when (binding) {
-                is DownloadHeaderEpisodeBinding -> bindHeader(card as? VisualDownloadCached.Header)
-                is DownloadChildEpisodeBinding -> bindChild(card as? VisualDownloadCached.Child)
-            }
-        }
+    private fun bindHeader(binding: ViewBinding, card: VisualDownloadCached.Header?) {
+        if (binding !is DownloadHeaderEpisodeBinding || card == null) return
 
-        private fun bindHeader(card: VisualDownloadCached.Header?) {
-            if (binding !is DownloadHeaderEpisodeBinding || card == null) return
-
-            val data = card.data
-            binding.apply {
-                episodeHolder.apply {
-                    if (isMultiDeleteState) {
-                        setOnClickListener {
-                            toggleIsChecked(deleteCheckbox, data.id)
-                        }
+        val data = card.data
+        binding.apply {
+            episodeHolder.apply {
+                if (isMultiDeleteState) {
+                    setOnClickListener {
+                        toggleIsChecked(deleteCheckbox, data.id)
                     }
-
                     setOnLongClickListener {
                         toggleIsChecked(deleteCheckbox, data.id)
                         true
                     }
+                } else {
+                    setOnLongClickListener {
+                        onItemSelectionChanged.invoke(data.id, true)
+                        true
+                    }
                 }
+            }
 
-                downloadHeaderPoster.apply {
-                    loadImage(data.poster)
-                    if (isMultiDeleteState) {
-                        setOnClickListener {
-                            toggleIsChecked(deleteCheckbox, data.id)
-                        }
-                    } else {
-                        setOnClickListener {
-                            onHeaderClickEvent.invoke(
-                                DownloadHeaderClickEvent(
-                                    DOWNLOAD_ACTION_LOAD_RESULT,
-                                    data
-                                )
+            downloadHeaderPoster.apply {
+                loadImage(data.poster)
+                if (isMultiDeleteState) {
+                    setOnClickListener {
+                        toggleIsChecked(deleteCheckbox, data.id)
+                    }
+                } else {
+                    setOnClickListener {
+                        onHeaderClickEvent.invoke(
+                            DownloadHeaderClickEvent(
+                                DOWNLOAD_ACTION_LOAD_RESULT,
+                                data
                             )
-                        }
+                        )
                     }
+                }
 
-                    setOnLongClickListener {
-                        toggleIsChecked(deleteCheckbox, data.id)
-                        true
-                    }
+                setOnLongClickListener {
+                    toggleIsChecked(deleteCheckbox, data.id)
+                    true
                 }
-                downloadHeaderTitle.text = data.name
-                val formattedSize = formatShortFileSize(itemView.context, card.totalBytes)
+            }
+            downloadHeaderTitle.text = data.name
+            val formattedSize = formatShortFileSize(binding.root.context, card.totalBytes)
 
-                if (card.child != null) {
-                    handleChildDownload(card, formattedSize)
-                } else handleParentDownload(card, formattedSize)
+            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)
+            if (isMultiDeleteState) {
+                deleteCheckbox.setOnCheckedChangeListener { _, isChecked ->
+                    onItemSelectionChanged.invoke(data.id, isChecked)
+                }
+            } else deleteCheckbox.setOnCheckedChangeListener(null)
 
-                deleteCheckbox.apply {
-                    isVisible = isMultiDeleteState
-                    isChecked = card.isSelected
+            deleteCheckbox.apply {
+                isVisible = isMultiDeleteState
+                isChecked = card.isSelected
+            }
+        }
+    }
+
+    private fun DownloadHeaderEpisodeBinding.handleChildDownload(
+        card: VisualDownloadCached.Header,
+        formattedSize: String
+    ) {
+        card.child ?: return
+        downloadHeaderGotoChild.isVisible = false
+
+        val posDur = getViewPos(card.data.id)
+        watchProgressContainer.isVisible = true
+        downloadHeaderEpisodeProgress.apply {
+            isVisible = posDur != null
+            posDur?.let {
+                val max = (it.duration / 1000).toInt()
+                val progress = (it.position / 1000).toInt()
+
+                if (max > 0 && progress >= (0.95 * max).toInt()) {
+                    playIcon.setImageResource(R.drawable.ic_baseline_check_24)
+                    isVisible = false
+                } else {
+                    playIcon.setImageResource(R.drawable.netflix_play)
+                    this.max = max
+                    this.progress = progress
+                    isVisible = true
                 }
             }
         }
 
-        private fun DownloadHeaderEpisodeBinding.handleChildDownload(
-            card: VisualDownloadCached.Header,
-            formattedSize: String
-        ) {
-            card.child ?: return
-            downloadHeaderGotoChild.isVisible = false
+        downloadButton.resetView()
+        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.
+            val drawable = downloadButton.getDrawableFromStatus(status)?.let {
+                ContextCompat.getDrawable(downloadButton.context, it)
+            }
+            downloadButton.statusView.setImageDrawable(drawable)
+            downloadButton.progressBar.progressDrawable =
+                ContextCompat.getDrawable(
+                    downloadButton.context,
+                    downloadButton.progressDrawable
+                )
+        }
+
+        downloadHeaderInfo.isVisible = true
+        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.resetViewData()
+        watchProgressContainer.isVisible = false
+        downloadButton.isVisible = false
+        downloadHeaderEpisodeProgress.isVisible = false
+        downloadHeaderGotoChild.isVisible = !isMultiDeleteState
+
+        try {
+            downloadHeaderInfo.isVisible = true
+            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(binding: ViewBinding, card: VisualDownloadCached.Child?) {
+        if (binding !is DownloadChildEpisodeBinding || card == null) return
 
-            val posDur = getViewPos(card.data.id)
-            downloadHeaderEpisodeProgress.apply {
+        val data = card.data
+        binding.apply {
+            val posDur = getViewPos(data.id)
+            downloadChildEpisodeProgress.apply {
                 isVisible = posDur != null
                 posDur?.let {
-                    val visualPos = it.fixVisual()
-                    max = (visualPos.duration / 1000).toInt()
-                    progress = (visualPos.position / 1000).toInt()
+                    val max = (it.duration / 1000).toInt()
+                    val progress = (it.position / 1000).toInt()
+
+                    if (max > 0 && progress >= (0.95 * max).toInt()) {
+                        downloadChildEpisodePlay.setImageResource(R.drawable.ic_baseline_check_24)
+                        isVisible = false
+                    } else {
+                        downloadChildEpisodePlay.setImageResource(R.drawable.play_button_transparent)
+                        this.max = max
+                        this.progress = progress
+                        isVisible = true
+                    }
                 }
             }
 
-            val status = downloadButton.getStatus(card.child.id, card.currentBytes, card.totalBytes)
+            downloadButton.resetView()
+            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(card.child.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) }
-                downloadHeaderInfo.text = formattedSize
+                downloadChildEpisodeTextExtra.text =
+                    formatShortFileSize(downloadChildEpisodeTextExtra.context, card.totalBytes)
             } 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)
                 }
@@ -195,199 +308,105 @@ class DownloadAdapter(
                     )
             }
 
-            downloadButton.setDefaultClickListener(card.child, downloadHeaderInfo, onItemClickEvent)
+            downloadButton.setDefaultClickListener(
+                data,
+                downloadChildEpisodeTextExtra,
+                onItemClickEvent
+            )
             downloadButton.isVisible = !isMultiDeleteState
 
-            if (!isMultiDeleteState) {
-                episodeHolder.setOnClickListener {
-                    onItemClickEvent.invoke(
-                        DownloadClickEvent(
-                            DOWNLOAD_ACTION_PLAY_FILE,
-                            card.child
-                        )
-                    )
-                }
+            downloadChildEpisodeText.apply {
+                text = context.getNameFull(data.name, data.episode, data.season)
+                isSelected = true // Needed for text repeating
             }
-        }
 
-        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)
+            downloadChildEpisodeHolder.setOnClickListener {
+                onItemClickEvent.invoke(DownloadClickEvent(DOWNLOAD_ACTION_PLAY_FILE, data))
             }
 
-            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(data.id)
-                downloadChildEpisodeProgress.apply {
-                    isVisible = posDur != null
-                    posDur?.let {
-                        val visualPos = it.fixVisual()
-                        max = (visualPos.duration / 1000).toInt()
-                        progress = (visualPos.position / 1000).toInt()
-                    }
-                }
-
-                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(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)
-                } 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(
-                    data,
-                    downloadChildEpisodeTextExtra,
-                    onItemClickEvent
-                )
-                downloadButton.isVisible = !isMultiDeleteState
-
-                downloadChildEpisodeText.apply {
-                    text = context.getNameFull(data.name, data.episode, data.season)
-                    isSelected = true // Needed for text repeating
-                }
-
-                downloadChildEpisodeHolder.setOnClickListener {
-                    onItemClickEvent.invoke(DownloadClickEvent(DOWNLOAD_ACTION_PLAY_FILE, data))
-                }
-
-                downloadChildEpisodeHolder.apply {
-                    when {
-                        isMultiDeleteState -> {
-                            setOnClickListener {
-                                toggleIsChecked(deleteCheckbox, data.id)
-                            }
+            downloadChildEpisodeHolder.apply {
+                when {
+                    isMultiDeleteState -> {
+                        setOnClickListener {
+                            toggleIsChecked(deleteCheckbox, data.id)
                         }
+                        setOnLongClickListener {
+                            toggleIsChecked(deleteCheckbox, data.id)
+                            true
+                        }
+                    }
 
-                        else -> {
-                            setOnClickListener {
-                                onItemClickEvent.invoke(
-                                    DownloadClickEvent(
-                                        DOWNLOAD_ACTION_PLAY_FILE,
-                                        data
-                                    )
+                    else -> {
+                        setOnClickListener {
+                            onItemClickEvent.invoke(
+                                DownloadClickEvent(
+                                    DOWNLOAD_ACTION_PLAY_FILE,
+                                    data
                                 )
-                            }
+                            )
                         }
-                    }
 
-                    setOnLongClickListener {
-                        toggleIsChecked(deleteCheckbox, data.id)
-                        true
+                        setOnLongClickListener {
+                            onItemSelectionChanged.invoke(data.id, true)
+                            true
+                        }
                     }
                 }
+            }
 
-                if (isMultiDeleteState) {
-                    deleteCheckbox.setOnCheckedChangeListener { _, isChecked ->
-                        onItemSelectionChanged.invoke(data.id, isChecked)
-                    }
-                } else deleteCheckbox.setOnCheckedChangeListener(null)
-
-                deleteCheckbox.apply {
-                    isVisible = isMultiDeleteState
-                    isChecked = card.isSelected
+            if (isMultiDeleteState) {
+                deleteCheckbox.setOnCheckedChangeListener { _, isChecked ->
+                    onItemSelectionChanged.invoke(data.id, isChecked)
                 }
+            } else deleteCheckbox.setOnCheckedChangeListener(null)
+
+            deleteCheckbox.apply {
+                isVisible = isMultiDeleteState
+                isChecked = card.isSelected
             }
         }
     }
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): DownloadViewHolder {
+    override fun onCreateCustomContent(parent: ViewGroup, viewType: Int): ViewHolderState<Any> {
         val inflater = LayoutInflater.from(parent.context)
         val binding = when (viewType) {
             VIEW_TYPE_HEADER -> DownloadHeaderEpisodeBinding.inflate(inflater, parent, false)
             VIEW_TYPE_CHILD -> DownloadChildEpisodeBinding.inflate(inflater, parent, false)
             else -> throw IllegalArgumentException("Invalid view type")
         }
-        return DownloadViewHolder(binding)
+        return ViewHolderState(binding)
     }
 
-    override fun onBindViewHolder(holder: DownloadViewHolder, position: Int) {
-        holder.bind(getItem(position))
+    override fun onBindContent(
+        holder: ViewHolderState<Any>,
+        item: VisualDownloadCached,
+        position: Int
+    ) {
+        when (val binding = holder.view) {
+            is DownloadHeaderEpisodeBinding -> bindHeader(
+                binding,
+                item as? VisualDownloadCached.Header
+            )
+
+            is DownloadChildEpisodeBinding -> bindChild(
+                binding,
+                item as? VisualDownloadCached.Child
+            )
+        }
     }
 
-    override fun getItemViewType(position: Int): Int {
-        return when (getItem(position)) {
+    override fun customContentViewType(item: VisualDownloadCached): Int {
+        return when (item) {
             is VisualDownloadCached.Child -> VIEW_TYPE_CHILD
             is VisualDownloadCached.Header -> VIEW_TYPE_HEADER
-            else -> throw IllegalArgumentException("Invalid data type at position $position")
         }
     }
 
+    @SuppressLint("NotifyDataSetChanged")
     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)
-            }
-        }
+        notifyDataSetChanged() // This is shit, but what can you do?
     }
 
     private fun toggleIsChecked(checkbox: CheckBox, itemId: Int) {
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 83e0d016788..dae70ebd7ad 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
@@ -4,8 +4,8 @@ import android.content.DialogInterface
 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.CloudStreamApp.Companion.getKey
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.getKeys
 import com.lagradost.cloudstream3.CommonActivity.activity
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.mvvm.logError
@@ -18,8 +18,9 @@ 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 com.lagradost.cloudstream3.utils.downloader.DownloadObjects
+import com.lagradost.cloudstream3.utils.downloader.DownloadQueueManager
+import com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager
 import kotlinx.coroutines.MainScope
 
 object DownloadButtonSetup {
@@ -82,7 +83,7 @@ object DownloadButtonSetup {
                     } else {
                         val pkg = VideoDownloadManager.getDownloadResumePackage(ctx, id)
                         if (pkg != null) {
-                            VideoDownloadManager.downloadFromResumeUsingWorker(ctx, pkg)
+                            DownloadQueueManager.addToQueue(pkg.toWrapper())
                         } else {
                             VideoDownloadManager.downloadEvent.invoke(
                                 Pair(click.data.id, VideoDownloadManager.DownloadActionType.Resume)
@@ -95,7 +96,7 @@ object DownloadButtonSetup {
             DOWNLOAD_ACTION_LONG_CLICK -> {
                 activity?.let { act ->
                     val length =
-                        VideoDownloadManager.getDownloadFileInfoAndUpdateSettings(
+                        VideoDownloadManager.getDownloadFileInfo(
                             act,
                             click.data.id
                         )?.fileLength
@@ -110,24 +111,31 @@ object DownloadButtonSetup {
                 }
             }
 
+            DOWNLOAD_ACTION_CANCEL_PENDING -> {
+                DownloadQueueManager.cancelDownload(id)
+            }
+
             DOWNLOAD_ACTION_PLAY_FILE -> {
                 activity?.let { act ->
-                    val parent = getKey<VideoDownloadHelper.DownloadHeaderCached>(
+                    val parent = getKey<DownloadObjects.DownloadHeaderCached>(
                         DOWNLOAD_HEADER_CACHE,
                         click.data.parentId.toString()
                     ) ?: return
 
                     val episodes = getKeys(DOWNLOAD_EPISODE_CACHE)
                         ?.mapNotNull {
-                            getKey<VideoDownloadHelper.DownloadEpisodeCached>(it)
+                            getKey<DownloadObjects.DownloadEpisodeCached>(it)
                         }
                         ?.filter { it.parentId == click.data.parentId }
 
                     val items = mutableListOf<ExtractorUri>()
-                    val allRelevantEpisodes = episodes?.sortedWith(compareBy<VideoDownloadHelper.DownloadEpisodeCached> { it.season ?: 0 }.thenBy { it.episode })
+                    val allRelevantEpisodes =
+                        episodes?.sortedWith(compareBy<DownloadObjects.DownloadEpisodeCached> {
+                            it.season ?: 0
+                        }.thenBy { it.episode })
 
                     allRelevantEpisodes?.forEach {
-                        val keyInfo = getKey<VideoDownloadManager.DownloadedFileInfo>(
+                        val keyInfo = getKey<DownloadObjects.DownloadedFileInfo>(
                             VideoDownloadManager.KEY_DOWNLOAD_INFO,
                             it.id.toString()
                         ) ?: return@forEach
@@ -141,7 +149,7 @@ object DownloadButtonSetup {
                                 uri = Uri.EMPTY,
                                 id = it.id,
                                 parentId = it.parentId,
-                                name = act.getString(R.string.downloaded_file),
+                                name = it.name ?: act.getString(R.string.downloaded_file),
                                 season = it.season,
                                 episode = it.episode,
                                 headerName = parent.name,
@@ -154,7 +162,8 @@ object DownloadButtonSetup {
                     }
                     act.navigate(
                         R.id.global_to_navigation_player, GeneratorPlayer.newInstance(
-                            DownloadFileGenerator(items).apply { goto(items.indexOfFirst { it.id == click.data.id }) }
+                            DownloadFileGenerator(items),
+                            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 1f5b9e337fa..d44ea0020b5 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,32 +1,35 @@
 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.isGone
 import androidx.core.view.isVisible
-import androidx.fragment.app.Fragment
-import androidx.lifecycle.ViewModelProvider
+import androidx.fragment.app.activityViewModels
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.databinding.FragmentChildDownloadsBinding
+import com.lagradost.cloudstream3.mvvm.Resource
 import com.lagradost.cloudstream3.mvvm.observe
+import com.lagradost.cloudstream3.mvvm.observeNullable
+import com.lagradost.cloudstream3.ui.BaseFragment
 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.TV
+import com.lagradost.cloudstream3.ui.settings.Globals.isLandscape
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
 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.fixSystemBarsPadding
 import com.lagradost.cloudstream3.utils.UIHelper.setAppBarNoScrollFlagsOnTV
 
-class DownloadChildFragment : Fragment() {
-    private lateinit var downloadsViewModel: DownloadViewModel
-    private var binding: FragmentChildDownloadsBinding? = null
+class DownloadChildFragment : BaseFragment<FragmentChildDownloadsBinding>(
+    BaseFragment.BindingCreator.Inflate(FragmentChildDownloadsBinding::inflate)
+) {
+
+    private val downloadViewModel: DownloadViewModel by activityViewModels()
 
     companion object {
         fun newInstance(headerName: String, folder: String): Bundle {
@@ -39,99 +42,104 @@ class DownloadChildFragment : Fragment() {
 
     override fun onDestroyView() {
         activity?.detachBackPressedCallback("Downloads")
-        binding = null
+        downloadViewModel.clearChildren()
         super.onDestroyView()
     }
 
-    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
+    override fun fixLayout(view: View) {
+        fixSystemBarsPadding(
+            view,
+            padBottom = isLandscape(),
+            padLeft = isLayout(TV or EMULATOR)
+        )
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        /**
-         * 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()
-
+    override fun onBindingCreated(binding: FragmentChildDownloadsBinding) {
         val folder = arguments?.getString("folder")
         val name = arguments?.getString("name")
         if (folder == null) {
-            activity?.onBackPressedDispatcher?.onBackPressed()
+            dispatchBackPressed()
             return
         }
 
-        binding?.downloadChildToolbar?.apply {
+        context?.let { downloadViewModel.updateChildList(it, folder) }
+
+        binding.downloadChildToolbar.apply {
             title = name
             if (isLayout(PHONE or EMULATOR)) {
                 setNavigationIcon(R.drawable.ic_baseline_arrow_back_24)
                 setNavigationOnClickListener {
-                    activity?.onBackPressedDispatcher?.onBackPressed()
+                    dispatchBackPressed()
                 }
             }
             setAppBarNoScrollFlagsOnTV()
         }
 
-        binding?.downloadDeleteAppbar?.setAppBarNoScrollFlagsOnTV()
+        binding.downloadDeleteAppbar.setAppBarNoScrollFlagsOnTV()
 
-        observe(downloadsViewModel.childCards) {
-            if (it.isEmpty()) {
-                activity?.onBackPressedDispatcher?.onBackPressed()
-                return@observe
+        observe(downloadViewModel.childCards) { cards ->
+            when (cards) {
+                is Resource.Success -> {
+                    if (cards.value.isEmpty()) {
+                        dispatchBackPressed()
+                    }
+                    (binding.downloadChildList.adapter as? DownloadAdapter)?.submitList(cards.value)
+                }
+
+                else -> {
+                    (binding.downloadChildList.adapter as? DownloadAdapter)?.submitList(null)
+                }
             }
+        }
 
-            (binding?.downloadChildList?.adapter as? DownloadAdapter)?.submitList(it)
+        observe(downloadViewModel.selectedBytes) {
+            updateDeleteButton(downloadViewModel.selectedItemIds.value?.count() ?: 0, it)
         }
-        observe(downloadsViewModel.isMultiDeleteState) { isMultiDeleteState ->
-            val adapter = binding?.downloadChildList?.adapter as? DownloadAdapter
+
+
+        binding.apply {
+            btnDelete.setOnClickListener { view ->
+                downloadViewModel.handleMultiDelete(view.context ?: return@setOnClickListener)
+            }
+
+            btnCancel.setOnClickListener {
+                downloadViewModel.cancelSelection()
+            }
+
+            btnToggleAll.setOnClickListener {
+                val allSelected = downloadViewModel.isAllChildrenSelected()
+                if (allSelected) {
+                    downloadViewModel.clearSelectedItems()
+                } else {
+                    downloadViewModel.selectAllChildren()
+                }
+            }
+        }
+
+        observeNullable(downloadViewModel.selectedItemIds) { selection ->
+            val isMultiDeleteState = selection != null
+            val adapter = binding.downloadChildList.adapter as? DownloadAdapter
             adapter?.setIsMultiDeleteState(isMultiDeleteState)
-            binding?.downloadDeleteAppbar?.isVisible = isMultiDeleteState
-            if (!isMultiDeleteState) {
+            binding.downloadDeleteAppbar.isVisible = isMultiDeleteState
+            binding.downloadChildToolbar.isGone = isMultiDeleteState
+
+            if (selection == null) {
                 activity?.detachBackPressedCallback("Downloads")
-                downloadsViewModel.clearSelectedItems()
-                binding?.downloadChildToolbar?.isVisible = true
+                return@observeNullable
             }
-        }
-        observe(downloadsViewModel.selectedBytes) {
-            updateDeleteButton(downloadsViewModel.selectedItemIds.value?.count() ?: 0, it)
-        }
-        observe(downloadsViewModel.selectedItemIds) {
-            handleSelectedChange(it)
-            updateDeleteButton(it.count(), downloadsViewModel.selectedBytes.value ?: 0L)
+            activity?.attachBackPressedCallback("Downloads") {
+                downloadViewModel.cancelSelection()
+            }
+
+            updateDeleteButton(selection.count(), downloadViewModel.selectedBytes.value ?: 0L)
 
-            binding?.btnDelete?.isVisible = it.isNotEmpty()
-            binding?.selectItemsText?.isVisible = it.isEmpty()
+            binding.btnDelete.isVisible = selection.isNotEmpty()
+            binding.selectItemsText.isVisible = selection.isEmpty()
 
-            val allSelected = downloadsViewModel.isAllSelected()
+            val allSelected = downloadViewModel.isAllChildrenSelected()
             if (allSelected) {
-                binding?.btnToggleAll?.setText(R.string.deselect_all)
-            } else binding?.btnToggleAll?.setText(R.string.select_all)
+                binding.btnToggleAll.setText(R.string.deselect_all)
+            } else binding.btnToggleAll.setText(R.string.select_all)
         }
 
         val adapter = DownloadAdapter(
@@ -139,18 +147,18 @@ class DownloadChildFragment : Fragment() {
             { click ->
                 if (click.action == DOWNLOAD_ACTION_DELETE_FILE) {
                     context?.let { ctx ->
-                        downloadsViewModel.handleSingleDelete(ctx, click.data.id)
+                        downloadViewModel.handleSingleDelete(ctx, click.data.id)
                     }
                 } else handleDownloadClick(click)
             },
             { itemId, isChecked ->
                 if (isChecked) {
-                    downloadsViewModel.addSelected(itemId)
-                } else downloadsViewModel.removeSelected(itemId)
+                    downloadViewModel.addSelected(itemId)
+                } else downloadViewModel.removeSelected(itemId)
             }
         )
 
-        binding?.downloadChildList?.apply {
+        binding.downloadChildList.apply {
             setHasFixedSize(true)
             setItemViewCacheSize(20)
             this.adapter = adapter
@@ -160,43 +168,6 @@ class DownloadChildFragment : Fragment() {
                 nextDown = FOCUS_SELF,
             )
         }
-
-        context?.let { downloadsViewModel.updateChildList(it, folder) }
-        fixPaddingStatusbar(binding?.downloadChildRoot)
-    }
-
-    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)
-        }
     }
 
     private fun updateDeleteButton(count: Int, selectedBytes: Long) {
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 7c1c5b76965..abc432ef959 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
@@ -7,13 +7,8 @@ import android.content.Context
 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
-import android.view.ViewGroup
 import android.widget.LinearLayout
 import android.widget.TextView
 import android.widget.Toast
@@ -22,23 +17,28 @@ import androidx.annotation.StringRes
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.core.widget.doOnTextChanged
-import androidx.fragment.app.Fragment
-import androidx.lifecycle.ViewModelProvider
+import androidx.fragment.app.activityViewModels
 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.isEpisodeBased
+import com.lagradost.cloudstream3.mvvm.Resource
 import com.lagradost.cloudstream3.mvvm.safe
 import com.lagradost.cloudstream3.mvvm.observe
+import com.lagradost.cloudstream3.mvvm.observeNullable
+import com.lagradost.cloudstream3.ui.BaseFragment
 import com.lagradost.cloudstream3.ui.download.DownloadButtonSetup.handleDownloadClick
+import com.lagradost.cloudstream3.ui.download.queue.DownloadQueueViewModel
 import com.lagradost.cloudstream3.ui.player.BasicLink
 import com.lagradost.cloudstream3.ui.player.GeneratorPlayer
 import com.lagradost.cloudstream3.ui.player.LinkGenerator
 import com.lagradost.cloudstream3.ui.player.OfflinePlaybackHelper.playUri
 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.TV
+import com.lagradost.cloudstream3.ui.settings.Globals.isLandscape
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
 import com.lagradost.cloudstream3.utils.AppContextUtils.loadResult
 import com.lagradost.cloudstream3.utils.BackPressedCallbackHelper.attachBackPressedCallback
@@ -46,7 +46,7 @@ import com.lagradost.cloudstream3.utils.BackPressedCallbackHelper.detachBackPres
 import com.lagradost.cloudstream3.utils.DOWNLOAD_EPISODE_CACHE
 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.fixSystemBarsPadding
 import com.lagradost.cloudstream3.utils.UIHelper.hideKeyboard
 import com.lagradost.cloudstream3.utils.UIHelper.navigate
 import com.lagradost.cloudstream3.utils.UIHelper.setAppBarNoScrollFlagsOnTV
@@ -54,9 +54,12 @@ import java.net.URI
 
 const val DOWNLOAD_NAVIGATE_TO = "downloadpage"
 
-class DownloadFragment : Fragment() {
-    private lateinit var downloadsViewModel: DownloadViewModel
-    private var binding: FragmentDownloadsBinding? = null
+class DownloadFragment : BaseFragment<FragmentDownloadsBinding>(
+    BaseFragment.BindingCreator.Inflate(FragmentDownloadsBinding::inflate)
+) {
+
+    private val downloadViewModel: DownloadViewModel by activityViewModels()
+    private val downloadQueueViewModel: DownloadQueueViewModel by activityViewModels()
 
     private fun View.setLayoutWidth(weight: Long) {
         val param = LinearLayout.LayoutParams(
@@ -69,117 +72,135 @@ class DownloadFragment : Fragment() {
 
     override fun onDestroyView() {
         activity?.detachBackPressedCallback("Downloads")
-        binding = null
         super.onDestroyView()
     }
 
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        downloadsViewModel = ViewModelProvider(this)[DownloadViewModel::class.java]
-        val localBinding = FragmentDownloadsBinding.inflate(inflater, container, false)
-        binding = localBinding
-        return localBinding.root
+    override fun fixLayout(view: View) {
+        fixSystemBarsPadding(
+            view,
+            padBottom = isLandscape(),
+            padLeft = isLayout(TV or EMULATOR)
+        )
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
+    override fun onBindingCreated(binding: FragmentDownloadsBinding) {
         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)
-        }
+        binding.downloadAppbar.setAppBarNoScrollFlagsOnTV()
+        binding.downloadDeleteAppbar.setAppBarNoScrollFlagsOnTV()
+
+        observe(downloadViewModel.headerCards) { cards ->
+            when (cards) {
+                is Resource.Success -> {
+                    (binding.downloadList.adapter as? DownloadAdapter)?.submitList(cards.value)
+                    binding.textNoDownloads.isVisible = cards.value.isEmpty()
+                    binding.downloadLoading.isVisible = false
+                    binding.downloadList.isVisible = true
+                }
 
-        /**
-         * 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)
-            binding?.downloadLoading?.isVisible = false
-            binding?.textNoDownloads?.isVisible = it.isEmpty()
+                is Resource.Loading -> {
+                    binding.downloadList.isVisible = false
+                    binding.downloadLoading.isVisible = true
+                }
+
+                is Resource.Failure -> {
+                    binding.downloadList.isVisible = true
+                    binding.downloadLoading.isVisible = false
+                }
+            }
         }
-        observe(downloadsViewModel.availableBytes) {
+
+        observe(downloadViewModel.availableBytes) {
             updateStorageInfo(
-                view.context,
+                binding.root.context,
                 it,
                 R.string.free_storage,
-                binding?.downloadFreeTxt,
-                binding?.downloadFree
+                binding.downloadFreeTxt,
+                binding.downloadFree
             )
         }
-        observe(downloadsViewModel.usedBytes) {
+        observe(downloadViewModel.usedBytes) {
             updateStorageInfo(
-                view.context,
+                binding.root.context,
                 it,
                 R.string.used_storage,
-                binding?.downloadUsedTxt,
-                binding?.downloadUsed
+                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
+            val hasBytes = it > 0
+            if (hasBytes) {
+                binding.downloadLoadingBytes.stopShimmer()
+            } else binding.downloadLoadingBytes.startShimmer()
+
+            binding.downloadBytesBar.isVisible = hasBytes
+            binding.downloadLoadingBytes.isGone = hasBytes
         }
-        observe(downloadsViewModel.downloadBytes) {
+        observe(downloadViewModel.downloadBytes) {
             updateStorageInfo(
-                view.context,
+                binding.root.context,
                 it,
                 R.string.app_storage,
-                binding?.downloadAppTxt,
-                binding?.downloadApp
+                binding.downloadAppTxt,
+                binding.downloadApp
             )
         }
-        observe(downloadsViewModel.selectedBytes) {
-            updateDeleteButton(downloadsViewModel.selectedItemIds.value?.count() ?: 0, it)
+        observe(downloadQueueViewModel.childCards) { cards ->
+            val size = cards.currentDownloads.size + cards.queue.size
+            val context = binding.root.context
+            val baseText = context.getString(R.string.download_queue)
+            binding.downloadQueueText.text = if (size > 0) {
+                "$baseText (${cards.currentDownloads.size}/$size)"
+            } else {
+                baseText
+            }
         }
-        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(downloadViewModel.selectedBytes) {
+            updateDeleteButton(downloadViewModel.selectedItemIds.value?.count() ?: 0, it)
+        }
+
+        binding.apply {
+            btnDelete.setOnClickListener { view ->
+                downloadViewModel.handleMultiDelete(view.context ?: return@setOnClickListener)
+            }
+
+            btnCancel.setOnClickListener {
+                downloadViewModel.cancelSelection()
+            }
+
+            btnToggleAll.setOnClickListener {
+                val allSelected = downloadViewModel.isAllHeadersSelected()
+                if (allSelected) {
+                    downloadViewModel.clearSelectedItems()
+                } else {
+                    downloadViewModel.selectAllHeaders()
                 }
             }
         }
-        observe(downloadsViewModel.selectedItemIds) {
-            handleSelectedChange(it)
-            updateDeleteButton(it.count(), downloadsViewModel.selectedBytes.value ?: 0L)
 
-            binding?.btnDelete?.isVisible = it.isNotEmpty()
-            binding?.selectItemsText?.isVisible = it.isEmpty()
+        observeNullable(downloadViewModel.selectedItemIds) { selection ->
+            val isMultiDeleteState = selection != null
+            val adapter = binding.downloadList.adapter as? DownloadAdapter
+            adapter?.setIsMultiDeleteState(isMultiDeleteState)
+            binding.downloadDeleteAppbar.isVisible = isMultiDeleteState
+            binding.downloadAppbar.isGone = isMultiDeleteState
+
+            if (selection == null) {
+                activity?.detachBackPressedCallback("Downloads")
+                return@observeNullable
+            }
+            activity?.attachBackPressedCallback("Downloads") {
+                downloadViewModel.cancelSelection()
+            }
+            updateDeleteButton(selection.count(), downloadViewModel.selectedBytes.value ?: 0L)
 
-            val allSelected = downloadsViewModel.isAllSelected()
+            binding.btnDelete.isVisible = selection.isNotEmpty()
+            binding.selectItemsText.isVisible = selection.isEmpty()
+
+            val allSelected = downloadViewModel.isAllHeadersSelected()
             if (allSelected) {
-                binding?.btnToggleAll?.setText(R.string.deselect_all)
-            } else binding?.btnToggleAll?.setText(R.string.select_all)
+                binding.btnToggleAll.setText(R.string.deselect_all)
+            } else binding.btnToggleAll.setText(R.string.select_all)
         }
 
         val adapter = DownloadAdapter(
@@ -187,29 +208,29 @@ class DownloadFragment : Fragment() {
             { click ->
                 if (click.action == DOWNLOAD_ACTION_DELETE_FILE) {
                     context?.let { ctx ->
-                        downloadsViewModel.handleSingleDelete(ctx, click.data.id)
+                        downloadViewModel.handleSingleDelete(ctx, click.data.id)
                     }
                 } else handleDownloadClick(click)
             },
             { itemId, isChecked ->
                 if (isChecked) {
-                    downloadsViewModel.addSelected(itemId)
-                } else downloadsViewModel.removeSelected(itemId)
+                    downloadViewModel.addSelected(itemId)
+                } else downloadViewModel.removeSelected(itemId)
             }
         )
 
-        binding?.downloadList?.apply {
+        binding.downloadList.apply {
             setHasFixedSize(true)
             setItemViewCacheSize(20)
             this.adapter = adapter
             setLinearListLayout(
                 isHorizontal = false,
                 nextRight = FOCUS_SELF,
-                nextDown = FOCUS_SELF,
+                nextDown = R.id.download_queue_button,
             )
         }
 
-        binding?.apply {
+        binding.apply {
             openLocalVideoButton.apply {
                 isGone = isLayout(TV)
                 setOnClickListener { openLocalVideo() }
@@ -218,16 +239,25 @@ class DownloadFragment : Fragment() {
                 isGone = isLayout(TV)
                 setOnClickListener { showStreamInputDialog(it.context) }
             }
+
+            downloadQueueButton.setOnClickListener {
+                activity?.navigate(R.id.action_navigation_global_to_navigation_download_queue)
+            }
+
+            downloadStreamButtonTv.isFocusableInTouchMode = isLayout(TV)
+            downloadAppbar.isFocusableInTouchMode = isLayout(TV)
+
+            downloadStreamButtonTv.setOnClickListener { showStreamInputDialog(it.context) }
+            steamImageviewHolder.isVisible = isLayout(TV)
         }
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            binding?.downloadList?.setOnScrollChangeListener { _, _, scrollY, _, oldScrollY ->
+            binding.downloadList.setOnScrollChangeListener { _, _, scrollY, _, oldScrollY ->
                 handleScroll(scrollY - oldScrollY)
             }
         }
 
-        context?.let { downloadsViewModel.updateHeaderList(it) }
-        fixPaddingStatusbar(binding?.downloadRoot)
+        context?.let { downloadViewModel.updateHeaderList(it) }
     }
 
     private fun handleItemClick(click: DownloadHeaderClickEvent) {
@@ -249,40 +279,6 @@ class DownloadFragment : Fragment() {
         }
     }
 
-    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)
-        }
-    }
-
     private fun updateDeleteButton(count: Int, selectedBytes: Long) {
         val formattedSize = formatShortFileSize(context, selectedBytes)
         binding?.btnDelete?.text =
@@ -353,7 +349,8 @@ class DownloadFragment : Fragment() {
                             listOf(BasicLink(url)),
                             extract = true,
                             refererUrl = referer,
-                        )
+                            id = url.hashCode()
+                        ), 0
                     )
                 )
                 dialog.dismissSafe(activity)
@@ -384,7 +381,7 @@ class DownloadFragment : Fragment() {
         ActivityResultContracts.StartActivityForResult()
     ) { result ->
         if (result.resultCode != Activity.RESULT_OK) return@registerForActivityResult
-        val selectedVideoUri = result?.data?.data ?: return@registerForActivityResult
+        val selectedVideoUri = result.data?.data ?: return@registerForActivityResult
         playUri(activity ?: return@registerForActivityResult, selectedVideoUri)
     }
 }
\ No newline at end of file
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 137f1355e25..0d35d5670f5 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
@@ -5,91 +5,119 @@ import android.content.DialogInterface
 import android.os.Environment
 import android.os.StatFs
 import androidx.appcompat.app.AlertDialog
+import androidx.core.content.edit
 import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.lagradost.api.Log
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.isEpisodeBased
+import com.lagradost.cloudstream3.mvvm.Resource
 import com.lagradost.cloudstream3.mvvm.launchSafe
 import com.lagradost.cloudstream3.mvvm.logError
+import com.lagradost.cloudstream3.services.DownloadQueueService
+import com.lagradost.cloudstream3.services.DownloadQueueService.Companion.downloadInstances
 import com.lagradost.cloudstream3.utils.AppContextUtils.getNameFull
 import com.lagradost.cloudstream3.utils.AppContextUtils.setDefaultFocus
+import com.lagradost.cloudstream3.utils.ConsistentLiveData
+import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
+import com.lagradost.cloudstream3.utils.Coroutines.ioWork
 import com.lagradost.cloudstream3.utils.DOWNLOAD_EPISODE_CACHE
+import com.lagradost.cloudstream3.utils.DOWNLOAD_EPISODE_CACHE_BACKUP
 import com.lagradost.cloudstream3.utils.DOWNLOAD_HEADER_CACHE
+import com.lagradost.cloudstream3.utils.DOWNLOAD_HEADER_CACHE_BACKUP
 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 com.lagradost.cloudstream3.utils.DataStore.getSharedPrefs
+import com.lagradost.cloudstream3.utils.DataStoreHelper.getAllResumeStateIds
+import com.lagradost.cloudstream3.utils.DataStoreHelper.getLastWatched
+import com.lagradost.cloudstream3.utils.ResourceLiveData
+import com.lagradost.cloudstream3.utils.downloader.DownloadObjects
+import com.lagradost.cloudstream3.utils.downloader.DownloadQueueManager
+import com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager.deleteFilesAndUpdateSettings
+import com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager.getDownloadFileInfo
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 
 class DownloadViewModel : ViewModel() {
+    companion object {
+        const val TAG = "DownloadViewModel"
+    }
 
-    private val _headerCards = MutableLiveData<List<VisualDownloadCached.Header>>()
-    val headerCards: LiveData<List<VisualDownloadCached.Header>> = _headerCards
+    private val _headerCards =
+        ResourceLiveData<List<VisualDownloadCached.Header>>(Resource.Loading())
+    val headerCards: LiveData<Resource<List<VisualDownloadCached.Header>>> = _headerCards
 
-    private val _childCards = MutableLiveData<List<VisualDownloadCached.Child>>()
-    val childCards: LiveData<List<VisualDownloadCached.Child>> = _childCards
+    private val _childCards = ResourceLiveData<List<VisualDownloadCached.Child>>(Resource.Loading())
+    val childCards: LiveData<Resource<List<VisualDownloadCached.Child>>> = _childCards
 
-    private val _usedBytes = MutableLiveData<Long>()
+    private val _usedBytes = ConsistentLiveData<Long>()
     val usedBytes: LiveData<Long> = _usedBytes
 
-    private val _availableBytes = MutableLiveData<Long>()
+    private val _availableBytes = ConsistentLiveData<Long>()
     val availableBytes: LiveData<Long> = _availableBytes
 
-    private val _downloadBytes = MutableLiveData<Long>()
+    private val _downloadBytes = ConsistentLiveData<Long>()
     val downloadBytes: LiveData<Long> = _downloadBytes
 
-    private val _selectedBytes = MutableLiveData<Long>(0)
+    private val _selectedBytes = ConsistentLiveData<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 val _selectedItemIds = ConsistentLiveData<Set<Int>?>(null)
+    val selectedItemIds: LiveData<Set<Int>?> = _selectedItemIds
 
-    private var previousVisual: List<VisualDownloadCached>? = null
 
-    fun setIsMultiDeleteState(value: Boolean) {
-        _isMultiDeleteState.postValue(value)
+    fun cancelSelection() {
+        updateSelectedItems { null }
     }
 
     fun addSelected(itemId: Int) {
-        updateSelectedItems { it.add(itemId) }
+        updateSelectedItems { it?.plus(itemId) ?: setOf(itemId) }
     }
 
     fun removeSelected(itemId: Int) {
-        updateSelectedItems { it.remove(itemId) }
+        updateSelectedItems { it?.minus(itemId) ?: emptySet() }
     }
 
-    fun selectAllItems() {
-        val items = headerCards.value.orEmpty() + childCards.value.orEmpty()
-        updateSelectedItems { it.addAll(items.map { item -> item.data.id }) }
+    fun selectAllHeaders() {
+        updateSelectedItems {
+            _headerCards.success.orEmpty()
+                .map { item -> item.data.id }.toSet()
+        }
+    }
+
+    fun selectAllChildren() {
+        updateSelectedItems {
+            _childCards.success.orEmpty()
+                .map { item -> item.data.id }.toSet()
+        }
     }
 
     fun clearSelectedItems() {
         // We need this to be done immediately
         // so we can't use postValue
-        _selectedItemIds.value = mutableSetOf()
-        updateSelectedItems { it.clear() }
+        updateSelectedItems { emptySet() }
+    }
+
+    fun isAllChildrenSelected(): Boolean {
+        val currentSelected = selectedItemIds.value ?: return false
+        val children = _childCards.success.orEmpty()
+        return currentSelected.size == children.size && children.all { it.data.id in currentSelected }
     }
 
-    fun isAllSelected(): Boolean {
+    fun isAllHeadersSelected(): 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 }
+        val headers = _headerCards.success.orEmpty()
+        return currentSelected.size == headers.size && headers.all { it.data.id in currentSelected }
     }
 
-    private fun updateSelectedItems(action: (MutableSet<Int>) -> Unit) {
-        val currentSelected = selectedItemIds.value ?: mutableSetOf()
-        action(currentSelected)
+    private fun updateSelectedItems(action: (Set<Int>?) -> Set<Int>?) {
+        val currentSelected = action(selectedItemIds.value)
         _selectedItemIds.postValue(currentSelected)
+        postHeaders()
+        postChildren()
         updateSelectedBytes()
-        updateSelectedCards()
     }
 
     private fun updateSelectedBytes() = viewModelScope.launchSafe {
@@ -98,61 +126,173 @@ class DownloadViewModel : ViewModel() {
         _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
+    fun removeRedundantEpisodeKeys(context: Context, keys: List<Pair<Int, Int>>) {
+        val settingsManager = context.getSharedPrefs()
+        ioSafe {
+            settingsManager.edit {
+                keys.forEach { (parentId, childId) ->
+                    Log.i(TAG, "Removing download episode key: ${parentId}/${childId}")
+                    val oldPath = getFolderName(
+                        getFolderName(
+                            DOWNLOAD_EPISODE_CACHE,
+                            parentId.toString()
+                        ),
+                        childId.toString()
+                    )
+                    val newPath = getFolderName(
+                        getFolderName(
+                            DOWNLOAD_EPISODE_CACHE_BACKUP,
+                            parentId.toString()
+                        ),
+                        childId.toString()
+                    )
+
+                    val oldPref = settingsManager.getString(oldPath, null)
+                    // Cowardly future backup solution in case the key removal fails in some edge case.
+                    // This and all backup keys may be removed in a future update if the key removal is proven to be robust.
+                    this.putString(newPath, oldPref)
+                    this.remove(oldPath)
+                }
             }
-            _headerCards.postValue(headers)
         }
+    }
 
-        childCards.value?.let { children ->
-            children.forEach { child ->
-                child.isSelected = child.data.id in currentSelected
+    fun removeRedundantHeaderKeys(
+        context: Context,
+        cached: List<DownloadObjects.DownloadHeaderCached>,
+        totalBytesUsedByChild: Map<Int, Long>,
+        totalDownloads: Map<Int, Int>
+    ) {
+        val settingsManager = context.getSharedPrefs()
+        ioSafe {
+           // Do not remove headers used by resume watching
+            val resumeWatchingIds =
+                getAllResumeStateIds()?.mapNotNull { id ->
+                    getLastWatched(id)?.parentId
+                }?.toSet() ?: emptySet()
+
+            settingsManager.edit {
+                cached.forEach { header ->
+                    val downloads = totalDownloads[header.id] ?: 0
+                    val bytes = totalBytesUsedByChild[header.id] ?: 0
+
+                    if ( (downloads <= 0 || bytes <= 0) && !resumeWatchingIds.contains(header.id) ) {
+                        Log.i(TAG, "Removing download header key: ${header.id}")
+                        val oldPAth = getFolderName(DOWNLOAD_HEADER_CACHE, header.id.toString())
+                        val newPath =
+                            getFolderName(DOWNLOAD_HEADER_CACHE_BACKUP, header.id.toString())
+                        val oldPref = settingsManager.getString(oldPAth, null)
+                        // Cowardly future backup solution in case the key removal fails in some edge case.
+                        // This and all backup keys may be removed in a future update if the key removal is proven to be robust.
+                        this.putString(newPath, oldPref)
+                        this.remove(oldPAth)
+                    }
+                }
             }
-            _childCards.postValue(children)
         }
     }
 
     fun updateHeaderList(context: Context) = viewModelScope.launchSafe {
-        val visual = withContext(Dispatchers.IO) {
+        // Do not push loading as it interrupts the UI
+        //_headerCards.postValue(Resource.Loading())
+
+        val visual = ioWork {
             val children = context.getKeys(DOWNLOAD_EPISODE_CACHE)
-                .mapNotNull { context.getKey<VideoDownloadHelper.DownloadEpisodeCached>(it) }
+                .mapNotNull { context.getKey<DownloadObjects.DownloadEpisodeCached>(it) }
                 .distinctBy { it.id } // Remove duplicates
 
-            val (totalBytesUsedByChild, currentBytesUsedByChild, totalDownloads) =
+            val isCurrentlyDownloading =
+                DownloadQueueService.isRunning || downloadInstances.value.isNotEmpty() || DownloadQueueManager.queue.value.isNotEmpty()
+
+            val downloadStats =
                 calculateDownloadStats(context, children)
 
             val cached = context.getKeys(DOWNLOAD_HEADER_CACHE)
-                .mapNotNull { context.getKey<VideoDownloadHelper.DownloadHeaderCached>(it) }
+                .mapNotNull { context.getKey<DownloadObjects.DownloadHeaderCached>(it) }
+
+            // Download stats and header keys may change when downloading.
+            // To prevent the downloader and key removal from colliding, simply do not prune keys when downloading.
+            if (!isCurrentlyDownloading) {
+                removeRedundantHeaderKeys(
+                    context,
+                    cached,
+                    downloadStats.totalBytesUsedByChild,
+                    downloadStats.totalDownloads
+                )
+            }
+            // calculateDownloadStats already performed checks when creating redundantDownloads, no extra check required
+            removeRedundantEpisodeKeys(context, downloadStats.redundantDownloads)
 
             createVisualDownloadList(
-                context, cached, totalBytesUsedByChild, currentBytesUsedByChild, totalDownloads
+                context,
+                cached,
+                downloadStats.totalBytesUsedByChild,
+                downloadStats.currentBytesUsedByChild,
+                downloadStats.totalDownloads
             )
         }
 
-        if (visual != previousVisual) {
-            previousVisual = visual
-            updateStorageStats(visual)
-            _headerCards.postValue(visual)
-        }
+        updateStorageStats(visual)
+        postHeaders(visual)
     }
 
+    fun postHeaders(newValue: List<VisualDownloadCached.Header>? = null) {
+        val newValue = newValue ?: _headerCards.success ?: return
+        val selection = selectedItemIds.value ?: emptySet()
+        _headerCards.postValue(Resource.Success(newValue.map {
+            it.copy(
+                isSelected = selection.contains(
+                    it.data.id
+                )
+            )
+        }))
+    }
+
+    fun postChildren(newValue: List<VisualDownloadCached.Child>? = null) {
+        val newValue = newValue ?: _childCards.success ?: return
+        val selection = selectedItemIds.value ?: emptySet()
+        _childCards.postValue(Resource.Success(newValue.map {
+            it.copy(
+                isSelected = selection.contains(
+                    it.data.id
+                )
+            )
+        }))
+    }
+
+    private data class DownloadStats(
+        val totalBytesUsedByChild: Map<Int, Long>,
+        val currentBytesUsedByChild: Map<Int, Long>,
+        val totalDownloads: Map<Int, Int>,
+        /** Parent ID to child ID. Keys to be removed. */
+        val redundantDownloads: List<Pair<Int, Int>>
+    )
+
     private fun calculateDownloadStats(
         context: Context,
-        children: List<VideoDownloadHelper.DownloadEpisodeCached>
-    ): Triple<Map<Int, Long>, Map<Int, Long>, Map<Int, Int>> {
+        children: List<DownloadObjects.DownloadEpisodeCached>
+    ): DownloadStats {
         // parentId : bytes
         val totalBytesUsedByChild = mutableMapOf<Int, Long>()
         // parentId : bytes
         val currentBytesUsedByChild = mutableMapOf<Int, Long>()
         // parentId : downloadsCount
         val totalDownloads = mutableMapOf<Int, Int>()
+        val redundantDownloads = mutableListOf<Pair<Int, Int>>()
 
         children.forEach { child ->
-            val childFile = getDownloadFileInfoAndUpdateSettings(context, child.id) ?: return@forEach
+            val childFile = getDownloadFileInfo(context, child.id)
+
+            if (childFile == null) {
+                // It may not be a redundant child if something is currently downloading.
+                // DOWNLOAD_EPISODE_CACHE gets created before KEY_DOWNLOAD_INFO in the downloader
+                // leading to valid situations where getDownloadFileInfo is null, but we do not want to remove DOWNLOAD_EPISODE_CACHE
+                if (!DownloadQueueService.isRunning && downloadInstances.value.isEmpty() && DownloadQueueManager.queue.value.isEmpty()) {
+                    redundantDownloads.add(child.parentId to child.id)
+                }
+                return@forEach
+            }
             if (childFile.fileLength <= 1) return@forEach
 
             val len = childFile.totalBytes
@@ -162,12 +302,17 @@ class DownloadViewModel : ViewModel() {
             currentBytesUsedByChild.merge(child.parentId, flen, Long::plus)
             totalDownloads.merge(child.parentId, 1, Int::plus)
         }
-        return Triple(totalBytesUsedByChild, currentBytesUsedByChild, totalDownloads)
+        return DownloadStats(
+            totalBytesUsedByChild,
+            currentBytesUsedByChild,
+            totalDownloads,
+            redundantDownloads
+        )
     }
 
     private fun createVisualDownloadList(
         context: Context,
-        cached: List<VideoDownloadHelper.DownloadHeaderCached>,
+        cached: List<DownloadObjects.DownloadHeaderCached>,
         totalBytesUsedByChild: Map<Int, Long>,
         currentBytesUsedByChild: Map<Int, Long>,
         totalDownloads: Map<Int, Int>
@@ -176,13 +321,17 @@ class DownloadViewModel : ViewModel() {
             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
+
+            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 movieEpisode =
+                if (it.type.isEpisodeBased()) null else context.getKey<DownloadObjects.DownloadEpisodeCached>(
+                    DOWNLOAD_EPISODE_CACHE,
+                    getFolderName(it.id.toString(), it.id.toString())
+                )
 
             VisualDownloadCached.Header(
                 currentBytes = currentBytes,
@@ -208,12 +357,14 @@ class DownloadViewModel : ViewModel() {
     }
 
     fun updateChildList(context: Context, folder: String) = viewModelScope.launchSafe {
+        _childCards.postValue(Resource.Loading()) // always push loading
+
         val visual = withContext(Dispatchers.IO) {
             context.getKeys(folder).mapNotNull { key ->
-                context.getKey<VideoDownloadHelper.DownloadEpisodeCached>(key)
+                context.getKey<DownloadObjects.DownloadEpisodeCached>(key)
             }.mapNotNull {
                 val isSelected = selectedItemIds.value?.contains(it.id) ?: false
-                val info = getDownloadFileInfoAndUpdateSettings(context, it.id) ?: return@mapNotNull null
+                val info = getDownloadFileInfo(context, it.id) ?: return@mapNotNull null
                 VisualDownloadCached.Child(
                     currentBytes = info.fileLength,
                     totalBytes = info.totalBytes,
@@ -221,24 +372,21 @@ class DownloadViewModel : ViewModel() {
                     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)
-        }
+        }.sortedWith(
+            compareBy(
+                // Sort by season first, and then by episode number,
+                // to ensure sorting is consistent.
+                { it.data.season ?: 0 },
+                { it.data.episode }
+            ))
+
+        postChildren(visual)
     }
 
     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)
+        _selectedItemIds.postValue(null)
+        postHeaders(_headerCards.success?.filter { it.data.id !in idsToRemove })
+        postChildren(_childCards.success?.filter { it.data.id !in idsToRemove })
     }
 
     private fun updateStorageStats(visual: List<VisualDownloadCached.Header>) {
@@ -292,7 +440,7 @@ class DownloadViewModel : ViewModel() {
                     if (item.data.type.isEpisodeBased()) {
                         val episodes = context.getKeys(DOWNLOAD_EPISODE_CACHE)
                             .mapNotNull {
-                                context.getKey<VideoDownloadHelper.DownloadEpisodeCached>(
+                                context.getKey<DownloadObjects.DownloadEpisodeCached>(
                                     it
                                 )
                             }
@@ -316,7 +464,7 @@ class DownloadViewModel : ViewModel() {
 
                 is VisualDownloadCached.Child -> {
                     ids.add(item.data.id)
-                    val parent = context.getKey<VideoDownloadHelper.DownloadHeaderCached>(
+                    val parent = context.getKey<DownloadObjects.DownloadHeaderCached>(
                         DOWNLOAD_HEADER_CACHE,
                         item.data.parentId.toString()
                     )
@@ -345,16 +493,16 @@ class DownloadViewModel : ViewModel() {
             .joinToString(separator = "\n") { "• $it" }
 
         return when {
+            data.seriesNames.isNotEmpty() && data.names.isEmpty() -> {
+                context.getString(R.string.delete_message_series_only).format(formattedSeriesNames)
+            }
+
             data.ids.count() == 1 -> {
                 context.getString(R.string.delete_message).format(
                     data.names.firstOrNull()
                 )
             }
 
-            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)
@@ -383,7 +531,6 @@ class DownloadViewModel : ViewModel() {
                 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
@@ -414,8 +561,8 @@ class DownloadViewModel : ViewModel() {
     }
 
     private fun getSelectedItemsData(): List<VisualDownloadCached>? {
-        val headers = headerCards.value.orEmpty()
-        val children = childCards.value.orEmpty()
+        val headers = _headerCards.success.orEmpty()
+        val children = _childCards.success.orEmpty()
 
         return selectedItemIds.value?.mapNotNull { id ->
             headers.find { it.data.id == id } ?: children.find { it.data.id == id }
@@ -423,10 +570,11 @@ class DownloadViewModel : ViewModel() {
     }
 
     private fun getItemDataFromId(itemId: Int): List<VisualDownloadCached> {
-        val headers = headerCards.value.orEmpty()
-        val children = childCards.value.orEmpty()
+        return (_headerCards.success.orEmpty() + _childCards.success.orEmpty()).filter { it.data.id == itemId }
+    }
 
-        return (headers + children).filter { it.data.id == itemId }
+    fun clearChildren() {
+        _childCards.postValue(Resource.Loading())
     }
 
     private data class DeleteData(
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 908e3a80abc..382a770cd28 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
@@ -11,7 +11,7 @@ import androidx.core.widget.ContentLoadingProgressBar
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import com.lagradost.cloudstream3.utils.Coroutines.mainWork
-import com.lagradost.cloudstream3.utils.VideoDownloadManager
+import com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager
 
 typealias DownloadStatusTell = VideoDownloadManager.DownloadType
 
@@ -62,6 +62,7 @@ abstract class BaseFetchButton(context: Context, attributeSet: AttributeSet) :
 
     open fun resetViewData() {
         // lastRequest = null
+        progressText = null
         isZeroBytes = true
         doSetProgress = true
         persistentId = null
@@ -75,10 +76,10 @@ abstract class BaseFetchButton(context: Context, attributeSet: AttributeSet) :
         currentMetaData.id = id
 
         if (!doSetProgress) return
+        val appContext = context.applicationContext
 
         ioSafe {
-            val savedData = VideoDownloadManager.getDownloadFileInfoAndUpdateSettings(context, id)
-
+            val savedData = VideoDownloadManager.getDownloadFileInfo(appContext, id)
             mainWork {
                 if (savedData != null) {
                     val downloadedBytes = savedData.fileLength
@@ -86,7 +87,7 @@ abstract class BaseFetchButton(context: Context, attributeSet: AttributeSet) :
 
                     setProgress(downloadedBytes, totalBytes)
                     applyMetaData(id, downloadedBytes, totalBytes)
-                } else run { resetView() }
+                }
             }
         }
     }
@@ -215,4 +216,4 @@ abstract class BaseFetchButton(context: Context, attributeSet: AttributeSet) :
      * Get a clean slate again, might be useful in recyclerview?
      * */
     abstract fun resetView()
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/download/button/DownloadButton.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/download/button/DownloadButton.kt
index 20a4446114b..91c5dd72ce3 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
@@ -8,7 +8,7 @@ import androidx.core.view.isVisible
 import com.google.android.material.button.MaterialButton
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.ui.download.DownloadClickEvent
-import com.lagradost.cloudstream3.utils.VideoDownloadHelper
+import com.lagradost.cloudstream3.utils.downloader.DownloadObjects
 
 class DownloadButton(context: Context, attributeSet: AttributeSet) :
     PieFetchButton(context, attributeSet) {
@@ -18,6 +18,7 @@ class DownloadButton(context: Context, attributeSet: AttributeSet) :
         super.onAttachedToWindow()
         progressText = findViewById(R.id.result_movie_download_text_precentage)
         mainText = findViewById(R.id.result_movie_download_text)
+        setStatus(null)
     }
 
     override fun setStatus(status: DownloadStatusTell?) {
@@ -35,7 +36,7 @@ class DownloadButton(context: Context, attributeSet: AttributeSet) :
     }
 
     override fun setDefaultClickListener(
-        card: VideoDownloadHelper.DownloadEpisodeCached,
+        card: DownloadObjects.DownloadEpisodeCached,
         textView: TextView?,
         callback: (DownloadClickEvent) -> Unit
     ) {
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 29c2daa2cf4..f6f8a5ff846 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
@@ -10,11 +10,14 @@ import android.widget.ImageView
 import android.widget.TextView
 import androidx.annotation.MainThread
 import androidx.core.content.ContextCompat
+import androidx.core.content.withStyledAttributes
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
-import com.lagradost.cloudstream3.AcraApplication.Companion.removeKey
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.removeKey
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.mvvm.logError
+import com.lagradost.cloudstream3.services.DownloadQueueService.Companion.downloadInstances
+import com.lagradost.cloudstream3.ui.download.DOWNLOAD_ACTION_CANCEL_PENDING
 import com.lagradost.cloudstream3.ui.download.DOWNLOAD_ACTION_DELETE_FILE
 import com.lagradost.cloudstream3.ui.download.DOWNLOAD_ACTION_DOWNLOAD
 import com.lagradost.cloudstream3.ui.download.DOWNLOAD_ACTION_LONG_CLICK
@@ -23,9 +26,10 @@ import com.lagradost.cloudstream3.ui.download.DOWNLOAD_ACTION_PLAY_FILE
 import com.lagradost.cloudstream3.ui.download.DOWNLOAD_ACTION_RESUME_DOWNLOAD
 import com.lagradost.cloudstream3.ui.download.DownloadClickEvent
 import com.lagradost.cloudstream3.utils.UIHelper.popupMenuNoIcons
-import com.lagradost.cloudstream3.utils.VideoDownloadHelper
-import com.lagradost.cloudstream3.utils.VideoDownloadManager
-import com.lagradost.cloudstream3.utils.VideoDownloadManager.KEY_RESUME_PACKAGES
+import com.lagradost.cloudstream3.utils.downloader.DownloadObjects
+import com.lagradost.cloudstream3.utils.downloader.DownloadQueueManager.queue
+import com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager
+import com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager.KEY_RESUME_PACKAGES
 
 open class PieFetchButton(context: Context, attributeSet: AttributeSet) :
     BaseFetchButton(context, attributeSet) {
@@ -63,7 +67,7 @@ open class PieFetchButton(context: Context, attributeSet: AttributeSet) :
     open fun onInflate() {}
 
     init {
-        context.obtainStyledAttributes(attributeSet, R.styleable.PieFetchButton, 0, 0).apply {
+        context.withStyledAttributes(attributeSet, R.styleable.PieFetchButton, 0, 0) {
             try {
                 inflate(
                     overrideLayout ?: getResourceId(
@@ -72,6 +76,7 @@ open class PieFetchButton(context: Context, attributeSet: AttributeSet) :
                     )
                 )
             } catch (e: Exception) {
+                recycle() // Manually call recycle first to avoid memory leaks
                 Log.e(
                     "PieFetchButton", "Error inflating PieFetchButton, " +
                             "check that you have declared the required aria2c attrs: aria2c_icon_scale aria2c_icon_color aria2c_outline_color aria2c_fill_color"
@@ -79,11 +84,6 @@ open class PieFetchButton(context: Context, attributeSet: AttributeSet) :
                 throw e
             }
 
-
-            progressBar = findViewById(R.id.progress_downloaded)
-            progressBarBackground = findViewById(R.id.progress_downloaded_background)
-            statusView = findViewById(R.id.image_download_status)
-
             animateWaiting = getBoolean(
                 R.styleable.PieFetchButton_download_animate_waiting,
                 true
@@ -92,16 +92,13 @@ open class PieFetchButton(context: Context, attributeSet: AttributeSet) :
                 R.styleable.PieFetchButton_download_hide_when_icon,
                 true
             )
-
             waitingAnimation = getResourceId(
                 R.styleable.PieFetchButton_download_waiting_animation,
                 R.anim.rotate_around_center_point
             )
-
             activeOutline = getResourceId(
                 R.styleable.PieFetchButton_download_outline_active, R.drawable.circle_shape
             )
-
             nonActiveOutline = getResourceId(
                 R.styleable.PieFetchButton_download_outline_non_active,
                 R.drawable.circle_shape_dotted
@@ -129,19 +126,29 @@ open class PieFetchButton(context: Context, attributeSet: AttributeSet) :
             )
 
             val fillIndex = getInt(R.styleable.PieFetchButton_download_fill, 0)
-
             progressDrawable = getResourceId(
                 R.styleable.PieFetchButton_download_fill_override, fillArray[fillIndex]
             )
-
-            progressBar.progressDrawable = ContextCompat.getDrawable(context, progressDrawable)
-
-            recycle()
         }
-        resetView()
+        
+        progressBar = findViewById(R.id.progress_downloaded)
+        progressBarBackground = findViewById(R.id.progress_downloaded_background)
+        statusView = findViewById(R.id.image_download_status)
+        
+        progressBar.progressDrawable = ContextCompat.getDrawable(context, progressDrawable)
+
+        // resetView()
         onInflate()
     }
 
+
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+        // Re-run all animations when the view gets visible.
+        // Otherwise views may run without animations after recycled
+        setStatusInternal(currentStatus)
+    }
+
     private var currentStatus: DownloadStatusTell? = null
     /*private fun getActivity(): Activity? {
         var context = context
@@ -162,16 +169,31 @@ open class PieFetchButton(context: Context, attributeSet: AttributeSet) :
     }*/
 
     protected fun setDefaultClickListener(
-        view: View, textView: TextView?, card: VideoDownloadHelper.DownloadEpisodeCached,
+        view: View, textView: TextView?, card: DownloadObjects.DownloadEpisodeCached,
         callback: (DownloadClickEvent) -> Unit
     ) {
         this.progressText = textView
         this.setPersistentId(card.id)
         view.setOnClickListener {
             if (isZeroBytes) {
-                removeKey(KEY_RESUME_PACKAGES, card.id.toString())
-                callback(DownloadClickEvent(DOWNLOAD_ACTION_DOWNLOAD, card))
-                // callback.invoke(DownloadClickEvent(DOWNLOAD_ACTION_DOWNLOAD, data))
+                val localQueue = queue.value
+                val localInstances = downloadInstances.value
+                val id = card.id
+
+                // If the download is already in queue or active downloads, provide an option to cancel it
+                if (localQueue.any { q -> q.id == id } || localInstances.any { i -> i.downloadQueueWrapper.id == id }) {
+                    it.popupMenuNoIcons(
+                        arrayListOf(
+                            Pair(DOWNLOAD_ACTION_CANCEL_PENDING, R.string.cancel),
+                        )
+                    ) {
+                        callback(DownloadClickEvent(itemId, card))
+                    }
+                } else {
+                    // Otherwise just start a download instantly
+                    removeKey(KEY_RESUME_PACKAGES, card.id.toString())
+                    callback(DownloadClickEvent(DOWNLOAD_ACTION_DOWNLOAD, card))
+                }
             } else {
                 val list = arrayListOf(
                     Pair(DOWNLOAD_ACTION_PLAY_FILE, R.string.popup_play_file),
@@ -212,7 +234,7 @@ open class PieFetchButton(context: Context, attributeSet: AttributeSet) :
     }
 
     open fun setDefaultClickListener(
-        card: VideoDownloadHelper.DownloadEpisodeCached,
+        card: DownloadObjects.DownloadEpisodeCached,
         textView: TextView?,
         callback: (DownloadClickEvent) -> Unit
     ) {
@@ -282,8 +304,8 @@ open class PieFetchButton(context: Context, attributeSet: AttributeSet) :
     override fun setStatus(status: DownloadStatusTell?) {
         currentStatus = status
 
-        // Runs on the main thread, but also instant if it already is
-        if (Looper.myLooper() == Looper.getMainLooper()) {
+        // Runs on the main thread, but also instant if it already is.
+        if (Looper.getMainLooper().isCurrentThread) {
             try {
                 setStatusInternal(status)
             } catch (t: Throwable) {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/download/queue/DownloadQueueAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/download/queue/DownloadQueueAdapter.kt
new file mode 100644
index 00000000000..877fcfea857
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/download/queue/DownloadQueueAdapter.kt
@@ -0,0 +1,274 @@
+package com.lagradost.cloudstream3.ui.download.queue
+
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.core.view.isGone
+import androidx.fragment.app.Fragment
+import androidx.recyclerview.widget.ItemTouchHelper
+import androidx.recyclerview.widget.RecyclerView
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.getKey
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.databinding.DownloadQueueItemBinding
+import com.lagradost.cloudstream3.ui.BaseAdapter
+import com.lagradost.cloudstream3.ui.BaseDiffCallback
+import com.lagradost.cloudstream3.ui.ViewHolderState
+import com.lagradost.cloudstream3.ui.download.DOWNLOAD_ACTION_CANCEL_PENDING
+import com.lagradost.cloudstream3.ui.download.DOWNLOAD_ACTION_DELETE_FILE
+import com.lagradost.cloudstream3.ui.download.DOWNLOAD_ACTION_PAUSE_DOWNLOAD
+import com.lagradost.cloudstream3.ui.download.DOWNLOAD_ACTION_RESUME_DOWNLOAD
+import com.lagradost.cloudstream3.ui.download.DownloadButtonSetup.handleDownloadClick
+import com.lagradost.cloudstream3.ui.download.DownloadClickEvent
+import com.lagradost.cloudstream3.ui.download.queue.DownloadQueueAdapter.Companion.DOWNLOAD_SEPARATOR_TAG
+import com.lagradost.cloudstream3.utils.AppContextUtils.getNameFull
+import com.lagradost.cloudstream3.utils.DOWNLOAD_EPISODE_CACHE
+import com.lagradost.cloudstream3.utils.DataStore.getFolderName
+import com.lagradost.cloudstream3.utils.DataStore.getKey
+import com.lagradost.cloudstream3.utils.UIHelper.popupMenuNoIcons
+import com.lagradost.cloudstream3.utils.downloader.DownloadObjects
+import com.lagradost.cloudstream3.utils.downloader.DownloadObjects.DownloadQueueWrapper
+import com.lagradost.cloudstream3.utils.downloader.DownloadQueueManager
+import com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager
+import com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager.KEY_DOWNLOAD_INFO
+
+/** An item in the adapter can either be a separator or a real item.
+ * isCurrentlyDownloading is used to fully update items as opposed to just moving them. */
+class DownloadAdapterItem(val item: DownloadQueueWrapper?) {
+    val isSeparator = item == null
+}
+
+
+class DownloadQueueAdapter(val fragment: Fragment) : BaseAdapter<DownloadAdapterItem, Unit>(
+    diffCallback = BaseDiffCallback(
+        itemSame = { a, b -> a.item?.id == b.item?.id },
+        contentSame = { a, b ->
+            a.item == b.item
+        })
+) {
+    var currentDownloads = 0
+
+    companion object {
+        val DOWNLOAD_SEPARATOR_TAG = "DOWNLOAD_SEPARATOR_TAG"
+    }
+
+    override fun onCreateContent(parent: ViewGroup): ViewHolderState<Unit> {
+        val inflater = LayoutInflater.from(parent.context)
+        val binding = DownloadQueueItemBinding.inflate(inflater, parent, false)
+        return ViewHolderState(binding)
+    }
+
+    override fun onBindContent(
+        holder: ViewHolderState<Unit>,
+        item: DownloadAdapterItem,
+        position: Int
+    ) {
+        when (val binding = holder.view) {
+            is DownloadQueueItemBinding -> {
+                if (item.item == null) {
+                    holder.itemView.tag = DOWNLOAD_SEPARATOR_TAG
+                    bindSeparator(binding)
+                } else {
+                    holder.itemView.tag = null
+                    bind(binding, item.item)
+                }
+            }
+        }
+    }
+
+    fun submitQueue(newQueue: DownloadAdapterQueue) {
+        val index = newQueue.currentDownloads.size
+        val current = newQueue.currentDownloads
+        val queue = newQueue.queue
+        currentDownloads = current.size
+
+        val newList =
+            (current + queue).distinctBy { it.id }.map { DownloadAdapterItem(it) }.toMutableList()
+                .apply {
+                    // Only add the separator if it actually separates something
+                    if (index < this.size) {
+                        add(index, DownloadAdapterItem(null))
+                    }
+                }
+        submitList(newList)
+    }
+
+    fun bindSeparator(binding: DownloadQueueItemBinding) {
+        binding.apply {
+            separatorHolder.isGone = false
+            downloadChildEpisodeHolder.isGone = true
+        }
+    }
+
+    fun bind(
+        binding: DownloadQueueItemBinding,
+        queueWrapper: DownloadQueueWrapper,
+    ) {
+        val context = binding.root.context
+
+        binding.apply {
+            separatorHolder.isGone = true
+            downloadChildEpisodeHolder.isGone = false
+
+            // Only set the child-text if child and parent are not the same
+            // This prevents setting movie titles twice
+            if (queueWrapper.id != queueWrapper.parentId) {
+                val mainName = queueWrapper.downloadItem?.resultName ?: queueWrapper.resumePackage?.item?.ep?.mainName
+                downloadChildEpisodeTextExtra.text = mainName
+            } else {
+                downloadChildEpisodeTextExtra.text = null
+            }
+
+            downloadChildEpisodeTextExtra.isGone = downloadChildEpisodeTextExtra.text.isNullOrBlank()
+
+            val status = VideoDownloadManager.downloadStatus[queueWrapper.id]
+
+            downloadButton.setOnClickListener { view ->
+                val episodeCached =
+                    getKey<DownloadObjects.DownloadEpisodeCached>(
+                        DOWNLOAD_EPISODE_CACHE,
+                        getFolderName(queueWrapper.parentId.toString(), queueWrapper.id.toString())
+                    )
+
+                val downloadInfo = context.getKey<DownloadObjects.DownloadedFileInfo>(
+                    KEY_DOWNLOAD_INFO,
+                    queueWrapper.id.toString()
+                )
+
+                val isCurrentlyDownloading = queueWrapper.isCurrentlyDownloading()
+
+                val actionList = arrayListOf<Pair<Int,Int>>()
+
+                if (isCurrentlyDownloading && episodeCached != null) {
+                    // KEY_DOWNLOAD_INFO is used in the file deletion, and is required to exist to delete anything
+                    if (downloadInfo != null) {
+                        actionList.add(Pair(DOWNLOAD_ACTION_DELETE_FILE, R.string.popup_delete_file))
+                    } else {
+                        actionList.add(Pair(DOWNLOAD_ACTION_CANCEL_PENDING, R.string.cancel))
+                    }
+
+                    val currentStatus = VideoDownloadManager.downloadStatus[queueWrapper.id]
+
+                    when (currentStatus) {
+                        VideoDownloadManager.DownloadType.IsDownloading -> {
+                            actionList.add(
+                                Pair(
+                                    DOWNLOAD_ACTION_PAUSE_DOWNLOAD,
+                                    R.string.popup_pause_download
+                                )
+                            )
+                        }
+
+                        VideoDownloadManager.DownloadType.IsPaused -> {
+                            actionList.add(
+                                Pair(
+                                    DOWNLOAD_ACTION_RESUME_DOWNLOAD,
+                                    R.string.popup_resume_download
+                                )
+                            )
+                        }
+
+                        else -> {}
+                    }
+
+                    view.popupMenuNoIcons(
+                        actionList
+                    ) {
+                        handleDownloadClick(DownloadClickEvent(itemId, episodeCached))
+                    }
+                } else {
+                    actionList.add(Pair(DOWNLOAD_ACTION_CANCEL_PENDING, R.string.cancel))
+
+                    view.popupMenuNoIcons(
+                        actionList
+                    ) {
+                        when (itemId) {
+                            DOWNLOAD_ACTION_CANCEL_PENDING -> {
+                                DownloadQueueManager.cancelDownload(queueWrapper.id)
+                            }
+                        }
+                    }
+                }
+            }
+
+            downloadButton.resetView()
+            downloadButton.setStatus(status)
+            downloadButton.setPersistentId(queueWrapper.id)
+
+            downloadChildEpisodeText.apply {
+                val name = queueWrapper.downloadItem?.episode?.name
+                    ?: queueWrapper.resumePackage?.item?.ep?.name
+                val episode =
+                    queueWrapper.downloadItem?.episode?.episode
+                        ?: queueWrapper.resumePackage?.item?.ep?.episode
+                val season =
+                    queueWrapper.downloadItem?.episode?.season
+                        ?: queueWrapper.resumePackage?.item?.ep?.season
+                text = context.getNameFull(name, episode, season)
+                isSelected = true // Needed for text repeating
+            }
+        }
+    }
+}
+
+
+class DragAndDropTouchHelper(adapter: DownloadQueueAdapter) :
+    ItemTouchHelper(
+        DragAndDropTouchHelperCallback(adapter)
+    )
+
+private class DragAndDropTouchHelperCallback(private val adapter: DownloadQueueAdapter) :
+    ItemTouchHelper.Callback() {
+    override fun getMovementFlags(
+        recyclerView: RecyclerView,
+        viewHolder: RecyclerView.ViewHolder
+    ): Int {
+        val item = adapter.getItem(viewHolder.absoluteAdapterPosition)
+        val isDownloading = item.item?.isCurrentlyDownloading() == true
+        val dragFlags = if (item.isSeparator || isDownloading) {
+            0
+        } else {
+            ItemTouchHelper.UP or ItemTouchHelper.DOWN // Allow drag up/down
+        }
+
+        val swipeFlags = 0 // Disable swipe functionality
+        return makeMovementFlags(dragFlags, swipeFlags)
+    }
+
+    override fun onMove(
+        recyclerView: RecyclerView,
+        source: RecyclerView.ViewHolder,
+        target: RecyclerView.ViewHolder
+    ): Boolean {
+        val fromPosition = source.absoluteAdapterPosition
+        val toPosition = target.absoluteAdapterPosition
+        val separatorPosition = adapter.currentDownloads
+
+        val toPositionNoSeparator =
+            if (separatorPosition < toPosition) toPosition - separatorPosition else toPosition
+
+        if (source.itemView.tag == DOWNLOAD_SEPARATOR_TAG) {
+            return false
+        } else {
+            adapter.getItem(fromPosition).item?.let { downloadQueueInfo ->
+                DownloadQueueManager.reorderItem(
+                    downloadQueueInfo,
+                    toPositionNoSeparator - 1
+                )
+            }
+        }
+
+        return true
+    }
+
+    override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) {
+
+    }
+
+    override fun isLongPressDragEnabled(): Boolean {
+        return true // Enable drag with long press
+    }
+
+    override fun isItemViewSwipeEnabled(): Boolean {
+        return false // Disable swipe by default
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/download/queue/DownloadQueueFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/download/queue/DownloadQueueFragment.kt
new file mode 100644
index 00000000000..071d8913d2a
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/download/queue/DownloadQueueFragment.kt
@@ -0,0 +1,79 @@
+package com.lagradost.cloudstream3.ui.download.queue
+
+import android.view.View
+import androidx.appcompat.app.AlertDialog
+import androidx.core.view.isGone
+import androidx.fragment.app.activityViewModels
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.databinding.FragmentDownloadQueueBinding
+import com.lagradost.cloudstream3.mvvm.observe
+import com.lagradost.cloudstream3.ui.BaseFragment
+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.isLandscape
+import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
+import com.lagradost.cloudstream3.utils.UIHelper.fixSystemBarsPadding
+import com.lagradost.cloudstream3.utils.UIHelper.setAppBarNoScrollFlagsOnTV
+import com.lagradost.cloudstream3.utils.downloader.DownloadQueueManager
+import com.lagradost.cloudstream3.utils.txt
+
+
+class DownloadQueueFragment :
+    BaseFragment<FragmentDownloadQueueBinding>(BindingCreator.Inflate(FragmentDownloadQueueBinding::inflate)) {
+    private val queueViewModel: DownloadQueueViewModel by activityViewModels()
+
+    override fun onBindingCreated(binding: FragmentDownloadQueueBinding) {
+        val adapter = DownloadQueueAdapter(this@DownloadQueueFragment)
+        val clearQueueItem = binding.downloadQueueToolbar.menu?.findItem(R.id.cancel_all)
+
+        observe(queueViewModel.childCards) { cards ->
+            val size = cards.queue.size + cards.currentDownloads.size
+            val isEmptyQueue = size == 0
+            binding.downloadQueueList.isGone = isEmptyQueue
+            binding.textNoQueue.isGone = !isEmptyQueue
+            clearQueueItem?.isVisible = !isEmptyQueue
+
+            adapter.submitQueue(cards)
+        }
+
+        binding.apply {
+            downloadQueueToolbar.apply {
+                title = txt(R.string.download_queue).asString(context)
+                if (isLayout(PHONE or EMULATOR)) {
+                    setNavigationIcon(R.drawable.ic_baseline_arrow_back_24)
+                    setNavigationOnClickListener {
+                        dispatchBackPressed()
+                    }
+                }
+                setAppBarNoScrollFlagsOnTV()
+                clearQueueItem?.setOnMenuItemClickListener {
+                        AlertDialog.Builder(context, R.style.AlertDialogCustom)
+                            .setTitle(R.string.cancel_all)
+                            .setMessage(R.string.cancel_queue_message)
+                            .setPositiveButton(R.string.yes) { _, _ ->
+                                DownloadQueueManager.removeAllFromQueue()
+                            }
+                            .setNegativeButton(R.string.no) { _, _ ->
+                            }.show()
+
+                    true
+                }
+            }
+
+            downloadQueueList.adapter = adapter
+
+            // Drag and drop
+            val helper = DragAndDropTouchHelper(adapter)
+            helper.attachToRecyclerView(downloadQueueList)
+        }
+    }
+    
+    override fun fixLayout(view: View) {
+        fixSystemBarsPadding(
+            view,
+            padBottom = isLandscape(),
+            padLeft = isLayout(TV or EMULATOR)
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/download/queue/DownloadQueueViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/download/queue/DownloadQueueViewModel.kt
new file mode 100644
index 00000000000..fc384cb4ebf
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/download/queue/DownloadQueueViewModel.kt
@@ -0,0 +1,43 @@
+package com.lagradost.cloudstream3.ui.download.queue
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.lagradost.cloudstream3.mvvm.launchSafe
+import com.lagradost.cloudstream3.services.DownloadQueueService.Companion.downloadInstances
+import com.lagradost.cloudstream3.utils.downloader.DownloadObjects
+import com.lagradost.cloudstream3.utils.downloader.DownloadQueueManager
+import com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.launch
+
+data class DownloadAdapterQueue(
+    val currentDownloads: List<DownloadObjects.DownloadQueueWrapper>,
+    val queue: List<DownloadObjects.DownloadQueueWrapper>,
+)
+
+class DownloadQueueViewModel : ViewModel() {
+    private val _childCards = MutableLiveData<DownloadAdapterQueue>()
+    val childCards: LiveData<DownloadAdapterQueue> = _childCards
+    private val totalDownloadFlow =
+        downloadInstances.combine(DownloadQueueManager.queue) { instances, queue ->
+            val current = instances.map { it.downloadQueueWrapper }
+            DownloadAdapterQueue(current, queue.toList())
+        }.combine(VideoDownloadManager.currentDownloads) { total, _ ->
+            // We want to update the flow when currentDownloads updates, but we do not care about its value
+            total
+        }
+
+    init {
+        viewModelScope.launch {
+            totalDownloadFlow.collect { queue ->
+                updateChildList(queue)
+            }
+        }
+    }
+
+    fun updateChildList(downloads: DownloadAdapterQueue) {
+        _childCards.postValue(downloads)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeChildItemAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeChildItemAdapter.kt
index ae22afdb223..43f6d19ff6a 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeChildItemAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeChildItemAdapter.kt
@@ -1,9 +1,10 @@
 package com.lagradost.cloudstream3.ui.home
 
+import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.fragment.app.Fragment
+import android.widget.FrameLayout
 import androidx.preference.PreferenceManager
 import androidx.viewbinding.ViewBinding
 import com.lagradost.cloudstream3.R
@@ -13,7 +14,9 @@ import com.lagradost.cloudstream3.databinding.HomeRemoveGridExpandedBinding
 import com.lagradost.cloudstream3.databinding.HomeResultGridBinding
 import com.lagradost.cloudstream3.databinding.HomeResultGridExpandedBinding
 import com.lagradost.cloudstream3.ui.BaseAdapter
+import com.lagradost.cloudstream3.ui.BaseDiffCallback
 import com.lagradost.cloudstream3.ui.ViewHolderState
+import com.lagradost.cloudstream3.ui.newSharedPool
 import com.lagradost.cloudstream3.ui.search.SEARCH_ACTION_LOAD
 import com.lagradost.cloudstream3.ui.search.SearchClickCallback
 import com.lagradost.cloudstream3.ui.search.SearchResultBuilder
@@ -41,13 +44,11 @@ class HomeScrollViewHolderState(view: ViewBinding) : ViewHolderState<Boolean>(vi
 }
 
 class ResumeItemAdapter(
-    fragment: Fragment,
     nextFocusUp: Int? = null,
     nextFocusDown: Int? = null,
     clickCallback: (SearchClickCallback) -> Unit,
     private val removeCallback: (View) -> Unit,
 ) : HomeChildItemAdapter(
-    fragment = fragment,
     id = "resumeAdapter".hashCode(),
     nextFocusUp = nextFocusUp,
     nextFocusDown = nextFocusDown,
@@ -67,20 +68,32 @@ class ResumeItemAdapter(
         return HomeScrollViewHolderState(binding)
     }
 
+    override fun onClearView(holder: ViewHolderState<Boolean>) {
+        // Clear the image, idk if this saves ram or not, but I guess?
+        clearImage(holder.view.root.findViewById(R.id.imageView))
+    }
+
     override fun onBindFooter(holder: ViewHolderState<Boolean>) {
         this.applyBinding(holder, false)
+        when (val binding = holder.view) {
+            is HomeRemoveGridBinding -> {
+                updateLayoutParms(binding.backgroundCard, setWidth, setHeight)
+            }
+
+            is HomeRemoveGridExpandedBinding -> {
+                updateLayoutParms(binding.backgroundCard, setWidth, setHeight)
+            }
+        }
         holder.itemView.apply {
             if (isLayout(TV)) {
                 isFocusableInTouchMode = true
                 isFocusable = true
             }
-
-            if (nextFocusUp != null) {
-                nextFocusUpId = nextFocusUp
+            nextFocusUp?.let {
+                nextFocusUpId = it
             }
-
-            if (nextFocusDown != null) {
-                nextFocusDownId = nextFocusDown
+            nextFocusDown?.let {
+                nextFocusDownId = it
             }
 
             setOnClickListener { v ->
@@ -90,16 +103,49 @@ class ResumeItemAdapter(
     }
 }
 
+/** Remember to set `updatePosterSize` to cache the poster size,
+ * otherwise the width and height is unset */
 open class HomeChildItemAdapter(
-    fragment: Fragment,
     id: Int,
-    protected val nextFocusUp: Int? = null,
-    protected val nextFocusDown: Int? = null,
-    private val clickCallback: (SearchClickCallback) -> Unit,
+    var nextFocusUp: Int? = null,
+    var nextFocusDown: Int? = null,
+    var clickCallback: (SearchClickCallback) -> Unit,
 ) :
-    BaseAdapter<SearchResponse, Boolean>(fragment, id) {
-    var isHorizontal: Boolean = false
+    BaseAdapter<SearchResponse, Boolean>(
+        id, diffCallback = BaseDiffCallback(
+            itemSame = { a, b ->
+                a.url == b.url && a.name == b.name
+            },
+            contentSame = { a, b ->
+                a == b
+            })
+    ) {
     var hasNext: Boolean = false
+    var isHorizontal: Boolean = false
+        set(value) {
+            field = value
+            updateCachedPosterSize()
+        }
+
+    private fun updateCachedPosterSize() {
+        setWidth = if (!isHorizontal) {
+            minPosterSize
+        } else {
+            maxPosterSize
+        }
+        setHeight = if (!isHorizontal) {
+            maxPosterSize
+        } else {
+            minPosterSize
+        }
+    }
+
+    init {
+        updateCachedPosterSize()
+    }
+
+    protected var setWidth = 0
+    protected var setHeight = 0
 
     override fun onCreateContent(parent: ViewGroup): ViewHolderState<Boolean> {
         val expanded = parent.context.isBottomLayout()
@@ -112,52 +158,43 @@ open class HomeChildItemAdapter(
         return HomeScrollViewHolderState(binding)
     }
 
-    protected fun applyBinding(holder: ViewHolderState<Boolean>, isFirstItem: Boolean) {
-        val context = holder.view.root.context
-        val scale = PreferenceManager.getDefaultSharedPreferences(context)
-            ?.getInt(context.getString(R.string.poster_size_key), 0) ?: 0
-        // Scale by +10% per step
-        val mul = 1.0f + scale * 0.1f
-        val min = (114.toPx.toFloat() * mul).toInt()
-        val max = (180.toPx.toFloat() * mul).toInt()
+    companion object {
+        // The vast majority of the lag comes from creating the view
+        // This simply shares the views between all HomeChildItemAdapter
+        val sharedPool =
+            newSharedPool { setMaxRecycledViews(CONTENT, 20) }
+
+        var minPosterSize: Int = 0
+        var maxPosterSize: Int = 0
+
+        fun updatePosterSize(context: Context, value: Int? = null) {
+            val scale = value ?: PreferenceManager.getDefaultSharedPreferences(context)
+                ?.getInt(context.getString(R.string.poster_size_key), 0) ?: 0
+            // Scale by +10% per step
+            val mul = 1.0f + scale * 0.1f
+            minPosterSize = (114.toPx.toFloat() * mul).toInt()
+            maxPosterSize = (180.toPx.toFloat() * mul).toInt()
+        }
+
+        fun updateLayoutParms(layout: FrameLayout, width: Int, height: Int) {
+            val params = layout.layoutParams
+            if (params.height == height && params.width == width) return
 
+            params.width = width
+            params.height = height
+
+            layout.layoutParams = params
+        }
+    }
+
+    protected fun applyBinding(holder: ViewHolderState<Boolean>, isFirstItem: Boolean) {
         when (val binding = holder.view) {
             is HomeResultGridBinding -> {
-                binding.backgroundCard.apply {
-
-                    layoutParams =
-                        layoutParams.apply {
-                            width = if (!isHorizontal) {
-                                min
-                            } else {
-                                max
-                            }
-                            height = if (!isHorizontal) {
-                                max
-                            } else {
-                                min
-                            }
-                        }
-                }
+                updateLayoutParms(binding.backgroundCard, setWidth, setHeight)
             }
 
             is HomeResultGridExpandedBinding -> {
-                binding.backgroundCard.apply {
-
-                    layoutParams =
-                        layoutParams.apply {
-                            width = if (!isHorizontal) {
-                                min
-                            } else {
-                                max
-                            }
-                            height = if (!isHorizontal) {
-                                max
-                            } else {
-                                min
-                            }
-                        }
-                }
+                updateLayoutParms(binding.backgroundCard, setWidth, setHeight)
 
                 if (isFirstItem) { // to fix tv
                     binding.backgroundCard.nextFocusLeftId = R.id.nav_rail_view
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 08c4359e138..b68ef59625c 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
@@ -5,26 +5,36 @@ import android.app.Activity
 import android.content.Context
 import android.content.DialogInterface
 import android.content.Intent
-import android.content.res.Configuration
-import android.net.Uri
 import android.os.Bundle
 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.ListView
+import android.widget.TextView
+import android.widget.Toast
+import androidx.activity.ComponentActivity
 import androidx.appcompat.app.AlertDialog
+import androidx.core.net.toUri
 import androidx.core.view.isGone
+import androidx.core.view.isInvisible
 import androidx.core.view.isVisible
-import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.chip.Chip
-import com.lagradost.cloudstream3.*
+import com.lagradost.api.Log
 import com.lagradost.cloudstream3.APIHolder.apis
+import com.lagradost.cloudstream3.AllLanguagesName
 import com.lagradost.cloudstream3.CommonActivity.showToast
+import com.lagradost.cloudstream3.MainAPI
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.SearchResponse
+import com.lagradost.cloudstream3.TvType
 import com.lagradost.cloudstream3.databinding.FragmentHomeBinding
 import com.lagradost.cloudstream3.databinding.HomeEpisodesExpandedBinding
 import com.lagradost.cloudstream3.databinding.HomeSelectMainpageBinding
@@ -35,13 +45,18 @@ import com.lagradost.cloudstream3.mvvm.observe
 import com.lagradost.cloudstream3.mvvm.observeNullable
 import com.lagradost.cloudstream3.ui.APIRepository.Companion.noneApi
 import com.lagradost.cloudstream3.ui.APIRepository.Companion.randomApi
+import com.lagradost.cloudstream3.ui.BaseFragment
 import com.lagradost.cloudstream3.ui.account.AccountHelper.showAccountSelectLinear
-import com.lagradost.cloudstream3.utils.txt
-import com.lagradost.cloudstream3.ui.search.*
+import com.lagradost.cloudstream3.ui.account.AccountViewModel
+import com.lagradost.cloudstream3.ui.search.SEARCH_ACTION_LOAD
+import com.lagradost.cloudstream3.ui.search.SEARCH_ACTION_PLAY_FILE
+import com.lagradost.cloudstream3.ui.search.SearchAdapter
 import com.lagradost.cloudstream3.ui.search.SearchHelper.handleSearchClickCallback
+import com.lagradost.cloudstream3.ui.setRecycledViewPool
 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.isLandscape
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
 import com.lagradost.cloudstream3.utils.AppContextUtils.filterProviderByPreferredMedia
 import com.lagradost.cloudstream3.utils.AppContextUtils.getApiProviderLangSettings
@@ -51,22 +66,30 @@ import com.lagradost.cloudstream3.utils.AppContextUtils.loadSearchResult
 import com.lagradost.cloudstream3.utils.AppContextUtils.ownHide
 import com.lagradost.cloudstream3.utils.AppContextUtils.ownShow
 import com.lagradost.cloudstream3.utils.AppContextUtils.setDefaultFocus
+import com.lagradost.cloudstream3.utils.BackPressedCallbackHelper
+import com.lagradost.cloudstream3.utils.BackPressedCallbackHelper.attachBackPressedCallback
+import com.lagradost.cloudstream3.utils.BackPressedCallbackHelper.detachBackPressedCallback
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import com.lagradost.cloudstream3.utils.DataStoreHelper
-import com.lagradost.cloudstream3.utils.Event
+import com.lagradost.cloudstream3.utils.EmptyEvent
 import com.lagradost.cloudstream3.utils.SubtitleHelper.getFlagFromIso
+import com.lagradost.cloudstream3.utils.TvChannelUtils
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
+import com.lagradost.cloudstream3.utils.UIHelper.fixSystemBarsPadding
 import com.lagradost.cloudstream3.utils.UIHelper.getSpanCount
 import com.lagradost.cloudstream3.utils.UIHelper.navigate
 import com.lagradost.cloudstream3.utils.UIHelper.popupMenuNoIconsAndNoStringRes
-import java.util.*
+import com.lagradost.cloudstream3.utils.UIHelper.toPx
 
+private const val TAG = "HomeFragment"
 
-class HomeFragment : Fragment() {
+class HomeFragment : BaseFragment<FragmentHomeBinding>(
+    BindingCreator.Bind(FragmentHomeBinding::bind)
+) {
     companion object {
-        val configEvent = Event<Int>()
+        // Used for configuration changed events to fix any popups that are not attached to a fragment
+        val configEvent = EmptyEvent()
         var currentSpan = 1
-        val listHomepageItems = mutableListOf<SearchResponse>()
 
         private val errorProfilePics = listOf(
             R.drawable.monke_benene,
@@ -95,6 +118,7 @@ class HomeFragment : Fragment() {
         //}
 
         // returns a BottomSheetDialog that will be hidden with OwnHidden upon hide, and must be saved to be able call ownShow in onCreateView
+
         fun Activity.loadHomepageList(
             expand: HomeViewModel.ExpandableHomepageList,
             deleteCallback: (() -> Unit)? = null,
@@ -176,16 +200,17 @@ class HomeFragment : Fragment() {
 
 
             // Span settings
-            binding.homeExpandedRecycler.spanCount = currentSpan
-
+            binding.homeExpandedRecycler.spanCount = context.getSpanCount(item.isHorizontalImages)
+            binding.homeExpandedRecycler.setRecycledViewPool(SearchAdapter.sharedPool)
             binding.homeExpandedRecycler.adapter =
-                SearchAdapter(item.list.toMutableList(), binding.homeExpandedRecycler) { callback ->
+                SearchAdapter(binding.homeExpandedRecycler,item.isHorizontalImages) { callback ->
                     handleSearchClickCallback(callback)
                     if (callback.action == SEARCH_ACTION_LOAD || callback.action == SEARCH_ACTION_PLAY_FILE) {
                         bottomSheetDialogBuilder.ownHide() // we hide here because we want to resume it later
                         //bottomSheetDialogBuilder.dismissSafe(this)
                     }
                 }.apply {
+                    submitList(item.list)
                     hasNext = expand.hasNext
                 }
 
@@ -209,7 +234,7 @@ class HomeFragment : Fragment() {
                             expandCallback?.invoke(name)?.let { newExpand ->
                                 (recyclerView.adapter as? SearchAdapter?)?.apply {
                                     hasNext = newExpand.hasNext
-                                    updateList(newExpand.list.list)
+                                    submitList(newExpand.list.list)
                                 }
                             }
                         }
@@ -217,9 +242,12 @@ class HomeFragment : Fragment() {
                 }
             })
 
-            val spanListener = { span: Int ->
-                binding.homeExpandedRecycler.spanCount = span
-                //(recycle.adapter as SearchAdapter).notifyDataSetChanged()
+            val spanListener = Runnable {
+                binding.homeExpandedRecycler.spanCount = context.getSpanCount(item.isHorizontalImages)
+                // We want to rebind everything to update the UI, however we also want to avoid
+                // any animations ect, this is the easiest way to do this, and the most correct
+                @SuppressLint("NotifyDataSetChanged")
+                binding.homeExpandedRecycler.adapter?.notifyDataSetChanged()
             }
 
             configEvent += spanListener
@@ -289,7 +317,7 @@ class HomeFragment : Fragment() {
             val pairList = getPairList(header)
             for ((button, types) in pairList) {
                 button?.isChecked =
-                    button?.isVisible == true && selectedTypes.any { types.contains(it) }
+                    button.isVisible && selectedTypes.any { types.contains(it) }
             }
         }
 
@@ -379,8 +407,31 @@ class HomeFragment : Fragment() {
                     dialog.dismissSafe()
                 }
 
+                var pinnedphashset = DataStoreHelper.pinnedProviders.toHashSet()
+
                 val listView = dialog.findViewById<ListView>(R.id.listview1)
-                val arrayAdapter = ArrayAdapter<String>(this, R.layout.sort_bottom_single_choice)
+
+                val arrayAdapter = object : ArrayAdapter<String>(
+                    this, R.layout.sort_bottom_single_provider_choice,
+                    mutableListOf()
+                ) {
+                    override fun getView(
+                        position: Int,
+                        convertView: View?,
+                        parent: ViewGroup
+                    ): View {
+                        val view = convertView ?: LayoutInflater.from(context)
+                            .inflate(R.layout.sort_bottom_single_provider_choice, parent, false)
+                        val titleText = view.findViewById<TextView>(R.id.text1)
+                        val pinIcon = view.findViewById<ImageView>(R.id.pinicon)
+                        val name = getItem(position)
+                        titleText?.text = name
+                        val isPinned =
+                            pinnedphashset.contains(currentValidApis[position].name)
+                        pinIcon.visibility = if (isPinned) View.VISIBLE else View.GONE
+                        return view
+                    }
+                }
                 listView?.adapter = arrayAdapter
                 listView?.choiceMode = AbsListView.CHOICE_MODE_SINGLE
 
@@ -388,21 +439,39 @@ class HomeFragment : Fragment() {
                     if (currentValidApis.isNotEmpty()) {
                         currentApiName = currentValidApis[i].name
                         //to switch to apply simply remove this
-                        currentApiName?.let(callback)
+                        currentApiName.let(callback)
                         dialog.dismissSafe()
                     }
                 }
 
                 fun updateList() {
                     DataStoreHelper.homePreference = preSelectedTypes
-
+                    val pinnedp = DataStoreHelper.pinnedProviders.toList()
+                    pinnedphashset = pinnedp.toHashSet()
                     arrayAdapter.clear()
-                    currentValidApis = validAPIs.filter { api ->
-                        api.hasMainPage && api.supportedTypes.any {
-                            preSelectedTypes.contains(it)
+                    val sortedApis = validAPIs
+                        .filter {
+                            it.hasMainPage && (pinnedphashset.contains(it.name) || it.supportedTypes.any(
+                                preSelectedTypes::contains
+                            ))
                         }
-                    }.sortedBy { it.name.lowercase() }.toMutableList()
-                    currentValidApis.addAll(0, validAPIs.subList(0, 2))
+                        .sortedBy { it.name.lowercase() }
+
+                    val sortedApiMap = LinkedHashMap<String, MainAPI>().apply {
+                        sortedApis.forEach { put(it.name, it) }
+                    }
+
+                    val pinnedApis = pinnedp.asReversed().mapNotNull { name ->
+                        sortedApiMap[name]
+                    }
+
+                    val remainingApis = sortedApis.filterNot { pinnedphashset.contains(it.name) }
+
+                    currentValidApis = mutableListOf<MainAPI>().apply {
+                        addAll(validAPIs.take(2))
+                        addAll(pinnedApis)
+                        addAll(remainingApis)
+                    }
 
                     val names =
                         currentValidApis.map { if (isMultiLang) "${getFlagFromIso(it.lang)?.plus(" ") ?: ""}${it.name}" else it.name }
@@ -411,6 +480,21 @@ class HomeFragment : Fragment() {
                     arrayAdapter.addAll(names)
                     arrayAdapter.notifyDataSetChanged()
                 }
+                // pin provider on hold
+                listView?.setOnItemLongClickListener { _, _, i, _ ->
+                    if (currentValidApis.isNotEmpty() && i > 1) {
+                        val pinnedp = DataStoreHelper.pinnedProviders.toMutableList()
+                        val thisapi = currentValidApis[i].name
+                        if (pinnedp.contains(thisapi)) {
+                            pinnedp.remove(thisapi)
+                        } else {
+                            pinnedp.add(thisapi)
+                        }
+                        DataStoreHelper.pinnedProviders = pinnedp.toTypedArray()
+                        updateList()
+                    }
+                    true
+                }
 
                 bindChips(
                     binding.tvtypesChipsScroll.tvtypesChips,
@@ -427,47 +511,71 @@ class HomeFragment : Fragment() {
     }
 
     private val homeViewModel: HomeViewModel by activityViewModels()
+    private val accountViewModel: AccountViewModel by activityViewModels()
+
+    fun addMovies(cards: List<SearchResponse>) {
+        val ctx = context ?: run {
+            Log.e(TAG, "Context is null, aborting addMovies")
+            return
+        }
+
+        try {
+            val existingId = TvChannelUtils.getChannelId(ctx, getString(R.string.app_name))
+            if (existingId != null) {
+                Log.d(TAG, "Channel ID: $existingId")
 
-    var binding: FragmentHomeBinding? = null
+                val programCards = cards
 
+                TvChannelUtils.addPrograms(
+                    context = ctx,
+                    channelId = existingId,
+                    items = programCards
+                )
+            } else {
+                Log.d(TAG, "Channel does not exist")
+            }
+        } catch (e: Exception) {
+            Log.e(TAG, "Error adding movies: $e")
+        }
+    }
+
+    private fun deleteAll() {
+        val ctx = context ?: run {
+            Log.e(TAG, "Context is null, aborting deleteAll")
+            return
+        }
+
+        try {
+            val existingId = TvChannelUtils.getChannelId(ctx, getString(R.string.app_name))
+            if (existingId != null) {
+                Log.d(TAG, "Channel ID: $existingId")
+                TvChannelUtils.deleteStoredPrograms(ctx)
+            } else {
+                Log.d(TAG, "Channel does not exist")
+            }
+        } catch (e: Exception) {
+            Log.e(TAG, "Error deleting programs: ${e.message}")
+        }
+    }
+
+    override fun pickLayout(): Int? =
+        if (isLayout(PHONE)) R.layout.fragment_home else R.layout.fragment_home_tv
 
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
-        //homeViewModel =
-        //     ViewModelProvider(this).get(HomeViewModel::class.java)
-
         bottomSheetDialog?.ownShow()
-        val layout =
-            if (isLayout(TV or EMULATOR)) R.layout.fragment_home_tv else R.layout.fragment_home
-        val root = inflater.inflate(layout, container, false)
-        binding = try {
-            FragmentHomeBinding.bind(root)
-        } catch (t: Throwable) {
-            showToast(txt(R.string.unable_to_inflate, t.message ?: ""), Toast.LENGTH_LONG)
-            logError(t)
-            null
-        }
-
-        return root
+        return super.onCreateView(inflater, container, savedInstanceState)
     }
 
     override fun onDestroyView() {
-
+        (activity as? ComponentActivity)?.detachBackPressedCallback("HomeFragment_BackPress")
         bottomSheetDialog?.ownHide()
-        binding = null
         super.onDestroyView()
     }
 
-    private fun fixGrid() {
-        activity?.getSpanCount()?.let {
-            currentSpan = it
-        }
-        configEvent.invoke(currentSpan)
-    }
-
     private val apiChangeClickListener = View.OnClickListener { view ->
         view.context.selectHomepage(currentApiName) { api ->
             homeViewModel.loadAndCancel(api, forceReload = true, fromUI = true)
@@ -481,55 +589,129 @@ class HomeFragment : Fragment() {
         }*/
     }
 
-    override fun onConfigurationChanged(newConfig: Configuration) {
-        super.onConfigurationChanged(newConfig)
-        //(home_preview_viewpager?.adapter as? HomeScrollAdapter)?.notifyDataSetChanged()
-        fixGrid()
-    }
-
     private var currentApiName: String? = null
     private var toggleRandomButton = false
 
     private var bottomSheetDialog: BottomSheetDialog? = null
     private var homeMasterAdapter: HomeParentItemAdapterPreview? = null
 
-    @SuppressLint("SetTextI18n")
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        fixGrid()
+    var lastSavedHomepage: String? = null
+
+    fun saveHomepageToTV(page: Map<String, HomeViewModel.ExpandableHomepageList>) {
+        // No need to update for phone
+        if (isLayout(PHONE)) {
+            return
+        }
+        val (name, data) = page.entries.firstOrNull() ?: return
+        // Modifying homepage is an expensive operation, and therefore we avoid it at all cost
+        if (name == lastSavedHomepage) {
+            return
+        }
+        Log.i(TAG, "Adding programs $name to TV")
+        lastSavedHomepage = name
+        ioSafe {
+            // empty the channel
+            deleteAll()
+            // insert the program from first array
+            addMovies(data.list.list)
+        }
+    }
 
-        binding?.apply {
+    override fun fixLayout(view: View) {
+        fixSystemBarsPadding(
+            view,
+            padTop = false,
+            padBottom = isLandscape(),
+            padLeft = isLayout(TV or EMULATOR)
+        )
+
+        // Fix grid
+        configEvent.invoke()
+    }
+
+    @SuppressLint("SetTextI18n")
+    override fun onBindingCreated(binding: FragmentHomeBinding) {
+        context?.let { HomeChildItemAdapter.updatePosterSize(it) }
+        (activity as? ComponentActivity)?.attachBackPressedCallback("HomeFragment_BackPress") {
+            handleTvBackPress(this)
+        }
+        binding.apply {
             //homeChangeApiLoading.setOnClickListener(apiChangeClickListener)
             //homeChangeApiLoading.setOnClickListener(apiChangeClickListener)
             homeApiFab.setOnClickListener(apiChangeClickListener)
+            homeApiFab.setOnLongClickListener {
+                if (currentApiName == noneApi.name) return@setOnLongClickListener false
+                homeViewModel.loadAndCancel(currentApiName, forceReload = true, fromUI = true)
+                showToast(R.string.action_reload, Toast.LENGTH_SHORT)
+                true
+            }
             homeChangeApi.setOnClickListener(apiChangeClickListener)
             homeSwitchAccount.setOnClickListener {
                 activity?.showAccountSelectLinear()
             }
 
-            homeRandom.setOnClickListener {
-                if (listHomepageItems.isNotEmpty()) {
-                    activity.loadSearchResult(listHomepageItems.random())
-                }
-            }
             homeMasterAdapter = HomeParentItemAdapterPreview(
-                fragment = this@HomeFragment,
-                homeViewModel,
+                homeViewModel, accountViewModel
             )
+            homeMasterRecycler.setRecycledViewPool(ParentItemAdapter.sharedPool)
             homeMasterRecycler.adapter = homeMasterAdapter
-            //fixPaddingStatusbar(homeLoadingStatusbar)
 
             homeApiFab.isVisible = isLayout(PHONE)
 
+            homePreviewReloadProvider.setOnClickListener {
+                homeViewModel.loadAndCancel(
+                    homeViewModel.apiName.value ?: noneApi.name,
+                    forceReload = true,
+                    fromUI = true
+                )
+                showToast(R.string.action_reload, Toast.LENGTH_SHORT)
+                true
+            }
+
+            homePreviewSearchButton.setOnClickListener { _ ->
+                // Open blank screen.
+                homeViewModel.queryTextSubmit("")
+            }
+
             homeMasterRecycler.addOnScrollListener(object : RecyclerView.OnScrollListener() {
                 override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
-                    if (dy > 0) { //check for scroll down
-                        homeApiFab.shrink() // hide
-                        homeRandom.shrink()
-                    } else if (dy < -5) {
-                        if (isLayout(PHONE)) {
-                            homeApiFab.extend() // show
-                            homeRandom.extend()
+                    if (isLayout(PHONE)) {
+                        // Fab is only relevant to Phone
+                        if (dy > 0) { //check for scroll down
+                            homeApiFab.shrink() // hide
+                            homeRandom.shrink()
+                        } else if (dy < -5) {
+                            if (isLayout(PHONE)) {
+                                homeApiFab.extend() // show
+                                homeRandom.extend()
+                            }
+                        }
+                    } else {
+                        // Header scrolling is only relevant to TV/Emulator
+
+                        val view = recyclerView.findViewHolderForAdapterPosition(0)?.itemView
+                        val scrollParent = binding.homeApiHolder
+
+                        if (view == null) {
+                            // The first view is not visible, so we can assume we have scrolled past it
+                            scrollParent.isVisible = false
+                        } else {
+                            // A bit weird, but this is a major limitation we are working around here
+                            // 1. We cant have a real parent to the recyclerview as android cant layout that without lagging
+                            // 2. We cant put the view in the recyclerview, as it should always be shown
+                            // 3. We cant mirror the view in the recyclerview as then it causes focus issues when swaping out the mirror view
+                            //
+                            // This means that if we want to have a parent view to the recyclerview we are out of luck
+                            // Instead this uses getLocationInWindow to calculate how much the view should be scrolled
+                            // as recyclerView has no scrollY (always 0)
+                            //
+                            // Then it manually "scrolls" it to the correct position
+                            //
+                            // Hopefully getLocationInWindow acts correctly on all devices
+                            val rect = IntArray(2)
+                            view.getLocationInWindow(rect)
+                            scrollParent.isVisible = true
+                            scrollParent.translationY = rect[1].toFloat() - 60.toPx
                         }
                     }
                     super.onScrolled(recyclerView, dx, dy)
@@ -538,7 +720,6 @@ class HomeFragment : Fragment() {
 
         }
 
-
         //Load value for toggling Random button. Hide at startup
         context?.let {
             val settingsManager = PreferenceManager.getDefaultSharedPreferences(it)
@@ -546,46 +727,56 @@ class HomeFragment : Fragment() {
                 settingsManager.getBoolean(
                     getString(R.string.random_button_key),
                     false
-                ) && isLayout(PHONE)
-            binding?.homeRandom?.visibility = View.GONE
+                )
+            binding.homeRandom.visibility = View.GONE
+            binding.homeRandomButtonTv.visibility = View.GONE
         }
 
         observe(homeViewModel.apiName) { apiName ->
             currentApiName = apiName
-            binding?.homeApiFab?.text = apiName
-            binding?.homeChangeApi?.text = apiName
+            binding.apply {
+                homeApiFab.text = apiName
+                homeChangeApi.text = apiName
+                homePreviewReloadProvider.isGone = (apiName == noneApi.name)
+                homePreviewSearchButton.isGone = (apiName == noneApi.name)
+            }
         }
 
         observe(homeViewModel.page) { data ->
-            binding?.apply {
+            binding.apply {
                 when (data) {
                     is Resource.Success -> {
-                        homeLoadingShimmer.stopShimmer()
-
                         val d = data.value
-                        val mutableListOfResponse = mutableListOf<SearchResponse>()
-                        listHomepageItems.clear()
-
                         (homeMasterRecycler.adapter as? ParentItemAdapter)?.submitList(d.values.map {
                             it.copy(
                                 list = it.list.copy(list = it.list.list.toMutableList())
                             )
-                        }.toMutableList())
+                        })
+
+                        saveHomepageToTV(d)
 
                         homeLoading.isVisible = false
                         homeLoadingError.isVisible = false
                         homeMasterRecycler.isVisible = true
+                        homeLoadingShimmer.stopShimmer()
                         //home_loaded?.isVisible = true
                         if (toggleRandomButton) {
-                            //Flatten list
-                            d.values.forEach { dlist ->
-                                mutableListOfResponse.addAll(dlist.list.list)
+                            val distinct = d.values
+                                .flatMap { it.list.list }
+                                .distinctBy { it.url }
+                            val hasItems = distinct.isNotEmpty()
+                            val isPhone = isLayout(PHONE)
+                            val randomClickListener = View.OnClickListener {
+                                distinct.randomOrNull()?.let { activity.loadSearchResult(it) }
                             }
-                            listHomepageItems.addAll(mutableListOfResponse.distinctBy { it.url })
 
-                            homeRandom.isVisible = listHomepageItems.isNotEmpty()
+                            homeRandom.isVisible = isPhone && hasItems
+                            homeRandom.setOnClickListener(randomClickListener)
+                            homeRandomButtonTv.isVisible = !isPhone && hasItems
+                            homeRandomButtonTv.setOnClickListener(randomClickListener)
                         } else {
                             homeRandom.isGone = true
+                            homeRandomButtonTv.isGone = true
                         }
                     }
 
@@ -603,7 +794,7 @@ class HomeFragment : Fragment() {
                             }) {
                                 try {
                                     val i = Intent(Intent.ACTION_VIEW)
-                                    i.data = Uri.parse(validAPIs[itemId].mainUrl)
+                                    i.data = validAPIs[itemId].mainUrl.toUri()
                                     startActivity(i)
                                 } catch (e: Exception) {
                                     logError(e)
@@ -613,7 +804,7 @@ class HomeFragment : Fragment() {
 
                         homeLoading.isVisible = false
                         homeLoadingError.isVisible = true
-                        homeMasterRecycler.isVisible = false
+                        homeMasterRecycler.isInvisible = true
 
                         // Based on https://github.com/recloudstream/cloudstream/pull/1438
                         val hasNoNetworkConnection = context?.isNetworkAvailable() == false
@@ -635,24 +826,28 @@ class HomeFragment : Fragment() {
                         homeReloadConnectionGoToDownloads.setOnClickListener {
                             activity.navigate(R.id.navigation_downloads)
                         }
+
+                        (homeMasterRecycler.adapter as? ParentItemAdapter)?.apply {
+                            submitList(null)
+                            clearState()
+                        }
                     }
 
                     is Resource.Loading -> {
-                        (homeMasterRecycler.adapter as? ParentItemAdapter)?.submitList(listOf())
                         homeLoadingShimmer.startShimmer()
                         homeLoading.isVisible = true
                         homeLoadingError.isVisible = false
-                        homeMasterRecycler.isVisible = false
+                        homeMasterRecycler.isInvisible = true
+                        (homeMasterRecycler.adapter as? ParentItemAdapter)?.apply {
+                            submitList(null)
+                            clearState()
+                        }
                         //home_loaded?.isVisible = false
                     }
                 }
             }
         }
 
-
-        //context?.fixPaddingStatusbarView(home_statusbar)
-        //context?.fixPaddingStatusbar(home_padding)
-
         observeNullable(homeViewModel.popup) { item ->
             if (item == null) {
                 bottomSheetDialog?.dismissSafe()
@@ -685,7 +880,7 @@ class HomeFragment : Fragment() {
 
         //TODO READD THIS
         /*for (syncApi in OAuth2Apis) {
-            val login = syncApi.loginInfo()
+            val login = SyncAPI2.loginInfo()
             val pic = login?.profilePicture
             if (home_profile_picture?.setImage(
                     pic,
@@ -697,4 +892,44 @@ class HomeFragment : Fragment() {
             }
         }*/
     }
+
+    private fun handleTvBackPress(helper: BackPressedCallbackHelper.CallbackHelper) {
+        // Only apply custom behavior on TV interface
+        if (!isLayout(TV)) {
+            helper.runDefault()
+            return
+        }
+        val currentFocus = activity?.currentFocus ?: run {
+            helper.runDefault()
+            return
+        }
+        // isInsideRecycle is true when focus is inside home_master_recycler
+        var parent = currentFocus.parent
+        var isInsideRecycler = false
+        while (parent != null) {
+            if (parent is View && parent.id == R.id.home_master_recycler) {
+                isInsideRecycler = true
+                break
+            }
+            parent = parent.parent
+        }
+        when {
+            // Case 1: Focus is within plugin content -> Move to plugin selector
+            isInsideRecycler -> {
+                binding?.homeMasterRecycler?.scrollToPosition(0)
+                // Defer focus request until after scroll ends
+                binding?.homeChangeApi?.post {
+                    binding?.homeChangeApi?.requestFocus()
+                }
+            }
+            // Case 2: Focus is on plugin selector or nearby buttons -> Move to home navigation
+            currentFocus.id == R.id.home_change_api ||
+            currentFocus.id == R.id.home_preview_reload_provider ||
+            currentFocus.id == R.id.home_preview_search_button -> {
+                activity?.findViewById<View>(R.id.navigation_home)?.requestFocus()
+            }
+            // Case 3: Any other location -> Use default back behavior
+            else -> helper.runDefault()
+        }
+    }
 }
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 8bc0aa287ea..6bdd1bf492f 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
@@ -6,10 +6,8 @@ import android.os.Parcelable
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.RecyclerView
 import androidx.viewbinding.ViewBinding
-import com.lagradost.cloudstream3.HomePageList
 import com.lagradost.cloudstream3.LoadResponse
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.databinding.HomepageParentBinding
@@ -17,9 +15,11 @@ import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.ui.BaseAdapter
 import com.lagradost.cloudstream3.ui.BaseDiffCallback
 import com.lagradost.cloudstream3.ui.ViewHolderState
+import com.lagradost.cloudstream3.ui.newSharedPool
 import com.lagradost.cloudstream3.ui.result.FOCUS_SELF
 import com.lagradost.cloudstream3.ui.result.setLinearListLayout
 import com.lagradost.cloudstream3.ui.search.SearchClickCallback
+import com.lagradost.cloudstream3.ui.setRecycledViewPool
 import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
 import com.lagradost.cloudstream3.ui.settings.Globals.PHONE
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
@@ -34,13 +34,11 @@ class LoadClickCallback(
 )
 
 open class ParentItemAdapter(
-    open val fragment: Fragment,
     id: Int,
     private val clickCallback: (SearchClickCallback) -> Unit,
     private val moreInfoClickCallback: (HomeViewModel.ExpandableHomepageList) -> Unit,
     private val expandCallback: ((String) -> Unit)? = null,
 ) : BaseAdapter<HomeViewModel.ExpandableHomepageList, Bundle>(
-    fragment,
     id,
     diffCallback = BaseDiffCallback(
         itemSame = { a, b -> a.list.name == b.list.name },
@@ -48,6 +46,11 @@ open class ParentItemAdapter(
             a.list.list == b.list.list
         })
 ) {
+    companion object {
+        val sharedPool =
+            newSharedPool { setMaxRecycledViews(CONTENT, 4) }
+    }
+
     data class ParentItemHolder(val binding: ViewBinding) : ViewHolderState<Bundle>(binding) {
         override fun save(): Bundle = Bundle().apply {
             val recyclerView = (binding as? HomepageParentBinding)?.homeChildRecyclerview
@@ -60,13 +63,16 @@ open class ParentItemAdapter(
 
         override fun restore(state: Bundle) {
             (binding as? HomepageParentBinding)?.homeChildRecyclerview?.layoutManager?.onRestoreInstanceState(
-                    state.getSafeParcelable<Parcelable>("value")
+                state.getSafeParcelable<Parcelable>("value")
             )
         }
     }
 
-    override fun submitList(list: List<HomeViewModel.ExpandableHomepageList>?) {
-        super.submitList(list?.sortedBy { it.list.list.isEmpty() })
+    override fun submitList(
+        list: Collection<HomeViewModel.ExpandableHomepageList>?,
+        commitCallback: Runnable?
+    ) {
+        super.submitList(list?.sortedBy { it.list.list.isEmpty() }, commitCallback)
     }
 
     override fun onUpdateContent(
@@ -90,17 +96,30 @@ open class ParentItemAdapter(
         if (binding !is HomepageParentBinding) return
         val info = item.list
         binding.apply {
-            homeChildRecyclerview.adapter = HomeChildItemAdapter(
-                fragment = fragment,
-                id = id + position + 100,
-                clickCallback = clickCallback,
-                nextFocusUp = homeChildRecyclerview.nextFocusUpId,
-                nextFocusDown = homeChildRecyclerview.nextFocusDownId,
-            ).apply {
-                isHorizontal = info.isHorizontalImages
-                hasNext = item.hasNext
-                submitList(item.list.list)
+            val currentAdapter = homeChildRecyclerview.adapter as? HomeChildItemAdapter
+            if (currentAdapter == null) {
+                homeChildRecyclerview.setRecycledViewPool(HomeChildItemAdapter.sharedPool)
+                homeChildRecyclerview.adapter = HomeChildItemAdapter(
+                    id = id + position + 100,
+                    clickCallback = clickCallback,
+                    nextFocusUp = homeChildRecyclerview.nextFocusUpId,
+                    nextFocusDown = homeChildRecyclerview.nextFocusDownId,
+                ).apply {
+                    isHorizontal = info.isHorizontalImages
+                    hasNext = item.hasNext
+                    submitList(item.list.list)
+                }
+            } else {
+                currentAdapter.apply {
+                    isHorizontal = info.isHorizontalImages
+                    hasNext = item.hasNext
+                    this.clickCallback = this@ParentItemAdapter.clickCallback
+                    nextFocusUp = homeChildRecyclerview.nextFocusUpId
+                    nextFocusDown = homeChildRecyclerview.nextFocusDownId
+                    submitIncomparableList(item.list.list)
+                }
             }
+
             homeChildRecyclerview.setLinearListLayout(
                 isHorizontal = true,
                 nextLeft = startFocus,
@@ -166,11 +185,6 @@ open class ParentItemAdapter(
 
         return ParentItemHolder(binding)
     }
-
-    fun updateList(newList: List<HomePageList>) {
-        submitList(newList.map { HomeViewModel.ExpandableHomepageList(it, 1, false) }
-            .toMutableList())
-    }
 }
 
 @Suppress("DEPRECATION")
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 0ce7ca8f28b..959806e566c 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
@@ -1,16 +1,18 @@
 package com.lagradost.cloudstream3.ui.home
 
+import android.content.Context
 import android.os.Bundle
 import android.os.Parcelable
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.ImageView
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.widget.SearchView
 import androidx.core.content.ContextCompat
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
-import androidx.fragment.app.Fragment
+import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.findViewTreeLifecycleOwner
 import androidx.recyclerview.widget.RecyclerView
 import androidx.viewbinding.ViewBinding
@@ -18,9 +20,8 @@ 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.lagradost.cloudstream3.AcraApplication.Companion.getActivity
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.getActivity
 import com.lagradost.cloudstream3.CommonActivity.activity
-import com.lagradost.cloudstream3.CommonActivity.showToast
 import com.lagradost.cloudstream3.HomePageList
 import com.lagradost.cloudstream3.LoadResponse
 import com.lagradost.cloudstream3.MainActivity
@@ -34,9 +35,11 @@ import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.mvvm.observe
 import com.lagradost.cloudstream3.ui.ViewHolderState
 import com.lagradost.cloudstream3.ui.WatchType
+import com.lagradost.cloudstream3.ui.account.AccountHelper.showAccountEditDialog
 import com.lagradost.cloudstream3.ui.account.AccountHelper.showAccountSelectLinear
-import com.lagradost.cloudstream3.ui.home.HomeFragment.Companion.selectHomepage
+import com.lagradost.cloudstream3.ui.account.AccountViewModel
 import com.lagradost.cloudstream3.ui.result.FOCUS_SELF
+import com.lagradost.cloudstream3.ui.result.ResultFragment.bindLogo
 import com.lagradost.cloudstream3.ui.result.ResultViewModel2
 import com.lagradost.cloudstream3.ui.result.START_ACTION_RESUME_LATEST
 import com.lagradost.cloudstream3.ui.result.getId
@@ -47,19 +50,23 @@ import com.lagradost.cloudstream3.ui.search.SearchClickCallback
 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.AppContextUtils.html
 import com.lagradost.cloudstream3.utils.AppContextUtils.setDefaultFocus
 import com.lagradost.cloudstream3.utils.DataStoreHelper
+import com.lagradost.cloudstream3.utils.ImageLoader.loadImage
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialog
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showOptionSelectStringRes
 import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbarMargin
 import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbarView
 import com.lagradost.cloudstream3.utils.UIHelper.populateChips
+import androidx.core.graphics.toColorInt
+import com.lagradost.cloudstream3.ui.setRecycledViewPool
 
 class HomeParentItemAdapterPreview(
-    override val fragment: Fragment,
     private val viewModel: HomeViewModel,
+    private val accountViewModel: AccountViewModel
 ) : ParentItemAdapter(
-    fragment, id = "HomeParentItemAdapterPreview".hashCode(),
+    id = "HomeParentItemAdapterPreview".hashCode(),
     clickCallback = {
         viewModel.click(it)
     }, moreInfoClickCallback = {
@@ -97,15 +104,33 @@ class HomeParentItemAdapterPreview(
             )
         }
 
-        return HeaderViewHolder(binding, viewModel, fragment = fragment)
+        return HeaderViewHolder(binding, viewModel, accountViewModel)
     }
 
     override fun onBindHeader(holder: ViewHolderState<Bundle>) {
         (holder as? HeaderViewHolder)?.bind()
     }
 
+    override fun onViewDetachedFromWindow(holder: ViewHolderState<Bundle>) {
+        when (holder) {
+            is HeaderViewHolder -> {
+                holder.onViewDetachedFromWindow()
+            }
+        }
+    }
+
+    override fun onViewAttachedToWindow(holder: ViewHolderState<Bundle>) {
+        when (holder) {
+            is HeaderViewHolder -> {
+                holder.onViewAttachedToWindow()
+            }
+        }
+    }
+
     private class HeaderViewHolder(
-        val binding: ViewBinding, val viewModel: HomeViewModel, fragment: Fragment,
+        val binding: ViewBinding,
+        val viewModel: HomeViewModel,
+        accountViewModel: AccountViewModel,
     ) :
         ViewHolderState<Bundle>(binding) {
 
@@ -131,9 +156,13 @@ class HomeParentItemAdapterPreview(
             }
         }
 
-        val previewAdapter = HomeScrollAdapter(fragment = fragment)
+        val previewAdapter = HomeScrollAdapter { view, position, item ->
+            viewModel.click(
+                LoadClickCallback(0, view, position, item)
+            )
+        }
+
         private val resumeAdapter = ResumeItemAdapter(
-            fragment,
             nextFocusUp = itemView.nextFocusUpId,
             nextFocusDown = itemView.nextFocusDownId,
             removeCallback = { v ->
@@ -216,7 +245,6 @@ class HomeParentItemAdapterPreview(
                 }
             })
         private val bookmarkAdapter = HomeChildItemAdapter(
-            fragment,
             id = "bookmarkAdapter".hashCode(),
             nextFocusUp = itemView.nextFocusUpId,
             nextFocusDown = itemView.nextFocusDownId
@@ -293,9 +321,14 @@ class HomeParentItemAdapterPreview(
         private val bookmarkRecyclerView: RecyclerView =
             itemView.findViewById(R.id.home_bookmarked_child_recyclerview)
 
-        private val homeAccount: View? = itemView.findViewById(R.id.home_preview_switch_account)
-        private val alternativeHomeAccount: View? =
-            itemView.findViewById(R.id.alternative_switch_account)
+        private val headProfilePic: ImageView? = itemView.findViewById(R.id.home_head_profile_pic)
+        private val headProfilePicCard: View? =
+            itemView.findViewById(R.id.home_head_profile_padding)
+
+        private val alternateHeadProfilePic: ImageView? =
+            itemView.findViewById(R.id.alternate_home_head_profile_pic)
+        private val alternateHeadProfilePicCard: View? =
+            itemView.findViewById(R.id.alternate_home_head_profile_padding)
 
         private val topPadding: View? = itemView.findViewById(R.id.home_padding)
 
@@ -306,38 +339,73 @@ class HomeParentItemAdapterPreview(
 
         fun onSelect(item: LoadResponse, position: Int) {
             (binding as? FragmentHomeHeadTvBinding)?.apply {
-                homePreviewDescription.isGone =
-                    item.plot.isNullOrBlank()
-                homePreviewDescription.text =
-                    item.plot ?: ""
+                homePreviewDescription.isGone = item.plot.isNullOrBlank()
+                homePreviewDescription.text = item.plot?.html() ?: ""
+
+                val scoreText = item.score?.toStringNull(0.1, 10, 1, false)
+
+                scoreText?.let { score ->
+                    homePreviewScore.text =
+                        homePreviewScore.context.getString(R.string.extension_rating, score)
+
+                    // while it should never fail, we do this just in case
+                    val rating = score.toDoubleOrNull() ?: item.score?.toDouble() ?: 0.0
+
+                    val color = when {
+                        rating < 5.0 -> "#eb2f2f".toColorInt() // Red
+                        rating < 8.0 -> "#eda009".toColorInt() // Yellow
+                        else -> "#3bb33b".toColorInt() // Green
+                    }
+                    homePreviewScore.backgroundTintList =
+                        android.content.res.ColorStateList.valueOf(color)
+                }
+                homePreviewScore.isGone = scoreText == null
+
+                item.year?.let { year ->
+                    homePreviewYear.text = year.toString()
+                }
+                homePreviewYear.isGone = item.year == null
 
-                homePreviewText.text = item.name
+                val duration = item.duration
+                duration?.let { min ->
+                    homePreviewDuration.text =
+                        homePreviewDuration.context.getString(R.string.duration_format, min)
+                }
+                homePreviewDuration.isGone = duration == null || duration <= 0
+
+                val castText = item.actors?.take(3)?.joinToString(", ") { it.actor.name }
+                if (!castText.isNullOrBlank()) {
+                    homePreviewCast.text =
+                        homePreviewCast.context.getString(R.string.cast_format, castText)
+                    homePreviewCast.isVisible = true
+                } else {
+                    homePreviewCast.isVisible = false
+                }
+
+                homePreviewText.text = item.name.html()
                 populateChips(
                     homePreviewTags,
                     item.tags?.take(6) ?: emptyList(),
-                    R.style.ChipFilledSemiTransparent
+                    R.style.ChipFilledSemiTransparent,
+                    null
+                )
+
+
+                bindLogo(
+                    url = item.logoUrl,
+                    headers = item.posterHeaders,
+                    titleView = homePreviewText,
+                    logoView = homeBackgroundPosterWatermarkBadgeHolder
                 )
 
                 homePreviewTags.isGone =
                     item.tags.isNullOrEmpty()
 
-                homePreviewPlayBtt.setOnClickListener { view ->
-                    viewModel.click(
-                        LoadClickCallback(
-                            START_ACTION_RESUME_LATEST,
-                            view,
-                            position,
-                            item
-                        )
-                    )
-                }
-
                 homePreviewInfoBtt.setOnClickListener { view ->
                     viewModel.click(
                         LoadClickCallback(0, view, position, item)
                     )
                 }
-
             }
             (binding as? FragmentHomeHeadBinding)?.apply {
                 //homePreviewImage.setImage(item.posterUrl, item.posterHeaders)
@@ -422,7 +490,7 @@ class HomeParentItemAdapterPreview(
                 }
             }
 
-        override fun onViewDetachedFromWindow() {
+        fun onViewDetachedFromWindow() {
             previewViewpager.unregisterOnPageChangeCallback(previewCallback)
         }
 
@@ -443,12 +511,14 @@ class HomeParentItemAdapterPreview(
 
             previewViewpager.adapter = previewAdapter
             resumeRecyclerView.adapter = resumeAdapter
+            bookmarkRecyclerView.setRecycledViewPool(HomeChildItemAdapter.sharedPool)
             bookmarkRecyclerView.adapter = bookmarkAdapter
 
             resumeRecyclerView.setLinearListLayout(
                 nextLeft = R.id.nav_rail_view,
                 nextRight = FOCUS_SELF
             )
+
             bookmarkRecyclerView.setLinearListLayout(
                 nextLeft = R.id.nav_rail_view,
                 nextRight = FOCUS_SELF
@@ -469,36 +539,80 @@ class HomeParentItemAdapterPreview(
                 }
             }
 
-            homeAccount?.isGone = isLayout(TV or EMULATOR)
+            headProfilePicCard?.isGone = isLayout(TV or EMULATOR)
+            alternateHeadProfilePicCard?.isGone = isLayout(TV or EMULATOR)
+
+            (headProfilePic ?: alternateHeadProfilePic)?.observe(viewModel.currentAccount) { currentAccount ->
+                headProfilePic?.loadImage(currentAccount?.image)
+                alternateHeadProfilePic?.loadImage(currentAccount?.image)
+            }
 
-            homeAccount?.setOnClickListener {
+            headProfilePicCard?.setOnClickListener {
                 activity?.showAccountSelectLinear()
             }
 
-            alternativeHomeAccount?.setOnClickListener {
+            fun showAccountEditBox(context: Context): Boolean {
+                val currentAccount = DataStoreHelper.getCurrentAccount()
+                return if (currentAccount != null) {
+                    showAccountEditDialog(
+                        context = context,
+                        account = currentAccount,
+                        isNewAccount = false,
+                        accountEditCallback = { accountViewModel.handleAccountUpdate(it, context) },
+                        accountDeleteCallback = {
+                            accountViewModel.handleAccountDelete(
+                                it,
+                                context
+                            )
+                        }
+                    )
+                    true
+                } else false
+            }
+
+            alternateHeadProfilePicCard?.setOnLongClickListener {
+                showAccountEditBox(it.context)
+            }
+            headProfilePicCard?.setOnLongClickListener {
+                showAccountEditBox(it.context)
+            }
+
+            alternateHeadProfilePicCard?.setOnClickListener {
                 activity?.showAccountSelectLinear()
             }
 
             (binding as? FragmentHomeHeadTvBinding)?.apply {
-                homePreviewChangeApi.setOnClickListener { view ->
+                /*homePreviewChangeApi.setOnClickListener { view ->
                     view.context.selectHomepage(viewModel.repo?.name) { api ->
                         viewModel.loadAndCancel(api, forceReload = true, fromUI = true)
                     }
                 }
-
+                homePreviewReloadProvider.setOnClickListener {
+                    viewModel.loadAndCancel(
+                        viewModel.apiName.value ?: noneApi.name,
+                        forceReload = true,
+                        fromUI = true
+                    )
+                    showToast(R.string.action_reload, Toast.LENGTH_SHORT)
+                    true
+                }
                 homePreviewSearchButton.setOnClickListener { _ ->
                     // Open blank screen.
                     viewModel.queryTextSubmit("")
-                }
-
-                // This makes the hidden next buttons only available when on the info button
-                // Otherwise you might be able to go to the next item without being at the info button
-                homePreviewInfoBtt.setOnFocusChangeListener { _, hasFocus ->
-                    homePreviewHiddenNextFocus.isFocusable = hasFocus
-                }
-
-                homePreviewPlayBtt.setOnFocusChangeListener { _, hasFocus ->
-                    homePreviewHiddenPrevFocus.isFocusable = hasFocus
+                }*/
+
+                // A workaround to the focus problem of always centering the view on focus
+                // as that causes higher android versions to stretch the ui when switching between shows
+                var lastFocusTimeoutMs = 0L
+                homePreviewInfoBtt.setOnFocusChangeListener { view, hasFocus ->
+                    val lastFocusMs = lastFocusTimeoutMs
+                    // Always reset timer, as we only want to update
+                    // it if we have not interacted in half a second
+                    lastFocusTimeoutMs = System.currentTimeMillis()
+                    if (!hasFocus) return@setOnFocusChangeListener
+                    if (lastFocusMs + 500L < System.currentTimeMillis()) {
+                        MainActivity.centerView(view)
+                    }
                 }
 
                 homePreviewHiddenNextFocus.setOnFocusChangeListener { _, hasFocus ->
@@ -516,7 +630,8 @@ class HomeParentItemAdapterPreview(
                         )?.requestFocus()
                     } else {
                         previewViewpager.setCurrentItem(previewViewpager.currentItem - 1, true)
-                        binding.homePreviewPlayBtt.requestFocus()
+                        binding.homePreviewInfoBtt.requestFocus()
+                        //binding.homePreviewPlayBtt.requestFocus()
                     }
                 }
             }
@@ -543,9 +658,7 @@ class HomeParentItemAdapterPreview(
                     params.height = 0
                     layoutParams = params
                 }
-            } else {
-                fixPaddingStatusbarView(homeNonePadding)
-            }
+            } else fixPaddingStatusbarView(homeNonePadding)
 
             when (preview) {
                 is Resource.Success -> {
@@ -569,6 +682,15 @@ class HomeParentItemAdapterPreview(
                     previewViewpager.isVisible = true
                     previewViewpagerText.isVisible = true
                     alternativeAccountPadding?.isVisible = false
+                    (binding as? FragmentHomeHeadTvBinding)?.apply {
+                        homePreviewInfoBtt.isVisible = true
+                    }
+                    // Explicitly bind the current item to ensure instant loading
+                    val currentPos = previewViewpager.currentItem
+                    val item = preview.value.second.getOrNull(currentPos)
+                    if (item != null) {
+                        onSelect(item, currentPos)
+                    }
                 }
 
                 else -> {
@@ -577,6 +699,9 @@ class HomeParentItemAdapterPreview(
                     previewViewpager.isVisible = false
                     previewViewpagerText.isVisible = false
                     alternativeAccountPadding?.isVisible = true
+                    (binding as? FragmentHomeHeadTvBinding)?.apply {
+                        homePreviewInfoBtt.isVisible = false
+                    }
                     //previewHeader.isVisible = false
                 }
             }
@@ -645,18 +770,19 @@ class HomeParentItemAdapterPreview(
             }
         }
 
-        override fun onViewAttachedToWindow() {
+        fun onViewAttachedToWindow() {
             previewViewpager.registerOnPageChangeCallback(previewCallback)
 
-            binding.root.findViewTreeLifecycleOwner()?.apply {
+            previewViewpager.apply {
                 observe(viewModel.preview) {
                     updatePreview(it)
                 }
-                if (binding is FragmentHomeHeadTvBinding) {
+                /*if (binding is FragmentHomeHeadTvBinding) {
                     observe(viewModel.apiName) { name ->
                         binding.homePreviewChangeApi.text = name
+                        binding.homePreviewReloadProvider.isGone = (name == noneApi.name)
                     }
-                }
+                }*/
                 observe(viewModel.resumeWatching) {
                     updateResume(it)
                 }
@@ -672,7 +798,7 @@ class HomeParentItemAdapterPreview(
                     }
                     toggleListHolder?.isGone = visible.isEmpty()
                 }
-            } ?: debugException { "Expected findViewTreeLifecycleOwner" }
+            }
         }
     }
 }
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 4c4dd2d84dc..e42e774b5ba 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
@@ -1,23 +1,27 @@
 package com.lagradost.cloudstream3.ui.home
 
-import android.content.res.Configuration
 import android.view.LayoutInflater
+import android.view.View
 import android.view.ViewGroup
 import androidx.core.view.isGone
-import androidx.fragment.app.Fragment
 import com.lagradost.cloudstream3.LoadResponse
 import com.lagradost.cloudstream3.databinding.HomeScrollViewBinding
 import com.lagradost.cloudstream3.databinding.HomeScrollViewTvBinding
+import com.lagradost.cloudstream3.ui.BaseDiffCallback
 import com.lagradost.cloudstream3.ui.NoStateAdapter
 import com.lagradost.cloudstream3.ui.ViewHolderState
+import com.lagradost.cloudstream3.ui.result.ResultFragment.bindLogo
 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.AppContextUtils.html
 import com.lagradost.cloudstream3.utils.ImageLoader.loadImage
 
 class HomeScrollAdapter(
-    fragment: Fragment
-) : NoStateAdapter<LoadResponse>(fragment) {
+    val callback: ((View, Int, LoadResponse) -> Unit)
+) : NoStateAdapter<LoadResponse>(diffCallback = BaseDiffCallback(itemSame = { a, b ->
+    a.uniqueUrl == b.uniqueUrl && a.name == b.name
+})) {
     var hasMoreItems: Boolean = false
 
     override fun onCreateContent(parent: ViewGroup): ViewHolderState<Any> {
@@ -31,19 +35,26 @@ class HomeScrollAdapter(
         return ViewHolderState(binding)
     }
 
+    override fun onClearView(holder: ViewHolderState<Any>) {
+        when (val binding = holder.view) {
+            is HomeScrollViewBinding -> {
+                clearImage(binding.homeScrollPreview)
+            }
+
+            is HomeScrollViewTvBinding -> {
+                clearImage(binding.homeScrollPreview)
+            }
+        }
+    }
+
     override fun onBindContent(
         holder: ViewHolderState<Any>,
         item: LoadResponse,
         position: Int,
     ) {
         val binding = holder.view
-        val itemView = holder.itemView
-        val isHorizontal =
-            binding is HomeScrollViewTvBinding || itemView.resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
 
-        val posterUrl =
-            if (isHorizontal) item.backgroundPosterUrl ?: item.posterUrl else item.posterUrl
-                ?: item.backgroundPosterUrl
+        val posterUrl = item.backgroundPosterUrl ?: item.posterUrl
 
         when (binding) {
             is HomeScrollViewBinding -> {
@@ -53,10 +64,21 @@ class HomeScrollAdapter(
                     isGone = item.tags.isNullOrEmpty()
                     maxLines = 2
                 }
-                binding.homeScrollPreviewTitle.text = item.name
+                binding.homeScrollPreviewTitle.text = item.name.html()
+
+                bindLogo(
+                    url = item.logoUrl,
+                    headers = item.posterHeaders,
+                    titleView = binding.homeScrollPreviewTitle,
+                    logoView = binding.homePreviewLogo
+                )
             }
 
             is HomeScrollViewTvBinding -> {
+                binding.homeScrollPreview.isFocusable = false
+                binding.homeScrollPreview.setOnClickListener { view ->
+                    callback.invoke(view ?: return@setOnClickListener, position, item)
+                }
                 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 60f2c18015f..e0609c0e57b 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
@@ -7,14 +7,14 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.lagradost.cloudstream3.APIHolder.apis
 import com.lagradost.cloudstream3.APIHolder.getApiFromNameNull
-import com.lagradost.cloudstream3.AcraApplication.Companion.context
-import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.context
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.getKey
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.setKey
 import com.lagradost.cloudstream3.CommonActivity.activity
 import com.lagradost.cloudstream3.HomePageList
 import com.lagradost.cloudstream3.LoadResponse
 import com.lagradost.cloudstream3.MainAPI
 import com.lagradost.cloudstream3.MainActivity
-import com.lagradost.cloudstream3.MainActivity.Companion.lastError
 import com.lagradost.cloudstream3.SearchResponse
 import com.lagradost.cloudstream3.amap
 import com.lagradost.cloudstream3.mvvm.Resource
@@ -40,6 +40,7 @@ import com.lagradost.cloudstream3.utils.AppContextUtils.filterSearchResultByFilm
 import com.lagradost.cloudstream3.utils.AppContextUtils.loadResult
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import com.lagradost.cloudstream3.utils.DOWNLOAD_HEADER_CACHE
+import com.lagradost.cloudstream3.utils.DOWNLOAD_HEADER_CACHE_BACKUP
 import com.lagradost.cloudstream3.utils.DataStoreHelper
 import com.lagradost.cloudstream3.utils.DataStoreHelper.deleteAllResumeStateIds
 import com.lagradost.cloudstream3.utils.DataStoreHelper.getAllResumeStateIds
@@ -49,13 +50,12 @@ 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
-import com.lagradost.cloudstream3.utils.VideoDownloadHelper
+import com.lagradost.cloudstream3.utils.downloader.DownloadObjects
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.withContext
 import java.util.EnumSet
 import java.util.concurrent.CopyOnWriteArrayList
-import kotlin.collections.set
 
 class HomeViewModel : ViewModel() {
     companion object {
@@ -67,11 +67,26 @@ class HomeViewModel : ViewModel() {
             }
             val resumeWatchingResult = withContext(Dispatchers.IO) {
                 resumeWatching?.mapNotNull { resume ->
-
-                    val data = getKey<VideoDownloadHelper.DownloadHeaderCached>(
+                    val headerCache = getKey<DownloadObjects.DownloadHeaderCached>(
                         DOWNLOAD_HEADER_CACHE,
                         resume.parentId.toString()
-                    ) ?: return@mapNotNull null
+                    )
+
+                    val data = if (headerCache == null) {
+                        // We store resume watching data in download header cache
+                        // Because downloads automatically pruned outdated download headers we
+                        // removed resume watching data. We should restore the data for affected users.
+                        val oldData = getKey<DownloadObjects.DownloadHeaderCached>(
+                            DOWNLOAD_HEADER_CACHE_BACKUP,
+                            resume.parentId.toString()
+                        ) ?: return@mapNotNull null
+
+                        // Restore data
+                        setKey(DOWNLOAD_HEADER_CACHE, resume.parentId.toString(), oldData)
+                        oldData
+                    } else {
+                        headerCache
+                    }
 
                     val watchPos = getViewPos(resume.episodeId)
 
@@ -520,18 +535,18 @@ class HomeViewModel : ViewModel() {
             } else if (api == null) {
                 // API is not found aka not loaded or removed, post the loading
                 // progress if waiting for plugins, otherwise nothing
-                if (PluginManager.loadedOnlinePlugins || PluginManager.checkSafeModeFile() || lastError != null) {
+                if (PluginManager.loadedOnlinePlugins || PluginManager.isSafeMode()) {
                     loadAndCancel(noneApi)
                 } 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()
             }
+            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 bfac72067f0..6e28c128d1c 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
@@ -7,22 +7,16 @@ import android.content.res.Configuration
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
-import android.util.TypedValue
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import android.view.ViewGroup.FOCUS_AFTER_DESCENDANTS
 import android.view.ViewGroup.FOCUS_BLOCK_DESCENDANTS
 import android.view.animation.AlphaAnimation
-import android.widget.ImageView
 import android.widget.TextView
-import android.widget.Toast
 import androidx.annotation.StringRes
 import androidx.appcompat.widget.SearchView
 import androidx.core.view.allViews
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
-import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.RecyclerView
@@ -30,35 +24,33 @@ import com.google.android.material.tabs.TabLayout
 import com.google.android.material.tabs.TabLayoutMediator
 import com.lagradost.cloudstream3.APIHolder
 import com.lagradost.cloudstream3.APIHolder.allProviders
-import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
-import com.lagradost.cloudstream3.AcraApplication.Companion.openBrowser
-import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
-import com.lagradost.cloudstream3.CommonActivity
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.getKey
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.openBrowser
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.setKey
 import com.lagradost.cloudstream3.MainActivity
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.SearchResponse
 import com.lagradost.cloudstream3.databinding.FragmentLibraryBinding
 import com.lagradost.cloudstream3.mvvm.Resource
 import com.lagradost.cloudstream3.mvvm.debugAssert
-import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.mvvm.observe
 import com.lagradost.cloudstream3.syncproviders.SyncAPI
 import com.lagradost.cloudstream3.syncproviders.SyncIdName
 import com.lagradost.cloudstream3.ui.AutofitRecyclerView
 import com.lagradost.cloudstream3.ui.quicksearch.QuickSearchFragment
 import com.lagradost.cloudstream3.utils.txt
+import com.lagradost.cloudstream3.ui.BaseFragment
 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
 import com.lagradost.cloudstream3.ui.settings.Globals.PHONE
-import com.lagradost.cloudstream3.ui.settings.Globals.TV
+import com.lagradost.cloudstream3.ui.settings.Globals.isLandscape
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
 import com.lagradost.cloudstream3.utils.AppContextUtils.loadResult
 import com.lagradost.cloudstream3.utils.AppContextUtils.loadSearchResult
 import com.lagradost.cloudstream3.utils.AppContextUtils.reduceDragSensitivity
 import com.lagradost.cloudstream3.utils.DataStoreHelper.currentAccount
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialog
-import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
+import com.lagradost.cloudstream3.utils.UIHelper.fixSystemBarsPadding
 import com.lagradost.cloudstream3.utils.UIHelper.getSpanCount
 import java.util.concurrent.CopyOnWriteArrayList
 import kotlin.math.abs
@@ -84,10 +76,10 @@ data class ProviderLibraryData(
     val apiName: String
 )
 
-class LibraryFragment : Fragment() {
+class LibraryFragment : BaseFragment<FragmentLibraryBinding>(
+    BaseFragment.BindingCreator.Bind(FragmentLibraryBinding::bind)
+) {
     companion object {
-
-        val listLibraryItems = mutableListOf<SyncAPI.LibraryItem>()
         fun newInstance() = LibraryFragment()
 
         /**
@@ -98,35 +90,10 @@ class LibraryFragment : Fragment() {
 
     private val libraryViewModel: LibraryViewModel by activityViewModels()
 
-    var binding: FragmentLibraryBinding? = null
     private var toggleRandomButton = false
 
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
-    ): View {
-        val layout =
-            if (isLayout(TV or EMULATOR)) R.layout.fragment_library_tv else R.layout.fragment_library
-        val root = inflater.inflate(layout, container, false)
-        binding = try {
-            FragmentLibraryBinding.bind(root)
-        } catch (t: Throwable) {
-            CommonActivity.showToast(
-                txt(R.string.unable_to_inflate, t.message ?: ""),
-                Toast.LENGTH_LONG
-            )
-            logError(t)
-            null
-        }
-
-        return root
-
-        //return inflater.inflate(R.layout.fragment_library, container, false)
-    }
-
-    override fun onDestroyView() {
-        binding = null
-        super.onDestroyView()
-    }
+    override fun pickLayout(): Int? =
+        if (isLayout(PHONE)) R.layout.fragment_library else R.layout.fragment_library_tv
 
     override fun onSaveInstanceState(outState: Bundle) {
         binding?.viewpager?.currentItem?.let { currentItem ->
@@ -135,48 +102,52 @@ class LibraryFragment : Fragment() {
         super.onSaveInstanceState(outState)
     }
 
-    private fun updateRandom() {
+    private fun updateRandomVisibility(binding: FragmentLibraryBinding) {
+        if (!toggleRandomButton) {
+            binding.libraryRandom.isGone = true
+            binding.libraryRandomButtonTv.isGone = true
+            return
+        }
         val position = libraryViewModel.currentPage.value ?: 0
         val pages = (libraryViewModel.pages.value as? Resource.Success)?.value ?: return
-        if (toggleRandomButton) {
-            listLibraryItems.clear()
-            listLibraryItems.addAll(pages[position].items)
-            binding?.libraryRandom?.isVisible = listLibraryItems.isNotEmpty()
-        } else {
-            binding?.libraryRandom?.isGone = true
-        }
+        val hasItems = pages[position].items.isNotEmpty()
+        val isPhone = isLayout(PHONE)
+
+        binding.libraryRandom.isVisible = isPhone && hasItems
+        binding.libraryRandomButtonTv.isVisible = !isPhone && hasItems
+    }
+
+    override fun fixLayout(view: View) {
+        fixSystemBarsPadding(
+            view,
+            padBottom = isLandscape(),
+            padLeft = !isLayout(PHONE)
+        )
     }
 
     @SuppressLint("ResourceType", "CutPasteId")
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        fixPaddingStatusbar(binding?.searchStatusBarPadding)
-
-        binding?.sortFab?.setOnClickListener(sortChangeClickListener)
-        binding?.librarySort?.setOnClickListener(sortChangeClickListener)
-
-        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 { _, _ ->
-                binding?.searchBar?.setExpanded(true)
+    override fun onBindingCreated(
+        binding: FragmentLibraryBinding,
+        savedInstanceState: Bundle?
+    ) {
+        binding.sortFab.setOnClickListener(sortChangeClickListener)
+        binding.librarySort.setOnClickListener(sortChangeClickListener)
+
+        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 { _, _ ->
+                    binding.searchBar.setExpanded(true)
+                }
             }
-        }
-
-        // Set the color for the search exit icon to the correct theme text color
-        val searchExitIcon =
-            binding?.mainSearch?.findViewById<ImageView>(androidx.appcompat.R.id.search_close_btn)
-        val searchExitIconColor = TypedValue()
-
-        activity?.theme?.resolveAttribute(android.R.attr.textColor, searchExitIconColor, true)
-        searchExitIcon?.setColorFilter(searchExitIconColor.data)
 
         val searchCallback = Runnable {
-            val newText = binding?.mainSearch?.query?.toString() ?: return@Runnable
+            val newText = binding.mainSearch.query.toString()
             libraryViewModel.sort(ListSorting.Query, newText)
         }
 
-        binding?.mainSearch?.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
+        binding.mainSearch.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
             override fun onQueryTextSubmit(query: String?): Boolean {
                 libraryViewModel.sort(ListSorting.Query, query)
                 return true
@@ -192,11 +163,11 @@ class LibraryFragment : Fragment() {
                     return true
                 }
 
-                binding?.mainSearch?.removeCallbacks(searchCallback)
+                binding.mainSearch.removeCallbacks(searchCallback)
 
                 // Delay the execution of the search operation by 1 second (adjust as needed)
                 // this prevents running search when the user is typing
-                binding?.mainSearch?.postDelayed(searchCallback, 1000)
+                binding.mainSearch.postDelayed(searchCallback, 1000)
 
                 return true
             }
@@ -204,11 +175,12 @@ class LibraryFragment : Fragment() {
 
         libraryViewModel.reloadPages(false)
 
-        binding?.listSelector?.setOnClickListener {
+        binding.listSelector.setOnClickListener {
             val items = libraryViewModel.availableApiNames
             val currentItem = libraryViewModel.currentApiName.value
 
-            activity?.showBottomDialog(items,
+            activity?.showBottomDialog(
+                items,
                 items.indexOf(currentItem),
                 txt(R.string.select_library).asString(it.context),
                 false,
@@ -225,17 +197,9 @@ class LibraryFragment : Fragment() {
                 settingsManager.getBoolean(
                     getString(R.string.random_button_key),
                     false
-                ) && isLayout(PHONE)
-            binding?.libraryRandom?.visibility = View.GONE
-        }
-
-        binding?.libraryRandom?.setOnClickListener {
-            if (listLibraryItems.isNotEmpty()) {
-                val listLibraryItem = listLibraryItems.random()
-                libraryViewModel.currentSyncApi?.syncIdName?.let {
-                    loadLibraryItem(it, listLibraryItem.syncId, listLibraryItem)
-                }
-            }
+                )
+            binding.libraryRandom.visibility = View.GONE
+            binding.libraryRandomButtonTv.visibility = View.GONE
         }
 
         /**
@@ -305,22 +269,21 @@ class LibraryFragment : Fragment() {
             }
         }
 
-        binding?.providerSelector?.setOnClickListener {
+        binding.providerSelector.setOnClickListener {
             val syncName = libraryViewModel.currentSyncApi?.syncIdName ?: return@setOnClickListener
             activity?.showPluginSelectionDialog(syncName.name, syncName)
         }
 
-        binding?.viewpager?.setPageTransformer(LibraryScrollTransformer())
+        binding.viewpager.setPageTransformer(LibraryScrollTransformer())
 
-        binding?.viewpager?.adapter = ViewpagerAdapter(
-            fragment = this,
+        binding.viewpager.adapter = ViewpagerAdapter(
             { isScrollingDown: Boolean ->
                 if (isScrollingDown) {
-                    binding?.sortFab?.shrink()
-                    binding?.libraryRandom?.shrink()
+                    binding.sortFab.shrink()
+                    binding.libraryRandom.shrink()
                 } else {
-                    binding?.sortFab?.extend()
-                    binding?.libraryRandom?.extend()
+                    binding.sortFab.extend()
+                    binding.libraryRandom.extend()
                 }
             }) callback@{ searchClickCallback ->
             // To prevent future accidents
@@ -353,15 +316,15 @@ class LibraryFragment : Fragment() {
             }
         }
 
-        binding?.apply {
+        binding.apply {
             viewpager.offscreenPageLimit = 2
             viewpager.reduceDragSensitivity()
             searchBar.setExpanded(true)
         }
 
         val startLoading = Runnable {
-            binding?.apply {
-                gridview.numColumns = context?.getSpanCount() ?: 3
+            binding.apply {
+                gridview.numColumns = root.context.getSpanCount()
                 gridview.adapter =
                     context?.let { LoadingPosterAdapter(it, 6 * 3) }
                 libraryLoadingOverlay.isVisible = true
@@ -371,7 +334,7 @@ class LibraryFragment : Fragment() {
         }
 
         val stopLoading = Runnable {
-            binding?.apply {
+            binding.apply {
                 gridview.adapter = null
                 libraryLoadingOverlay.isVisible = false
                 libraryLoadingShimmer.stopShimmer()
@@ -387,7 +350,7 @@ class LibraryFragment : Fragment() {
                     val pages = resource.value
                     val showNotice = pages.all { it.items.isEmpty() }
 
-                    binding?.apply {
+                    binding.apply {
                         emptyListTextview.isVisible = showNotice
                         if (showNotice) {
                             if (libraryViewModel.availableApiNames.size > 1) {
@@ -415,10 +378,23 @@ class LibraryFragment : Fragment() {
                         )*/
 
                         libraryViewModel.currentPage.value?.let { page ->
-                            binding?.viewpager?.setCurrentItem(page, false)
+                            binding.viewpager.setCurrentItem(page, false)
+                            binding.searchBar.setExpanded(true)
                         }
 
-                        updateRandom()
+                        // Set up random button click listener
+                        if (toggleRandomButton) {
+                            val randomClickListener = View.OnClickListener {
+                                val position = libraryViewModel.currentPage.value ?: 0
+                                val syncIdName = libraryViewModel.currentSyncApi?.syncIdName ?: return@OnClickListener
+                                pages[position].items.randomOrNull()?.let { item ->
+                                    loadLibraryItem(syncIdName, item.syncId, item)
+                                }
+                            }
+                            libraryRandom.setOnClickListener(randomClickListener)
+                            libraryRandomButtonTv.setOnClickListener(randomClickListener)
+                        }
+                        updateRandomVisibility(binding)
 
                         // Only stop loading after 300ms to hide the fade effect the viewpager produces when updating
                         // Without this there would be a flashing effect:
@@ -459,21 +435,20 @@ class LibraryFragment : Fragment() {
                             tab.view.nextFocusDownId = R.id.search_result_root
 
                             tab.view.setOnClickListener {
-                                val currentItem =
-                                    binding?.viewpager?.currentItem ?: return@setOnClickListener
+                                val currentItem = binding.viewpager.currentItem
                                 val distance = abs(position - currentItem)
                                 hideViewpager(distance)
                             }
                             //Expand the appBar on tab focus
                             tab.view.setOnFocusChangeListener { _, _ ->
-                                binding?.searchBar?.setExpanded(true)
+                                binding.searchBar.setExpanded(true)
                             }
                         }.attach()
 
-                        binding?.libraryTabLayout?.addOnTabSelectedListener(object :
+                        binding.libraryTabLayout.addOnTabSelectedListener(object :
                             TabLayout.OnTabSelectedListener {
                             override fun onTabSelected(tab: TabLayout.Tab?) {
-                                binding?.libraryTabLayout?.selectedTabPosition?.let { page ->
+                                binding.libraryTabLayout.selectedTabPosition.let { page ->
                                     libraryViewModel.switchPage(page)
                                 }
                             }
@@ -498,11 +473,11 @@ class LibraryFragment : Fragment() {
         }
 
         observe(libraryViewModel.currentPage) { position ->
-            updateRandom()
-            val all = binding?.viewpager?.allViews?.toList()
-                ?.filterIsInstance<AutofitRecyclerView>()
+            updateRandomVisibility(binding)
+            val all = binding.viewpager.allViews.toList()
+                .filterIsInstance<AutofitRecyclerView>()
 
-            all?.forEach { view ->
+            all.forEach { view ->
                 view.isVisible = view.tag == position
                 view.isFocusable = view.tag == position
 
@@ -512,14 +487,6 @@ class LibraryFragment : Fragment() {
                     view.descendantFocusability = FOCUS_BLOCK_DESCENDANTS
             }
         }
-
-        /*binding?.viewpager?.registerOnPageChangeCallback(object :
-            ViewPager2.OnPageChangeCallback() {
-            override fun onPageSelected(position: Int) {
-
-                super.onPageSelected(position)
-            }
-        })*/
     }
 
     private fun loadLibraryItem(
@@ -578,10 +545,10 @@ class LibraryFragment : Fragment() {
 
     }
 
-    @SuppressLint("NotifyDataSetChanged")
     override fun onConfigurationChanged(newConfig: Configuration) {
-        binding?.viewpager?.adapter?.notifyDataSetChanged()
         super.onConfigurationChanged(newConfig)
+        val adapter = binding?.viewpager?.adapter ?: return
+        adapter.notifyItemRangeChanged(0, adapter.itemCount)
     }
 
     private val sortChangeClickListener = View.OnClickListener { view ->
@@ -589,7 +556,8 @@ class LibraryFragment : Fragment() {
             txt(it.stringRes).asString(view.context)
         }
 
-        activity?.showBottomDialog(methods,
+        activity?.showBottomDialog(
+            methods,
             libraryViewModel.sortingMethods.indexOf(libraryViewModel.currentSortingMethod),
             txt(R.string.sort_by).asString(view.context),
             false,
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 6c602e6c527..38f7fcf9dcb 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
@@ -4,12 +4,13 @@ import androidx.annotation.StringRes
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
-import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
-import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.getKey
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.setKey
 import com.lagradost.cloudstream3.MainActivity
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.mvvm.Resource
-import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.SyncApis
+import com.lagradost.cloudstream3.mvvm.throwAbleToResource
+import com.lagradost.cloudstream3.syncproviders.AccountManager
 import com.lagradost.cloudstream3.syncproviders.SyncAPI
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import com.lagradost.cloudstream3.utils.DataStoreHelper
@@ -30,13 +31,13 @@ enum class ListSorting(@StringRes val stringRes: Int) {
 const val LAST_SYNC_API_KEY = "last_sync_api"
 
 class LibraryViewModel : ViewModel() {
-    fun switchPage(page : Int) {
+    fun switchPage(page: Int) {
         _currentPage.postValue(page)
     }
 
     private val _currentPage: MutableLiveData<Int> = MutableLiveData(0)
     val currentPage: LiveData<Int> = _currentPage
-    
+
     private val _pages: MutableLiveData<Resource<List<SyncAPI.Page>>> = MutableLiveData(null)
     val pages: LiveData<Resource<List<SyncAPI.Page>>> = _pages
 
@@ -44,7 +45,7 @@ class LibraryViewModel : ViewModel() {
     val currentApiName: LiveData<String> = _currentApiName
 
     private val availableSyncApis
-        get() = SyncApis.filter { it.hasAccount() }
+        get() = AccountManager.syncApis.filter { it.isAvailable }
 
     var currentSyncApi = availableSyncApis.let { allApis ->
         val lastSelection = getKey<String>("$currentAccount/$LAST_SYNC_API_KEY")
@@ -97,12 +98,17 @@ class LibraryViewModel : ViewModel() {
             currentSyncApi?.let { repo ->
                 _currentApiName.postValue(repo.name)
                 _pages.postValue(Resource.Loading())
-                val libraryResource = repo.getPersonalLibrary()
-                if (libraryResource is Resource.Failure) {
-                    _pages.postValue(libraryResource)
+                val libraryResource = repo.library()
+                val err = libraryResource.exceptionOrNull()
+                if (err != null) {
+                    _pages.postValue(throwAbleToResource(err))
+                    return@let
+                }
+                val library = libraryResource.getOrNull()
+                if (library == null) {
+                    _pages.postValue(Resource.Failure(false, "Unable to fetch library"))
                     return@let
                 }
-                val library = (libraryResource as? Resource.Success)?.value ?: return@let
 
                 sortingMethods = library.supportedListSorting.toList()
                 repo.requireLibraryRefresh = false
@@ -116,7 +122,10 @@ class LibraryViewModel : ViewModel() {
 
                 val desiredSortingMethod =
                     ListSorting.entries.getOrNull(DataStoreHelper.librarySortingMode)
-                if (desiredSortingMethod != null && library.supportedListSorting.contains(desiredSortingMethod)) {
+                if (desiredSortingMethod != null && library.supportedListSorting.contains(
+                        desiredSortingMethod
+                    )
+                ) {
                     sort(desiredSortingMethod, null, pages)
                 } else {
                     // null query = no sorting
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/library/PageAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/library/PageAdapter.kt
index 98156efc879..066cf468d20 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/library/PageAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/library/PageAdapter.kt
@@ -1,35 +1,34 @@
 package com.lagradost.cloudstream3.ui.library
 
-import android.content.res.ColorStateList
-import android.graphics.Color
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import android.widget.FrameLayout
-import androidx.core.content.ContextCompat
-import androidx.core.graphics.ColorUtils
 import androidx.core.view.isVisible
-import androidx.recyclerview.widget.RecyclerView
-import com.lagradost.cloudstream3.AcraApplication
-import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.databinding.SearchResultGridExpandedBinding
 import com.lagradost.cloudstream3.syncproviders.SyncAPI
 import com.lagradost.cloudstream3.ui.AutofitRecyclerView
+import com.lagradost.cloudstream3.ui.BaseDiffCallback
+import com.lagradost.cloudstream3.ui.NoStateAdapter
+import com.lagradost.cloudstream3.ui.ViewHolderState
 import com.lagradost.cloudstream3.ui.search.SearchClickCallback
 import com.lagradost.cloudstream3.ui.search.SearchResultBuilder
-import com.lagradost.cloudstream3.utils.AppContextUtils
-import com.lagradost.cloudstream3.utils.UIHelper.toPx
 import kotlin.math.roundToInt
 
-
 class PageAdapter(
-    override val items: MutableList<SyncAPI.LibraryItem>,
     private val resView: AutofitRecyclerView,
     val clickCallback: (SearchClickCallback) -> Unit
 ) :
-    AppContextUtils.DiffAdapter<SyncAPI.LibraryItem>(items) {
+    NoStateAdapter<SyncAPI.LibraryItem>(diffCallback = BaseDiffCallback(itemSame = { a, b ->
+        if (a.id != null || b.id != null) {
+            a.id == b.id
+        } else {
+            a.name == b.name && a.url == b.url
+        }
+    })) {
+    private val coverHeight: Int get() = (resView.itemWidth / 0.68).roundToInt()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-        return LibraryItemViewHolder(
+    override fun onCreateContent(parent: ViewGroup): ViewHolderState<Any> {
+        return ViewHolderState(
             SearchResultGridExpandedBinding.inflate(
                 LayoutInflater.from(parent.context),
                 parent,
@@ -38,86 +37,45 @@ class PageAdapter(
         )
     }
 
-    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-        when (holder) {
-            is LibraryItemViewHolder -> {
-                holder.bind(items[position], position)
+    override fun onClearView(holder: ViewHolderState<Any>) {
+        when (val binding = holder.view) {
+            is SearchResultGridExpandedBinding -> {
+                clearImage(binding.imageView)
             }
         }
     }
 
-    private fun isDark(color: Int): Boolean {
-        return ColorUtils.calculateLuminance(color) < 0.5
-    }
-
-    fun getDifferentColor(color: Int, ratio: Float = 0.7f): Int {
-        return if (isDark(color)) {
-            ColorUtils.blendARGB(color, Color.WHITE, ratio)
-        } else {
-            ColorUtils.blendARGB(color, Color.BLACK, ratio)
-        }
-    }
-
-    inner class LibraryItemViewHolder(val binding: SearchResultGridExpandedBinding) :
-        RecyclerView.ViewHolder(binding.root) {
-
-        private val compactView = false//itemView.context.getGridIsCompact()
-        private val coverHeight: Int =
-            if (compactView) 80.toPx else (resView.itemWidth / 0.68).roundToInt()
+    override fun onBindContent(
+        holder: ViewHolderState<Any>,
+        item: SyncAPI.LibraryItem,
+        position: Int
+    ) {
+        val binding = holder.view as? SearchResultGridExpandedBinding ?: return
 
-        fun bind(item: SyncAPI.LibraryItem, position: Int) {
-            /** https://stackoverflow.com/questions/8817522/how-to-get-color-code-of-image-view */
-
-            SearchResultBuilder.bind(
-                this@PageAdapter.clickCallback,
-                item,
-                position,
-                itemView,
-                /*colorCallback = { palette ->
-                    AcraApplication.context?.let { ctx ->
-                        val defColor = ContextCompat.getColor(ctx, R.color.ratingColorBg)
-                        var bg = palette.getDarkVibrantColor(defColor)
-                        if (bg == defColor) {
-                            bg = palette.getDarkMutedColor(defColor)
-                        }
-                        if (bg == defColor) {
-                            bg = palette.getVibrantColor(defColor)
-                        }
-
-                        val fg =
-                            getDifferentColor(bg)//palette.getVibrantColor(ContextCompat.getColor(ctx,R.color.ratingColor))
-                        binding.textRating.apply {
-                            setTextColor(ColorStateList.valueOf(fg))
-                        }
-                        binding.textRating.compoundDrawables.getOrNull(0)?.setTint(fg)
-                        binding.textRating.backgroundTintList = ColorStateList.valueOf(bg)
-                        binding.watchProgress.apply {
-                            progressTintList = ColorStateList.valueOf(fg)
-                            progressBackgroundTintList = ColorStateList.valueOf(bg)
-                        }
-                    }
-                }
-                */
-            )
-
-            // See searchAdaptor for this, it basically fixes the height
-            if (!compactView) {
-                binding.imageView.apply {
-                    layoutParams = FrameLayout.LayoutParams(
-                        ViewGroup.LayoutParams.MATCH_PARENT,
-                        coverHeight
-                    )
-                }
-            }
+        /** https://stackoverflow.com/questions/8817522/how-to-get-color-code-of-image-view */
+        SearchResultBuilder.bind(
+            this@PageAdapter.clickCallback,
+            item,
+            position,
+            holder.itemView,
+        )
 
-            val showProgress = item.episodesCompleted != null && item.episodesTotal != null
-            binding.watchProgress.isVisible = showProgress
-            if (showProgress) {
-                binding.watchProgress.max = item.episodesTotal!!
-                binding.watchProgress.progress = item.episodesCompleted!!
-            }
+        // See searchAdaptor for this, it basically fixes the height
+        val params = FrameLayout.LayoutParams(
+            ViewGroup.LayoutParams.MATCH_PARENT,
+            coverHeight
+        )
+        if (params.height != binding.imageView.layoutParams.height || params.width != binding.imageView.layoutParams.width) {
+            binding.imageView.layoutParams = params
+        }
 
-            binding.imageText.text = item.name
+        val showProgress = item.episodesCompleted?.let{ it>0 } ?: false && item.episodesTotal != null
+        binding.watchProgress.isVisible = showProgress
+        if (showProgress) {
+            binding.watchProgress.max = item.episodesTotal
+            binding.watchProgress.progress = item.episodesCompleted
         }
+
+        binding.imageText.text = item.name
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/library/ViewpagerAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/library/ViewpagerAdapter.kt
index 0110187f603..68b6eb2735a 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
@@ -40,19 +40,19 @@ class ViewpagerAdapterViewHolderState(val binding: LibraryViewpagerPageBinding)
 }
 
 class ViewpagerAdapter(
-    fragment: Fragment,
     val scrollCallback: (isScrollingDown: Boolean) -> Unit,
     val clickCallback: (SearchClickCallback) -> Unit
-) : BaseAdapter<SyncAPI.Page, Bundle>(fragment,
+) : BaseAdapter<SyncAPI.Page, Bundle>(
     id = "ViewpagerAdapter".hashCode(),
     diffCallback = BaseDiffCallback(
-    itemSame = { a, b ->
-        a.title == b.title
-    },
-    contentSame = { a, b ->
-        a.items == b.items && a.title == b.title
-    }
-)) {
+        itemSame = { a, b ->
+            a.title == b.title
+        },
+        contentSame = { a, b ->
+            a.items == b.items && a.title == b.title
+        }
+    )) {
+
     override fun onCreateContent(parent: ViewGroup): ViewHolderState<Bundle> {
         return ViewpagerAdapterViewHolderState(
             LibraryViewpagerPageBinding.inflate(LayoutInflater.from(parent.context), parent, false)
@@ -66,7 +66,8 @@ class ViewpagerAdapter(
     ) {
         val binding = holder.view
         if (binding !is LibraryViewpagerPageBinding) return
-        (binding.pageRecyclerview.adapter as? PageAdapter)?.updateList(item.items)
+        (binding.pageRecyclerview.adapter as? PageAdapter)?.submitList(item.items)
+        binding.pageRecyclerview.scrollToPosition(0)
     }
 
     override fun onBindContent(holder: ViewHolderState<Bundle>, item: SyncAPI.Page, position: Int) {
@@ -75,21 +76,21 @@ class ViewpagerAdapter(
 
         binding.pageRecyclerview.tag = position
         binding.pageRecyclerview.apply {
-            spanCount =
-                binding.root.context.getSpanCount() ?: 3
+            spanCount = binding.root.context.getSpanCount()
             if (adapter == null) { //  || rebind
                 // Only add the items after it has been attached since the items rely on ItemWidth
                 // Which is only determined after the recyclerview is attached.
                 // If this fails then item height becomes 0 when there is only one item
                 doOnAttach {
                     adapter = PageAdapter(
-                        item.items.toMutableList(),
                         this,
                         clickCallback
-                    )
+                    ).apply {
+                        submitList(item.items)
+                    }
                 }
             } else {
-                (adapter as? PageAdapter)?.updateList(item.items)
+                (adapter as? PageAdapter)?.submitList(item.items)
                 // scrollToPosition(0)
             }
 
@@ -100,7 +101,7 @@ class ViewpagerAdapter(
                     //Expand the top Appbar based on scroll direction up/down, simulate phone behavior
                     if (isLayout(TV or EMULATOR)) {
                         binding.root.rootView.findViewById<AppBarLayout>(R.id.search_bar)
-                            .apply {
+                            ?.apply {
                                 if (diff <= 0)
                                     setExpanded(true)
                                 else
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 75a589a0e83..e5a460b9a02 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
@@ -1,62 +1,16 @@
 package com.lagradost.cloudstream3.ui.player
 
-import android.annotation.SuppressLint
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import android.content.IntentFilter
-import android.graphics.drawable.AnimatedImageDrawable
-import android.graphics.drawable.AnimatedVectorDrawable
-import android.media.metrics.PlaybackErrorEvent
-import android.os.Build
 import android.os.Bundle
-import android.util.Log
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
-import android.view.WindowManager
-import android.widget.FrameLayout
 import android.widget.ImageView
-import android.widget.ProgressBar
-import android.widget.Toast
-import androidx.annotation.LayoutRes
+import androidx.annotation.OptIn
 import androidx.annotation.StringRes
-import androidx.core.view.isGone
-import androidx.core.view.isVisible
-import androidx.fragment.app.Fragment
-import androidx.media3.common.PlaybackException
-import androidx.media3.exoplayer.ExoPlayer
+import androidx.media3.common.util.UnstableApi
 import androidx.media3.session.MediaSession
-import androidx.media3.ui.AspectRatioFrameLayout
-import androidx.media3.ui.DefaultTimeBar
-import androidx.media3.ui.PlayerView
 import androidx.media3.ui.SubtitleView
-import androidx.media3.ui.TimeBar
-import androidx.preference.PreferenceManager
-import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
-import com.github.rubensousa.previewseekbar.PreviewBar
-import com.github.rubensousa.previewseekbar.media3.PreviewTimeBar
-import com.lagradost.cloudstream3.CommonActivity.canEnterPipMode
-import com.lagradost.cloudstream3.CommonActivity.isInPIPMode
-import com.lagradost.cloudstream3.CommonActivity.keyEventListener
-import com.lagradost.cloudstream3.CommonActivity.playerEventListener
-import com.lagradost.cloudstream3.CommonActivity.screenWidth
-import com.lagradost.cloudstream3.CommonActivity.showToast
-import com.lagradost.cloudstream3.ErrorLoadingException
+import androidx.viewbinding.ViewBinding
 import com.lagradost.cloudstream3.R
-import com.lagradost.cloudstream3.mvvm.logError
-import com.lagradost.cloudstream3.mvvm.safe
-import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.unixTimeMs
-import com.lagradost.cloudstream3.ui.subtitles.SaveCaptionStyle
-import com.lagradost.cloudstream3.ui.subtitles.SubtitlesFragment
-import com.lagradost.cloudstream3.utils.AppContextUtils
-import com.lagradost.cloudstream3.utils.AppContextUtils.requestLocalAudioFocus
-import com.lagradost.cloudstream3.utils.DataStoreHelper
-import com.lagradost.cloudstream3.utils.EpisodeSkip
-import com.lagradost.cloudstream3.utils.UIHelper
-import com.lagradost.cloudstream3.utils.UIHelper.hideSystemUI
-import com.lagradost.cloudstream3.utils.UIHelper.popCurrentPage
-import java.net.SocketTimeoutException
+import com.lagradost.cloudstream3.ui.BaseFragment
 
 enum class PlayerResize(@StringRes val nameRes: Int) {
     Fit(R.string.resize_fit),
@@ -76,669 +30,132 @@ const val NEXT_WATCH_EPISODE_PERCENTAGE = 90
 // when the player should sync the progress of "watched", TODO MAKE SETTING
 const val UPDATE_SYNC_PROGRESS_PERCENTAGE = 80
 
-abstract class AbstractPlayerFragment(
-    var player: IPlayer = CS3IPlayer()
-) : Fragment() {
-    var resizeMode: Int = 0
-    var subView: SubtitleView? = null
-    var isBuffering = true
-    protected open var hasPipModeSupport = true
-
-    var playerPausePlayHolderHolder: FrameLayout? = null
-    var playerPausePlay: ImageView? = null
-    var playerBuffering: ProgressBar? = null
-    var playerView: PlayerView? = null
-    var piphide: FrameLayout? = null
-    var subtitleHolder: FrameLayout? = null
-
-    @LayoutRes
-    protected open var layout: Int = R.layout.fragment_player
-
-    open fun nextEpisode() {
-        throw NotImplementedError()
-    }
+@OptIn(UnstableApi::class)
+abstract class AbstractPlayerFragment<T : ViewBinding>(
+    bindingCreator: BindingCreator<T>
+) : BaseFragment<T>(bindingCreator), PlayerView.Callbacks {
 
-    open fun prevEpisode() {
-        throw NotImplementedError()
-    }
+    // Stored pre-initialization so subclasses can set them before onBindingCreated.
+    private var _player: IPlayer = CS3IPlayer()
 
-    open fun playerPositionChanged(position: Long, duration: Long) {
-        throw NotImplementedError()
-    }
+    /** The shared [PlayerView] host that owns all player state and view references. */
+    protected var playerHostView: PlayerView? = null
 
-    open fun playerStatusChanged() {}
+    var player: IPlayer
+        get() = playerHostView?.player ?: _player
+        set(value) {
+            _player = value
+            playerHostView?.player = value
+        }
 
-    open fun playerDimensionsLoaded(width: Int, height: Int) {
-        throw NotImplementedError()
-    }
+    val subView: SubtitleView? get() = playerHostView?.subView
+    val playerPausePlay: ImageView? get() = playerHostView?.playerPausePlay
 
-    open fun subtitlesChanged() {
-        throw NotImplementedError()
-    }
+    /** The underlying [androidx.media3.ui.PlayerView] widget (named to avoid conflict with our [PlayerView]). */
+    val playerView: androidx.media3.ui.PlayerView?
+        get() = playerHostView?.exoPlayerView
 
-    open fun embeddedSubtitlesFetched(subtitles: List<SubtitleData>) {
-        throw NotImplementedError()
-    }
+    var currentPlayerStatus: CSPlayerLoading
+        get() = playerHostView?.currentPlayerStatus ?: CSPlayerLoading.IsBuffering
+        set(value) { playerHostView?.currentPlayerStatus = value }
 
-    open fun onTracksInfoChanged() {
-        throw NotImplementedError()
-    }
+    protected var mMediaSession: MediaSession?
+        get() = playerHostView?.mMediaSession
+        set(value) { playerHostView?.mMediaSession = value }
 
-    open fun onTimestamp(timestamp: EpisodeSkip.SkipStamp?) {
+    // No-op callbacks (nextEpisode, prevEpisode, etc.) are intentionally left as
+    // open so subclasses can override only what they need.  The ones below throw
+    // to make it obvious when an implementation is missing.
 
+    override fun nextEpisode() {
+        throw NotImplementedError()
     }
 
-    open fun onTimestampSkipped(timestamp: EpisodeSkip.SkipStamp) {
-
+    override fun prevEpisode() {
+        throw NotImplementedError()
     }
 
-    open fun exitedPipMode() {
+    override fun playerPositionChanged(position: Long, duration: Long) {
         throw NotImplementedError()
     }
 
-    private fun keepScreenOn(on: Boolean) {
-        if (on) {
-            activity?.window?.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
-        } else {
-            activity?.window?.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
-        }
+    override fun playerDimensionsLoaded(width: Int, height: Int) {
+        throw NotImplementedError()
     }
 
-    private fun updateIsPlaying(
-        wasPlaying: CSPlayerLoading,
-        isPlaying: CSPlayerLoading
-    ) {
-        val isPlayingRightNow = CSPlayerLoading.IsPlaying == isPlaying
-        val isPausedRightNow = CSPlayerLoading.IsPaused == isPlaying
-
-        keepScreenOn(!isPausedRightNow)
-
-        isBuffering = CSPlayerLoading.IsBuffering == isPlaying
-        if (isBuffering) {
-            playerPausePlayHolderHolder?.isVisible = false
-            playerBuffering?.isVisible = true
-        } else {
-            playerPausePlayHolderHolder?.isVisible = true
-            playerBuffering?.isVisible = false
-
-            if (wasPlaying != isPlaying) {
-                playerPausePlay?.setImageResource(if (isPlayingRightNow) R.drawable.play_to_pause else R.drawable.pause_to_play)
-                val drawable = playerPausePlay?.drawable
-
-                var startedAnimation = false
-                if (Build.VERSION.SDK_INT > Build.VERSION_CODES.P) {
-                    if (drawable is AnimatedImageDrawable) {
-                        drawable.start()
-                        startedAnimation = true
-                    }
-                }
-
-                if (drawable is AnimatedVectorDrawable) {
-                    drawable.start()
-                    startedAnimation = true
-                }
-
-                if (drawable is AnimatedVectorDrawableCompat) {
-                    drawable.start()
-                    startedAnimation = true
-                }
-
-                // somehow the phone is wacked
-                if (!startedAnimation) {
-                    playerPausePlay?.setImageResource(if (isPlayingRightNow) R.drawable.netflix_pause else R.drawable.netflix_play)
-                }
-            } else {
-                playerPausePlay?.setImageResource(if (isPlayingRightNow) R.drawable.netflix_pause else R.drawable.netflix_play)
-            }
-        }
-
-        canEnterPipMode = isPlayingRightNow && hasPipModeSupport
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            activity?.let { act ->
-                PlayerPipHelper.updatePIPModeActions(
-                    act,
-                    isPlayingRightNow,
-                    player.getAspectRatio()
-                )
-            }
-        }
+    override fun subtitlesChanged() {
+        throw NotImplementedError()
     }
 
-    private var pipReceiver: BroadcastReceiver? = null
-    override fun onPictureInPictureModeChanged(isInPictureInPictureMode: Boolean) {
-        super.onPictureInPictureModeChanged(isInPictureInPictureMode)
-        try {
-            isInPIPMode = isInPictureInPictureMode
-            if (isInPictureInPictureMode) {
-                // Hide the full-screen UI (controls, etc.) while in picture-in-picture mode.
-                piphide?.isVisible = false
-                pipReceiver = object : BroadcastReceiver() {
-                    override fun onReceive(
-                        context: Context,
-                        intent: Intent,
-                    ) {
-                        if (ACTION_MEDIA_CONTROL != intent.action) {
-                            return
-                        }
-                        player.handleEvent(
-                            CSPlayerEvent.entries[intent.getIntExtra(
-                                EXTRA_CONTROL_TYPE,
-                                0
-                            )], source = PlayerEventSource.UI
-                        )
-                    }
-                }
-                val filter = IntentFilter()
-                filter.addAction(ACTION_MEDIA_CONTROL)
-                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
-                updateIsPlaying(isPlayingValue, isPlayingValue)
-            } else {
-                // Restore the full-screen UI.
-                piphide?.isVisible = true
-                exitedPipMode()
-                pipReceiver?.let {
-                    // Prevents java.lang.IllegalArgumentException: Receiver not registered
-                    safe {
-                        activity?.unregisterReceiver(it)
-                    }
-                }
-                activity?.hideSystemUI()
-                this.view?.let { UIHelper.hideKeyboard(it) }
-            }
-        } catch (e: Exception) {
-            logError(e)
-        }
+    override fun embeddedSubtitlesFetched(subtitles: List<SubtitleData>) {
+        throw NotImplementedError()
     }
 
-    open fun hasNextMirror(): Boolean {
+    override fun onTracksInfoChanged() {
         throw NotImplementedError()
     }
 
-    open fun nextMirror() {
+    override fun exitedPipMode() {
         throw NotImplementedError()
     }
 
-    private fun requestAudioFocus() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            activity?.requestLocalAudioFocus(AppContextUtils.getFocusRequest())
-        }
+    override fun hasNextMirror(): Boolean {
+        throw NotImplementedError()
     }
 
-    open fun playerError(exception: Throwable) {
-        fun showToast(message: String, gotoNext: Boolean = false) {
-            if (gotoNext && hasNextMirror()) {
-                showToast(
-                    message,
-                    Toast.LENGTH_SHORT
-                )
-                nextMirror()
-            } else {
-                showToast(
-                    context?.getString(R.string.no_links_found_toast) + "\n" + message,
-                    Toast.LENGTH_LONG
-                )
-                activity?.popCurrentPage()
-            }
-        }
-
-        val ctx = context ?: return
-        when (exception) {
-            is PlaybackException -> {
-                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 -> {
-                        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_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
-                        )
-                    }
-
-                    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",
-                            gotoNext = false
-                        )
-                    }
-                }
-            }
-
-            is InvalidFileException -> {
-                showToast(
-                    "${ctx.getString(R.string.source_error)}\n${exception.message}",
-                    gotoNext = true
-                )
-            }
-
-            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
-                    )
-                }
-            }
-
-            is ErrorLoadingException -> {
-                exception.message?.let {
-                    showToast(
-                        it,
-                        gotoNext = true
-                    )
-                } ?: showToast(
-                    exception.toString(),
-                    gotoNext = true
-                )
-            }
-
-            else -> {
-                exception.message?.let {
-                    showToast(
-                        it,
-                        gotoNext = false
-                    )
-                } ?: showToast(
-                    exception.toString(),
-                    gotoNext = false
-                )
-            }
-        }
+    override fun nextMirror() {
+        throw NotImplementedError()
     }
 
-    private fun onSubStyleChanged(style: SaveCaptionStyle) {
-        player.updateSubtitleStyle(style)
-        // Forcefully update the subtitle encoding in case the edge size is changed
-        player.seekTime(-1)
+    /** Delegates to [PlayerView.playerError] by default; override to customize. */
+    override fun playerError(exception: Throwable) {
+        playerHostView?.playerError(exception)
     }
 
+    /** Player fragments don't need system-bar padding adjustment by default. */
+    override fun fixLayout(view: View) = Unit
 
-    @SuppressLint("UnsafeOptInUsageError")
-    open fun playerUpdated(player: Any?) {
-        if (player is ExoPlayer) {
-            context?.let { ctx ->
-                mMediaSession?.release()
-                mMediaSession = MediaSession.Builder(ctx, player)
-                    // Ensure unique ID for concurrent players
-                    .setId(unixTimeMs.toString())
-                    .build()
-            }
-
-            // Necessary for multiple combined videos
-            @Suppress("DEPRECATION")
-            playerView?.setShowMultiWindowTimeBar(true)
-            playerView?.player = player
-            playerView?.performClick()
-        }
-    }
-
-    protected var mMediaSession: MediaSession? = null
-
-    // this can be used in the future for players other than exoplayer
-    //private val mMediaSessionCallback: MediaSessionCompat.Callback = object : MediaSessionCompat.Callback() {
-    //    override fun onMediaButtonEvent(mediaButtonEvent: Intent): Boolean {
-    //        val keyEvent = mediaButtonEvent.getParcelableExtra(Intent.EXTRA_KEY_EVENT) as KeyEvent?
-    //        if (keyEvent != null) {
-    //            if (keyEvent.action == KeyEvent.ACTION_DOWN) { // NO DOUBLE SKIP
-    //                val consumed = when (keyEvent.keyCode) {
-    //                    KeyEvent.KEYCODE_MEDIA_PAUSE -> callOnPause()
-    //                    KeyEvent.KEYCODE_MEDIA_PLAY -> callOnPlay()
-    //                    KeyEvent.KEYCODE_MEDIA_STOP -> callOnStop()
-    //                    KeyEvent.KEYCODE_MEDIA_NEXT -> callOnNext()
-    //                    else -> false
-    //                }
-    //                if (consumed) return true
-    //            }
-    //        }
-    //
-    //        return super.onMediaButtonEvent(mediaButtonEvent)
-    //    }
-    //}
-
-    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) {
-        // 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)
-            }
-
-            is PlayerAttachedEvent -> {
-                playerUpdated(event.player)
-            }
-
-            is SubtitlesUpdatedEvent -> {
-                subtitlesChanged()
-            }
-
-            is TimestampSkippedEvent -> {
-                onTimestampSkipped(event.timestamp)
-            }
-
-            is TimestampInvokedEvent -> {
-                onTimestamp(event.timestamp)
-            }
-
-            is TracksChangedEvent -> {
-                onTracksInfoChanged()
-            }
-
-            is EmbeddedSubtitlesFetchedEvent -> {
-                embeddedSubtitlesFetched(event.tracks)
-            }
-
-            is ErrorEvent -> {
-                playerError(event.error)
-            }
-
-            is RequestAudioFocusEvent -> {
-                requestAudioFocus()
-            }
-
-            is EpisodeSeekEvent -> {
-                when (event.offset) {
-                    -1 -> prevEpisode()
-                    1 -> nextEpisode()
-                    else -> {}
-                }
-            }
-
-            is StatusEvent -> {
-                updateIsPlaying(wasPlaying = event.wasPlaying, isPlaying = event.isPlaying)
-                playerStatusChanged()
-            }
-
-            is PositionEvent -> {
-                playerPositionChanged(position = event.toMs, duration = event.durationMs)
-            }
-
-            is VideoEndedEvent -> {
-                context?.let { ctx ->
-                    // Resets subtitle delay on ended video
-                    player.setSubtitleOffset(0)
-
-                    // Only play next episode if autoplay is on (default)
-                    if (PreferenceManager.getDefaultSharedPreferences(ctx)
-                            ?.getBoolean(
-                                ctx.getString(R.string.autoplay_next_key),
-                                true
-                            ) == true
-                    ) {
-                        player.handleEvent(
-                            CSPlayerEvent.NextEpisode,
-                            source = PlayerEventSource.Player
-                        )
-                    }
-                }
-            }
-
-            is PauseEvent -> Unit
-            is PlayEvent -> Unit
-        }
+    override fun onBindingCreated(binding: T, savedInstanceState: Bundle?) {
+        val ctx = context ?: return
+        playerHostView = PlayerView(ctx)
+        playerHostView?.player = _player
+        playerHostView?.callbacks = this
+        playerHostView?.bindViews(binding.root)
+        playerHostView?.initialize()
     }
 
-    @SuppressLint("SetTextI18n", "UnsafeOptInUsageError")
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        resizeMode = DataStoreHelper.resizeMode
-        resize(resizeMode, false)
-
-        player.releaseCallbacks()
-        player.initCallbacks(
-            eventHandler = ::mainCallback,
-            requestedListeningPercentages = listOf(
-                SKIP_OP_VIDEO_PERCENTAGE,
-                PRELOAD_NEXT_EPISODE_PERCENTAGE,
-                NEXT_WATCH_EPISODE_PERCENTAGE,
-                UPDATE_SYNC_PROGRESS_PERCENTAGE,
-            ),
-        )
-
-        val player = player
-        if (player is CS3IPlayer) {
-            // preview bar
-            val progressBar: PreviewTimeBar? = playerView?.findViewById(R.id.exo_progress)
-            val previewImageView: ImageView? = playerView?.findViewById(R.id.previewImageView)
-            val previewFrameLayout: FrameLayout? = playerView?.findViewById(R.id.previewFrameLayout)
-            if (progressBar != null && previewImageView != null && previewFrameLayout != null) {
-                var resume = false
-                progressBar.addOnScrubListener(object : PreviewBar.OnScrubListener {
-                    override fun onScrubStart(previewBar: PreviewBar?) {
-                        val hasPreview = player.hasPreview()
-                        progressBar.isPreviewEnabled = hasPreview
-                        resume = player.getIsPlaying()
-                        if (resume) player.handleEvent(
-                            CSPlayerEvent.Pause,
-                            PlayerEventSource.Player
-                        )
-
-                        // No clashing UI
-                        if (hasPreview) {
-                            subView?.isVisible = false
-                        }
-                    }
-
-                    override fun onScrubMove(
-                        previewBar: PreviewBar?,
-                        progress: Int,
-                        fromUser: Boolean
-                    ) {
-                    }
-
-                    override fun onScrubStop(previewBar: PreviewBar?) {
-                        if (resume) player.handleEvent(CSPlayerEvent.Play, PlayerEventSource.Player)
-                        // Delay to prevent the small flicker of subtitle before seeking
-                        subView?.postDelayed({
-                            // If we are not scrubbing then show subtitles again
-                            if (previewBar == null || !previewBar.isPreviewEnabled || !previewBar.isShowingPreview) {
-                                subView?.isVisible = true
-                            }
-                        }, 200)
-                    }
-                })
-                progressBar.attachPreviewView(previewFrameLayout)
-                progressBar.setPreviewLoader { currentPosition, max ->
-                    val bitmap = player.getPreview(currentPosition.toFloat().div(max.toFloat()))
-                    previewImageView.isGone = bitmap == null
-                    previewImageView.setImageBitmap(bitmap)
-                }
-            }
-
-            subView = playerView?.findViewById(androidx.media3.ui.R.id.exo_subtitles)
-            player.initSubtitles(subView, subtitleHolder, CustomDecoder.style)
-            (player.imageGenerator as? PreviewGenerator)?.params = ImageParams.new16by9(screenWidth)
-
-            /*previewImageView?.doOnLayout {
-                (player.imageGenerator as? PreviewGenerator)?.params = ImageParams(
-                    it.measuredWidth,
-                    it.measuredHeight
-                )
-            }*/
-            /** this might seam a bit fucky and that is because it is, the seek event is captured twice, once by the player
-             * and once by the UI even if it should only be registered once by the UI */
-            playerView?.findViewById<DefaultTimeBar>(R.id.exo_progress)
-                ?.addListener(object : TimeBar.OnScrubListener {
-                    override fun onScrubStart(timeBar: TimeBar, position: Long) = Unit
-                    override fun onScrubMove(timeBar: TimeBar, position: Long) = Unit
-                    override fun onScrubStop(timeBar: TimeBar, position: Long, canceled: Boolean) {
-                        if (canceled) return
-                        val playerDuration = player.getDuration() ?: return
-                        val playerPosition = player.getPosition() ?: return
-                        mainCallback(
-                            PositionEvent(
-                                source = PlayerEventSource.UI,
-                                durationMs = playerDuration,
-                                fromMs = playerPosition,
-                                toMs = position
-                            )
-                        )
-                    }
-                })
-
-            SubtitlesFragment.applyStyleEvent += ::onSubStyleChanged
-
-            try {
-                context?.let { ctx ->
-                    val settingsManager = PreferenceManager.getDefaultSharedPreferences(
-                        ctx
-                    )
-
-                    val currentPrefCacheSize =
-                        settingsManager.getInt(getString(R.string.video_buffer_size_key), 0)
-                    val currentPrefDiskSize =
-                        settingsManager.getInt(getString(R.string.video_buffer_disk_key), 0)
-                    val currentPrefBufferSec =
-                        settingsManager.getInt(getString(R.string.video_buffer_length_key), 0)
-
-                    player.cacheSize = currentPrefCacheSize * 1024L * 1024L
-                    player.simpleCacheSize = currentPrefDiskSize * 1024L * 1024L
-                    player.videoBufferMs = currentPrefBufferSec * 1000L
-                }
-            } catch (e: Exception) {
-                logError(e)
-            }
-        }
-
-        /*context?.let { ctx ->
-            player.loadPlayer(
-                ctx,
-                false,
-                ExtractorLink(
-                    "idk",
-                    "bunny",
-                    "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4",
-                    "",
-                    Qualities.P720.value,
-                    false
-                ),
-            )
-        }*/
+    override fun onPictureInPictureModeChanged(isInPictureInPictureMode: Boolean) {
+        super.onPictureInPictureModeChanged(isInPictureInPictureMode)
+        playerHostView?.onPictureInPictureModeChanged(isInPictureInPictureMode, activity)
     }
 
     override fun onDestroy() {
-        playerEventListener = null
-        keyEventListener = null
-        canEnterPipMode = false
-        mMediaSession?.release()
-        mMediaSession = null
-        playerView?.player = null
-        SubtitlesFragment.applyStyleEvent -= ::onSubStyleChanged
-
-        keepScreenOn(false)
+        playerHostView?.release()
         super.onDestroy()
     }
 
-    fun nextResize() {
-        resizeMode = (resizeMode + 1) % PlayerResize.entries.size
-        resize(resizeMode, true)
-    }
-
-    fun resize(resize: Int, showToast: Boolean) {
-        resize(PlayerResize.entries[resize], showToast)
-    }
-
-    @SuppressLint("UnsafeOptInUsageError")
-    fun resize(resize: PlayerResize, showToast: Boolean) {
-        DataStoreHelper.resizeMode = resize.ordinal
-        val type = when (resize) {
-            PlayerResize.Fill -> AspectRatioFrameLayout.RESIZE_MODE_FILL
-            PlayerResize.Fit -> AspectRatioFrameLayout.RESIZE_MODE_FIT
-            PlayerResize.Zoom -> AspectRatioFrameLayout.RESIZE_MODE_ZOOM
-        }
-        playerView?.resizeMode = type
-
-        if (showToast)
-            showToast(resize.nameRes, Toast.LENGTH_SHORT)
+    override fun onPause() {
+        playerHostView?.releaseKeyEventListener()
+        super.onPause()
     }
 
     override fun onStop() {
-        player.onStop()
+        playerHostView?.onStop()
         super.onStop()
     }
 
     override fun onResume() {
         context?.let { ctx ->
-            player.onResume(ctx)
+            playerHostView?.onResume(ctx)
         }
-
         super.onResume()
     }
 
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        val root = inflater.inflate(layout, container, false)
-        playerPausePlayHolderHolder = root.findViewById(R.id.player_pause_play_holder_holder)
-        playerPausePlay = root.findViewById(R.id.player_pause_play)
-        playerBuffering = root.findViewById(R.id.player_buffering)
-        playerView = root.findViewById(R.id.player_view)
-        piphide = root.findViewById(R.id.piphide)
-        subtitleHolder = root.findViewById(R.id.subtitle_holder)
-        return root
+    fun nextResize() {
+        playerHostView?.nextResize()
     }
-}
\ No newline at end of file
+
+    open fun resize(resize: PlayerResize, showToast: Boolean) {
+        playerHostView?.resize(resize, showToast)
+    }
+}
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 e4be1f625e5..aa44b92359b 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
@@ -12,9 +12,11 @@ import android.os.Looper
 import android.util.Log
 import android.util.Rational
 import android.widget.FrameLayout
+import androidx.annotation.AnyThread
 import androidx.annotation.MainThread
 import androidx.annotation.OptIn
 import androidx.appcompat.app.AlertDialog
+import androidx.core.net.toUri
 import androidx.media3.common.C.TIME_UNSET
 import androidx.media3.common.C.TRACK_TYPE_AUDIO
 import androidx.media3.common.C.TRACK_TYPE_TEXT
@@ -28,6 +30,7 @@ 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.ExperimentalApi
 import androidx.media3.common.util.UnstableApi
 import androidx.media3.database.StandaloneDatabaseProvider
 import androidx.media3.datasource.DataSource
@@ -37,33 +40,42 @@ import androidx.media3.datasource.HttpDataSource
 import androidx.media3.datasource.cache.CacheDataSource
 import androidx.media3.datasource.cache.LeastRecentlyUsedCacheEvictor
 import androidx.media3.datasource.cache.SimpleCache
+import androidx.media3.datasource.cronet.CronetDataSource
 import androidx.media3.datasource.okhttp.OkHttpDataSource
+import androidx.media3.exoplayer.DecoderCounters
+import androidx.media3.exoplayer.DecoderReuseEvaluation
+import androidx.media3.exoplayer.DefaultLivePlaybackSpeedControl
 import androidx.media3.exoplayer.DefaultLoadControl
 import androidx.media3.exoplayer.DefaultRenderersFactory
 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.analytics.AnalyticsListener
 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.hls.playlist.HlsPlaylistTracker
 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.MediaSource
 import androidx.media3.exoplayer.source.MergingMediaSource
 import androidx.media3.exoplayer.source.SingleSampleMediaSource
 import androidx.media3.exoplayer.text.TextOutput
 import androidx.media3.exoplayer.text.TextRenderer
 import androidx.media3.exoplayer.trackselection.DefaultTrackSelector
 import androidx.media3.exoplayer.trackselection.TrackSelector
+import androidx.media3.extractor.mp4.FragmentedMp4Extractor
 import androidx.media3.ui.SubtitleView
 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.AudioFile
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.getKey
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.setKey
 import com.lagradost.cloudstream3.CommonActivity.activity
 import com.lagradost.cloudstream3.ErrorLoadingException
 import com.lagradost.cloudstream3.MainActivity.Companion.deleteFileOnExit
@@ -75,28 +87,34 @@ import com.lagradost.cloudstream3.mvvm.debugAssert
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.mvvm.safe
 import com.lagradost.cloudstream3.ui.player.CustomDecoder.Companion.fixSubtitleAlignment
-import com.lagradost.cloudstream3.ui.settings.Globals.TV
+import com.lagradost.cloudstream3.ui.player.live.LiveHelper
+import com.lagradost.cloudstream3.ui.player.live.PREFERRED_LIVE_OFFSET
+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.ui.subtitles.SaveCaptionStyle
 import com.lagradost.cloudstream3.ui.subtitles.SubtitlesFragment.Companion.applyStyle
 import com.lagradost.cloudstream3.utils.AppContextUtils.isUsingMobileData
 import com.lagradost.cloudstream3.utils.AppContextUtils.setDefaultFocus
+import com.lagradost.cloudstream3.utils.CLEARKEY_UUID
 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 com.lagradost.cloudstream3.utils.PLAYREADY_UUID
+import com.lagradost.cloudstream3.utils.SubtitleHelper.fromTagToLanguageName
+import com.lagradost.cloudstream3.utils.WIDEVINE_UUID
+import com.lagradost.cloudstream3.utils.videoskip.VideoSkipStamp
 import kotlinx.coroutines.delay
+import okhttp3.Interceptor
+import org.chromium.net.CronetEngine
 import java.io.File
+import java.security.SecureRandom
 import java.util.UUID
+import java.util.concurrent.Executors
 import javax.net.ssl.HttpsURLConnection
 import javax.net.ssl.SSLContext
 import javax.net.ssl.SSLSession
@@ -116,6 +134,7 @@ const val toleranceAfterUs = 300_000L
 
 @OptIn(UnstableApi::class)
 class CS3IPlayer : IPlayer {
+    private var playerListener: Player.Listener? = null
     private var isPlaying = false
     private var exoPlayer: ExoPlayer? = null
         set(value) {
@@ -189,36 +208,42 @@ class CS3IPlayer : IPlayer {
 
     private var eventHandler: ((PlayerEvent) -> Unit)? = null
 
+    @AnyThread
     fun event(event: PlayerEvent) {
-        eventHandler?.invoke(event)
+        // Ensure that all work is done on the main thread.
+        if (Looper.getMainLooper().isCurrentThread) {
+            eventHandler?.invoke(event)
+        } else runOnMainThread {
+            eventHandler?.invoke(event)
+        }
     }
 
+    /**
+     * As initCallbacks and releaseCallbacks must always be done,
+     * we use this to say that the player is in use.
+     * */
+    @Volatile
+    var isPlayerActive: Boolean = false
+
     override fun releaseCallbacks() {
         eventHandler = null
+        if (isPlayerActive) {
+            isPlayerActive = false
+            activePlayers -= 1
+            releaseCronetEngine()
+        }
     }
 
+    @AnyThread
     override fun initCallbacks(
-        eventHandler: ((PlayerEvent) -> Unit),
+        @MainThread eventHandler: ((PlayerEvent) -> Unit),
         requestedListeningPercentages: List<Int>?,
     ) {
         this.requestedListeningPercentages = requestedListeningPercentages
         this.eventHandler = eventHandler
-    }
-
-    // I know, this is not a perfect solution, however it works for fixing subs
-    private fun reloadSubs() {
-        exoPlayer?.applicationLooper?.let {
-            try {
-                Handler(it).post {
-                    try {
-                        seekTime(1L, source = PlayerEventSource.Player)
-                    } catch (e: Exception) {
-                        logError(e)
-                    }
-                }
-            } catch (e: Exception) {
-                logError(e)
-            }
+        if (!isPlayerActive) {
+            isPlayerActive = true
+            activePlayers += 1
         }
     }
 
@@ -235,6 +260,10 @@ class CS3IPlayer : IPlayer {
     }
 
     override fun hasPreview(): Boolean {
+        // No previews on livestreams because the previews get outdated
+        if (exoPlayer?.isCurrentMediaItemDynamic == true) {
+            return false
+        }
         return imageGenerator.hasPreview()
     }
 
@@ -348,44 +377,47 @@ class CS3IPlayer : IPlayer {
             ?: return
     }
 
-    override fun setPreferredAudioTrack(trackLanguage: String?, id: String?) {
+    override fun setPreferredAudioTrack(trackLanguage: String?, id: String?, formatIndex: Int?) {
         preferredAudioTrackLanguage = trackLanguage
-
-        if (id != null) {
-            val audioTrack =
-                exoPlayer?.currentTracks?.groups?.filter { it.type == TRACK_TYPE_AUDIO }
-                    ?.getTrack(id)
-
-            if (audioTrack != null) {
-                exoPlayer?.trackSelectionParameters = exoPlayer?.trackSelectionParameters
-                    ?.buildUpon()
-                    ?.setOverrideForType(
-                        TrackSelectionOverride(
-                            audioTrack.first,
-                            audioTrack.second
+        id?.let { trackId ->
+            val trackFormatIndex = formatIndex ?: 0
+            exoPlayer?.currentTracks?.groups
+                ?.filter { it.type == TRACK_TYPE_AUDIO }
+                ?.find { group ->
+                    group.getFormats().any { (format, _) ->
+                        format.id == trackId
+                    }
+                }
+                ?.let { group ->
+                    exoPlayer?.trackSelectionParameters
+                        ?.buildUpon()
+                        ?.setOverrideForType(
+                            TrackSelectionOverride(
+                                group.mediaTrackGroup,
+                                trackFormatIndex
+                            )
                         )
-                    )
-                    ?.build()
-                    ?: return
-                return
-            }
+                        ?.build()
+                }
+                ?.let { newParams ->
+                    exoPlayer?.trackSelectionParameters = newParams
+                    return
+                }
         }
-
+        // Fallback to language-based selection
         exoPlayer?.trackSelectionParameters = exoPlayer?.trackSelectionParameters
             ?.buildUpon()
             ?.setPreferredAudioLanguage(trackLanguage)
-            ?.build()
-            ?: return
+            ?.build() ?: return
     }
 
-
     /**
      * Gets all supported formats in a list
      * */
     private fun List<Tracks.Group>.getFormats(): List<Pair<Format, Int>> {
-        return this.map {
+        return this.flatMap {
             it.getFormats()
-        }.flatten()
+        }
     }
 
     private fun Tracks.Group.getFormats(): List<Pair<Format, Int>> {
@@ -396,11 +428,14 @@ class CS3IPlayer : IPlayer {
         }
     }
 
-    private fun Format.toAudioTrack(): AudioTrack {
+    private fun Format.toAudioTrack(formatIndex: Int?): AudioTrack {
         return AudioTrack(
-            this.id?.stripTrackId(),
+            this.id,
             this.label,
-            this.language
+            this.language,
+            this.sampleMimeType,
+            this.channelCount,
+            formatIndex ?: 0,
         )
     }
 
@@ -409,7 +444,7 @@ class CS3IPlayer : IPlayer {
             this.id?.stripTrackId(),
             this.label,
             this.language,
-            this.sampleMimeType
+            this.sampleMimeType,
         )
     }
 
@@ -420,27 +455,35 @@ class CS3IPlayer : IPlayer {
             this.language,
             this.width,
             this.height,
+            this.sampleMimeType
         )
     }
 
     override fun getVideoTracks(): CurrentTracks {
-        val allTracks = exoPlayer?.currentTracks?.groups ?: emptyList()
-        val videoTracks = allTracks.filter { it.type == TRACK_TYPE_VIDEO }
+        val allTrackGroups = exoPlayer?.currentTracks?.groups ?: emptyList()
+        val videoTracks = allTrackGroups.filter { it.type == TRACK_TYPE_VIDEO }
             .getFormats()
             .map { it.first.toVideoTrack() }
-        val audioTracks = allTracks.filter { it.type == TRACK_TYPE_AUDIO }.getFormats()
-            .map { it.first.toAudioTrack() }
-
-        val textTracks = allTracks.filter { it.type == TRACK_TYPE_TEXT }.getFormats()
+        var currentAudioTrack: AudioTrack? = null
+        val audioTracks = allTrackGroups.filter { it.type == TRACK_TYPE_AUDIO }
+            .flatMap { group ->
+                group.getFormats().map { (format, formatIndex) ->
+                    val audioTrack = format.toAudioTrack(formatIndex)
+                    if (group.isTrackSelected(formatIndex)) {
+                        currentAudioTrack = audioTrack
+                    }
+                    audioTrack
+                }
+            }
+        val textTracks = allTrackGroups.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(),
+            currentAudioTrack,
             currentTextTracks,
             videoTracks,
             audioTracks,
@@ -454,60 +497,43 @@ class CS3IPlayer : IPlayer {
     override fun setPreferredSubtitles(subtitle: SubtitleData?): Boolean {
         Log.i(TAG, "setPreferredSubtitles init $subtitle")
         currentSubtitles = subtitle
+        val trackSelector = exoPlayer?.trackSelector as? DefaultTrackSelector ?: return false
+        // Disable subtitles if null
+        if (subtitle == null) {
+            trackSelector.setParameters(
+                trackSelector.buildUponParameters()
+                    .setTrackTypeDisabled(TRACK_TYPE_TEXT, true)
+                    .clearOverridesOfType(TRACK_TYPE_TEXT)
+            )
+            return false
+        }
+        // Handle subtitle based on status
+        when (subtitleHelper.subtitleStatus(subtitle)) {
+            SubtitleStatus.REQUIRES_RELOAD -> {
+                Log.i(TAG, "setPreferredSubtitles REQUIRES_RELOAD")
+                return true
+            }
 
-        fun getTextTrack(id: String) =
-            exoPlayer?.currentTracks?.groups?.filter { it.type == TRACK_TYPE_TEXT }
-                ?.getTrack(id)
-
-        return (exoPlayer?.trackSelector as? DefaultTrackSelector?)?.let { trackSelector ->
-            if (subtitle == null) {
-                trackSelector.setParameters(
-                    trackSelector.buildUponParameters()
-                        .setTrackTypeDisabled(TRACK_TYPE_TEXT, true)
-                        .clearOverridesOfType(TRACK_TYPE_TEXT)
-                )
-            } else {
-                when (subtitleHelper.subtitleStatus(subtitle)) {
-                    SubtitleStatus.REQUIRES_RELOAD -> {
-                        Log.i(TAG, "setPreferredSubtitles REQUIRES_RELOAD")
-                        return@let true
-                    }
-
-                    SubtitleStatus.IS_ACTIVE -> {
-                        Log.i(TAG, "setPreferredSubtitles IS_ACTIVE")
+            SubtitleStatus.NOT_FOUND -> {
+                Log.i(TAG, "setPreferredSubtitles NOT_FOUND")
+                return true
+            }
 
+            SubtitleStatus.IS_ACTIVE -> {
+                Log.i(TAG, "setPreferredSubtitles IS_ACTIVE")
+                exoPlayer?.currentTracks?.groups
+                    ?.filter { it.type == TRACK_TYPE_TEXT }
+                    ?.getTrack(subtitle.getId())
+                    ?.let { (trackGroup, trackIndex) ->
                         trackSelector.setParameters(
                             trackSelector.buildUponParameters()
-                                .apply {
-                                    val track = getTextTrack(subtitle.getId())
-                                    if (track != null) {
-                                        setTrackTypeDisabled(TRACK_TYPE_TEXT, false)
-                                        setOverrideForType(
-                                            TrackSelectionOverride(
-                                                track.first,
-                                                track.second
-                                            )
-                                        )
-                                    }
-                                }
+                                .setTrackTypeDisabled(TRACK_TYPE_TEXT, false)
+                                .setOverrideForType(TrackSelectionOverride(trackGroup, trackIndex))
                         )
-
-                        // ugliest code I have written, it seeks 1ms to *update* the subtitles
-                        //exoPlayer?.applicationLooper?.let {
-                        //    Handler(it).postDelayed({
-                        //        seekTime(1L)
-                        //    }, 1)
-                        //}
                     }
-
-                    SubtitleStatus.NOT_FOUND -> {
-                        Log.i(TAG, "setPreferredSubtitles NOT_FOUND")
-                        return@let true
-                    }
-                }
+                return false
             }
-            return false
-        } ?: false
+        }
     }
 
     private var currentSubtitleOffset: Long = 0
@@ -516,10 +542,10 @@ class CS3IPlayer : IPlayer {
         currentSubtitleOffset = offset
         CustomDecoder.subtitleOffset = offset
         if (currentTextRenderer?.state == STATE_ENABLED || currentTextRenderer?.state == STATE_STARTED) {
-            exoPlayer?.currentPosition?.let { pos ->
+            exoPlayer?.currentPosition?.also { 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)
+                currentTextRenderer?.resetPosition(pos, false)
             }
         }
     }
@@ -581,7 +607,10 @@ class CS3IPlayer : IPlayer {
                 // No documented exception, but just to be extra safe
                 logError(t)
             }
-
+            playerListener?.let {
+                removeListener(it)
+                playerListener = null
+            }
             stop()
             release()
         }
@@ -628,6 +657,62 @@ class CS3IPlayer : IPlayer {
     }
 
     companion object {
+        private const val CRONET_TIMEOUT_MS = 15_000
+
+        /**
+         * Single shared engine, to minimize the overhead of maintaining many as:
+         * 1. Cpu time/Startup time
+         * 2. Mem consumption/GC
+         * 3. Disk usage, as we simply use the same folder
+         * */
+        private var cronetEngine: CronetEngine? = null
+
+        /**
+         * How many active sessions we have.
+         *
+         * However in reality it should never go negative or be more than 1,
+         * but this makes more sense architecturally.
+         * */
+        @Volatile
+        private var activePlayers = 0
+
+        /** Unique monotonically increasing id to keep track of the last release call */
+        @Volatile
+        private var cronetReleasedId = 0
+
+        fun releaseCronetEngine() {
+            if (cronetEngine == null) return
+
+            // Delayed release, as we do not want to restart it when opening trailers ect
+            val id = ++cronetReleasedId
+            val posted = Handler(Looper.getMainLooper()).postDelayed({
+                // This might get dropped, but that should be very rare
+                // and should not affect it.
+                releaseCronetEngineInstantly(id)
+            }, 60_000) // 1min timeout before release
+
+            // If not posted, then run instantly
+            if (!posted) {
+                releaseCronetEngineInstantly(id)
+            }
+        }
+
+        private fun releaseCronetEngineInstantly(id: Int) {
+            // We should release if and only if this was the last call, and
+            // there is no active players
+            if (activePlayers == 0 && id == cronetReleasedId) {
+                try {
+                    cronetEngine?.shutdown()
+                } catch (t: Throwable) {
+                    logError(t)
+                } finally {
+                    Log.d(TAG, "CronetEngine shutdown")
+                    // Even if it fails to shutdown, the GC should take care of it
+                    cronetEngine = null
+                }
+            }
+        }
+
         /**
          * Setting this variable is permanent across app sessions.
          **/
@@ -646,42 +731,98 @@ class CS3IPlayer : IPlayer {
             }
 
         private var simpleCache: SimpleCache? = null
-        private fun createOnlineSource(headers: Map<String, String>): HttpDataSource.Factory {
-            val source = OkHttpDataSource.Factory(app.baseClient).setUserAgent(USER_AGENT)
-            return source.apply {
-                setDefaultRequestProperties(headers)
+
+        /// Create a small factory for small things, no cache, no cronet
+        private fun createOnlineSource(
+            headers: Map<String, String>?,
+            interceptor: Interceptor?
+        ): HttpDataSource.Factory {
+            val client = if (interceptor == null) {
+                app.baseClient
+            } else {
+                app.baseClient.newBuilder()
+                    .addInterceptor(interceptor)
+                    .build()
             }
+            val source = OkHttpDataSource.Factory(client).setUserAgent(USER_AGENT)
+
+            if (!headers.isNullOrEmpty()) {
+                source.setDefaultRequestProperties(headers)
+            }
+            return source
         }
 
-        private fun createOnlineSource(link: ExtractorLink): HttpDataSource.Factory {
-            val provider = getApiFromNameNull(link.source)
-            val interceptor = provider?.getVideoInterceptor(link)
+        fun tryCreateEngine(context: Context, diskCacheSize: Long): CronetEngine? {
+            // Fast case, no need to recreate it
+            cronetEngine?.let {
+                return it
+            }
+
+            // https://gist.github.com/ShivamKumarJha/3c8398b47053ae05112d2a8f8b5de531
+            return try {
+                val cacheDirectory = File(context.cacheDir, "CronetEngine")
+                cacheDirectory.deleteRecursively()
+                if (!cacheDirectory.exists()) {
+                    cacheDirectory.mkdirs()
+                }
+                CronetEngine.Builder(context)
+                    .enableBrotli(true)
+                    .enableHttp2(true)
+                    .enableQuic(true)
+                    .setStoragePath(cacheDirectory.absolutePath)
+                    .setLibraryLoader(null)
+                    .enableHttpCache(CronetEngine.Builder.HTTP_CACHE_DISK, diskCacheSize)
+                    .build().also { buildEngine ->
+                        Log.d(
+                            TAG,
+                            "Created CronetEngine with cache at ${cacheDirectory.absolutePath}"
+                        )
+                        cronetEngine = buildEngine
+                    }
+            } catch (t: Throwable) {
+                logError(t)
+                // Something went wrong, so we use the backup okhttp
+                null
+            }
+        }
+
+        private fun createVideoSource(
+            link: ExtractorLink,
+            engine: CronetEngine?,
+            interceptor: Interceptor?,
+        ): HttpDataSource.Factory {
             val userAgent = link.headers.entries.find {
                 it.key.equals("User-Agent", ignoreCase = true)
-            }?.value
+            }?.value ?: USER_AGENT
 
             val source = if (interceptor == null) {
-                DefaultHttpDataSource.Factory() //TODO USE app.baseClient
-                    .setUserAgent(userAgent ?: USER_AGENT)
-                    .setAllowCrossProtocolRedirects(true)   //https://stackoverflow.com/questions/69040127/error-code-io-bad-http-status-exoplayer-android
+                if (engine == null) {
+                    Log.d(TAG, "Using DefaultHttpDataSource for $link")
+                    OkHttpDataSource.Factory(app.baseClient).setUserAgent(userAgent)
+                } else {
+                    Log.d(TAG, "Using CronetDataSource for $link")
+                    CronetDataSource.Factory(engine, Executors.newSingleThreadExecutor())
+                        .setUserAgent(userAgent)
+                        .setConnectionTimeoutMs(CRONET_TIMEOUT_MS)
+                        .setReadTimeoutMs(CRONET_TIMEOUT_MS)
+                        .setResetTimeoutOnRedirects(true)
+                        .setHandleSetCookieRequests(true)
+                }
             } else {
+                Log.d(TAG, "Using OkHttpDataSource for $link")
                 val client = app.baseClient.newBuilder()
                     .addInterceptor(interceptor)
                     .build()
-                OkHttpDataSource.Factory(client).setUserAgent(userAgent ?: USER_AGENT)
+                OkHttpDataSource.Factory(client).setUserAgent(userAgent)
             }
 
             // Do no include empty referer, if the provider wants those they can use the header map.
             val refererMap =
                 if (link.referer.isBlank()) emptyMap() else mapOf("referer" to link.referer)
-            val headers = mapOf(
-                "accept" to "*/*",
-                "sec-ch-ua" to "\"Chromium\";v=\"91\", \" Not;A Brand\";v=\"99\"",
-                "sec-ch-ua-mobile" to "?0",
-                "sec-fetch-user" to "?1",
-                "sec-fetch-mode" to "navigate",
-                "sec-fetch-dest" to "video"
-            ) + refererMap + link.headers // Adds the headers from the provider, e.g Authorization
+
+            // These are extra headers the browser like to insert, not sure if we want to include them
+            // for WIDEVINE/drm as well? Do that if someone gets 404 and creates an issue.
+            val headers = refererMap + link.headers // Adds the headers from the provider, e.g Authorization
 
             return source.apply {
                 setDefaultRequestProperties(headers)
@@ -741,10 +882,10 @@ class CS3IPlayer : IPlayer {
         private var currentTextRenderer: TextRenderer? = null
     }
 
-    private fun getCurrentTimestamp(writePosition: Long? = null): EpisodeSkip.SkipStamp? {
+    private fun getCurrentTimestamp(writePosition: Long? = null): VideoSkipStamp? {
         val position = writePosition ?: this@CS3IPlayer.getPosition() ?: return null
         for (lastTimeStamp in lastTimeStamps) {
-            if (lastTimeStamp.startMs <= position && (position + (toleranceBeforeUs / 1000L) + 1) < lastTimeStamp.endMs) {
+            if (lastTimeStamp.timestamp.startMs <= position && (position + (toleranceBeforeUs / 1000L) + 1) < lastTimeStamp.timestamp.endMs) {
                 return lastTimeStamp
             }
         }
@@ -803,6 +944,22 @@ class CS3IPlayer : IPlayer {
                 when (event) {
                     CSPlayerEvent.Play -> {
                         event(PlayEvent(source))
+                        // If the player was stopped (e.g. notification dismissed) it lands in
+                        // STATE_IDLE. A bare play() call is a no-op in that state, re-prepare and
+                        // then resume to the current position once we are in STATE_READY again.
+                        if (playbackState == Player.STATE_IDLE) {
+                            val seekPosition = currentPosition
+                            exoPlayer?.addListener(object : Player.Listener {
+                                private var seekApplied = false
+                                override fun onPlaybackStateChanged(playbackState: Int) {
+                                    if (seekApplied || playbackState != Player.STATE_READY) return
+                                    seekApplied = true
+                                    exoPlayer?.seekTo(currentWindow, seekPosition)
+                                    exoPlayer?.removeListener(this)
+                                }
+                            })
+                            prepare()
+                        }
                         play()
                     }
 
@@ -856,7 +1013,7 @@ class CS3IPlayer : IPlayer {
                             if (lastTimeStamp.skipToNextEpisode) {
                                 handleEvent(CSPlayerEvent.NextEpisode, source)
                             } else {
-                                seekTo(lastTimeStamp.endMs + 1L)
+                                seekTo(lastTimeStamp.timestamp.endMs + 1L)
                             }
                             event(TimestampSkippedEvent(timestamp = lastTimeStamp, source = source))
                         }
@@ -912,39 +1069,57 @@ class CS3IPlayer : IPlayer {
         subtitleOffset: Long,
         cacheSize: Long,
         videoBufferMs: Long,
+        onlineSource: HttpDataSource.Factory? = null,
         playWhenReady: Boolean = true,
-        cacheFactory: CacheDataSource.Factory? = null,
         trackSelector: TrackSelector? = null,
         /**
          * Sets the m3u8 preferred video quality, will not force stop anything with higher quality.
          * Does not work if trackSelector is defined.
          **/
-        maxVideoHeight: Int? = null
+        maxVideoHeight: Int? = null,
+        /** External audio tracks to merge with the video */
+        audioSources: List<MediaSource> = emptyList()
     ): ExoPlayer {
         val exoPlayerBuilder =
             ExoPlayer.Builder(context)
-                .setRenderersFactory { eventHandler, videoRendererEventListener, audioRendererEventListener, textRendererOutput, metadataRendererOutput ->
+                .setMediaSourceFactory(
+                    DefaultMediaSourceFactory(context).setLiveTargetOffsetMs(
+                        PREFERRED_LIVE_OFFSET
+                    )
+                )
+                .setLivePlaybackSpeedControl(
+                    DefaultLivePlaybackSpeedControl.Builder()
+                        .setFallbackMaxPlaybackSpeed(1.03f)
+                        .setFallbackMinPlaybackSpeed(0.97f)
+                        .build()
+                )
+                .setRenderersFactory { eventHandler, videoRendererEventListener, audioRendererEventListener, _, metadataRendererOutput ->
                     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
+                    val (isSoftwareDecodingEnabled, isSoftwareDecodingPreferred) = when (current) {
+                        0 -> true to false // HW+SW, aka on but prefer hw
+                        2 -> true to true // SW+HW, aka on but prefer sw
+                        1 -> false to false // HW, aka off
                         // -1 = automatic
-                        else -> {
-                            // we do not want tv to have software decoding, because of crashes
-                            !isLayout(TV)
-                        }
+                        // We do not want tv to have software decoding, because of crashes
+                        else -> isLayout(PHONE or EMULATOR) to false
                     }
 
-                    val factory = if (softwareDecoding) {
-                        NextRenderersFactory(context).apply {
+                    val factory = if (isSoftwareDecodingEnabled) {
+                        FixedNextRenderersFactory(context).apply {
                             setEnableDecoderFallback(true)
-                            setExtensionRendererMode(DefaultRenderersFactory.EXTENSION_RENDERER_MODE_ON)
+                            setExtensionRendererMode(
+                                if (isSoftwareDecodingPreferred)
+                                    DefaultRenderersFactory.EXTENSION_RENDERER_MODE_PREFER
+                                else
+                                    DefaultRenderersFactory.EXTENSION_RENDERER_MODE_ON
+                            )
                         }
                     } else {
+                        // no nextlib = EXTENSION_RENDERER_MODE_OFF
                         DefaultRenderersFactory(context)
                     }
 
@@ -952,7 +1127,8 @@ class CS3IPlayer : IPlayer {
                     // Custom TextOutput to apply cue styling and rules to all subtitles
                     val customTextOutput = TextOutput { cue ->
                         // Do not remove filterNotNull as Java typesystem is fucked
-                        val (bitmapCues, textCues) = cue.cues.filterNotNull().partition { it.bitmap != null }
+                        val (bitmapCues, textCues) = cue.cues.toList()
+                            .partition { it.bitmap != null }
 
                         val styledBitmapCues = bitmapCues.map { bitmapCue ->
                             bitmapCue
@@ -962,16 +1138,38 @@ class CS3IPlayer : IPlayer {
                                 .build()
                         }
 
+                        // Reuse memory, to avoid many allocations
+                        val set = HashSet<CharSequence>()
+                        val buffer = StringBuilder()
+
                         // Move cues into one single one
                         // This is to prevent text overlap in vtt (and potentially other) subtitle files
                         val styledTextCues = textCues.groupBy {
                             // Groups cues which share the same positon
                             it.lineAnchor to it.position.times(1000.0f).toInt()
                         }.mapNotNull { (_, entries) ->
-                            val combinedCueText = entries.joinToString("\n") {
-                                it.text?.toString() ?: ""
+                            set.clear()
+                            buffer.clear()
+                            var count = 0
+                            for (x in entries) {
+                                // Only allow non null text, otherwise we might have "a\n\nb"
+                                val text = x.text ?: continue
+
+                                // Prevent duplicate entries, this often happens when the subtitle file
+                                // uses multiple text lines as outlines. Most commonly found in fansubs
+                                // with fancy subtitle styling.
+                                if (!set.add(text)) {
+                                    continue
+                                }
+                                if (++count > 1) buffer.append('\n')
+
+                                // Trim to avoid weird formatting if the last line ends with a newline
+                                buffer.append(text.trim())
                             }
 
+                            val combinedCueText = buffer.toString()
+
+                            // Use the style of the first entry as the base
                             entries
                                 .firstOrNull()
                                 ?.buildUpon()
@@ -997,6 +1195,7 @@ class CS3IPlayer : IPlayer {
                             CustomDecoder.subtitleOffset = subtitleOffset
                             val decoder = CustomSubtitleDecoderFactory()
 
+                            // @OptIn(ExperimentalApi::class)
                             val currentTextRenderer = TextRenderer(
                                 customTextOutput,
                                 eventHandler.looper,
@@ -1051,10 +1250,27 @@ class CS3IPlayer : IPlayer {
         // Because "Java rules" the media3 team hates to do open classes so we have to copy paste the entire thing to add a custom extractor
         // This includes the updated MKV extractor that enabled seeking in formats where the seek information is at the back of the file
         val extractorFactor = UpdatedDefaultExtractorsFactory()
+            .setFragmentedMp4ExtractorFlags(FragmentedMp4Extractor.FLAG_MERGE_FRAGMENTED_SIDX)
 
-        val factory =
-            if (cacheFactory == null) DefaultMediaSourceFactory(context, extractorFactor)
-            else DefaultMediaSourceFactory(cacheFactory, extractorFactor)
+        // Create an online connection with cache for all online sources
+        val dataSourceFactory = if (onlineSource == null) {
+            null
+        } else {
+            if (simpleCache == null)
+                simpleCache = getCache(context, simpleCacheSize)
+
+            val cacheFactory = CacheDataSource.Factory().apply {
+                simpleCache?.let { setCache(it) }
+                setUpstreamDataSourceFactory(onlineSource)
+            }
+            cacheFactory
+        }
+
+        val defaultMediaSourceFactory = if (dataSourceFactory != null) {
+            DefaultMediaSourceFactory(dataSourceFactory, extractorFactor)
+        } else {
+            DefaultMediaSourceFactory(context, extractorFactor)
+        }
 
         // If there is only one item then treat it as normal, if multiple: concatenate the items.
         val videoMediaSource = if (mediaItemSlices.size == 1) {
@@ -1063,8 +1279,9 @@ class CS3IPlayer : IPlayer {
             item.drm?.let { drm ->
                 when (drm.uuid) {
                     CLEARKEY_UUID -> {
-                        val client =
-                            OkHttpDataSource.Factory(app.baseClient).setUserAgent(USER_AGENT)
+                        // Use headers from DrmMetadata for media requests
+                        val client = dataSourceFactory
+                            ?: throw IllegalArgumentException("Must supply onlineSource")
                         val drmCallback =
                             LocalMediaDrmCallback("{\"keys\":[{\"kty\":\"${drm.kty}\",\"k\":\"${drm.key}\",\"kid\":\"${drm.kid}\"}],\"type\":\"temporary\"}".toByteArray())
                         val manager = DefaultDrmSessionManager.Builder()
@@ -1084,8 +1301,9 @@ class CS3IPlayer : IPlayer {
 
                     WIDEVINE_UUID,
                     PLAYREADY_UUID -> {
-                        val client =
-                            OkHttpDataSource.Factory(app.baseClient).setUserAgent(USER_AGENT)
+                        // Use headers from DrmMetadata for media requests
+                        val client = dataSourceFactory
+                            ?: throw IllegalArgumentException("Must supply onlineSource")
                         val drmCallback = HttpMediaDrmCallback(drm.licenseUrl, client)
                         val manager = DefaultDrmSessionManager.Builder()
                             .setPlayClearSamplesWithoutKeys(true)
@@ -1111,16 +1329,16 @@ class CS3IPlayer : IPlayer {
                     }
                 }
             } ?: run {
-                factory.createMediaSource(item.mediaItem)
+                defaultMediaSourceFactory.createMediaSource(item.mediaItem)
             }
         } else {
             try {
                 val source = ConcatenatingMediaSource2.Builder()
-                mediaItemSlices.map { item ->
+                mediaItemSlices.forEach { 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),
+                            defaultMediaSourceFactory.createMediaSource(item.mediaItem),
                             item.durationUs
                         )
                     )
@@ -1130,11 +1348,11 @@ class CS3IPlayer : IPlayer {
                 @Suppress("DEPRECATION")
                 val source =
                     ConcatenatingMediaSource() // FIXME figure out why ConcatenatingMediaSource2 seems to fail with Torrents only
-                mediaItemSlices.map { item ->
+                mediaItemSlices.forEach { 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),
+                            defaultMediaSourceFactory.createMediaSource(item.mediaItem),
                             item.durationUs
                         )
                     )
@@ -1142,19 +1360,18 @@ class CS3IPlayer : IPlayer {
                 source
             }
         }
-
-        //println("PLAYBACK POS $playbackPosition")
         return exoPlayerBuilder.build().apply {
             setPlayWhenReady(playWhenReady)
             seekTo(currentWindow, playbackPosition)
+            // Merge video, subtitles and external audio tracks
+            val allSources = listOf(videoMediaSource) + subSources + audioSources
             setMediaSource(
-                MergingMediaSource(
-                    videoMediaSource, *subSources.toTypedArray()
-                ),
+                MergingMediaSource(*allSources.toTypedArray()),
                 playbackPosition
             )
             setHandleAudioBecomingNoisy(true)
             setPlaybackSpeed(playBackSpeed)
+            this.addAnalyticsListener(tracksAnalyticsListener)
         }
     }
 
@@ -1162,7 +1379,8 @@ class CS3IPlayer : IPlayer {
         context: Context,
         mediaSlices: List<MediaItemSlice>,
         subSources: List<SingleSampleMediaSource>,
-        cacheFactory: CacheDataSource.Factory? = null
+        audioSources: List<MediaSource> = emptyList(),
+        onlineSource: HttpDataSource.Factory? = null,
     ) {
         Log.i(TAG, "loadExo")
         val settingsManager = PreferenceManager.getDefaultSharedPreferences(context)
@@ -1186,14 +1404,32 @@ class CS3IPlayer : IPlayer {
                 cacheSize = cacheSize,
                 videoBufferMs = videoBufferMs,
                 playWhenReady = isPlaying, // this keep the current state of the player
-                cacheFactory = cacheFactory,
                 subtitleOffset = currentSubtitleOffset,
-                maxVideoHeight = maxVideoHeight
+                maxVideoHeight = maxVideoHeight,
+                audioSources = audioSources,
+                onlineSource = onlineSource,
             )
 
             event(PlayerAttachedEvent(exoPlayer))
             exoPlayer?.prepare()
 
+            // For offline fragmented MP4s, FLAG_MERGE_FRAGMENTED_SIDX builds the SIDX seek map
+            // incrementally as data is buffered. The initial seek resolves to the nearest merged
+            // entry (~first fragment, 3 s). On STATE_READY, re-seek to the actual saved position.
+            // This may only be reproducible on large and fairly long fragmented MP4 files with
+            // multiple sidx boxes.
+            if (onlineSource == null && playbackPosition > (exoPlayer?.duration ?: 0L)) {
+                exoPlayer?.addListener(object : Player.Listener {
+                    private var seekApplied = false
+                    override fun onPlaybackStateChanged(playbackState: Int) {
+                        if (seekApplied || playbackState != Player.STATE_READY) return
+                        seekApplied = true
+                        exoPlayer?.seekTo(currentWindow, playbackPosition)
+                        exoPlayer?.removeListener(this)
+                    }
+                })
+            }
+
             exoPlayer?.let { exo ->
                 event(StatusEvent(CSPlayerLoading.IsBuffering, CSPlayerLoading.IsBuffering))
                 isPlaying = exo.isPlaying
@@ -1206,6 +1442,8 @@ class CS3IPlayer : IPlayer {
                 return
             }
 
+            LiveHelper.registerPlayer(exoPlayer)
+
             exoPlayer?.addListener(object : Player.Listener {
                 override fun onTracksChanged(tracks: Tracks) {
                     safe {
@@ -1230,7 +1468,7 @@ class CS3IPlayer : IPlayer {
 
                                     return@mapNotNull SubtitleData(
                                         // Nicer looking displayed names
-                                        fromTwoLettersToLanguage(format.language!!)
+                                        fromTagToLanguageName(format.language)
                                             ?: format.language!!,
                                         format.label ?: "",
                                         // See setPreferredTextLanguage
@@ -1248,13 +1486,19 @@ class CS3IPlayer : IPlayer {
                     }
                 }
 
-                //fixme: Use onPlaybackStateChanged(int) and onPlayWhenReadyChanged(boolean, int) instead.
+                // fixme: Use onPlaybackStateChanged(int) and onPlayWhenReadyChanged(boolean, int) instead.
+                @Suppress("OVERRIDE_DEPRECATION")
                 override fun onPlayerStateChanged(playWhenReady: Boolean, playbackState: Int) {
                     exoPlayer?.let { exo ->
                         event(
                             StatusEvent(
                                 wasPlaying = if (isPlaying) CSPlayerLoading.IsPlaying else CSPlayerLoading.IsPaused,
-                                isPlaying = if (playbackState == Player.STATE_BUFFERING) CSPlayerLoading.IsBuffering else if (exo.isPlaying) CSPlayerLoading.IsPlaying else CSPlayerLoading.IsPaused
+                                isPlaying =
+                                    when (playbackState) {
+                                        Player.STATE_ENDED -> CSPlayerLoading.IsEnded
+                                        Player.STATE_BUFFERING -> CSPlayerLoading.IsBuffering
+                                        else -> if (exo.isPlaying) CSPlayerLoading.IsPlaying else CSPlayerLoading.IsPaused
+                                    }
                             )
                         )
                         isPlaying = exo.isPlaying
@@ -1308,6 +1552,23 @@ class CS3IPlayer : IPlayer {
                             exoPlayer?.prepare()
                         }
 
+                        // PlaylistStuckException usually happens when the player position is ahead of the live window.
+                        // Seek to the default location in that case
+                        error.cause is HlsPlaylistTracker.PlaylistStuckException -> {
+                            val position = exoPlayer?.currentPosition ?: exoPlayer?.duration ?: 0
+
+                            // Seek to live head
+                            val aheadOfLive = LiveHelper.getLiveManager(exoPlayer)?.getTimeAheadOfLive(position) ?: 0
+
+                            if (aheadOfLive > 100) {
+                                exoPlayer?.seekTo(position - aheadOfLive)
+                            } else {
+                                exoPlayer?.seekToDefaultPosition()
+                            }
+                            exoPlayer?.prepare()
+                        }
+
+
                         else -> {
                             event(ErrorEvent(error))
                         }
@@ -1336,9 +1597,6 @@ class CS3IPlayer : IPlayer {
                         }
 
                         Player.STATE_ENDED -> {
-                            // Resets subtitle delay on ended video
-                            setSubtitleOffset(0)
-
                             // Only play next episode if autoplay is on (default)
                             if (PreferenceManager.getDefaultSharedPreferences(context)
                                     ?.getBoolean(
@@ -1375,16 +1633,16 @@ class CS3IPlayer : IPlayer {
                     onRenderFirst()
                     updatedTime(source = PlayerEventSource.Player)
                 }
-            })
+            }.also { playerListener = it })
         } catch (t: Throwable) {
             Log.e(TAG, "loadExo error", t)
             event(ErrorEvent(t))
         }
     }
 
-    private var lastTimeStamps: List<EpisodeSkip.SkipStamp> = emptyList()
+    private var lastTimeStamps: List<VideoSkipStamp> = emptyList()
 
-    override fun addTimeStamps(timeStamps: List<EpisodeSkip.SkipStamp>) {
+    override fun addTimeStamps(timeStamps: List<VideoSkipStamp>) {
         lastTimeStamps = timeStamps
         timeStamps.forEach { timestamp ->
             exoPlayer?.createMessage { _, _ ->
@@ -1393,7 +1651,7 @@ class CS3IPlayer : IPlayer {
                 //    onTimestampInvoked?.invoke(payload)
             }
                 ?.setLooper(Looper.getMainLooper())
-                ?.setPosition(timestamp.startMs)
+                ?.setPosition(timestamp.timestamp.startMs)
                 //?.setPayload(timestamp)
                 ?.setDeleteAfterDelivery(false)
                 ?.send()
@@ -1407,20 +1665,6 @@ class CS3IPlayer : IPlayer {
         }
         Log.i(TAG, "Rendered first frame")
         hasUsedFirstRender = true
-        val invalid = exoPlayer?.duration?.let { duration ->
-            // Only errors short playback when not playing downloaded files
-            duration < 20_000L && currentDownloadedFile == null
-                    // Concatenated sources (non 1 periodCount) bypasses the invalid check as exoPlayer.duration gives only the current period
-                    // If you can get the total time that'd be better, but this is already niche.
-                    && exoPlayer?.currentTimeline?.periodCount == 1
-                    && exoPlayer?.isCurrentMediaItemLive != true
-        } ?: false
-
-        if (invalid) {
-            releasePlayer(saveTime = false)
-            event(ErrorEvent(InvalidFileException("Too short playback")))
-            return
-        }
 
         setPreferredSubtitles(currentSubtitles)
         val format = exoPlayer?.videoFormat
@@ -1451,12 +1695,11 @@ class CS3IPlayer : IPlayer {
 
             val mediaItem = getMediaItem(MimeTypes.VIDEO_MP4, data.uri)
             val offlineSourceFactory = context.createOfflineSource()
-            val onlineSourceFactory = createOnlineSource(emptyMap())
 
             val (subSources, activeSubtitles) = getSubSources(
-                onlineSourceFactory = onlineSourceFactory,
                 offlineSourceFactory = offlineSourceFactory,
-                subtitleHelper,
+                subHelper = subtitleHelper,
+                interceptor = null,
             )
 
             subtitleHelper.setActiveSubtitles(activeSubtitles.toSet())
@@ -1468,20 +1711,20 @@ class CS3IPlayer : IPlayer {
     }
 
     private fun getSubSources(
-        onlineSourceFactory: HttpDataSource.Factory?,
         offlineSourceFactory: DataSource.Factory?,
         subHelper: PlayerSubtitleHelper,
+        interceptor: Interceptor?,
     ): Pair<List<SingleSampleMediaSource>, List<SubtitleData>> {
         val activeSubtitles = ArrayList<SubtitleData>()
         val subSources = subHelper.getAllSubtitles().mapNotNull { sub ->
-            val subConfig = MediaItem.SubtitleConfiguration.Builder(Uri.parse(sub.getFixedUrl()))
+            val subConfig = MediaItem.SubtitleConfiguration.Builder(sub.getFixedUrl().toUri())
                 .setMimeType(sub.mimeType)
                 .setLanguage("_${sub.name}")
                 .setId(sub.getId())
                 .setSelectionFlags(0)
                 .build()
             when (sub.origin) {
-                SubtitleOrigin.DOWNLOADED_FILE -> {
+                SubtitleOrigin.DOWNLOADED_FILE, SubtitleOrigin.EMBEDDED_IN_VIDEO -> {
                     if (offlineSourceFactory != null) {
                         activeSubtitles.add(sub)
                         SingleSampleMediaSource.Factory(offlineSourceFactory)
@@ -1492,37 +1735,41 @@ class CS3IPlayer : IPlayer {
                 }
 
                 SubtitleOrigin.URL -> {
-                    if (onlineSourceFactory != null) {
-                        activeSubtitles.add(sub)
-                        SingleSampleMediaSource.Factory(onlineSourceFactory.apply {
-                            if (sub.headers.isNotEmpty())
-                                this.setDefaultRequestProperties(sub.headers)
-                        })
-                            .createMediaSource(subConfig, TIME_UNSET)
-                    } else {
-                        null
-                    }
-                }
-
-                SubtitleOrigin.EMBEDDED_IN_VIDEO -> {
-                    if (offlineSourceFactory != null) {
-                        activeSubtitles.add(sub)
-                        SingleSampleMediaSource.Factory(offlineSourceFactory)
-                            .createMediaSource(subConfig, TIME_UNSET)
-                    } else {
-                        null
-                    }
+                    val dataSourceFactory = createOnlineSource(sub.headers, interceptor)
+                    activeSubtitles.add(sub)
+                    SingleSampleMediaSource.Factory(dataSourceFactory)
+                        .createMediaSource(subConfig, TIME_UNSET)
                 }
             }
         }
         return Pair(subSources, activeSubtitles)
     }
 
+    /**
+     * Creates audio media sources from ExtractorLink's audioTracks
+     * @param audioTracks List of audio tracks from ExtractorLink
+     * @return List of MediaSource for audio tracks
+     */
+    private fun getAudioSources(
+        audioTracks: List<AudioFile>,
+        interceptor: Interceptor?,
+    ): List<MediaSource> {
+        return audioTracks.mapNotNull { audio ->
+            try {
+                val mediaItem = getMediaItem(MimeTypes.AUDIO_UNKNOWN, audio.url)
+                val dataSourceFactory = createOnlineSource(audio.headers, interceptor)
+                DefaultMediaSourceFactory(dataSourceFactory).createMediaSource(mediaItem)
+            } catch (e: Exception) {
+                Log.e(TAG, "Failed to create audio source for ${audio.url}: ${e.message}")
+                null
+            }
+        }
+    }
+
     override fun isActive(): Boolean {
         return exoPlayer != null
     }
 
-
     @MainThread
     private fun loadTorrent(context: Context, link: ExtractorLink) {
         ioSafe {
@@ -1572,7 +1819,7 @@ class CS3IPlayer : IPlayer {
                                 defaultSet
                             )
                             ?.mapNotNull { it.toIntOrNull() ?: return@mapNotNull null }
-                    } catch (e: Throwable) {
+                    } catch (_: Throwable) {
                         null
                     } ?: default
 
@@ -1592,7 +1839,7 @@ class CS3IPlayer : IPlayer {
                         // this causes a *bug* that restarts all torrents from 0
                         // but I would call this a feature
                         releasePlayer()
-                        loadExo(context, listOf(), listOf(), null)
+                        loadExo(context, listOf(), listOf())
                     }
                     event(
                         StatusEvent(
@@ -1645,7 +1892,7 @@ class CS3IPlayer : IPlayer {
             if (ignoreSSL) {
                 // Disables ssl check
                 val sslContext: SSLContext = SSLContext.getInstance("TLS")
-                sslContext.init(null, arrayOf(SSLTrustManager()), java.security.SecureRandom())
+                sslContext.init(null, arrayOf(SSLTrustManager()), SecureRandom())
                 sslContext.createSSLEngine()
                 HttpsURLConnection.setDefaultHostnameVerifier { _: String, _: SSLSession ->
                     true
@@ -1670,7 +1917,7 @@ class CS3IPlayer : IPlayer {
                                 uuid = link.uuid,
                                 kty = link.kty,
                                 licenseUrl = link.licenseUrl,
-                                keyRequestParameters = link.keyRequestParameters
+                                keyRequestParameters = link.keyRequestParameters,
                             )
                         )
                     )
@@ -1682,26 +1929,46 @@ class CS3IPlayer : IPlayer {
                 )
             }
 
-            val onlineSourceFactory = createOnlineSource(link)
+            // For DASH or HLS single streams (non-playlist), prefer the player's default
+            // live position instead of starting at 0. Use TIME_UNSET to let ExoPlayer pick
+            // the live/default position when no explicit start position was provided.
+            if (playbackPosition == 0L && (link.type == ExtractorLinkType.M3U8 || link.type == ExtractorLinkType.DASH)) {
+                playbackPosition = TIME_UNSET
+            }
+
+            val provider = getApiFromNameNull(link.source)
+            val interceptor: Interceptor? = provider?.getVideoInterceptor(link)
+
+            val onlineSourceFactory =
+                createVideoSource(
+                    link = link,
+                    engine = tryCreateEngine(context, simpleCacheSize),
+                    interceptor = interceptor
+                )
+
             val offlineSourceFactory = context.createOfflineSource()
 
             val (subSources, activeSubtitles) = getSubSources(
-                onlineSourceFactory = onlineSourceFactory,
                 offlineSourceFactory = offlineSourceFactory,
-                subtitleHelper
+                subHelper = subtitleHelper,
+                interceptor = interceptor, // Backwards compatibility, needs a new api to work properly
             )
 
-            subtitleHelper.setActiveSubtitles(activeSubtitles.toSet())
-
-            if (simpleCache == null)
-                simpleCache = getCache(context, simpleCacheSize)
+            // Create audio sources from ExtractorLink's audioTracks
+            val audioSources = getAudioSources(
+                audioTracks = link.audioTracks,
+                interceptor = interceptor, // Backwards compatibility, needs a new api to work properly
+            )
 
-            val cacheFactory = CacheDataSource.Factory().apply {
-                simpleCache?.let { setCache(it) }
-                setUpstreamDataSourceFactory(onlineSourceFactory)
-            }
+            subtitleHelper.setActiveSubtitles(activeSubtitles.toSet())
 
-            loadExo(context, mediaItems, subSources, cacheFactory)
+            loadExo(
+                context = context,
+                mediaSlices = mediaItems,
+                subSources = subSources,
+                audioSources = audioSources,
+                onlineSource = onlineSourceFactory
+            )
         } catch (t: Throwable) {
             Log.e(TAG, "loadOnlinePlayer error", t)
             event(ErrorEvent(t))
@@ -1718,4 +1985,38 @@ class CS3IPlayer : IPlayer {
             loadOfflinePlayer(context, it)
         }
     }
+
+    private val tracksAnalyticsListener = object : AnalyticsListener {
+
+        override fun onVideoInputFormatChanged(
+            eventTime: AnalyticsListener.EventTime,
+            format: Format,
+            decoderReuseEvaluation: DecoderReuseEvaluation?
+        ) {
+            event(TracksChangedEvent())
+        }
+
+        override fun onAudioInputFormatChanged(
+            eventTime: AnalyticsListener.EventTime,
+            format: Format,
+            decoderReuseEvaluation: DecoderReuseEvaluation?
+        ) {
+            event(TracksChangedEvent())
+        }
+
+        override fun onVideoDisabled(
+            eventTime: AnalyticsListener.EventTime,
+            decoderCounters: DecoderCounters
+        ) {
+            event(TracksChangedEvent())
+        }
+
+        override fun onAudioDisabled(
+            eventTime: AnalyticsListener.EventTime,
+            decoderCounters: DecoderCounters
+        ) {
+            event(TracksChangedEvent())
+        }
+    }
+
 }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CustomSubripParser.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CustomSubripParser.kt
new file mode 100644
index 00000000000..c26a4f2dfdb
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CustomSubripParser.kt
@@ -0,0 +1,296 @@
+/*
+ * 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.
+ */
+
+
+/*
+* This is a fork of media3 subrip parses as the developers fear a flexible player, and open classes.
+*/
+package com.lagradost.cloudstream3.ui.player
+
+import android.text.Html
+import android.text.Spanned
+import android.text.TextUtils
+import androidx.annotation.VisibleForTesting
+import androidx.media3.common.C
+import androidx.media3.common.Format
+import androidx.media3.common.Format.CueReplacementBehavior
+import androidx.media3.common.text.Cue
+import androidx.media3.common.text.Cue.AnchorType
+import androidx.media3.common.util.Consumer
+import androidx.media3.common.util.Log
+import androidx.media3.common.util.ParsableByteArray
+import androidx.media3.common.util.UnstableApi
+import androidx.media3.extractor.text.CuesWithTiming
+import androidx.media3.extractor.text.SubtitleParser
+import androidx.media3.extractor.text.SubtitleParser.OutputOptions
+import com.google.common.base.Preconditions.checkNotNull
+import com.google.common.collect.ImmutableList
+import java.nio.charset.Charset
+import java.nio.charset.StandardCharsets
+import java.util.regex.Matcher
+import java.util.regex.Pattern
+
+/** A [SubtitleParser] for SubRip.  */
+@UnstableApi
+class CustomSubripParser : SubtitleParser {
+    private val textBuilder: StringBuilder = StringBuilder()
+    private val tags: ArrayList<String> = ArrayList()
+    private val parsableByteArray: ParsableByteArray = ParsableByteArray()
+
+    override fun getCueReplacementBehavior(): @CueReplacementBehavior Int {
+        return CUE_REPLACEMENT_BEHAVIOR
+    }
+
+    override fun parse(
+        data: ByteArray,
+        offset: Int,
+        length: Int,
+        outputOptions: OutputOptions,
+        output: Consumer<CuesWithTiming>
+    ) {
+        parsableByteArray.reset(data,  /* limit= */offset + length)
+        parsableByteArray.setPosition(offset)
+        val charset = detectUtfCharset(parsableByteArray)
+
+        val cuesWithTimingBeforeRequestedStartTimeUs: MutableList<CuesWithTiming>? =
+            if (outputOptions.startTimeUs != C.TIME_UNSET && outputOptions.outputAllCues)
+                ArrayList<CuesWithTiming>()
+            else
+                null
+        var currentLine: String?
+        while ((parsableByteArray.readLine(charset).also { currentLine = it }) != null) {
+            if (currentLine!!.isEmpty()) {
+                // Skip blank lines.
+                continue
+            }
+
+            // Parse and check the index line.
+            try {
+                currentLine.toInt()
+            } catch (_: NumberFormatException) {
+                Log.w(TAG, "Skipping invalid index: $currentLine")
+                continue
+            }
+
+            // Read and parse the timing line.
+            currentLine = parsableByteArray.readLine(charset)
+            if (currentLine == null) {
+                Log.w(TAG, "Unexpected end")
+                break
+            }
+
+            val startTimeUs: Long
+            val endTimeUs: Long
+            val matcher = SUBRIP_TIMING_LINE.matcher(currentLine)
+            if (matcher.matches()) {
+                startTimeUs = parseTimecode(matcher,  /* groupOffset= */1)
+                endTimeUs = parseTimecode(matcher,  /* groupOffset= */6)
+            } else {
+                Log.w(TAG, "Skipping invalid timing: $currentLine")
+                continue
+            }
+
+            // Read and parse the text and tags.
+            textBuilder.setLength(0)
+            tags.clear()
+            currentLine = parsableByteArray.readLine(charset)
+            while (!TextUtils.isEmpty(currentLine)) {
+                if (textBuilder.isNotEmpty()) {
+                    textBuilder.append("<br>")
+                }
+                textBuilder.append(processLine(currentLine!!, tags))
+                currentLine = parsableByteArray.readLine(charset)
+            }
+
+            @Suppress("DEPRECATION")
+            val text = Html.fromHtml(textBuilder.toString())
+
+            var alignmentTag: String? = null
+            for (i in tags.indices) {
+                val tag = tags[i]
+                if (tag.matches(SUBRIP_ALIGNMENT_TAG.toRegex())) {
+                    alignmentTag = tag
+                    // Subsequent alignment tags should be ignored.
+                    break
+                }
+            }
+            if (outputOptions.startTimeUs == C.TIME_UNSET || endTimeUs >= outputOptions.startTimeUs) {
+                output.accept(
+                    CuesWithTiming(
+                        ImmutableList.of<Cue>(buildCue(text, alignmentTag)),
+                        startTimeUs,  /* durationUs= */
+                        endTimeUs - startTimeUs
+                    )
+                )
+            } else cuesWithTimingBeforeRequestedStartTimeUs?.add(
+                CuesWithTiming(
+                    ImmutableList.of<Cue>(buildCue(text, alignmentTag)),
+                    startTimeUs,  /* durationUs= */
+                    endTimeUs - startTimeUs
+                )
+            )
+        }
+        if (cuesWithTimingBeforeRequestedStartTimeUs != null) {
+            for (cuesWithTiming in cuesWithTimingBeforeRequestedStartTimeUs) {
+                output.accept(cuesWithTiming)
+            }
+        }
+    }
+
+    /**
+     * Determine UTF encoding of the byte array from a byte order mark (BOM), defaulting to UTF-8 if
+     * no BOM is found.
+     */
+    private fun detectUtfCharset(data: ParsableByteArray): Charset {
+        val charset = data.readUtfCharsetFromBom()
+        return charset ?: StandardCharsets.UTF_8
+    }
+
+    /**
+     * Trims and removes tags from the given line. The removed tags are added to `tags`.
+     *
+     * @param line The line to process.
+     * @param tags A list to which removed tags will be added.
+     * @return The processed line.
+     */
+    private fun processLine(line: String, tags: ArrayList<String>): String {
+        var line = line
+        line = line.trim { it <= ' ' }
+
+        var removedCharacterCount = 0
+        val processedLine = StringBuilder(line)
+        val matcher = SUBRIP_TAG_PATTERN.matcher(line)
+        while (matcher.find()) {
+            val tag = matcher.group()
+            tags.add(tag)
+            val start = matcher.start() - removedCharacterCount
+            val tagLength = tag.length
+            processedLine.replace(start,  /* end= */start + tagLength,  /* str= */"")
+            removedCharacterCount += tagLength
+        }
+
+        return processedLine.toString()
+    }
+
+    /**
+     * Build a [Cue] based on the given text and alignment tag.
+     *
+     * @param text The text.
+     * @param alignmentTag The alignment tag, or `null` if no alignment tag is available.
+     * @return Built cue
+     */
+    private fun buildCue(text: Spanned, alignmentTag: String?): Cue {
+        val cue = Cue.Builder().setText(text)
+        if (alignmentTag == null) {
+            return cue.build()
+        }
+
+        // Horizontal alignment.
+        when (alignmentTag) {
+            ALIGN_BOTTOM_LEFT, ALIGN_MID_LEFT, ALIGN_TOP_LEFT -> cue.setPositionAnchor(Cue.ANCHOR_TYPE_START)
+            ALIGN_BOTTOM_RIGHT, ALIGN_MID_RIGHT, ALIGN_TOP_RIGHT -> cue.setPositionAnchor(Cue.ANCHOR_TYPE_END)
+            ALIGN_BOTTOM_MID, ALIGN_MID_MID, ALIGN_TOP_MID -> cue.setPositionAnchor(Cue.ANCHOR_TYPE_MIDDLE)
+            else -> cue.setPositionAnchor(Cue.ANCHOR_TYPE_MIDDLE)
+        }
+
+        // Vertical alignment.
+        when (alignmentTag) {
+            ALIGN_BOTTOM_LEFT, ALIGN_BOTTOM_MID, ALIGN_BOTTOM_RIGHT -> cue.setLineAnchor(Cue.ANCHOR_TYPE_END)
+            ALIGN_TOP_LEFT, ALIGN_TOP_MID, ALIGN_TOP_RIGHT -> cue.setLineAnchor(Cue.ANCHOR_TYPE_START)
+            ALIGN_MID_LEFT, ALIGN_MID_MID, ALIGN_MID_RIGHT -> cue.setLineAnchor(Cue.ANCHOR_TYPE_MIDDLE)
+            else -> cue.setLineAnchor(Cue.ANCHOR_TYPE_MIDDLE)
+        }
+
+        return cue.setPosition(getFractionalPositionForAnchorType(cue.getPositionAnchor()))
+            .setLine(
+                getFractionalPositionForAnchorType(cue.getLineAnchor()),
+                Cue.LINE_TYPE_FRACTION
+            )
+            .build()
+    }
+
+    companion object {
+        /**
+         * The [CueReplacementBehavior] for consecutive [CuesWithTiming] emitted by this
+         * implementation.
+         */
+        const val CUE_REPLACEMENT_BEHAVIOR: @CueReplacementBehavior Int =
+            Format.CUE_REPLACEMENT_BEHAVIOR_MERGE
+
+        // Fractional positions for use when alignment tags are present.
+        private const val START_FRACTION = 0.08f
+        private const val END_FRACTION = 1 - START_FRACTION
+        private const val MID_FRACTION = 0.5f
+
+        private const val TAG = "SubripParser"
+
+        // The google devs are useless, this entire class is just to override this
+        private const val SUBRIP_TIMECODE = "(?:(\\d+):)?(\\d+):(\\d+)(?:[,.](\\d+))?"
+        private val SUBRIP_TIMING_LINE: Pattern =
+            Pattern.compile("\\s*($SUBRIP_TIMECODE)\\s*-->\\s*($SUBRIP_TIMECODE)\\s*")
+
+        // NOTE: Android Studio's suggestion to simplify '\\}' is incorrect [internal: b/144480183].
+        private val SUBRIP_TAG_PATTERN: Pattern = Pattern.compile("\\{\\\\.*?\\}")
+        private const val SUBRIP_ALIGNMENT_TAG = "\\{\\\\an[1-9]\\}"
+
+        // Alignment tags for SSA V4+.
+        private const val ALIGN_BOTTOM_LEFT = "{\\an1}"
+        private const val ALIGN_BOTTOM_MID = "{\\an2}"
+        private const val ALIGN_BOTTOM_RIGHT = "{\\an3}"
+        private const val ALIGN_MID_LEFT = "{\\an4}"
+        private const val ALIGN_MID_MID = "{\\an5}"
+        private const val ALIGN_MID_RIGHT = "{\\an6}"
+        private const val ALIGN_TOP_LEFT = "{\\an7}"
+        private const val ALIGN_TOP_MID = "{\\an8}"
+        private const val ALIGN_TOP_RIGHT = "{\\an9}"
+
+        private fun parseTimecode(matcher: Matcher, groupOffset: Int): Long {
+            val hours = matcher.group(groupOffset + 1)
+            var timestampMs = if (hours != null) hours.toLong() * 60 * 60 * 1000 else 0
+            timestampMs += checkNotNull(matcher.group(groupOffset + 2))
+                .toLong() * 60 * 1000
+            timestampMs += checkNotNull(matcher.group(groupOffset + 3))
+                .toLong() * 1000
+            val millis = matcher.group(groupOffset + 4)
+
+            timestampMs += when (millis?.length) {
+                null -> 0L
+                1 -> millis.toLong() * 100L
+                2 -> millis.toLong() * 10L
+                3 -> millis.toLong() * 1L
+                else -> millis.substring(0, 3).toLong()
+            }
+
+            return timestampMs * 1000
+        }
+
+        // TODO(b/289983417): Make package-private again, once it is no longer needed in
+        // DelegatingSubtitleDecoderWithSubripParserTest.java (i.e. legacy subtitle flow is removed)
+        @VisibleForTesting(otherwise = VisibleForTesting.Companion.PRIVATE)
+        fun getFractionalPositionForAnchorType(anchorType: @AnchorType Int): Float {
+            return when (anchorType) {
+                Cue.ANCHOR_TYPE_START -> START_FRACTION
+                Cue.ANCHOR_TYPE_MIDDLE -> MID_FRACTION
+                Cue.ANCHOR_TYPE_END -> END_FRACTION
+                Cue.TYPE_UNSET ->         // Should never happen.
+                    throw IllegalArgumentException()
+
+                else ->
+                    throw IllegalArgumentException()
+            }
+        }
+    }
+}
\ 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 dfef0de005d..61d6f556450 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
@@ -18,7 +18,6 @@ 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
@@ -35,8 +34,8 @@ import java.nio.charset.Charset
 /**
  * @param fallbackFormat used to create a decoder based on mimetype if the subtitle string is not
  * enough to identify the subtitle format.
- **/
-@UnstableApi
+ */
+@OptIn(UnstableApi::class)
 class CustomDecoder(private val fallbackFormat: Format?) : SubtitleParser {
     companion object {
         fun updateForcedEncoding(context: Context) {
@@ -53,15 +52,15 @@ class CustomDecoder(private val fallbackFormat: Format?) : SubtitleParser {
         }
 
         private const val DEFAULT_MARGIN: Float = 0.05f
-        private const val SSA_ALIGNMENT_BOTTOM_LEFT = 1
-        private const val SSA_ALIGNMENT_BOTTOM_CENTER = 2
-        private const val SSA_ALIGNMENT_BOTTOM_RIGHT = 3
-        private const val SSA_ALIGNMENT_MIDDLE_LEFT = 4
-        private const val SSA_ALIGNMENT_MIDDLE_CENTER = 5
-        private const val SSA_ALIGNMENT_MIDDLE_RIGHT = 6
-        private const val SSA_ALIGNMENT_TOP_LEFT = 7
-        private const val SSA_ALIGNMENT_TOP_CENTER = 8
-        private const val SSA_ALIGNMENT_TOP_RIGHT = 9
+        const val SSA_ALIGNMENT_BOTTOM_LEFT = 1
+        const val SSA_ALIGNMENT_BOTTOM_CENTER = 2
+        const val SSA_ALIGNMENT_BOTTOM_RIGHT = 3
+        const val SSA_ALIGNMENT_MIDDLE_LEFT = 4
+        const val SSA_ALIGNMENT_MIDDLE_CENTER = 5
+        const val SSA_ALIGNMENT_MIDDLE_RIGHT = 6
+        const val SSA_ALIGNMENT_TOP_LEFT = 7
+        const val SSA_ALIGNMENT_TOP_CENTER = 8
+        const val SSA_ALIGNMENT_TOP_RIGHT = 9
 
         /** Subtitle offset in milliseconds */
         var subtitleOffset: Long = 0
@@ -108,7 +107,7 @@ class CustomDecoder(private val fallbackFormat: Format?) : SubtitleParser {
         }
 
         /**
-         * Fixes alignment for cues with {\anX}, 
+         * Fixes alignment for cues with {\anX},
          * this is common for .vtt that should be parsed as .srt
          *
          * ```
@@ -148,37 +147,7 @@ class CustomDecoder(private val fallbackFormat: Format?) : SubtitleParser {
             // exoplayer can already parse this, however for eg webvtt it fails
             locationRegex.find(trimmed)?.groupValues?.get(1)?.toIntOrNull()?.let { alignment ->
                 // toLineAnchor
-                when (alignment) {
-                    SSA_ALIGNMENT_BOTTOM_LEFT, SSA_ALIGNMENT_BOTTOM_CENTER, SSA_ALIGNMENT_BOTTOM_RIGHT -> Cue.ANCHOR_TYPE_END
-                    SSA_ALIGNMENT_MIDDLE_LEFT, SSA_ALIGNMENT_MIDDLE_CENTER, SSA_ALIGNMENT_MIDDLE_RIGHT -> Cue.ANCHOR_TYPE_MIDDLE
-                    SSA_ALIGNMENT_TOP_LEFT, SSA_ALIGNMENT_TOP_CENTER, SSA_ALIGNMENT_TOP_RIGHT -> Cue.ANCHOR_TYPE_START
-                    else -> null
-                }?.let { anchor ->
-                    setLineAnchor(anchor)
-                    setLine(
-                        computeDefaultLineOrPosition(anchor), Cue.LINE_TYPE_FRACTION
-                    )
-                }
-                // toPositionAnchor
-                when (alignment) {
-                    SSA_ALIGNMENT_BOTTOM_LEFT, SSA_ALIGNMENT_MIDDLE_LEFT, SSA_ALIGNMENT_TOP_LEFT -> Cue.ANCHOR_TYPE_START
-                    SSA_ALIGNMENT_BOTTOM_CENTER, SSA_ALIGNMENT_MIDDLE_CENTER, SSA_ALIGNMENT_TOP_CENTER -> Cue.ANCHOR_TYPE_MIDDLE
-                    SSA_ALIGNMENT_BOTTOM_RIGHT, SSA_ALIGNMENT_MIDDLE_RIGHT, SSA_ALIGNMENT_TOP_RIGHT -> Cue.ANCHOR_TYPE_END
-                    else -> null
-                }?.let { anchor ->
-                    setPositionAnchor(anchor)
-                    setPosition(computeDefaultLineOrPosition(anchor))
-                }
-
-                // toTextAlignment
-                when (alignment) {
-                    SSA_ALIGNMENT_BOTTOM_LEFT, SSA_ALIGNMENT_MIDDLE_LEFT, SSA_ALIGNMENT_TOP_LEFT -> Layout.Alignment.ALIGN_NORMAL
-                    SSA_ALIGNMENT_BOTTOM_CENTER, SSA_ALIGNMENT_MIDDLE_CENTER, SSA_ALIGNMENT_TOP_CENTER -> Layout.Alignment.ALIGN_CENTER
-                    SSA_ALIGNMENT_BOTTOM_RIGHT, SSA_ALIGNMENT_MIDDLE_RIGHT, SSA_ALIGNMENT_TOP_RIGHT -> Layout.Alignment.ALIGN_OPPOSITE
-                    else -> null
-                }?.let { anchor ->
-                    setTextAlignment(anchor)
-                }
+                this.setSubtitleAlignment(alignment)
             }
 
             // remove all matches, so we do not display \anx
@@ -186,6 +155,42 @@ class CustomDecoder(private val fallbackFormat: Format?) : SubtitleParser {
             setText(trimmed)
             return this
         }
+
+        fun Cue.Builder.setSubtitleAlignment(alignment: Int?): Cue.Builder {
+            if (alignment == null) return this
+            when (alignment) {
+                SSA_ALIGNMENT_BOTTOM_LEFT, SSA_ALIGNMENT_BOTTOM_CENTER, SSA_ALIGNMENT_BOTTOM_RIGHT -> Cue.ANCHOR_TYPE_END
+                SSA_ALIGNMENT_MIDDLE_LEFT, SSA_ALIGNMENT_MIDDLE_CENTER, SSA_ALIGNMENT_MIDDLE_RIGHT -> Cue.ANCHOR_TYPE_MIDDLE
+                SSA_ALIGNMENT_TOP_LEFT, SSA_ALIGNMENT_TOP_CENTER, SSA_ALIGNMENT_TOP_RIGHT -> Cue.ANCHOR_TYPE_START
+                else -> null
+            }?.let { anchor ->
+                setLineAnchor(anchor)
+                setLine(
+                    computeDefaultLineOrPosition(anchor), Cue.LINE_TYPE_FRACTION
+                )
+            }
+            // toPositionAnchor
+            when (alignment) {
+                SSA_ALIGNMENT_BOTTOM_LEFT, SSA_ALIGNMENT_MIDDLE_LEFT, SSA_ALIGNMENT_TOP_LEFT -> Cue.ANCHOR_TYPE_START
+                SSA_ALIGNMENT_BOTTOM_CENTER, SSA_ALIGNMENT_MIDDLE_CENTER, SSA_ALIGNMENT_TOP_CENTER -> Cue.ANCHOR_TYPE_MIDDLE
+                SSA_ALIGNMENT_BOTTOM_RIGHT, SSA_ALIGNMENT_MIDDLE_RIGHT, SSA_ALIGNMENT_TOP_RIGHT -> Cue.ANCHOR_TYPE_END
+                else -> null
+            }?.let { anchor ->
+                setPositionAnchor(anchor)
+                setPosition(computeDefaultLineOrPosition(anchor))
+            }
+
+            // toTextAlignment
+            when (alignment) {
+                SSA_ALIGNMENT_BOTTOM_LEFT, SSA_ALIGNMENT_MIDDLE_LEFT, SSA_ALIGNMENT_TOP_LEFT -> Layout.Alignment.ALIGN_NORMAL
+                SSA_ALIGNMENT_BOTTOM_CENTER, SSA_ALIGNMENT_MIDDLE_CENTER, SSA_ALIGNMENT_TOP_CENTER -> Layout.Alignment.ALIGN_CENTER
+                SSA_ALIGNMENT_BOTTOM_RIGHT, SSA_ALIGNMENT_MIDDLE_RIGHT, SSA_ALIGNMENT_TOP_RIGHT -> Layout.Alignment.ALIGN_OPPOSITE
+                else -> null
+            }?.let { anchor ->
+                setTextAlignment(anchor)
+            }
+            return this
+        }
     }
 
     private var realDecoder: SubtitleParser? = null
@@ -245,14 +250,14 @@ class CustomDecoder(private val fallbackFormat: Format?) : SubtitleParser {
                 ignoreCase = true
             )) -> SsaParser(fallbackFormat?.initializationData)
 
-            trimmedText.startsWith("1", ignoreCase = true) -> SubripParser()
+            trimmedText.startsWith("1", ignoreCase = true) -> CustomSubripParser()
             fallbackFormat != null -> {
-                when (val mimeType = fallbackFormat.sampleMimeType) {
+                when (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_SUBRIP -> CustomSubripParser()
                     MimeTypes.APPLICATION_TX3G -> Tx3gParser(fallbackFormat.initializationData)
                     // These decoders are not converted to parsers yet
                     // TODO
@@ -386,7 +391,7 @@ class CustomSubtitleDecoderFactory : SubtitleDecoderFactory {
     /**
      * 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 {
         val parser = CustomDecoder(format)
         // Allow garbage collection if player releases the decoder
@@ -398,8 +403,8 @@ class CustomSubtitleDecoderFactory : SubtitleDecoderFactory {
     }
 }
 
-@OptIn(UnstableApi::class)
 /** We need to convert the newer SubtitleParser to an older SubtitleDecoder */
+@OptIn(UnstableApi::class)
 class DelegatingSubtitleDecoder(name: String, private val parser: SubtitleParser) :
     SimpleSubtitleDecoder(name) {
 
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 16eb8832705..35f8dcfd8ae 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,60 +1,25 @@
 package com.lagradost.cloudstream3.ui.player
 
 import android.net.Uri
-import com.lagradost.cloudstream3.AcraApplication.Companion.context
+import com.lagradost.cloudstream3.CloudStreamApp.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.ExtractorLinkType
+import com.lagradost.cloudstream3.utils.SubtitleHelper.fromLanguageToTagIETF
 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
+import com.lagradost.cloudstream3.utils.downloader.DownloadFileManagement.getFolder
+import com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager.getDownloadFileInfo
 
 class DownloadFileGenerator(
-    private val episodes: List<ExtractorUri>,
-    private var currentIndex: Int = 0
-) : IGenerator {
+    episodes: List<ExtractorUri>
+) : VideoGenerator<ExtractorUri>(episodes) {
     override val hasCache = false
     override val canSkipLoading = false
 
-    override fun hasNext(): Boolean {
-        return currentIndex < episodes.size - 1
-    }
-
-    override fun hasPrev(): Boolean {
-        return currentIndex > 0
-    }
-
-    override fun next() {
-        if (hasNext())
-            currentIndex++
-    }
-
-    override fun prev() {
-        if (hasPrev())
-            currentIndex--
-    }
-
-    override fun goto(index: Int) {
-        // clamps value
-        currentIndex = min(episodes.size - 1, max(0, index))
-    }
-
-    override fun getCurrentId(): Int? {
-        return episodes[currentIndex].id
-    }
-
-    override fun getCurrent(offset: Int): Any? {
-        return episodes.getOrNull(currentIndex + offset)
-    }
-
-    override fun getAll(): List<Any>? {
-        return null
-    }
+    override fun getId(index: Int): Int? = this.videos.getOrNull(index)?.id
 
     override suspend fun generateLinks(
         clearCache: Boolean,
@@ -64,14 +29,14 @@ class DownloadFileGenerator(
         offset: Int,
         isCasting: Boolean
     ): Boolean {
-        val meta = episodes[currentIndex + offset]
+        val meta = videos.getOrNull(offset) ?: return false
 
         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)
+                    getDownloadFileInfo(act, id)
                 }
             }
 
@@ -90,17 +55,19 @@ class DownloadFileGenerator(
         getFolder(ctx, relative, meta.basePath)?.forEach { (name, uri) ->
             if (isMatchingSubtitle(name, display, cleanDisplay)) {
                 val cleanName = cleanDisplayName(name)
-                val realName = cleanName.removePrefix(cleanDisplay)
+                val lastNum = Regex(" ([0-9]+)$")
+                val nameSuffix = lastNum.find(cleanName)?.groupValues?.get(1) ?: ""
+                val originalName = cleanName.removePrefix(cleanDisplay).replace(lastNum, "").trim()
 
                 subtitleCallback(
                     SubtitleData(
-                        realName.ifBlank { ctx.getString(R.string.default_subtitles) },
-                        "",
+                        originalName.ifBlank { ctx.getString(R.string.default_subtitles) },
+                        nameSuffix,
                         uri.toString(),
                         SubtitleOrigin.DOWNLOADED_FILE,
                         name.toSubtitleMimeType(),
                         emptyMap(),
-                        null
+                        fromLanguageToTagIETF(originalName, 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 7fc297235af..7a42cea93f7 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
@@ -11,9 +11,12 @@ import com.lagradost.cloudstream3.mvvm.safe
 import com.lagradost.cloudstream3.ui.player.OfflinePlaybackHelper.playLink
 import com.lagradost.cloudstream3.ui.player.OfflinePlaybackHelper.playUri
 import com.lagradost.cloudstream3.utils.BackPressedCallbackHelper.attachBackPressedCallback
+import com.lagradost.cloudstream3.utils.UIHelper.enableEdgeToEdgeCompat
 
 class DownloadedPlayerActivity : AppCompatActivity() {
-    private val dTAG = "DownloadedPlayerAct"
+    companion object {
+        const val TAG = "DownloadedPlayerActivity"
+    }
 
     override fun dispatchKeyEvent(event: KeyEvent): Boolean =
         CommonActivity.dispatchKeyEvent(this, event) ?: super.dispatchKeyEvent(event)
@@ -26,52 +29,69 @@ class DownloadedPlayerActivity : AppCompatActivity() {
         CommonActivity.onUserLeaveHint(this)
     }
 
+    override fun onNewIntent(intent: Intent) {
+        super.onNewIntent(intent)
+        // Ignore same intent so the player doesnt totally
+        // reload if you are playing the same thing.
+        if (isSameIntent(intent)) return
+        setIntent(intent)
+        Log.i(TAG, "onNewIntent")
+        handleIntent(intent)
+    }
+
+    private fun isSameIntent(newIntent: Intent): Boolean {
+        val old = intent ?: return false
+        // Compare URIs first
+        val oldUri = old.data ?: old.clipData?.getItemAt(0)?.uri
+        val newUri = newIntent.data ?: newIntent.clipData?.getItemAt(0)?.uri
+        if (oldUri != null && oldUri == newUri) return true
+        // Fall back to comparing EXTRA_TEXT links
+        val oldText = safe { old.getStringExtra(Intent.EXTRA_TEXT) }
+        val newText = safe { newIntent.getStringExtra(Intent.EXTRA_TEXT) }
+        return oldText != null && oldText == newText
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         CommonActivity.loadThemes(this)
         CommonActivity.init(this)
+        enableEdgeToEdgeCompat()
         setContentView(R.layout.empty_layout)
-        Log.i(dTAG, "onCreate")
+        Log.i(TAG, "onCreate")
 
-        val data = intent.data
+        handleIntent(intent)
+        attachBackPressedCallback("DownloadedPlayerActivity") { finish() }
+    }
 
+    private fun handleIntent(intent: Intent) {
+        val data = intent.data
         if (OfflinePlaybackHelper.playIntent(activity = this, intent = intent)) {
             return
         }
 
-        if (intent?.action == Intent.ACTION_SEND || intent?.action == Intent.ACTION_OPEN_DOCUMENT || intent?.action == Intent.ACTION_VIEW) {
-            val extraText = safe { // I dont trust android
-                intent.getStringExtra(Intent.EXTRA_TEXT)
-            }
+        if (
+            intent.action == Intent.ACTION_SEND ||
+            intent.action == Intent.ACTION_OPEN_DOCUMENT ||
+            intent.action == Intent.ACTION_VIEW
+        ) {
+            val extraText = safe { intent.getStringExtra(Intent.EXTRA_TEXT) }
             val cd = intent.clipData
             val item = if (cd != null && cd.itemCount > 0) cd.getItemAt(0) else null
             val url = item?.text?.toString()
-
-            // idk what I am doing, just hope any of these work
-            if (item?.uri != null)
-                playUri(this, item.uri)
-            else if (url != null)
-                playLink(this, url)
-            else if (data != null)
-                playUri(this, data)
-            else if (extraText != null)
-                playLink(this, extraText)
-            else {
-                finish()
-                return
+            when {
+                item?.uri != null -> playUri(this, item.uri)
+                url != null -> playLink(this, url)
+                data != null -> playUri(this, data)
+                extraText != null -> playLink(this, extraText)
+                else -> { finish(); return }
             }
         } else if (data?.scheme == "content") {
             playUri(this, data)
-        } else {
-            finish()
-            return
-        }
-
-        attachBackPressedCallback("DownloadedPlayerActivity") { finish() }
+        } else finish()
     }
 
     override fun onResume() {
         super.onResume()
         CommonActivity.setActivityInstance(this)
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/ExtractorLinkGenerator.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/ExtractorLinkGenerator.kt
index 794dd762df2..85db33fc094 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
@@ -6,36 +6,7 @@ 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
-    }
-
-    override fun hasNext(): Boolean {
-        return false
-    }
-
-    override fun getAll(): List<Any>? {
-        return null
-    }
-
-    override fun hasPrev(): Boolean {
-        return false
-    }
-
-    override fun getCurrent(offset: Int): Any? {
-        return null
-    }
-
-    override fun goto(index: Int) {}
-
-    override fun next() {}
-
-    override fun prev() {}
-
+) : NoVideoGenerator(null) {
     override suspend fun generateLinks(
         clearCache: Boolean,
         sourceTypes: Set<ExtractorLinkType>,
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/FixedNextRenderersFactory.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/FixedNextRenderersFactory.kt
new file mode 100644
index 00000000000..025267cc9ed
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/FixedNextRenderersFactory.kt
@@ -0,0 +1,28 @@
+package com.lagradost.cloudstream3.ui.player
+
+import android.content.Context
+import android.os.Looper
+import androidx.media3.common.util.UnstableApi
+import androidx.media3.exoplayer.Renderer
+import androidx.media3.exoplayer.text.TextOutput
+import androidx.media3.exoplayer.text.TextRenderer
+import io.github.anilbeesetti.nextlib.media3ext.ffdecoder.NextRenderersFactory
+
+@UnstableApi
+class FixedNextRenderersFactory(context: Context) : NextRenderersFactory(context) {
+    /** Somehow the nextlib authors decided that we need a text renderer that causes
+     * "ERROR_CODE_FAILED_RUNTIME_CHECK".
+     *
+     * Core issue: https://github.com/anilbeesetti/nextlib/pull/158
+     * Comment: https://github.com/recloudstream/cloudstream/pull/2342#issuecomment-3917751718
+     * */
+    override fun buildTextRenderers(
+        context: Context,
+        output: TextOutput,
+        outputLooper: Looper,
+        extensionRendererMode: Int,
+        out: ArrayList<Renderer>
+    ) {
+        out.add(TextRenderer(output, outputLooper))
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
index 5a3d9d0318f..26706699bcc 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
@@ -5,55 +5,45 @@ import android.annotation.SuppressLint
 import android.app.Activity
 import android.app.Dialog
 import android.content.Context
+import android.content.DialogInterface
 import android.content.pm.ActivityInfo
 import android.content.res.ColorStateList
 import android.content.res.Configuration
 import android.graphics.Color
-import android.media.AudioManager
-import android.media.audiofx.LoudnessEnhancer
 import android.os.Build
 import android.os.Bundle
-import android.os.Handler
-import android.os.Looper
-import android.provider.Settings
 import android.text.Editable
-import android.text.format.DateUtils
 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.AccelerateDecelerateInterpolator
 import android.view.animation.AlphaAnimation
-import android.view.animation.Animation
-import android.view.animation.AnimationUtils
+import android.view.animation.DecelerateInterpolator
 import android.widget.LinearLayout
 import androidx.annotation.OptIn
+import androidx.appcompat.app.AlertDialog
 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.media3.exoplayer.ExoPlayer
 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
-import com.lagradost.cloudstream3.CommonActivity.screenWidth
-import com.lagradost.cloudstream3.CommonActivity.showToast
 import com.lagradost.cloudstream3.LoadResponse
 import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.databinding.FragmentPlayerBinding
 import com.lagradost.cloudstream3.databinding.PlayerCustomLayoutBinding
+import com.lagradost.cloudstream3.databinding.SpeedDialogBinding
 import com.lagradost.cloudstream3.databinding.SubtitleOffsetBinding
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.ui.player.GeneratorPlayer.Companion.subsProvidersIsActive
@@ -63,57 +53,38 @@ 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.isUsingMobileData
+import com.lagradost.cloudstream3.utils.AppContextUtils.shouldShowPlayerMetadata
+import com.lagradost.cloudstream3.utils.BackPressedCallbackHelper.attachBackPressedCallback
+import com.lagradost.cloudstream3.utils.BackPressedCallbackHelper.detachBackPressedCallback
 import com.lagradost.cloudstream3.utils.DataStoreHelper
-import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showDialog
 import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
-import com.lagradost.cloudstream3.utils.UIHelper.getNavigationBarHeight
-import com.lagradost.cloudstream3.utils.UIHelper.getStatusBarHeight
+import com.lagradost.cloudstream3.utils.UIHelper.fixSystemBarsPadding
 import com.lagradost.cloudstream3.utils.UIHelper.hideSystemUI
 import com.lagradost.cloudstream3.utils.UIHelper.popCurrentPage
-import com.lagradost.cloudstream3.utils.UIHelper.showSystemUI
 import com.lagradost.cloudstream3.utils.UIHelper.toPx
-import com.lagradost.cloudstream3.utils.UserPreferenceDelegate
-import com.lagradost.cloudstream3.utils.Vector2
 import com.lagradost.cloudstream3.utils.setText
 import com.lagradost.cloudstream3.utils.txt
-import kotlin.math.abs
-import kotlin.math.ceil
-import kotlin.math.max
-import kotlin.math.min
-import kotlin.math.round
 import kotlin.math.roundToInt
 
-
-const val MINIMUM_SEEK_TIME = 7000L         // when swipe seeking
-const val MINIMUM_VERTICAL_SWIPE = 2.0f     // in percentage
-const val MINIMUM_HORIZONTAL_SWIPE = 2.0f   // in percentage
-const val VERTICAL_MULTIPLIER = 2.0f
-const val HORIZONTAL_MULTIPLIER = 2.0f
-const val DOUBLE_TAB_MAXIMUM_HOLD_TIME = 200L
-const val DOUBLE_TAB_MINIMUM_TIME_BETWEEN = 200L    // this also affects the UI show response time
-const val DOUBLE_TAB_PAUSE_PERCENTAGE = 0.15        // in both directions
 private const val SUBTITLE_DELAY_BUNDLE_KEY = "subtitle_delay"
 
 // All the UI Logic for the player
-open class FullScreenPlayer : AbstractPlayerFragment() {
-    private var isVerticalOrientation: Boolean = false
+@OptIn(UnstableApi::class)
+open class FullScreenPlayer : AbstractPlayerFragment<FragmentPlayerBinding>(
+    BindingCreator.Bind(FragmentPlayerBinding::bind)
+) {
+    override fun pickLayout(): Int = R.layout.fragment_player
     protected open var lockRotation = true
-    protected open var isFullScreenPlayer = true
     protected var playerBinding: PlayerCustomLayoutBinding? = null
 
-    private var durationMode: Boolean by UserPreferenceDelegate("duration_mode", false)
-
     // state of player UI
     protected var isShowing = false
     protected var isLocked = false
-
+    protected var timestampShowState = false
+    private var metadataVisibilityToken = 0
     protected var hasEpisodes = false
         private set
-    //protected val hasEpisodes
-    //    get() = episodes.isNotEmpty()
-
-    // options for player
 
     /**
      * Default profile 1
@@ -122,21 +93,13 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
      **/
     protected var currentQualityProfile = 1
 
-    //    protected var currentPrefQuality =
-//        Qualities.P2160.value // preferred maximum quality, used for ppl w bad internet or on cell
-    protected var fastForwardTime = 10000L
     protected var androidTVInterfaceOffSeekTime = 10000L
     protected var androidTVInterfaceOnSeekTime = 30000L
-    protected var swipeHorizontalEnabled = false
-    protected var swipeVerticalEnabled = false
     protected var playBackSpeedEnabled = false
     protected var playerResizeEnabled = false
-    protected var doubleTapEnabled = false
-    protected var doubleTapPauseEnabled = true
     protected var playerRotateEnabled = false
-    protected var autoPlayerRotateEnabled = false
+    protected var rotatedManually = false
     private var hideControlsNames = false
-    protected var speedupEnabled = false
     protected var subtitleDelay
         set(value) = try {
             player.setSubtitleOffset(-value)
@@ -150,47 +113,115 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
             0L
         }
 
-    //private var useSystemBrightness = false
-    protected var useTrueSystemBrightness = true
-    private val fullscreenNotch = true //TODO SETTING
-
-    private var statusBarHeight: Int? = null
-    private var navigationBarHeight: Int? = null
-
-    private val brightnessIcons = listOf(
-        R.drawable.sun_1,
-        R.drawable.sun_2,
-        R.drawable.sun_3,
-        R.drawable.sun_4,
-        R.drawable.sun_5,
-        R.drawable.sun_6,
-        //R.drawable.sun_7,
-        // R.drawable.ic_baseline_brightness_1_24,
-        // R.drawable.ic_baseline_brightness_2_24,
-        // R.drawable.ic_baseline_brightness_3_24,
-        // R.drawable.ic_baseline_brightness_4_24,
-        // R.drawable.ic_baseline_brightness_5_24,
-        // R.drawable.ic_baseline_brightness_6_24,
-        // R.drawable.ic_baseline_brightness_7_24,
-    )
-
-    private val volumeIcons = listOf(
-        R.drawable.ic_baseline_volume_mute_24,
-        R.drawable.ic_baseline_volume_down_24,
-        R.drawable.ic_baseline_volume_up_24,
-    )
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        val root = super.onCreateView(inflater, container, savedInstanceState) ?: return null
-        playerBinding = PlayerCustomLayoutBinding.bind(root.findViewById(R.id.player_holder))
-        return root
+    private var isShowingEpisodeOverlay: Boolean = false
+    private var previousPlayStatus: Boolean = false
+
+    override fun fixLayout(view: View) = Unit
+
+    /**
+     * Wet code but this can not be made into a function as it is a setter.
+     *
+     * The reason for this setter is to fix a bug with the titlecard popup, as we want it to autohide
+     * when pressing back.
+     *
+     * Note that we move the call to autoHide after field assignment with prevField to avoid inf recursion. */
+    protected var selectSourceDialog: Dialog? = null
+        set(value) {
+            val prevField = field
+            field = value
+            if (value == null && prevField != null) {
+                autoHide()
+            }
+        }
+    protected var selectTrackDialog: Dialog? = null
+        set(value) {
+            val prevField = field
+            field = value
+            if (value == null && prevField != null) {
+                autoHide()
+            }
+        }
+    protected var selectSpeedDialog: Dialog? = null
+        set(value) {
+            val prevField = field
+            field = value
+            if (value == null && prevField != null) {
+                autoHide()
+            }
+        }
+    protected var selectSubtitlesDialog: Dialog? = null
+        set(value) {
+            val prevField = field
+            field = value
+            if (value == null && prevField != null) {
+                autoHide()
+            }
+        }
+
+    /** Checks if any top level dialog is open and showing */
+    fun isDialogOpen() =
+        selectSourceDialog?.isShowing == true
+                || selectTrackDialog?.isShowing == true
+                || selectSpeedDialog?.isShowing == true
+                || selectSubtitlesDialog?.isShowing == true
+                || isShowingEpisodeOverlay
+
+    private fun scheduleMetadataVisibility() {
+        val metadataScrim = playerBinding?.playerMetadataScrim ?: return
+        val ctx = metadataScrim.context ?: return
+
+        if (!ctx.shouldShowPlayerMetadata()) {
+            metadataScrim.isVisible = false
+            metadataVisibilityToken++
+            return
+        }
+
+        if (isLayout(PHONE)) {
+            metadataScrim.isVisible = false
+            metadataVisibilityToken++
+            return
+        }
+
+        val isPaused = currentPlayerStatus == CSPlayerLoading.IsPaused
+        val token = ++metadataVisibilityToken
+
+        if (isPaused) {
+            metadataScrim.postDelayed({
+                /** Make sure the user has not interacted with anything */
+                if (token != metadataVisibilityToken) return@postDelayed
+                /** If already visible, then do not rerun the animation */
+                if (metadataScrim.isVisible) return@postDelayed
+                /** Failsafe, as this should only be shown when paused */
+                if (currentPlayerStatus != CSPlayerLoading.IsPaused) return@postDelayed
+                /** We do not want to show the logo in the background when the user is within another screen */
+                if (isDialogOpen()) return@postDelayed
+
+                metadataScrim.alpha = 0f
+                metadataScrim.isVisible = true
+                metadataScrim.animate()
+                    .alpha(1f)
+                    .setDuration(500L)
+                    .setInterpolator(DecelerateInterpolator())
+                    .start()
+                hidePlayerUI()
+            }, 8000L)
+        } else {
+            if (metadataScrim.isVisible) {
+                metadataScrim.animate()
+                    .alpha(0f)
+                    .setDuration(300L)
+                    .setInterpolator(AccelerateDecelerateInterpolator())
+                    .withEndAction {
+                        metadataScrim.alpha = 0f      // force final state
+                        metadataScrim.isVisible = false
+                    }
+                    .start()
+            }
+        }
     }
 
     override fun onDestroyView() {
+        playerHostView?.releaseOverlayLayoutListener()
         playerBinding = null
         super.onDestroyView()
     }
@@ -211,41 +242,12 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
         throw NotImplementedError()
     }
 
-    /**
-     * [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
-        }
+    open fun showEpisodesOverlay() {
+        throw NotImplementedError()
+    }
+
+    open fun isThereEpisodes(): Boolean {
+        return false
     }
 
     override fun exitedPipMode() {
@@ -255,7 +257,6 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
     private fun animateLayoutChangesForSubtitles() =
         // Post here as bottomPlayerBar is gone the first frame => bottomPlayerBar.height = 0
         playerBinding?.bottomPlayerBar?.post {
-            @OptIn(UnstableApi::class)
             val sView = subView ?: return@post
             val sStyle = CustomDecoder.style
             val binding = playerBinding ?: return@post
@@ -273,18 +274,19 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
         }
 
     protected fun animateLayoutChanges() {
-        if(isLayout(PHONE)) { // isEnabled also disables the onKeyDown
+        if (isLayout(PHONE)) { // isEnabled also disables the onKeyDown
             playerBinding?.exoProgress?.isEnabled = isShowing // Prevent accidental clicks/drags
         }
 
         if (isShowing) {
             updateUIVisibility()
         } else {
+            toggleEpisodesOverlay(false)
             playerBinding?.playerHolder?.postDelayed({ updateUIVisibility() }, 200)
         }
 
         val titleMove = if (isShowing) 0f else -50.toPx.toFloat()
-        playerBinding?.playerVideoTitle?.let {
+        playerBinding?.playerVideoTitleHolder?.let {
             ObjectAnimator.ofFloat(it, "translationY", titleMove).apply {
                 duration = 200
                 start()
@@ -296,6 +298,19 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
                 start()
             }
         }
+        playerBinding?.playerVideoInfo?.let {
+            ObjectAnimator.ofFloat(it, "translationY", titleMove).apply {
+                duration = 200
+                start()
+            }
+        }
+        playerBinding?.playerMetadataScrim?.let {
+            ObjectAnimator.ofFloat(it, "translationY", 1f).apply {
+                duration = 200
+                start()
+            }
+        }
+
         val playerBarMove = if (isShowing) 0f else 50.toPx.toFloat()
         playerBinding?.bottomPlayerBar?.let {
             ObjectAnimator.ofFloat(it, "translationY", playerBarMove).apply {
@@ -303,7 +318,15 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
                 start()
             }
         }
-
+        if (isLayout(PHONE)) {
+            playerBinding?.playerEpisodesButton?.let {
+                ObjectAnimator.ofFloat(it, "translationX", if (isShowing) 0f else 50.toPx.toFloat())
+                    .apply {
+                        duration = 200
+                        start()
+                    }
+            }
+        }
         val fadeTo = if (isShowing) 1f else 0f
         val fadeAnimation = AlphaAnimation(1f - fadeTo, fadeTo)
 
@@ -323,25 +346,10 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
             }
 
             if (!isLocked) {
-                playerFfwdHolder.alpha = 1f
-                playerRewHolder.alpha = 1f
-                // player_pause_play_holder?.alpha = 1f
+                playerHostView?.gestureHelper?.animateCenterControls(fadeTo)
                 shadowOverlay.isVisible = true
                 shadowOverlay.startAnimation(fadeAnimation)
-                playerFfwdHolder.startAnimation(fadeAnimation)
-                playerRewHolder.startAnimation(fadeAnimation)
-                playerPausePlay.startAnimation(fadeAnimation)
                 downloadBothHeader.startAnimation(fadeAnimation)
-
-                /*if (isBuffering) {
-                        player_pause_play?.isVisible = false
-                        player_pause_play_holder?.isVisible = false
-                    } else {
-                        player_pause_play?.isVisible = true
-                        player_pause_play_holder?.startAnimation(fadeAnimation)
-                        player_pause_play?.startAnimation(fadeAnimation)
-                    }*/
-                //player_buffering?.startAnimation(fadeAnimation)
             }
 
             bottomPlayerBar.startAnimation(fadeAnimation)
@@ -350,11 +358,10 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
         }
     }
 
-    @OptIn(UnstableApi::class)
     override fun subtitlesChanged() {
         val tracks = player.getVideoTracks()
         val isBuiltinSubtitles = tracks.currentTextTracks.all { track ->
-            track.mimeType == MimeTypes.APPLICATION_MEDIA3_CUES
+            track.sampleMimeType == MimeTypes.APPLICATION_MEDIA3_CUES
         }
         // Subtitle offset is not possible on built-in media3 tracks
         playerBinding?.playerSubtitleOffsetBtt?.isGone =
@@ -370,7 +377,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
             Configuration.ORIENTATION_PORTRAIT ->
                 ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT
 
-            else -> dynamicOrientation()
+            else -> playerHostView?.dynamicOrientation() ?: return
         }
         activity.requestedOrientation = orientation
     }
@@ -384,14 +391,14 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
             Configuration.ORIENTATION_PORTRAIT ->
                 ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE
 
-            else -> dynamicOrientation()
+            else -> playerHostView?.dynamicOrientation() ?: return
         }
         activity.requestedOrientation = orientation
     }
 
-    open fun lockOrientation(activity: Activity) {
-        @Suppress("DEPRECATION")
+    private fun lockOrientation(activity: Activity) {
         val display = if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R)
+            @Suppress("DEPRECATION")
             (activity.getSystemService(Context.WINDOW_SERVICE) as WindowManager).defaultDisplay
         else activity.display!!
         val rotation = display.rotation
@@ -412,7 +419,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
                     else
                         ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT
 
-            else -> orientation = dynamicOrientation()
+            else -> orientation = playerHostView?.dynamicOrientation() ?: return
         }
         activity.requestedOrientation = orientation
     }
@@ -423,55 +430,63 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
                 if (isLocked) {
                     lockOrientation(this)
                 } else {
-                    if (ignoreDynamicOrientation) {
-                        // restore when lock is disabled
+                    if (ignoreDynamicOrientation || rotatedManually) {
+                        // Restore when lock is disabled.
                         restoreOrientationWithSensor(this)
                     } else {
-                        this.requestedOrientation = dynamicOrientation()
+                        this.requestedOrientation =
+                            playerHostView?.dynamicOrientation() ?: return@apply
                     }
                 }
             }
         }
     }
 
-    protected fun enterFullscreen() {
-        if (isFullScreenPlayer) {
-            activity?.hideSystemUI()
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && fullscreenNotch) {
-                val params = activity?.window?.attributes
-                params?.layoutInDisplayCutoutMode = LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
-                activity?.window?.attributes = params
+    private fun setupKeyEventListener() {
+        keyEventListener = { (event, hasNavigated) ->
+            when {
+                event == null -> false
+                event.action == KeyEvent.ACTION_DOWN &&
+                        (event.keyCode == KeyEvent.KEYCODE_VOLUME_UP ||
+                                event.keyCode == KeyEvent.KEYCODE_VOLUME_DOWN) ->
+                    playerHostView?.handleVolumeKey(event.keyCode) ?: false
+
+                player.isActive() -> handleKeyEvent(event, hasNavigated)
+                else -> false
             }
         }
-        updateOrientation()
     }
 
-    protected fun exitFullscreen() {
-        //if (lockRotation)
-        activity?.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_USER
-
-        // simply resets brightness and notch settings that might have been overridden
-        val lp = activity?.window?.attributes
-        lp?.screenBrightness = WindowManager.LayoutParams.BRIGHTNESS_OVERRIDE_NONE
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-            lp?.layoutInDisplayCutoutMode =
-                WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_DEFAULT
+    override fun onResume() {
+        playerHostView?.enterFullscreen { updateOrientation() }
+        setupKeyEventListener()
+        playerHostView?.verifyVolume()
+        activity?.attachBackPressedCallback("FullScreenPlayer") {
+            if (isShowingEpisodeOverlay) {
+                // isShowingEpisodeOverlay pauses, so this makes it easier to unpause
+                if (isLayout(TV or EMULATOR)) {
+                    playerPausePlay?.requestFocus()
+                }
+                toggleEpisodesOverlay(show = false)
+                return@attachBackPressedCallback
+            } else if (isShowing && isLayout(TV or EMULATOR)) {
+                // netflix capture back and hide ~monke
+                onClickChange()
+            } else {
+                activity?.popCurrentPage("FullScreenPlayer")
+            }
         }
-        activity?.window?.attributes = lp
-        activity?.showSystemUI()
+        playerHostView?.requestUpdateBrightnessOverlayOnNextLayout()
+        super.onResume()
     }
 
-    override fun onResume() {
-        enterFullscreen()
-        verifyVolume()
-        super.onResume()
+    override fun onStop() {
+        activity?.detachBackPressedCallback("FullScreenPlayer")
+        super.onStop()
     }
 
     override fun onDestroy() {
-        exitFullscreen()
-        player.release()
-        player.releaseCallbacks()
-        player = CS3IPlayer()
+        playerHostView?.exitFullscreen()
         super.onDestroy()
     }
 
@@ -504,30 +519,21 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
         val binding = SubtitleOffsetBinding.inflate(LayoutInflater.from(ctx), null, false)
 
         // Use dialog as opposed to alertdialog to get fullscreen
-        val dialog = Dialog(ctx, R.style.AlertDialogCustomBlack).apply {
+        val dialog = Dialog(ctx, R.style.DialogFullscreenPlayer).apply {
             setContentView(binding.root)
         }
+        this.selectSubtitlesDialog = dialog
         dialog.show()
 
-        val beforeOffset = subtitleDelay
+        val isPortrait =
+            ctx.resources.configuration.orientation == Configuration.ORIENTATION_PORTRAIT
+        fixSystemBarsPadding(binding.root, fixIme = isPortrait)
 
+        var currentOffset = subtitleDelay
         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)
-                        }
-
+                    currentOffset = time
                     val str = when {
                         time > 0L -> {
                             txt(R.string.subtitle_offset_extra_hint_later_format, time)
@@ -545,19 +551,21 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
                 }
             }
             subtitleOffsetInput.text =
-                Editable.Factory.getInstance()?.newEditable(beforeOffset.toString())
+                Editable.Factory.getInstance()?.newEditable(currentOffset.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 initialSubtitlePosition = (player.getPosition() ?: 0) - currentOffset
+            val subtitleAdapter =
+                SubtitleOffsetItemAdapter(initialSubtitlePosition) { subtitleCue ->
                     val playerPosition = player.getPosition() ?: 0
                     subtitleOffsetInput.text = Editable.Factory.getInstance()
                         ?.newEditable((playerPosition - subtitleCue.startTimeMs).toString())
+                }.apply {
+                    submitList(subtitles)
                 }
 
             subtitleOffsetRecyclerview.adapter = subtitleAdapter
@@ -591,147 +599,109 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
             }
 
             dialog.setOnDismissListener {
-                if (isFullScreenPlayer)
-                    activity?.hideSystemUI()
+                selectSubtitlesDialog = null
+                activity?.hideSystemUI()
             }
             applyBtt.setOnClickListener {
+                selectSubtitlesDialog = null
+                subtitleDelay = currentOffset
                 dialog.dismissSafe(activity)
                 player.seekTime(1L)
             }
             resetBtt.setOnClickListener {
+                selectSubtitlesDialog = null
                 subtitleDelay = 0
                 dialog.dismissSafe(activity)
                 player.seekTime(1L)
             }
             cancelBtt.setOnClickListener {
-                subtitleDelay = beforeOffset
+                selectSubtitlesDialog = null
                 dialog.dismissSafe(activity)
             }
         }
     }
 
-
-    private fun showSpeedDialog() {
-        val speedsText =
-            listOf(
-                "0.5x",
-                "0.75x",
-                "0.85x",
-                "1x",
-                "1.15x",
-                "1.25x",
-                "1.4x",
-                "1.5x",
-                "1.75x",
-                "2x"
-            )
-        val speedsNumbers =
-            listOf(0.5f, 0.75f, 0.85f, 1f, 1.15f, 1.25f, 1.4f, 1.5f, 1.75f, 2f)
-        val speedIndex = speedsNumbers.indexOf(player.getPlaybackSpeed())
-
-        activity?.let { act ->
-            act.showDialog(
-                speedsText,
-                speedIndex,
-                act.getString(R.string.player_speed),
-                false,
-                {
-                    if (isFullScreenPlayer)
-                        activity?.hideSystemUI()
-                }) { index ->
-                if (isFullScreenPlayer)
-                    activity?.hideSystemUI()
-                setPlayBackSpeed(speedsNumbers[index])
-            }
-        }
-    }
-
-    fun resetRewindText() {
-        playerBinding?.exoRewText?.text =
-            getString(R.string.rew_text_regular_format).format(fastForwardTime / 1000)
-    }
-
-    fun resetFastForwardText() {
-        playerBinding?.exoFfwdText?.text =
-            getString(R.string.ffw_text_regular_format).format(fastForwardTime / 1000)
+    @SuppressLint("SetTextI18n")
+    fun updateSpeedDialogBinding(binding: SpeedDialogBinding) {
+        val speed = player.getPlaybackSpeed()
+        binding.speedText.text = "%.2fx".format(speed).replace(".0x", "x")
+        // Android crashes if you don't round to an exact step size
+        binding.speedBar.value =
+            (speed.coerceIn(0.1f, 2.0f) / binding.speedBar.stepSize).roundToInt()
+                .toFloat() * binding.speedBar.stepSize
     }
 
-    private fun rewind() {
-        try {
-            playerBinding?.apply {
-                playerCenterMenu.isGone = false
-                playerRewHolder.alpha = 1f
-
-                val rotateLeft = AnimationUtils.loadAnimation(context, R.anim.rotate_left)
-                playerRew.startAnimation(rotateLeft)
-
-                val goLeft = AnimationUtils.loadAnimation(context, R.anim.go_left)
-                goLeft.setAnimationListener(object : Animation.AnimationListener {
-                    override fun onAnimationStart(animation: Animation?) {}
+    private fun showSpeedDialog() {
+        val act = activity ?: return
+        val isPlaying = player.getIsPlaying()
+        player.handleEvent(CSPlayerEvent.Pause, PlayerEventSource.UI)
 
-                    override fun onAnimationRepeat(animation: Animation?) {}
+        val binding: SpeedDialogBinding = SpeedDialogBinding.inflate(
+            LayoutInflater.from(act)
+        )
 
-                    override fun onAnimationEnd(animation: Animation?) {
-                        exoRewText.post {
-                            resetRewindText()
-                            playerCenterMenu.isGone = !isShowing
-                            playerRewHolder.alpha = if (isShowing) 1f else 0f
-                        }
-                    }
-                })
-                exoRewText.startAnimation(goLeft)
-                exoRewText.text =
-                    getString(R.string.rew_text_format).format(fastForwardTime / 1000)
+        updateSpeedDialogBinding(binding)
+        for ((view, speed) in arrayOf(
+            binding.speed25 to 0.25f,
+            binding.speed100 to 1.0f,
+            binding.speed125 to 1.25f,
+            binding.speed150 to 1.5f,
+            binding.speed200 to 2.0f,
+        )) {
+            view.setOnClickListener {
+                setPlayBackSpeed(speed)
+                updateSpeedDialogBinding(binding)
             }
-            player.seekTime(-fastForwardTime)
-        } catch (e: Exception) {
-            logError(e)
         }
-    }
-
-    private fun fastForward() {
-        try {
-            playerBinding?.apply {
-                playerCenterMenu.isGone = false
-                playerFfwdHolder.alpha = 1f
 
-                val rotateRight = AnimationUtils.loadAnimation(context, R.anim.rotate_right)
-                playerFfwd.startAnimation(rotateRight)
+        binding.speedMinus.setOnClickListener {
+            setPlayBackSpeed(maxOf((player.getPlaybackSpeed() - 0.1f), 0.1f))
+            updateSpeedDialogBinding(binding)
+        }
 
-                val goRight = AnimationUtils.loadAnimation(context, R.anim.go_right)
-                goRight.setAnimationListener(object : Animation.AnimationListener {
-                    override fun onAnimationStart(animation: Animation?) {}
+        binding.speedPlus.setOnClickListener {
+            setPlayBackSpeed(minOf((player.getPlaybackSpeed() + 0.1f), 2.0f))
+            updateSpeedDialogBinding(binding)
+        }
 
-                    override fun onAnimationRepeat(animation: Animation?) {}
+        binding.speedBar.addOnChangeListener { _, value, fromUser ->
+            if (fromUser) {
+                setPlayBackSpeed(value)
+                updateSpeedDialogBinding(binding)
+            }
+        }
 
-                    override fun onAnimationEnd(animation: Animation?) {
-                        exoFfwdText.post {
-                            resetFastForwardText()
-                            playerCenterMenu.isGone = !isShowing
-                            playerFfwdHolder.alpha = if (isShowing) 1f else 0f
-                        }
-                    }
-                })
-                exoFfwdText.startAnimation(goRight)
-                exoFfwdText.text =
-                    getString(R.string.ffw_text_format).format(fastForwardTime / 1000)
+        val dismiss = DialogInterface.OnDismissListener {
+            activity?.hideSystemUI()
+            if (isPlaying) {
+                player.handleEvent(CSPlayerEvent.Play, PlayerEventSource.UI)
             }
-            player.seekTime(fastForwardTime)
-        } catch (e: Exception) {
-            logError(e)
+            selectSpeedDialog = null
         }
+
+        // if (isLayout(PHONE)) {
+        //    val builder =
+        //        BottomSheetDialog(act, R.style.AlertDialogCustom)
+        //    builder.setContentView(binding.root)
+        //    builder.setOnDismissListener(dismiss)
+        //    builder.show()
+        //} else {
+        val builder =
+            AlertDialog.Builder(act, R.style.AlertDialogCustom)
+                .setView(binding.root)
+        builder.setOnDismissListener(dismiss)
+        val dialog = builder.create()
+        this.selectSpeedDialog = dialog
+        dialog.show()
+        //}
     }
 
     private fun onClickChange() {
         isShowing = !isShowing
-        if (isShowing) {
-            playerBinding?.playerIntroPlay?.isGone = true
-            autoHide()
-        }
-        if (isFullScreenPlayer)
-            activity?.hideSystemUI()
+        if (isShowing) autoHide()
+        activity?.hideSystemUI()
         animateLayoutChanges()
-        playerBinding?.playerPausePlay?.requestFocus()
+        if (playerBinding?.playerEpisodeOverlay?.isGone == true) playerBinding?.playerPausePlay?.requestFocus()
     }
 
     private fun toggleLock() {
@@ -740,6 +710,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
         }
 
         isLocked = !isLocked
+        playerHostView?.isLocked = isLocked
         updateOrientation(true) // set true to ignore auto rotate to stay in current orientation
 
         if (isLocked && isShowing) {
@@ -751,41 +722,37 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
         }
 
         val fadeTo = if (isLocked) 0f else 1f
+        playerHostView?.gestureHelper?.animateCenterControls(fadeTo)
         playerBinding?.apply {
-            val fadeAnimation = AlphaAnimation(playerVideoTitle.alpha, fadeTo).apply {
+            val fadeAnimation = AlphaAnimation(playerVideoTitleHolder.alpha, fadeTo).apply {
                 duration = 100
                 fillAfter = true
             }
 
             updateUIVisibility()
-            // MENUS
-            //centerMenu.startAnimation(fadeAnimation)
-            playerPausePlay.startAnimation(fadeAnimation)
-            playerFfwdHolder.startAnimation(fadeAnimation)
-            playerRewHolder.startAnimation(fadeAnimation)
             downloadBothHeader.startAnimation(fadeAnimation)
 
-            //if (hasEpisodes)
-            //    player_episodes_button?.startAnimation(fadeAnimation)
-            //player_media_route_button?.startAnimation(fadeAnimation)
-            //video_bar.startAnimation(fadeAnimation)
+            if (hasEpisodes)
+                playerEpisodesButton.startAnimation(fadeAnimation)
+            // player_media_route_button?.startAnimation(fadeAnimation)
+            // video_bar.startAnimation(fadeAnimation)
 
-            //TITLE
+            // TITLE
             playerVideoTitleRez.startAnimation(fadeAnimation)
+            playerVideoInfo.startAnimation(fadeAnimation)
             playerEpisodeFiller.startAnimation(fadeAnimation)
-            playerVideoTitle.startAnimation(fadeAnimation)
+            playerVideoTitleHolder.startAnimation(fadeAnimation)
             playerTopHolder.startAnimation(fadeAnimation)
             // BOTTOM
             playerLockHolder.startAnimation(fadeAnimation)
-            //player_go_back_holder?.startAnimation(fadeAnimation)
-
+            // player_go_back_holder?.startAnimation(fadeAnimation)
             shadowOverlay.isVisible = true
             shadowOverlay.startAnimation(fadeAnimation)
         }
         updateLockUI()
     }
 
-    open fun updateUIVisibility() {
+    private fun updateUIVisibility() {
         val isGone = isLocked || !isShowing
         var togglePlayerTitleGone = isGone
         context?.let {
@@ -796,22 +763,23 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
             }
         }
         playerBinding?.apply {
-
             playerLockHolder.isGone = isGone
             playerVideoBar.isGone = isGone
 
-            playerPausePlay.isGone = isGone
-            //player_buffering?.isGone = isGone
+            playerPausePlayHolderHolder.isGone =
+                isGone || currentPlayerStatus == CSPlayerLoading.IsBuffering
             playerTopHolder.isGone = isGone
-            //player_episodes_button?.isVisible = !isGone && hasEpisodes
-            playerVideoTitle.isGone = togglePlayerTitleGone
-//        player_video_title_rez?.isGone = isGone
+            val showPlayerEpisodes = !isGone && isThereEpisodes()
+            playerEpisodesButtonRoot.isVisible = showPlayerEpisodes
+            playerEpisodesButton.isVisible = showPlayerEpisodes
+            playerVideoTitleHolder.isGone = togglePlayerTitleGone
+            playerVideoTitleRez.isGone = isGone || playerVideoTitleRez.text.isBlank()
             playerEpisodeFiller.isGone = isGone
             playerCenterMenu.isGone = isGone
             playerLock.isGone = !isShowing
-            //player_media_route_button?.isClickable = !isGone
             playerGoBackHolder.isGone = isGone
             playerSourcesBtt.isGone = isGone
+            shadowOverlay.isGone = isGone
             playerSkipEpisode.isClickable = !isGone
         }
     }
@@ -819,485 +787,231 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
     private fun updateLockUI() {
         playerBinding?.apply {
             playerLock.setIconResource(if (isLocked) R.drawable.video_locked else R.drawable.video_unlocked)
-            if (layout == R.layout.fragment_player) {
-                val color = if (isLocked) context?.colorFromAttribute(R.attr.colorPrimary)
-                else Color.WHITE
-                if (color != null) {
-                    playerLock.setTextColor(color)
-                    playerLock.iconTint = ColorStateList.valueOf(color)
-                    playerLock.rippleColor =
-                        ColorStateList.valueOf(Color.argb(50, color.red, color.green, color.blue))
-                }
+            val color = if (isLocked) context?.colorFromAttribute(R.attr.colorPrimary)
+            else Color.WHITE
+            if (color != null) {
+                playerLock.setTextColor(color)
+                playerLock.iconTint = ColorStateList.valueOf(color)
+                playerLock.rippleColor =
+                    ColorStateList.valueOf(Color.argb(50, color.red, color.green, color.blue))
             }
         }
     }
 
-    private var currentTapIndex = 0
     protected fun autoHide() {
-        currentTapIndex++
-        delayHide()
+        metadataVisibilityToken++
+        playerHostView?.scheduleAutoHide()
+        scheduleMetadataVisibility()
     }
 
-    override fun playerStatusChanged() {
-        super.playerStatusChanged()
-        delayHide()
+    override fun onAutoHideUI() {
+        if (player.getIsPlaying()) onClickChange()
     }
 
-    private fun delayHide() {
-        val index = currentTapIndex
-        playerBinding?.playerHolder?.postDelayed({
-            if (!isCurrentTouchValid && isShowing && index == currentTapIndex && player.getIsPlaying()) {
-                onClickChange()
-            }
-        }, 2000)
+    protected fun hidePlayerUI() {
+        if (isShowing) {
+            isShowing = false
+            animateLayoutChanges()
+        }
     }
 
-    // this is used because you don't want to hide UI when double tap seeking
-    private var currentDoubleTapIndex = 0
-    private fun toggleShowDelayed() {
-        if (doubleTapEnabled || doubleTapPauseEnabled) {
-            val index = currentDoubleTapIndex
-            playerBinding?.playerHolder?.postDelayed({
-                if (index == currentDoubleTapIndex) {
-                    onClickChange()
-                }
-            }, DOUBLE_TAB_MINIMUM_TIME_BETWEEN)
-        } else {
-            onClickChange()
-        }
+    /** PlayerView.Callbacks touch overrides */
+
+    override fun isUIShowing(): Boolean = isShowing
+
+    override fun onSingleTap() {
+        onClickChange()
     }
 
-    private var isCurrentTouchValid = false
-    private var currentTouchStart: Vector2? = null
-    private var currentTouchLast: Vector2? = null
-    private var currentTouchAction: TouchAction? = null
-    private var currentLastTouchAction: TouchAction? = null
-    private var currentTouchStartPlayerTime: Long? =
-        null // the time in the player when you first click
-    private var currentTouchStartTime: Long? = null // the system time when you first click
-    private var currentLastTouchEndTime: Long = 0 // the system time when you released your finger
-    private var currentClickCount: Int =
-        0 // amount of times you have double clicked, will reset when other action is taken
-
-    // requested volume and brightness is used to make swiping smoother
-    // to make it not jump between values,
-    // this value is within the range [0,2] where 1+ is loudness
-    private var currentRequestedVolume: Float = 0.0f
-
-    // this value is within the range [0,1]
-    private var currentRequestedBrightness: Float = 1.0f
-
-    enum class TouchAction {
-        Brightness,
-        Volume,
-        Time,
+    override fun onTouchDown() {
+        if (isShowingEpisodeOverlay) toggleEpisodesOverlay(show = false)
     }
 
-    companion object {
-        private fun forceLetters(inp: Long, letters: Int = 2): String {
-            val added: Int = letters - inp.toString().length
-            return if (added > 0) {
-                "0".repeat(added) + inp.toString()
-            } else {
-                inp.toString()
-            }
+    @SuppressLint("SetTextI18n")
+    override fun onSeekPreviewText(text: String?) {
+        playerBinding?.playerTimeText?.apply {
+            isVisible = text != null
+            if (text != null) this.text = text
         }
+    }
 
-        private fun convertTimeToString(sec: Long): String {
-            val rsec = sec % 60L
-            val min = ceil((sec - rsec) / 60.0).toInt()
-            val rmin = min % 60L
-            val h = ceil((min - rmin) / 60.0).toLong()
-            //int rh = h;// h % 24;
-            return (if (h > 0) forceLetters(h) + ":" else "") + (if (rmin >= 0 || h >= 0) forceLetters(
-                rmin
-            ) + ":" else "") + forceLetters(
-                rsec
-            )
+    override fun onHidePlayerUI() {
+        hidePlayerUI()
+    }
+
+    override fun onGestureEnd(hadSwipe: Boolean, wasUiShowing: Boolean) {
+        if (!player.getIsPlaying() && hadSwipe && wasUiShowing && !isShowing) {
+            isShowing = true
+            animateLayoutChanges()
         }
+        autoHide()
     }
 
-    private fun calculateNewTime(
-        startTime: Long?,
-        touchStart: Vector2?,
-        touchEnd: Vector2?
-    ): Long? {
-        if (touchStart == null || touchEnd == null || startTime == null) return null
-        val diffX = (touchEnd.x - touchStart.x) * HORIZONTAL_MULTIPLIER / screenWidth.toFloat()
-        val duration = player.getDuration() ?: return null
-        return max(
-            min(
-                startTime + ((duration * (diffX * diffX)) * (if (diffX < 0) -1 else 1)).toLong(),
-                duration
-            ), 0
-        )
+    override fun playerStatusChanged() {
+        super.playerStatusChanged()
+        scheduleMetadataVisibility()
     }
 
-    private fun getBrightness(): Float? {
-        return if (useTrueSystemBrightness) {
-            try {
-                Settings.System.getInt(
-                    context?.contentResolver,
-                    Settings.System.SCREEN_BRIGHTNESS
-                ) / 255f
-            } catch (e: Exception) {
-                // because true system brightness requires
-                // permission, this is a lazy way to check
-                // as it will throw an error if we do not have it
-                useTrueSystemBrightness = false
-                return getBrightness()
-            }
-        } else {
-            try {
-                activity?.window?.attributes?.screenBrightness
-            } catch (e: Exception) {
-                logError(e)
-                null
+    // When the hold-speedup gesture fires, hide controls so the video is unobstructed.
+    // The speedup button show/hide and speed change are handled by PlayerView.
+    override fun onHoldSpeedUp(show: Boolean) {
+        if (show && isShowing) onClickChange()
+    }
+
+    override fun onConfigurationChanged(newConfig: Configuration) {
+        super.onConfigurationChanged(newConfig)
+
+        // If we rotate the device we need to recalculate the zoom
+        val gh = playerHostView?.gestureHelper ?: return
+        val matrix = gh.zoomMatrix
+        val animation = gh.matrixAnimation
+        if ((animation == null || !animation.isRunning) && matrix != null) {
+            // Ignore if we have no zoom or mid-animation
+            playerView?.post {
+                gh.applyZoomMatrix(matrix, true)
+                playerHostView?.requestUpdateBrightnessOverlayOnNextLayout()
             }
         }
     }
 
-    private fun setBrightness(brightness: Float) {
-        if (useTrueSystemBrightness) {
-            try {
-                Settings.System.putInt(
-                    context?.contentResolver,
-                    Settings.System.SCREEN_BRIGHTNESS_MODE,
-                    Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL
-                )
+    override fun resize(resize: PlayerResize, showToast: Boolean) {
+        super.resize(resize, showToast)
+        playerHostView?.requestUpdateBrightnessOverlayOnNextLayout()
+    }
 
-                Settings.System.putInt(
-                    context?.contentResolver,
-                    Settings.System.SCREEN_BRIGHTNESS, (brightness * 255).toInt()
-                )
-            } catch (e: Exception) {
-                useTrueSystemBrightness = false
-                setBrightness(brightness)
+    private fun handleKeyDownEvent(keyCode: Int): Boolean? {
+        // adb shell input keyevent [INT]
+        when (keyCode) {
+            KeyEvent.KEYCODE_FORWARD, KeyEvent.KEYCODE_D, KeyEvent.KEYCODE_MEDIA_SKIP_FORWARD, KeyEvent.KEYCODE_MEDIA_FAST_FORWARD -> {
+                player.handleEvent(CSPlayerEvent.SeekForward)
             }
-        } else {
-            try {
-                val lp = activity?.window?.attributes
-                lp?.screenBrightness = brightness
-                activity?.window?.attributes = lp
-            } catch (e: Exception) {
-                logError(e)
+
+            KeyEvent.KEYCODE_A, KeyEvent.KEYCODE_MEDIA_SKIP_BACKWARD, KeyEvent.KEYCODE_MEDIA_REWIND -> {
+                player.handleEvent(CSPlayerEvent.SeekBack)
             }
-        }
-    }
 
-    private var isVolumeLocked: Boolean = false
-    private var hasShownVolumeToast: Boolean = false
-
-    private var progressBarLeftHideRunnable: Runnable? = null
-    private var progressBarRightHideRunnable: Runnable? = null
-
-    // Verifies that the currentRequestedVolume matches the system volume
-    // if not, then it removes changes currentRequestedVolume and removes the loudnessEnhancer
-    // if the real volume is less than 100%
-    //
-    // This is here to make returning to the player less jarring, if we change the volume outside
-    // the app. Note that this will make it a bit wierd when using loudness in PiP, then returning
-    // however that is the cost of correctness.
-    private fun verifyVolume() {
-        (activity?.getSystemService(Context.AUDIO_SERVICE) as? AudioManager)?.let { audioManager ->
-            val currentVolumeStep =
-                audioManager.getStreamVolume(AudioManager.STREAM_MUSIC)
-            val maxVolumeStep =
-                audioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC)
-
-            // if we can set the volume directly then do it
-            if (currentVolumeStep < maxVolumeStep || currentRequestedVolume <= 1.0f) {
-                currentRequestedVolume =
-                    currentVolumeStep.toFloat() / maxVolumeStep.toFloat()
-
-                loudnessEnhancer?.release()
-                loudnessEnhancer = null
+            KeyEvent.KEYCODE_MEDIA_NEXT, KeyEvent.KEYCODE_BUTTON_R1, KeyEvent.KEYCODE_N, KeyEvent.KEYCODE_NUMPAD_2, KeyEvent.KEYCODE_CHANNEL_UP -> {
+                player.handleEvent(CSPlayerEvent.NextEpisode)
             }
-        }
-    }
 
-    val holdhandler = Handler(Looper.getMainLooper())
-    var hasTriggeredSpeedUp = false
-    val holdRunnable  = Runnable {
-        player.setPlaybackSpeed(2.0f)
-        playerBinding?.playerSpeedupButton?.isGone = false
-        hasTriggeredSpeedUp = true
-    }
+            KeyEvent.KEYCODE_MEDIA_PREVIOUS, KeyEvent.KEYCODE_BUTTON_L1, KeyEvent.KEYCODE_B, KeyEvent.KEYCODE_NUMPAD_1, KeyEvent.KEYCODE_CHANNEL_DOWN -> {
+                player.handleEvent(CSPlayerEvent.PrevEpisode)
+            }
 
-    @SuppressLint("SetTextI18n")
-    private fun handleMotionEvent(view: View?, event: MotionEvent?): Boolean {
-        if (event == null || view == null) return false
-        val currentTouch = Vector2(event.x, event.y)
-        val startTouch = currentTouchStart
+            KeyEvent.KEYCODE_MEDIA_PAUSE -> {
+                player.handleEvent(CSPlayerEvent.Pause)
+            }
 
-        playerBinding?.apply {
-            playerIntroPlay.isGone = true
-
-            when (event.action) {
-                MotionEvent.ACTION_DOWN -> {
-                    // validates if the touch is inside of the player area
-                    isCurrentTouchValid = view.isValidTouch(currentTouch.x, currentTouch.y)
-                    /*if (isCurrentTouchValid && player_episode_list?.isVisible == true) {
-                        player_episode_list?.isVisible = false
-                    } else*/ if (isCurrentTouchValid) {
-                        if(speedupEnabled){
-                            hasTriggeredSpeedUp = false
-                            if (player.getIsPlaying() && !isLocked && isFullScreenPlayer) {
-                                holdhandler.postDelayed(holdRunnable, 500)
-                            }
-                        }
-                        isVolumeLocked = currentRequestedVolume < 1.0f
-                        if (currentRequestedVolume <= 1.0f) {
-                            hasShownVolumeToast = false
-                        }
+            KeyEvent.KEYCODE_MEDIA_PLAY, KeyEvent.KEYCODE_BUTTON_START -> {
+                player.handleEvent(CSPlayerEvent.Play)
+            }
 
-                        currentTouchStartTime = System.currentTimeMillis()
-                        currentTouchStart = currentTouch
-                        currentTouchLast = currentTouch
-                        currentTouchStartPlayerTime = player.getPosition()
+            KeyEvent.KEYCODE_L, KeyEvent.KEYCODE_NUMPAD_7, KeyEvent.KEYCODE_7 -> {
+                toggleLock()
+            }
 
-                        getBrightness()?.let {
-                            currentRequestedBrightness = it
-                        }
-                        verifyVolume()
-                    }
+            KeyEvent.KEYCODE_H -> {
+                onClickChange()
+            }
+
+            KeyEvent.KEYCODE_M, KeyEvent.KEYCODE_VOLUME_MUTE -> {
+                player.handleEvent(CSPlayerEvent.ToggleMute)
+            }
+
+            KeyEvent.KEYCODE_S, KeyEvent.KEYCODE_NUMPAD_9, KeyEvent.KEYCODE_9 -> {
+                showMirrorsDialogue()
+            }
+            // OpenSubtitles shortcut
+            KeyEvent.KEYCODE_O, KeyEvent.KEYCODE_NUMPAD_8, KeyEvent.KEYCODE_8 -> {
+                val context = context
+                if (subsProvidersIsActive && context != null) {
+                    openOnlineSubPicker(context, null) {}
                 }
+            }
 
-                MotionEvent.ACTION_UP -> {
-                    holdhandler.removeCallbacks(holdRunnable)
-                    if(hasTriggeredSpeedUp) {
-                        player.setPlaybackSpeed(DataStoreHelper.playBackSpeed)
-                        playerSpeedupButton?.isGone = true
-                    }
-                    if (isCurrentTouchValid && !isLocked && isFullScreenPlayer) {
-                        // seek time
-                       if(swipeHorizontalEnabled && currentTouchAction == TouchAction.Time) {
-                            val startTime = currentTouchStartPlayerTime
-                            if (startTime != null) {
-                                calculateNewTime(
-                                    startTime,
-                                    startTouch,
-                                    currentTouch
-                                )?.let { seekTo ->
-                                    if (abs(seekTo - startTime) > MINIMUM_SEEK_TIME) {
-                                        player.seekTo(seekTo, PlayerEventSource.UI)
-                                    }
-                                }
-                            }
-                        }
-                    }
+            KeyEvent.KEYCODE_E, KeyEvent.KEYCODE_NUMPAD_3, KeyEvent.KEYCODE_3 -> {
+                showSpeedDialog()
+            }
 
-                    // see if click is eligible for seek 10s
-                    val holdTime = currentTouchStartTime?.minus(System.currentTimeMillis())
-                    if (isCurrentTouchValid // is valid
-                        && currentTouchAction == null // no other action like swiping is taking place
-                        && currentLastTouchAction == null // last action was none, this prevents mis input random seek
-                        && holdTime != null
-                        && holdTime < DOUBLE_TAB_MAXIMUM_HOLD_TIME // it is a click not a long hold
-                    ) {
-                        if (!isLocked
-                            && (System.currentTimeMillis() - currentLastTouchEndTime) < DOUBLE_TAB_MINIMUM_TIME_BETWEEN // the time since the last action is short
-                        ) {
-                            currentClickCount++
-
-                            if (currentClickCount >= 1) { // have double clicked
-                                currentDoubleTapIndex++
-                                if (doubleTapPauseEnabled && isFullScreenPlayer) { // you can pause if your tap is in the middle of the screen
-                                    when {
-                                        currentTouch.x < screenWidth / 2 - (DOUBLE_TAB_PAUSE_PERCENTAGE * screenWidth) -> {
-                                            if (doubleTapEnabled)
-                                                rewind()
-                                        }
-
-                                        currentTouch.x > screenWidth / 2 + (DOUBLE_TAB_PAUSE_PERCENTAGE * screenWidth) -> {
-                                            if (doubleTapEnabled)
-                                                fastForward()
-                                        }
-
-                                        else -> {
-                                            player.handleEvent(
-                                                CSPlayerEvent.PlayPauseToggle,
-                                                PlayerEventSource.UI
-                                            )
-                                        }
-                                    }
-                                } else if (doubleTapEnabled && isFullScreenPlayer) {
-                                    if (currentTouch.x < screenWidth / 2) {
-                                        rewind()
-                                    } else {
-                                        fastForward()
-                                    }
-                                }
-                            }
-                        } else {
-                            // is a valid click but not fast enough for seek
-                            currentClickCount = 0
-                            if(!hasTriggeredSpeedUp){
-                                toggleShowDelayed()
-                            }
-                            //onClickChange()
-                        }
-                    } else {
-                        currentClickCount = 0
-                    }
+            KeyEvent.KEYCODE_R, KeyEvent.KEYCODE_NUMPAD_0, KeyEvent.KEYCODE_0 -> {
+                nextResize()
+            }
 
-                    // call auto hide as it wont hide when you have your finger down
-                    autoHide()
+            KeyEvent.KEYCODE_C, KeyEvent.KEYCODE_NUMPAD_4, KeyEvent.KEYCODE_4 -> {
+                skipOp()
+            }
 
-                    // reset variables
-                    isCurrentTouchValid = false
-                    currentTouchStart = null
-                    currentLastTouchAction = currentTouchAction
-                    currentTouchAction = null
-                    currentTouchStartPlayerTime = null
-                    currentTouchLast = null
-                    currentTouchStartTime = null
+            KeyEvent.KEYCODE_V, KeyEvent.KEYCODE_NUMPAD_5, KeyEvent.KEYCODE_5 -> {
+                player.handleEvent(CSPlayerEvent.SkipCurrentChapter)
+            }
 
-                    // resets UI
-                    playerTimeText.isVisible = false
+            KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE, KeyEvent.KEYCODE_P, KeyEvent.KEYCODE_SPACE, KeyEvent.KEYCODE_NUMPAD_ENTER, KeyEvent.KEYCODE_ENTER -> { // space is not captured due to navigation
+                player.handleEvent(CSPlayerEvent.PlayPauseToggle)
+            }
 
-                    currentLastTouchEndTime = System.currentTimeMillis()
+            KeyEvent.KEYCODE_DPAD_CENTER -> {
+                if (isShowing) {
+                    return null
                 }
+                // If UI is not shown make click instantly skip to next chapter even if locked
+                if (timestampShowState) {
+                    player.handleEvent(CSPlayerEvent.SkipCurrentChapter)
+                } else if (!isLocked) {
+                    player.handleEvent(CSPlayerEvent.PlayPauseToggle)
+                }
+                onClickChange()
+            }
 
-                MotionEvent.ACTION_MOVE -> {
-                    // if current touch is valid
+            KeyEvent.KEYCODE_DPAD_DOWN,
+            KeyEvent.KEYCODE_DPAD_UP -> {
+                if (isShowing || isShowingEpisodeOverlay) {
+                    return null
+                }
+                onClickChange()
+            }
 
-                    if(hasTriggeredSpeedUp){
-                        return true
-                    }
-                    if (startTouch != null && isCurrentTouchValid && !isLocked && isFullScreenPlayer) {
-                        // action is unassigned and can therefore be assigned
-
-                        if (currentTouchAction == null) {
-                            val diffFromStart = startTouch - currentTouch
-
-                            if (swipeVerticalEnabled) {
-                                if (abs(diffFromStart.y * 100 / screenHeight) > MINIMUM_VERTICAL_SWIPE) {
-                                    // left = Brightness, right = Volume, but the UI is reversed to show the UI better
-                                    currentTouchAction = if (startTouch.x < screenWidth / 2) {
-                                        // hide the UI if you hold brightness to show screen better, better UX
-                                        if (isShowing) {
-                                            isShowing = false
-                                            animateLayoutChanges()
-                                        }
-
-                                        TouchAction.Brightness
-                                    } else {
-                                        TouchAction.Volume
-                                    }
-                                }
-                            }
-                            if (swipeHorizontalEnabled) {
-                                if (abs(diffFromStart.x * 100 / screenHeight) > MINIMUM_HORIZONTAL_SWIPE) {
-                                    currentTouchAction = TouchAction.Time
-                                }
-                            }
-                        }
+            KeyEvent.KEYCODE_DPAD_LEFT -> {
+                if (!isShowing && !isLocked && !isShowingEpisodeOverlay) {
+                    player.seekTime(-androidTVInterfaceOffSeekTime)
+                    return true
+                } else if (playerBinding?.playerPausePlay?.isFocused == true) {
+                    player.seekTime(-androidTVInterfaceOnSeekTime)
+                    return true
+                } else {
+                    return null
+                }
+            }
 
-                        // display action
-                        val lastTouch = currentTouchLast
-                        if (lastTouch != null) {
-                            val diffFromLast = lastTouch - currentTouch
-                            val verticalAddition =
-                                diffFromLast.y * VERTICAL_MULTIPLIER / screenHeight.toFloat()
-
-                            // update UI
-                            playerTimeText.isVisible = false
-
-                            when (currentTouchAction) {
-                                TouchAction.Time -> {
-                                    holdhandler.removeCallbacks(holdRunnable)
-                                    // this simply updates UI as the seek logic happens on release
-                                    // startTime is rounded to make the UI sync in a nice way
-                                    val startTime =
-                                        currentTouchStartPlayerTime?.div(1000L)?.times(1000L)
-                                    if (startTime != null) {
-                                        calculateNewTime(
-                                            startTime,
-                                            startTouch,
-                                            currentTouch
-                                        )?.let { newMs ->
-                                            val skipMs = newMs - startTime
-                                            playerTimeText.apply {
-                                                text =
-                                                    "${convertTimeToString(newMs / 1000)} [${
-                                                        (if (abs(skipMs) < 1000) "" else (if (skipMs > 0) "+" else "-"))
-                                                    }${convertTimeToString(abs(skipMs / 1000))}]"
-                                                isVisible = true
-                                            }
-                                        }
-                                    }
-                                }
-
-                                TouchAction.Brightness -> {
-                                    holdhandler.removeCallbacks(holdRunnable)
-                                    playerBinding?.playerProgressbarRightHolder?.apply {
-                                        if (!isVisible || alpha < 1f) {
-                                            alpha = 1f
-                                            isVisible = true
-                                        }
-
-                                        progressBarRightHideRunnable?.let { removeCallbacks(it) }
-                                        progressBarRightHideRunnable = Runnable {
-                                            // Fade out the progress bar
-                                            animate().cancel()
-                                            animate()
-                                                .alpha(0f)
-                                                .setDuration(300)
-                                                .withEndAction { isVisible = false }
-                                                .start()
-                                        }
-                                        // Show the progress bar for 1.5 seconds
-                                        postDelayed(progressBarRightHideRunnable, 1500)
-                                    }
-
-                                    val lastRequested = currentRequestedBrightness
-                                    currentRequestedBrightness =
-                                        min(
-                                            1.0f,
-                                            max(currentRequestedBrightness + verticalAddition, 0.0f)
-                                        )
-
-                                    // this is to not spam request it, just in case it fucks over someone
-                                    if (lastRequested != currentRequestedBrightness)
-                                        setBrightness(currentRequestedBrightness)
-
-                                    // max is set high to make it smooth
-                                    playerProgressbarRight.max = 100_000
-                                    playerProgressbarRight.progress =
-                                        max(2_000, (currentRequestedBrightness * 100_000f).toInt())
-
-                                    playerProgressbarRightIcon.setImageResource(
-                                        brightnessIcons[min( // clamp the value just in case
-                                            brightnessIcons.size - 1,
-                                            max(
-                                                0,
-                                                round(currentRequestedBrightness * (brightnessIcons.size - 1)).toInt()
-                                            )
-                                        )]
-                                    )
-                                }
-
-                                TouchAction.Volume -> {
-                                    holdhandler.removeCallbacks(holdRunnable)
-                                    handleVolumeAdjustment(
-                                        verticalAddition,
-                                        false
-                                    )
-                                }
-
-                                else -> Unit
-                            }
-                        }
-                    }
+            KeyEvent.KEYCODE_DPAD_RIGHT -> {
+                if (!isShowing && !isLocked && !isShowingEpisodeOverlay) {
+                    player.seekTime(androidTVInterfaceOffSeekTime)
+                } else if (playerBinding?.playerPausePlay?.isFocused == true) {
+                    player.seekTime(androidTVInterfaceOnSeekTime)
+                } else {
+                    return null
+                }
+            }
+
+            KeyEvent.KEYCODE_VOLUME_DOWN,
+            KeyEvent.KEYCODE_VOLUME_UP -> {
+                // Handled entirely by PlayerView.handleVolumeKey (checks PHONE/EMULATOR).
+                if (playerHostView?.handleVolumeKey(keyCode) != true) {
+                    return null
+                }
+            }
+
+            KeyEvent.KEYCODE_MENU,
+            KeyEvent.KEYCODE_SETTINGS -> {
+                if (isLocked || !isThereEpisodes()) {
+                    return null
                 }
+                toggleEpisodesOverlay(true)
             }
+            else -> return null // Avoid capturing all input
         }
-        currentTouchLast = currentTouch
         return true
     }
 
-    @SuppressLint("GestureBackNavigation")
     private fun handleKeyEvent(event: KeyEvent, hasNavigated: Boolean): Boolean {
         if (hasNavigated) {
             autoHide()
@@ -1306,69 +1020,9 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
         val keyCode = event.keyCode
 
         if (event.action == KeyEvent.ACTION_DOWN) {
-            when (keyCode) {
-                KeyEvent.KEYCODE_DPAD_CENTER -> {
-                    if (!isShowing) {
-                        if (!isLocked) player.handleEvent(CSPlayerEvent.PlayPauseToggle)
-                        onClickChange()
-                        return true
-                    }
-                }
-
-                KeyEvent.KEYCODE_DPAD_DOWN,
-                KeyEvent.KEYCODE_DPAD_UP -> {
-                    if (!isShowing) {
-                        onClickChange()
-                        return true
-                    }
-                }
-
-                KeyEvent.KEYCODE_DPAD_LEFT -> {
-                    if (!isShowing && !isLocked) {
-                        player.seekTime(-androidTVInterfaceOffSeekTime)
-                        return true
-                    } else if (playerBinding?.playerPausePlay?.isFocused == true) {
-                        player.seekTime(-androidTVInterfaceOnSeekTime)
-                        return true
-                    }
-                }
-
-                KeyEvent.KEYCODE_DPAD_RIGHT -> {
-                    if (!isShowing && !isLocked) {
-                        player.seekTime(androidTVInterfaceOffSeekTime)
-                        return true
-                    } else if (playerBinding?.playerPausePlay?.isFocused == true) {
-                        player.seekTime(androidTVInterfaceOnSeekTime)
-                        return true
-                    }
-                }
-
-                KeyEvent.KEYCODE_VOLUME_DOWN,
-                KeyEvent.KEYCODE_VOLUME_UP -> {
-                    if (isLayout(PHONE or EMULATOR)) {
-                        /**
-                         * Some TVs do not support volume boosting, and overriding
-                         * the volume buttons can be inconvenient for TV users.
-                         * Since boosting volume is mainly useful on phones and emulators,
-                         * we limit this feature to those devices.
-                         */
-                        verifyVolume()
-                        if (currentRequestedVolume <= 1.0f) {
-                            hasShownVolumeToast = false
-                        }
-                        isVolumeLocked = currentRequestedVolume < 1.0f
-                        handleVolumeAdjustment(
-                            // +- 5%
-                            if (keyCode == KeyEvent.KEYCODE_VOLUME_UP) {
-                                0.05f
-                            } else {
-                                -0.05f
-                            },
-                            true
-                        )
-                        return true
-                    }
-                }
+            val value = handleKeyDownEvent(keyCode)
+            if (value != null) {
+                return value
             }
         }
 
@@ -1389,131 +1043,27 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
             }
 
             // netflix capture back and hide ~monke
-            KeyEvent.KEYCODE_BACK -> {
+            // This is removed due to inconsistent behavior on A36 vs A22, see https://github.com/recloudstream/cloudstream/issues/1804
+            /*KeyEvent.KEYCODE_BACK -> {
                 if (isShowing && isLayout(TV or EMULATOR)) {
                     onClickChange()
                     return true
                 }
-            }
+            }*/
         }
 
         return false
     }
 
-    private var loudnessEnhancer: LoudnessEnhancer? = null
-
-    @OptIn(UnstableApi::class)
-    private fun handleVolumeAdjustment(
-        delta: Float,
-        fromButton: Boolean,
-    ) {
-        val audioManager =
-            activity?.getSystemService(Context.AUDIO_SERVICE) as? AudioManager ?: return
-        val currentVolumeStep = audioManager.getStreamVolume(AudioManager.STREAM_MUSIC)
-        val maxVolumeStep = audioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC)
-
-        val currentVolume = currentRequestedVolume
-        val isCurrentVolumeLocked = isVolumeLocked
-
-        val nextVolume =
-            (currentVolume + delta).coerceIn(0.0f, if (isCurrentVolumeLocked) 1.0f else 2.0f)
-
-        val nextVolumeStep =
-            (nextVolume * maxVolumeStep.toFloat()).roundToInt().coerceIn(0, maxVolumeStep)
-
-        // show toast
-        if (fromButton) {
-            // for button related request we only show a toast when we exceeded the volume
-            if (currentVolume <= 1.0f && nextVolume > 1.0f && !hasShownVolumeToast) {
-                showToast(R.string.volume_exceeded_100)
-                hasShownVolumeToast = true
-            }
-        } else {
-            val nextRequestedVolume = currentVolume + delta
-
-            // for swipes, we show toast that we need to swipe again
-            if (nextRequestedVolume > 1.0 && isCurrentVolumeLocked && !hasShownVolumeToast) {
-                showToast(R.string.slide_up_again_to_exceed_100)
-                hasShownVolumeToast = true
-            }
-        }
-
-        // set the current volume step
-        if (nextVolumeStep != currentVolumeStep) {
-            audioManager.setStreamVolume(AudioManager.STREAM_MUSIC, nextVolumeStep, 0)
-        }
-
-        // Apply loudness enhancer for volumes > 100%, removes it if less
-        if (nextVolume > 1.0f) {
-            val boostFactor = ((nextVolume - 1.0f) * 1000).toInt()
-            val currentEnhancer = loudnessEnhancer
-
-            if (currentEnhancer != null) {
-                currentEnhancer.setTargetGain(boostFactor)
-            } else {
-                val audioSessionId = (playerView?.player as? ExoPlayer)?.audioSessionId
-                if (audioSessionId != null && audioSessionId != AudioManager.ERROR) {
-                    loudnessEnhancer = LoudnessEnhancer(audioSessionId).apply {
-                        setTargetGain(boostFactor)
-                        enabled = true
-                    }
-                }
-            }
-        } else {
-            loudnessEnhancer?.release()
-            loudnessEnhancer = null
-        }
-
-        currentRequestedVolume = nextVolume
-
-        // Update the progress bar
-        playerBinding?.apply {
-            val level1ProgressBar = playerProgressbarLeftLevel1
-            val level2ProgressBar = playerProgressbarLeftLevel2
-
-            level1ProgressBar.max = 100_000
-            level1ProgressBar.progress = (nextVolume * 100_000f).toInt().coerceIn(2_000, 100_000)
-
-            level2ProgressBar.max = 100_000
-            level2ProgressBar.progress =
-                if (nextVolume > 1.0f) ((nextVolume - 1.0) * 100_000f).toInt()
-                    .coerceIn(2_000, 100_000) else 0
-            level2ProgressBar.isVisible = nextVolume > 1.0f
-
-            // Calculate the clamped index for the volume icon based on the requested volume
-            val iconIndex = (nextVolume * (volumeIcons.lastIndex))
-                .roundToInt()
-                .coerceIn(0, volumeIcons.lastIndex)
-
-            // Update icon
-            playerProgressbarLeftIcon.setImageResource(volumeIcons[iconIndex])
-        }
-
-        // alpha fade
-        playerBinding?.playerProgressbarLeftHolder?.apply {
-            if (!isVisible || alpha < 1f) {
-                alpha = 1f
-                isVisible = true
-            }
-
-            progressBarLeftHideRunnable?.let { removeCallbacks(it) }
-            progressBarLeftHideRunnable = Runnable {
-                // Fade out the progress bar
-                animate().cancel()
-                animate()
-                    .alpha(0f)
-                    .setDuration(300)
-                    .withEndAction { isVisible = false }
-                    .start()
-            }
-            // Show the progress bar for 1.5 seconds
-            postDelayed(progressBarLeftHideRunnable, 1500)
-        }
-    }
-
     protected fun uiReset() {
+        metadataVisibilityToken++
+        playerBinding?.playerMetadataScrim?.let {
+            it.animate().cancel()
+            it.alpha = 0f
+            it.isVisible = false
+        }
         isShowing = false
-
+        toggleEpisodesOverlay(false)
         // if nothing has loaded these buttons should not be visible
         playerBinding?.apply {
             playerSkipEpisode.isVisible = false
@@ -1525,8 +1075,8 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
         updateLockUI()
         updateUIVisibility()
         animateLayoutChanges()
-        resetFastForwardText()
-        resetRewindText()
+        playerHostView?.gestureHelper?.resetFastForwardText()
+        playerHostView?.gestureHelper?.resetRewindText()
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
@@ -1535,109 +1085,35 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
         super.onSaveInstanceState(outState)
     }
 
-    @SuppressLint("ClickableViewAccessibility")
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        // init variables
-        setPlayBackSpeed(DataStoreHelper.playBackSpeed)
-        savedInstanceState?.getLong(SUBTITLE_DELAY_BUNDLE_KEY)?.let {
-            subtitleDelay = it
-        }
+    override fun onBindingCreated(binding: FragmentPlayerBinding, savedInstanceState: Bundle?) {
+        // Set up playerBinding before super initializes the player
+        // (brightness overlay is now injected by PlayerView.initialize())
+        playerBinding =
+            PlayerCustomLayoutBinding.bind(binding.root.findViewById(R.id.player_holder))
 
-        // handle tv controls
-        playerEventListener = { eventType ->
-            when (eventType) {
-                PlayerEventType.Lock -> {
-                    toggleLock()
-                }
+        super.onBindingCreated(binding, savedInstanceState)
 
-                PlayerEventType.NextEpisode -> {
-                    player.handleEvent(CSPlayerEvent.NextEpisode)
-                }
+        // This player is always full-screen; tell PlayerView so volume-key handling is active.
+        playerHostView?.isFullScreen = true
 
-                PlayerEventType.Pause -> {
-                    player.handleEvent(CSPlayerEvent.Pause)
-                }
-
-                PlayerEventType.PlayPauseToggle -> {
-                    player.handleEvent(CSPlayerEvent.PlayPauseToggle)
-                }
-
-                PlayerEventType.Play -> {
-                    player.handleEvent(CSPlayerEvent.Play)
-                }
-
-                PlayerEventType.SkipCurrentChapter -> {
-                    player.handleEvent(CSPlayerEvent.SkipCurrentChapter)
-                }
-
-                PlayerEventType.Resize -> {
-                    nextResize()
-                }
-
-                PlayerEventType.PrevEpisode -> {
-                    player.handleEvent(CSPlayerEvent.PrevEpisode)
-                }
-
-                PlayerEventType.SeekForward -> {
-                    player.handleEvent(CSPlayerEvent.SeekForward)
-                }
-
-                PlayerEventType.ShowSpeed -> {
-                    showSpeedDialog()
-                }
-
-                PlayerEventType.SeekBack -> {
-                    player.handleEvent(CSPlayerEvent.SeekBack)
-                }
-
-                PlayerEventType.Restart -> {
-                    player.handleEvent(CSPlayerEvent.Restart)
-                }
+        // Wire up the snap-hint outline view and schedule brightness overlay bounds update
+        playerHostView?.videoOutline = playerBinding?.videoOutline
+        playerHostView?.requestUpdateBrightnessOverlayOnNextLayout()
 
-                PlayerEventType.ToggleMute -> {
-                    player.handleEvent(CSPlayerEvent.ToggleMute)
-                }
-
-                PlayerEventType.ToggleHide -> {
-                    onClickChange()
-                }
-
-                PlayerEventType.ShowMirrors -> {
-                    showMirrorsDialogue()
-                }
-
-                PlayerEventType.SearchSubtitlesOnline -> {
-                    if (subsProvidersIsActive) {
-                        openOnlineSubPicker(view.context, null) {}
-                    }
-                }
-
-                PlayerEventType.SkipOp -> {
-                    skipOp()
-                }
-            }
+        val view = binding.root
+        // init variables
+        setPlayBackSpeed(DataStoreHelper.playBackSpeed)
+        savedInstanceState?.getLong(SUBTITLE_DELAY_BUNDLE_KEY)?.let {
+            subtitleDelay = it
         }
 
         // handle tv controls directly based on player state
-        keyEventListener = { eventNav ->
-            // Don't hook player keys if player isn't active
-            if (player.isActive()) {
-                val (event, hasNavigated) = eventNav
-                if (event != null)
-                    handleKeyEvent(event, hasNavigated)
-                else false
-            } else false
-        }
+        setupKeyEventListener()
 
         try {
             context?.let { ctx ->
                 val settingsManager = PreferenceManager.getDefaultSharedPreferences(ctx)
 
-                fastForwardTime =
-                    settingsManager.getInt(ctx.getString(R.string.double_tap_seek_time_key), 10)
-                        .toLong() * 1000L
-
                 androidTVInterfaceOffSeekTime =
                     settingsManager.getInt(
                         ctx.getString(R.string.android_tv_interface_off_seek_key),
@@ -1651,16 +1127,6 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
                     )
                         .toLong() * 1000L
 
-                navigationBarHeight = ctx.getNavigationBarHeight()
-                statusBarHeight = ctx.getStatusBarHeight()
-
-                swipeHorizontalEnabled =
-                    settingsManager.getBoolean(ctx.getString(R.string.swipe_enabled_key), true)
-                swipeVerticalEnabled =
-                    settingsManager.getBoolean(
-                        ctx.getString(R.string.swipe_vertical_enabled_key),
-                        true
-                    )
                 playBackSpeedEnabled = settingsManager.getBoolean(
                     ctx.getString(R.string.playback_speed_enabled_key),
                     false
@@ -1669,58 +1135,31 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
                     ctx.getString(R.string.rotate_video_key),
                     false
                 )
-                autoPlayerRotateEnabled = settingsManager.getBoolean(
-                    ctx.getString(R.string.auto_rotate_video_key),
-                    false
-                )
                 playerResizeEnabled =
                     settingsManager.getBoolean(
                         ctx.getString(R.string.player_resize_enabled_key),
                         true
                     )
-                doubleTapEnabled =
-                    settingsManager.getBoolean(
-                        ctx.getString(R.string.double_tap_enabled_key),
-                        false
-                    )
-
-                doubleTapPauseEnabled =
-                    settingsManager.getBoolean(
-                        ctx.getString(R.string.double_tap_pause_enabled_key),
-                        false
-                    )
-
                 hideControlsNames = settingsManager.getBoolean(
                     ctx.getString(R.string.hide_player_control_names_key),
                     false
                 )
 
-                speedupEnabled = settingsManager.getBoolean(
-                    ctx.getString(R.string.speedup_key),
-                    false
-                )
-
-
                 val profiles = QualityDataHelper.getProfiles()
                 val type = if (ctx.isUsingMobileData())
                     QualityDataHelper.QualityProfileType.Data
                 else QualityDataHelper.QualityProfileType.WiFi
 
                 currentQualityProfile =
-                    profiles.firstOrNull { it.type == type }?.id ?: profiles.firstOrNull()?.id
-                            ?: currentQualityProfile
-
-//                currentPrefQuality = settingsManager.getInt(
-//                    ctx.getString(if (ctx.isUsingMobileData()) R.string.quality_pref_mobile_data_key else R.string.quality_pref_key),
-//                    currentPrefQuality
-//                )
-                // useSystemBrightness =
-                //    settingsManager.getBoolean(ctx.getString(R.string.use_system_brightness_key), false)
+                    profiles.firstOrNull { it.types.contains(type) }?.id
+                        ?: profiles.firstOrNull()?.id
+                                ?: currentQualityProfile
             }
             playerBinding?.apply {
                 playerSpeedBtt.isVisible = playBackSpeedEnabled
                 playerResizeBtt.isVisible = playerResizeEnabled
-                playerRotateBtt.isVisible = playerRotateEnabled
+                playerRotateBtt.isVisible =
+                    if (isLayout(TV or EMULATOR)) false else playerRotateEnabled
                 if (hideControlsNames) {
                     hideControlsNames()
                 }
@@ -1730,13 +1169,13 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
         }
 
         playerBinding?.apply {
-
             if (isLayout(TV or EMULATOR)) {
                 mapOf(
                     playerGoBack to playerGoBackText,
                     playerRestart to playerRestartText,
                     playerGoForward to playerGoForwardText,
                     downloadHeaderToggle to downloadHeaderToggleText,
+                    playerEpisodesButton to playerEpisodesButtonText
                 ).forEach { (button, text) ->
                     button.setOnFocusChangeListener { _, hasFocus ->
                         if (!hasFocus) {
@@ -1744,25 +1183,17 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
                             text.isVisible = false
                             return@setOnFocusChangeListener
                         }
+                        if (button.id == R.id.player_episodes_button) {
+                            toggleEpisodesOverlay(show = true)
+                        } else {
+                            toggleEpisodesOverlay(show = false)
+                        }
                         text.isSelected = true
                         text.isVisible = true
                     }
                 }
             }
 
-            playerPausePlay.setOnClickListener {
-                autoHide()
-                player.handleEvent(CSPlayerEvent.PlayPauseToggle)
-            }
-
-            exoDuration.setOnClickListener {
-                setRemainingTimeCounter(true)
-            }
-
-            timeLeft.setOnClickListener {
-                setRemainingTimeCounter(false)
-            }
-
             skipChapterButton.setOnClickListener {
                 player.handleEvent(CSPlayerEvent.SkipCurrentChapter)
             }
@@ -1812,18 +1243,8 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
                 showSubtitleOffsetDialog()
             }
 
-            playerRew.setOnClickListener {
-                autoHide()
-                rewind()
-            }
-
-            playerFfwd.setOnClickListener {
-                autoHide()
-                fastForward()
-            }
-
             playerGoBack.setOnClickListener {
-                activity?.popCurrentPage()
+                activity?.popCurrentPage("FullScreenPlayer")
             }
 
             playerSourcesBtt.setOnClickListener {
@@ -1834,20 +1255,21 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
                 showTracksDialogue()
             }
 
-            // it is !not! a bug that you cant touch the right side, it does not register inputs on navbar or status bar
-            playerHolder.setOnTouchListener { callView, event ->
-                return@setOnTouchListener handleMotionEvent(callView, event)
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                playerControlsScroll.setOnScrollChangeListener { _, _, _, _, _ ->
+                    autoHide()
+                }
             }
 
+            exoProgress.registerPlayerView(playerView)
+
+            @SuppressLint("ClickableViewAccessibility")
             exoProgress.setOnTouchListener { _, event ->
                 // this makes the bar not disappear when sliding
                 when (event.action) {
-                    MotionEvent.ACTION_DOWN -> {
-                        currentTapIndex++
-                    }
-
+                    MotionEvent.ACTION_DOWN,
                     MotionEvent.ACTION_MOVE -> {
-                        currentTapIndex++
+                        playerHostView?.cancelAutoHide()
                     }
 
                     MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL, MotionEvent.ACTION_BUTTON_RELEASE -> {
@@ -1856,11 +1278,9 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
                 }
                 return@setOnTouchListener false
             }
-        }
-        // cs3 is peak media center
-        setRemainingTimeCounter(durationMode || isLayout(TV))
-        playerBinding?.exoPosition?.doOnTextChanged { _, _, _, _ ->
-            updateRemainingTime()
+            playerEpisodesButton.setOnClickListener {
+                toggleEpisodesOverlay(show = true)
+            }
         }
         // init UI
         try {
@@ -1870,10 +1290,10 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
         }
     }
 
-    @SuppressLint("SourceLockedOrientationActivity")
     private fun toggleRotate() {
         activity?.let {
             toggleOrientationWithSensor(it)
+            rotatedManually = true
         }
     }
 
@@ -1894,37 +1314,48 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
     }
 
     override fun playerDimensionsLoaded(width: Int, height: Int) {
-        isVerticalOrientation = height > width
+        // PlayerView already set isVerticalOrientation; skip rotation on TV (pillarbox instead).
+        if (isLayout(TV or EMULATOR)) return
+        // Skip zero-size events emitted when the player transitions to STATE_IDLE,
+        // acting on them would reset auto-detected orientation to landscape.
+        if (width <= 0 || height <= 0) return
         updateOrientation()
     }
 
-    private fun updateRemainingTime() {
-        val duration = player.getDuration()
-        val position = player.getPosition()
-
-        if (duration != null && duration > 1 && position != null) {
-            val remainingTimeSeconds = (duration - position + 500) / 1000
-            val formattedTime = "-${DateUtils.formatElapsedTime(remainingTimeSeconds)}"
-
-            playerBinding?.timeLeft?.text = formattedTime
+    private fun toggleEpisodesOverlay(show: Boolean) {
+        if (show && !isShowingEpisodeOverlay) {
+            previousPlayStatus = player.getIsPlaying()
+            player.handleEvent(CSPlayerEvent.Pause)
+            showEpisodesOverlay()
+            isShowingEpisodeOverlay = true
+            animateEpisodesOverlay(true)
+        } else if (isShowingEpisodeOverlay) {
+            if (previousPlayStatus) player.handleEvent(CSPlayerEvent.Play)
+            isShowingEpisodeOverlay = false
+            animateEpisodesOverlay(false)
         }
     }
 
-    private fun setRemainingTimeCounter(showRemaining: Boolean) {
-        durationMode = showRemaining
-        playerBinding?.exoDuration?.isInvisible = showRemaining
-        playerBinding?.timeLeft?.isVisible = showRemaining
-    }
+    private fun animateEpisodesOverlay(show: Boolean) {
+        playerBinding?.playerEpisodeOverlay?.let { overlay ->
+            overlay.animate().cancel()
+            (overlay.parent as? ViewGroup)?.layoutTransition = null // Disable layout transitions
 
-    private fun dynamicOrientation(): Int {
-        return if (autoPlayerRotateEnabled) {
-            if (isVerticalOrientation) {
-                ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT
-            } else {
-                ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE
-            }
-        } else {
-            ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE // default orientation
+            val offset = 50 * overlay.resources.displayMetrics.density
+
+            overlay.translationX = if (show) offset else 0f
+            playerBinding?.playerEpisodeOverlay?.isVisible = true
+
+            overlay.animate()
+                .translationX(if (show) 0f else offset)
+                .alpha(if (show) 1f else 0f)
+                .setDuration(300)
+                .setInterpolator(AccelerateDecelerateInterpolator()).withEndAction {
+                    if (!show) {
+                        playerBinding?.playerEpisodeOverlay?.isGone = true
+                    }
+                }
+                .start()
         }
     }
 }
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 5b925c71e11..2dfd5ef4df0 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
@@ -28,6 +28,7 @@ import androidx.core.animation.addListener
 import androidx.core.app.NotificationCompat
 import androidx.core.app.PendingIntentCompat
 import androidx.core.content.ContextCompat
+import androidx.core.content.edit
 import androidx.core.text.toSpanned
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
@@ -37,15 +38,16 @@ import androidx.media3.common.Format.NO_VALUE
 import androidx.media3.common.MimeTypes
 import androidx.media3.common.Player
 import androidx.media3.common.util.UnstableApi
-import androidx.media3.common.util.Util
 import androidx.media3.exoplayer.ExoPlayer
 import androidx.media3.ui.PlayerNotificationManager
 import androidx.media3.ui.PlayerNotificationManager.EXTRA_INSTANCE_ID
 import androidx.media3.ui.PlayerNotificationManager.MediaDescriptionAdapter
 import androidx.preference.PreferenceManager
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import com.lagradost.cloudstream3.APIHolder.getApiFromNameNull
-import com.lagradost.cloudstream3.AcraApplication
-import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
+import com.lagradost.cloudstream3.CloudStreamApp
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.setKey
 import com.lagradost.cloudstream3.CommonActivity.showToast
 import com.lagradost.cloudstream3.LoadResponse
 import com.lagradost.cloudstream3.LoadResponse.Companion.getAniListId
@@ -66,50 +68,62 @@ 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.safe
 import com.lagradost.cloudstream3.mvvm.observe
 import com.lagradost.cloudstream3.mvvm.observeNullable
-import com.lagradost.cloudstream3.subtitles.AbstractSubApi
+import com.lagradost.cloudstream3.mvvm.safe
 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.download.DownloadButtonSetup
 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.LinkSource
 import com.lagradost.cloudstream3.ui.player.source_priority.QualityDataHelper
+import com.lagradost.cloudstream3.ui.player.source_priority.QualityDataHelper.getLinkPriority
 import com.lagradost.cloudstream3.ui.player.source_priority.QualityProfileDialog
+import com.lagradost.cloudstream3.ui.result.ACTION_CLICK_DEFAULT
+import com.lagradost.cloudstream3.ui.result.EpisodeAdapter
+import com.lagradost.cloudstream3.ui.result.FOCUS_SELF
 import com.lagradost.cloudstream3.ui.result.ResultEpisode
 import com.lagradost.cloudstream3.ui.result.ResultFragment
+import com.lagradost.cloudstream3.ui.result.ResultFragment.bindLogo
+import com.lagradost.cloudstream3.ui.result.ResultViewModel2
 import com.lagradost.cloudstream3.ui.result.SyncViewModel
+import com.lagradost.cloudstream3.ui.result.setLinearListLayout
+import com.lagradost.cloudstream3.ui.setRecycledViewPool
 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.ui.subtitles.SubtitlesFragment.Companion.getAutoSelectLanguageTagIETF
+import com.lagradost.cloudstream3.utils.AppContextUtils.getShortSeasonText
 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.DataStoreHelper.getViewPos
 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.fromTagToEnglishLanguageName
+import com.lagradost.cloudstream3.utils.SubtitleHelper.fromTagToLanguageName
 import com.lagradost.cloudstream3.utils.SubtitleHelper.languages
 import com.lagradost.cloudstream3.utils.UIHelper.clipboardHelper
 import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
+import com.lagradost.cloudstream3.utils.UIHelper.fixSystemBarsPadding
 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.VideoDownloadManager.getImageBitmapFromUrl
+import com.lagradost.cloudstream3.utils.downloader.DownloadUtils.getImageBitmapFromUrl
 import com.lagradost.cloudstream3.utils.setText
 import com.lagradost.cloudstream3.utils.txt
+import com.lagradost.cloudstream3.utils.videoskip.VideoSkipStamp
 import com.lagradost.safefile.SafeFile
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
@@ -117,84 +131,79 @@ import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 import java.io.Serializable
 import java.util.Calendar
-import kotlin.math.abs
-import androidx.core.content.edit
+import java.util.UUID
+import java.util.concurrent.ConcurrentHashMap
+import java.util.concurrent.atomic.AtomicBoolean
 
-
-@UnstableApi
+@OptIn(UnstableApi::class)
 class GeneratorPlayer : FullScreenPlayer() {
     companion object {
         const val NOTIFICATION_ID = 2326
         const val CHANNEL_ID = 7340
         const val STOP_ACTION = "stopcs3"
 
-        private var lastUsedGenerator: IGenerator? = null
-        fun newInstance(generator: IGenerator, syncData: HashMap<String, String>? = null): Bundle {
+        private val generators = ConcurrentHashMap<String, VideoGenerator<*>>()
+        fun newInstance(
+            generator: VideoGenerator<*>,
+            index: Int,
+            syncData: HashMap<String, String>? = null
+        ): Bundle {
             Log.i(TAG, "newInstance = $syncData")
-            lastUsedGenerator = generator
+            val uuid = UUID.randomUUID().toString()
+            generators[uuid] = generator
             return Bundle().apply {
+                putString("uuid", uuid)
+                putInt("index", index)
                 if (syncData != null) putSerializable("syncData", syncData)
             }
         }
 
-        val subsProviders
-            get() = subtitleProviders.filter { provider ->
-                (provider as? AbstractSubApi)?.let { !it.requiresLogin || it.loginInfo() != null }
-                    ?: true
-            }.map { SubRepository(it) }
+        val subsProviders = subtitleProviders
         val subsProvidersIsActive
             get() = subsProviders.isNotEmpty()
     }
 
 
-    private var titleRez = 3
     private var limitTitle = 0
+    private var showTitle = false
+    private var showName = false
+    private var showResolution = false
+    private var showMediaInfo = false
 
     private lateinit var viewModel: PlayerGeneratorViewModel //by activityViewModels()
     private lateinit var sync: SyncViewModel
-    private var currentLinks: Set<Pair<ExtractorLink?, ExtractorUri?>> = setOf()
-    private var currentSubs: Set<SubtitleData> = setOf()
 
     private var currentSelectedLink: Pair<ExtractorLink?, ExtractorUri?>? = null
     private var currentSelectedSubtitles: SubtitleData? = null
-    private var currentMeta: Any? = null
-    private var nextMeta: Any? = null
-    private var isActive: Boolean = false
+    private val currentMeta: Any? get() = viewModel.state.generatorState?.meta
+    private val nextMeta: Any? get() = viewModel.state.generatorState?.nextMeta
+
+    private var isPlayerActive: AtomicBoolean = AtomicBoolean(false)
     private var isNextEpisode: Boolean = false // this is used to reset the watch time
 
     private var preferredAutoSelectSubtitles: String? = null // null means do nothing, "" means none
+    private val allMeta: List<ResultEpisode>?
+        get() = viewModel.state.generatorState?.allMeta?.filterIsInstance<ResultEpisode>()
+            ?.map { episode ->
+                // Refresh all the episodes watch duration
+                getViewPos(episode.id)?.let { data ->
+                    episode.copy(position = data.position, duration = data.duration)
+                } ?: episode
+            }
 
-    private var binding: FragmentPlayerBinding? = null
-
-    private fun startLoading() {
-        player.release()
-        currentSelectedSubtitles = null
-        isActive = false
-        binding?.overlayLoadingSkipButton?.isVisible = false
-        binding?.playerLoadingOverlay?.isVisible = true
-    }
-
-    private fun setSubtitles(subtitle: SubtitleData?): Boolean {
-        // If subtitle is changed -> Save the language
-        if (subtitle != currentSelectedSubtitles) {
-            val subtitleLanguage639 = if (subtitle == null) {
-                // "" is No Subtitles
-                ""
-            } else if (subtitle.languageCode != null) {
-                // Could be "English 4" which is why it is trimmed.
-                val trimmedLanguage = subtitle.languageCode.replace(Regex("\\d"), "").trim()
-
-                languages.firstOrNull { language ->
-                    language.languageName.equals(trimmedLanguage, ignoreCase = true) ||
-                            language.ISO_639_1 == subtitle.languageCode
-                }?.ISO_639_1
+    private fun setSubtitles(subtitle: SubtitleData?, userInitiated: Boolean): Boolean {
+        // If subtitle is changed and user initiated -> Save the language
+        if (subtitle != currentSelectedSubtitles && userInitiated) {
+            val subtitleLanguageTagIETF = if (subtitle == null) {
+                "" // -> No Subtitles
             } else {
-                null
+                subtitle.getIETF_tag()
             }
 
-            if (subtitleLanguage639 != null) {
-                setKey(SUBTITLE_AUTO_SELECT_KEY, subtitleLanguage639)
-                preferredAutoSelectSubtitles = subtitleLanguage639
+            if (subtitleLanguageTagIETF != null) {
+                Log.i(TAG, "Set SUBTITLE_AUTO_SELECT_KEY to '$subtitleLanguageTagIETF'")
+                setKey(SUBTITLE_AUTO_SELECT_KEY, subtitleLanguageTagIETF)
+                preferredAutoSelectSubtitles = subtitleLanguageTagIETF
             }
         }
 
@@ -212,10 +221,11 @@ class GeneratorPlayer : FullScreenPlayer() {
         playerBinding?.playerTracksBtt?.isVisible =
             tracks.allVideoTracks.size > 1 || tracks.allAudioTracks.size > 1
         // Only set the preferred language if it is available.
-        // Otherwise it may give some users audio track init failed!
+        // Otherwise, it may give some users audio track init failed!
         if (tracks.allAudioTracks.any { it.language == preferredAudioTrackLanguage }) {
             player.setPreferredAudioTrack(preferredAudioTrackLanguage)
         }
+        updatePlayerInfo()
     }
 
     override fun playerStatusChanged() {
@@ -226,11 +236,11 @@ class GeneratorPlayer : FullScreenPlayer() {
     }
 
     private fun noSubtitles(): Boolean {
-        return setSubtitles(null)
+        return setSubtitles(null, true)
     }
 
     private fun getPos(): Long {
-        val durPos = DataStoreHelper.getViewPos(viewModel.getId()) ?: return 0L
+        val durPos = getViewPos(viewModel.state.generatorState?.id) ?: return 0L
         if (durPos.duration == 0L) return 0L
         if (durPos.position * 100L / durPos.duration > 95L) {
             return 0L
@@ -260,21 +270,15 @@ class GeneratorPlayer : FullScreenPlayer() {
     ): PendingIntent {
         val intent: Intent = Intent(action).setPackage(context.packageName)
         intent.putExtra(EXTRA_INSTANCE_ID, instanceId)
-        val pendingFlags = if (Util.SDK_INT >= 23) {
+        val pendingFlags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
-        } else {
-            PendingIntent.FLAG_UPDATE_CURRENT
-        }
+        } else PendingIntent.FLAG_UPDATE_CURRENT
 
         return PendingIntent.getBroadcast(context, instanceId, intent, pendingFlags)
     }
 
-    @OptIn(UnstableApi::class)
-    @UnstableApi
     private var cachedPlayerNotificationManager: PlayerNotificationManager? = null
 
-    @OptIn(UnstableApi::class)
-    @UnstableApi
     private fun getMediaNotification(context: Context): PlayerNotificationManager {
         val cache = cachedPlayerNotificationManager
         if (cache != null) return cache
@@ -351,16 +355,13 @@ class GeneratorPlayer : FullScreenPlayer() {
                         }
 
                         // retry several times with a preview in case the preview generator is slow
-                        for (i in 0..10) {
+                        repeat(10) {
                             val preview = this@GeneratorPlayer.player.getPreview(0.5f)
-                            if (preview == null) {
-                                delay(1000L)
-                                continue
+                            if (preview != null) {
+                                callback.onBitmap(preview)
+                                return@repeat
                             }
-                            callback.onBitmap(
-                                preview
-                            )
-                            break
+                            delay(1000L)
                         }
                     }
 
@@ -376,6 +377,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                     return mutableMapOf(
                         STOP_ACTION to NotificationCompat.Action(
                             R.drawable.baseline_stop_24,
+                            @SuppressLint("PrivateResource")
                             context.getString(androidx.media3.ui.R.string.exo_controls_stop_description),
                             createBroadcastIntent(STOP_ACTION, context, instanceId)
                         )
@@ -389,9 +391,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                 override fun onCustomAction(player: Player, action: String, intent: Intent) {
                     when (action) {
                         STOP_ACTION -> {
-                            exitFullscreen()
-                            this@GeneratorPlayer.player.release()
-                            activity?.popCurrentPage()
+                            exitPlayer()
                         }
                     }
                 }
@@ -491,9 +491,9 @@ class GeneratorPlayer : FullScreenPlayer() {
         }
     }
 
-    private fun loadLink(link: Pair<ExtractorLink?, ExtractorUri?>?, sameEpisode: Boolean) {
+    private fun loadLink(link: VideoLink?, sameEpisode: Boolean) {
         if (link == null) return
-
+        isPlayerActive.set(true)
         // manage UI
         binding?.playerLoadingOverlay?.isVisible = false
         val isTorrent =
@@ -501,15 +501,15 @@ class GeneratorPlayer : FullScreenPlayer() {
 
         playerBinding?.downloadHeader?.isVisible = false
         playerBinding?.downloadHeaderToggle?.isVisible = isTorrent
+        if (!isLayout(PHONE)) {
+            playerBinding?.downloadBothHeader?.isVisible = isTorrent
+        }
 
         showDownloadProgress(DownloadEvent(0, 0, 0, null))
 
         uiReset()
         currentSelectedLink = link
-        currentMeta = viewModel.getMeta()
-        nextMeta = viewModel.getNextMeta()
         //  setEpisodes(viewModel.getAllMeta() ?: emptyList())
-        isActive = true
         setPlayerDimen(null)
         setTitle()
         if (!sameEpisode)
@@ -519,6 +519,7 @@ class GeneratorPlayer : FullScreenPlayer() {
         // load player
         context?.let { ctx ->
             val (url, uri) = link
+            val subtitles = viewModel.state.subtitles
             player.loadPlayer(
                 ctx,
                 sameEpisode,
@@ -527,43 +528,18 @@ class GeneratorPlayer : FullScreenPlayer() {
                 startPosition = if (sameEpisode) null else {
                     if (isNextEpisode) 0L else getPos()
                 },
-                currentSubs,
+                subtitles,
                 (if (sameEpisode) currentSelectedSubtitles else null) ?: getAutoSelectSubtitle(
-                    currentSubs, settings = true, downloads = true
+                    subtitles, settings = true, downloads = true
                 ),
-                preview = isFullScreenPlayer
+                preview = true
             )
         }
 
-        if (!sameEpisode)
-            player.addTimeStamps(listOf()) // clear stamps
-    }
-
-    private fun closestQuality(target: Int?): Qualities {
-        if (target == null) return Qualities.Unknown
-        return Qualities.entries.minBy { abs(it.value - target) }
-    }
-
-    private fun getLinkPriority(
-        qualityProfile: Int,
-        link: Pair<ExtractorLink?, ExtractorUri?>
-    ): Int {
-        val (linkData, _) = link
-
-        val qualityPriority = QualityDataHelper.getQualityPriority(
-            qualityProfile,
-            closestQuality(linkData?.quality)
-        )
-        val sourcePriority =
-            QualityDataHelper.getSourcePriority(qualityProfile, linkData?.source)
-
-        // negative because we want to sort highest quality first
-        return qualityPriority + sourcePriority
-    }
-
-    private fun sortLinks(qualityProfile: Int): List<Pair<ExtractorLink?, ExtractorUri?>> {
-        return currentLinks.sortedBy {
-            -getLinkPriority(qualityProfile, it)
+        if (!sameEpisode) {
+            player.addTimeStamps(emptyList()) // clear stamps
+            // Resets subtitle delay, as we watch some other content
+            player.setSubtitleOffset(0)
         }
     }
 
@@ -601,25 +577,25 @@ class GeneratorPlayer : FullScreenPlayer() {
         if (entry.lang.isBlank() || !withLanguage) {
             return entry.name
         }
-        val language = fromTwoLettersToLanguage(entry.lang.trim()) ?: entry.lang
+        val language = fromTagToLanguageName(entry.lang.trim()) ?: entry.lang
         return "$language ${entry.name}"
     }
 
     override fun openOnlineSubPicker(
         context: Context, loadResponse: LoadResponse?, dismissCallback: (() -> Unit)
     ) {
-        val providers = subsProviders
+        val providers = subsProviders.toList()
         val isSingleProvider = subsProviders.size == 1
 
-        val dialog = Dialog(context, R.style.AlertDialogCustomBlack)
+        val dialog = Dialog(context, R.style.DialogFullscreenPlayer)
         val binding =
             DialogOnlineSubtitlesBinding.inflate(LayoutInflater.from(context), null, false)
         dialog.setContentView(binding.root)
+        fixSystemBarsPadding(binding.root)
 
         var currentSubtitles: List<AbstractSubtitleEntities.SubtitleEntity> = emptyList()
         var currentSubtitle: AbstractSubtitleEntities.SubtitleEntity? = null
 
-
         val layout = R.layout.sort_bottom_single_choice_double_text
         val arrayAdapter =
             object : ArrayAdapter<AbstractSubtitleEntities.SubtitleEntity>(dialog.context, layout) {
@@ -645,7 +621,6 @@ class GeneratorPlayer : FullScreenPlayer() {
                     imageViewEnd.setImageDrawable(drawableEnd)
                 }
 
-                @SuppressLint("SetTextI18n")
                 override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
                     val view = convertView ?: LayoutInflater.from(context).inflate(layout, null)
 
@@ -658,9 +633,10 @@ class GeneratorPlayer : FullScreenPlayer() {
                     mainTextView?.text = item?.let { getName(it, false) }
 
                     val language =
-                        item?.let { fromTwoLettersToLanguage(it.lang.trim()) ?: it.lang } ?: ""
+                        item?.let { fromTagToLanguageName(it.lang) ?: it.lang } ?: ""
                     val providerSuffix =
                         if (isSingleProvider || item == null) "" else " · ${item.source}"
+                    @SuppressLint("SetTextI18n")
                     secondaryTextView?.text = language + providerSuffix
 
                     setHearingImpairedIcon(drawableEnd, position)
@@ -680,7 +656,7 @@ class GeneratorPlayer : FullScreenPlayer() {
             currentSubtitle = currentSubtitles.getOrNull(position) ?: return@setOnItemClickListener
         }
 
-        var currentLanguageTwoLetters: String = getAutoSelectLanguageISO639_1()
+        var currentLanguageTagIETF: String = getAutoSelectLanguageTagIETF()
 
 
         fun setSubtitlesList(list: List<AbstractSubtitleEntities.SubtitleEntity>) {
@@ -745,13 +721,13 @@ class GeneratorPlayer : FullScreenPlayer() {
                             aniListId = loadResponse?.getAniListId()?.toInt(),
                             epNumber = currentTempMeta.episode,
                             seasonNumber = currentTempMeta.season,
-                            lang = currentLanguageTwoLetters.ifBlank { null },
+                            lang = currentLanguageTagIETF.ifBlank { null },
                             year = viewModel.currentSubtitleYear.value
                         )
 
                     // TODO Make ui a lot better, like search with tabs
                     val results = providers.amap {
-                        when (val response = it.search(search)) {
+                        when (val response = Resource.fromResult(it.search(search))) {
                             is Resource.Success -> {
                                 response.value
                             }
@@ -793,15 +769,22 @@ class GeneratorPlayer : FullScreenPlayer() {
         })
 
         binding.searchFilter.setOnClickListener { view ->
-            val lang639_1 = languages.map { it.ISO_639_1 }
+            val languagesTagName =
+                languages
+                    .map { Pair(it.IETF_tag, it.nameNextToFlagEmoji()) }
+                    .sortedBy {
+                        it.second.substringAfter("\u00a0").lowercase()
+                    } // name ignoring flag emoji
+            val (langTagsIETF, langNames) = languagesTagName.unzip()
+
             activity?.showDialog(
-                languages.map { it.languageName },
-                lang639_1.indexOf(currentLanguageTwoLetters),
+                langNames,
+                langTagsIETF.indexOf(currentLanguageTagIETF),
                 view?.context?.getString(R.string.subs_subtitle_languages)
                     ?: return@setOnClickListener,
                 true,
                 { }) { index ->
-                currentLanguageTwoLetters = lang639_1[index]
+                currentLanguageTagIETF = langTagsIETF[index]
                 binding.subtitlesSearch.setQuery(binding.subtitlesSearch.query, true)
             }
         }
@@ -810,7 +793,8 @@ class GeneratorPlayer : FullScreenPlayer() {
             currentSubtitle?.let { currentSubtitle ->
                 providers.firstOrNull { it.idPrefix == currentSubtitle.idPrefix }?.let { api ->
                     ioSafe {
-                        when (val apiResource = api.getResource(currentSubtitle)) {
+                        when (val apiResource =
+                            Resource.fromResult(api.resource(currentSubtitle))) {
                             is Resource.Success -> {
                                 val subtitles = apiResource.value.getSubtitles().map { resource ->
                                     SubtitleData(
@@ -823,7 +807,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                                         origin = resource.origin,
                                         mimeType = resource.url.toSubtitleMimeType(),
                                         headers = currentSubtitle.headers,
-                                        currentSubtitle.lang
+                                        languageCode = currentSubtitle.lang
                                     )
                                 }
                                 if (subtitles.isEmpty()) {
@@ -859,7 +843,6 @@ class GeneratorPlayer : FullScreenPlayer() {
         //dialog.subtitles_search_year?.setText(currentTempMeta.year)
     }
 
-    @OptIn(UnstableApi::class)
     private fun openSubPicker() {
         try {
             subsPathPicker.launch(
@@ -885,22 +868,21 @@ class GeneratorPlayer : FullScreenPlayer() {
         vararg subtitleData: SubtitleData
     ) {
         if (subtitleData.isEmpty()) return
-        val selectedSubtitle = subtitleData.first()
         val ctx = context ?: return
-
-        val subs = currentSubs + subtitleData
+        val selectedSubtitle = subtitleData.first()
+        viewModel.addSubtitles(subtitleData.toSet())
 
         // this is used instead of observe(viewModel._currentSubs), because observe is too slow
-        player.setActiveSubtitles(subs)
+        player.setActiveSubtitles(viewModel.state.subtitles)
 
         // Save current time as to not reset player to 00:00
         player.saveData()
         player.reloadPlayer(ctx)
 
-        setSubtitles(selectedSubtitle)
-        viewModel.addSubtitles(subtitleData.toSet())
+        setSubtitles(selectedSubtitle, false)
 
         selectSourceDialog?.dismissSafe()
+        selectSourceDialog = null
 
         showToast(
             String.format(ctx.getString(R.string.player_loaded_subtitles), selectedSubtitle.name),
@@ -914,7 +896,7 @@ class GeneratorPlayer : FullScreenPlayer() {
             safe {
                 // It lies, it can be null if file manager quits.
                 if (uri == null) return@safe
-                val ctx = context ?: AcraApplication.context ?: return@safe
+                val ctx = context ?: CloudStreamApp.context ?: return@safe
                 // RW perms for the path
                 ctx.contentResolver.takePersistableUriPermission(
                     uri,
@@ -941,10 +923,6 @@ class GeneratorPlayer : FullScreenPlayer() {
             }
         }
 
-    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) =
@@ -955,9 +933,11 @@ class GeneratorPlayer : FullScreenPlayer() {
             // 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
+            subsProviders.toList().amap { provider ->
+                val success = when (val result = Resource.fromResult(
+                    provider.search(
+                        query = query
+                    )
                 )) {
                     is Resource.Failure -> {
                         // scope might cancel, so we do an extra check
@@ -983,21 +963,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                         break
                     }
 
-                    val subtitleResources =
-                        when (val result = provider.getResource(subtitleEntry)) {
-                            is Resource.Failure -> {
-                                continue
-                            }
-
-                            is Resource.Loading -> {
-                                // unreachable
-                                continue
-                            }
-
-                            is Resource.Success -> {
-                                result.value
-                            }
-                        }
+                    val subtitleResources = provider.resource(subtitleEntry).getOrNull() ?: continue
 
                     val subtitles = subtitleResources.getSubtitles().map { resource ->
                         SubtitleData(
@@ -1012,7 +978,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                     }
 
                     // checks for both a race condition and if any of the subs generated is new
-                    if (this.isActive && !currentSubs.containsAll(subtitles) && !hasSelectASubtitle) {
+                    if (this.isActive && !viewModel.state.subtitles.containsAll(subtitles) && !hasSelectASubtitle) {
                         hasSelectASubtitle = true
                         runOnMainThread {
                             addAndSelectSubtitles(*subtitles.toTypedArray())
@@ -1035,13 +1001,14 @@ class GeneratorPlayer : FullScreenPlayer() {
             context?.let { ctx ->
                 val isPlaying = player.getIsPlaying()
                 player.handleEvent(CSPlayerEvent.Pause, PlayerEventSource.UI)
-                val currentSubtitles = sortSubs(currentSubs)
+                val currentSubtitles = sortSubs(viewModel.state.subtitles)
 
-                val sourceDialog = Dialog(ctx, R.style.AlertDialogCustomBlack)
+                val sourceDialog = Dialog(ctx, R.style.DialogFullscreenPlayer)
                 val binding =
                     PlayerSelectSourceAndSubsBinding.inflate(LayoutInflater.from(ctx), null, false)
                 sourceDialog.setContentView(binding.root)
 
+                fixSystemBarsPadding(binding.root)
                 selectSourceDialog = sourceDialog
 
                 sourceDialog.show()
@@ -1062,7 +1029,9 @@ class GeneratorPlayer : FullScreenPlayer() {
 
                 binding.subtitleSettingsBtt.setOnClickListener {
                     safe {
-                        SubtitlesFragment().show(this.parentFragmentManager, "SubtitleSettings")
+                        val subtitlesFragment = SubtitlesFragment()
+                        subtitlesFragment.systemBarsAddPadding = true
+                        subtitlesFragment.show(this.parentFragmentManager, "SubtitleSettings")
                     }
                 }
 
@@ -1074,7 +1043,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                 }
 
                 if (subsProvidersIsActive) {
-                    val currentLoadResponse = viewModel.getLoadResponse()
+                    val currentLoadResponse = viewModel.state.generatorState?.response
 
                     val loadFromOpenSubsFooter: TextView = layoutInflater.inflate(
                         R.layout.sort_bottom_footer_add_choice, null
@@ -1086,6 +1055,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                     loadFromOpenSubsFooter.setOnClickListener {
                         shouldDismiss = false
                         sourceDialog.dismissSafe(activity)
+                        selectSourceDialog = null
                         openOnlineSubPicker(it.context, currentLoadResponse) {
                             dismiss()
                         }
@@ -1096,7 +1066,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                     val metadata = getMetaData()
                     val queryName = metadata.name ?: currentLoadResponse?.name
                     if (queryName != null) {
-                        val currentLanguageTwoLetters: String = getAutoSelectLanguageISO639_1()
+                        val currentLanguageTagIETF: String = getAutoSelectLanguageTagIETF()
                         val loadFromFirstSubsFooter: TextView = layoutInflater.inflate(
                             R.layout.sort_bottom_footer_add_choice, null
                         ) as TextView
@@ -1106,6 +1076,7 @@ class GeneratorPlayer : FullScreenPlayer() {
 
                         loadFromFirstSubsFooter.setOnClickListener {
                             sourceDialog.dismissSafe(activity)
+                            selectSourceDialog = null
                             showToast(R.string.loading)
                             addFirstSub(
                                 SubtitleSearch(
@@ -1116,7 +1087,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                                     aniListId = currentLoadResponse?.getAniListId()?.toInt(),
                                     epNumber = metadata.episode,
                                     seasonNumber = metadata.season,
-                                    lang = currentLanguageTwoLetters.ifBlank { null },
+                                    lang = currentLanguageTagIETF.ifBlank { null },
                                     year = viewModel.currentSubtitleYear.value
                                 )
                             )
@@ -1130,7 +1101,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                 var sortedUrls = emptyList<Pair<ExtractorLink?, ExtractorUri?>>()
 
                 fun refreshLinks(qualityProfile: Int) {
-                    sortedUrls = sortLinks(qualityProfile)
+                    sortedUrls = viewModel.state.sortLinks(qualityProfile)
                     if (sortedUrls.isEmpty()) {
                         sourceDialog.findViewById<LinearLayout>(R.id.sort_sources_holder)?.isGone =
                             true
@@ -1215,7 +1186,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                     subsOptionsArrayAdapter.clear()
 
                     val subtitleOptions =
-                        subtitlesGrouped.entries.toList()
+                        subtitlesGroupedList
                             .getOrNull(subtitleGroupIndex - 1)?.value?.map { subtitle ->
                                 val nameSuffix = subtitle.nameSuffix.html()
                                 nameSuffix.ifBlank {
@@ -1281,6 +1252,7 @@ class GeneratorPlayer : FullScreenPlayer() {
 
                 binding.cancelBtt.setOnClickListener {
                     sourceDialog.dismissSafe(activity)
+                    this.selectSourceDialog = null
                 }
 
                 fun setProfileName(profile: Int) {
@@ -1294,16 +1266,28 @@ class GeneratorPlayer : FullScreenPlayer() {
 
                 binding.profilesClickSettings.setOnClickListener {
                     val activity = activity ?: return@setOnClickListener
-                    QualityProfileDialog(
+                    val dialog = QualityProfileDialog(
                         activity,
-                        R.style.AlertDialogCustomBlack,
-                        currentLinks.mapNotNull { it.first },
+                        R.style.DialogFullscreenPlayer,
+                        viewModel.state.links.mapNotNull {
+                            it.first?.let { extractorLink ->
+                                LinkSource(
+                                    extractorLink
+                                )
+                            }
+                        },
                         currentQualityProfile
                     ) { profile ->
                         currentQualityProfile = profile.id
                         setProfileName(profile.id)
-                        refreshLinks(profile.id)
-                    }.show()
+                    }
+
+                    dialog.setOnDismissListener {
+                        viewModel.state.clearSortedLinksCache()
+                        refreshLinks(currentQualityProfile)
+                    }
+
+                    dialog.show()
                 }
 
                 binding.subtitlesEncodingFormat.apply {
@@ -1331,6 +1315,7 @@ class GeneratorPlayer : FullScreenPlayer() {
 
                     shouldDismiss = false
                     sourceDialog.dismissSafe(activity)
+                    selectSourceDialog = null
 
                     val index = prefValues.indexOf(currentPrefMedia)
                     activity?.showDialog(
@@ -1351,18 +1336,15 @@ class GeneratorPlayer : FullScreenPlayer() {
                 }
 
                 binding.applyBtt.setOnClickListener {
-                    var init = false
-                    if (sourceIndex != startSource) {
-                        init = true
-                    }
+                    var init = sourceIndex != startSource
                     if (subtitleGroupIndex != subtitleGroupIndexStart || subtitleOptionIndex != subtitleOptionIndexStart) {
-                        init = init || if (subtitleGroupIndex <= 0) {
+                        init = init or if (subtitleGroupIndex <= 0) {
                             noSubtitles()
                         } else {
                             subtitlesGroupedList.getOrNull(subtitleGroupIndex - 1)?.value?.getOrNull(
                                 subtitleOptionIndex
                             )?.let {
-                                setSubtitles(it)
+                                setSubtitles(it, true)
                             } ?: false
                         }
                     }
@@ -1372,6 +1354,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                         }
                     }
                     sourceDialog.dismissSafe(activity)
+                    selectSourceDialog = null
                 }
             }
         } catch (e: Exception) {
@@ -1394,11 +1377,14 @@ class GeneratorPlayer : FullScreenPlayer() {
                 val currentAudioTracks = tracks.allAudioTracks
                 val binding: PlayerSelectTracksBinding =
                     PlayerSelectTracksBinding.inflate(LayoutInflater.from(ctx), null, false)
-                val trackDialog = Dialog(ctx, R.style.AlertDialogCustomBlack)
+                val trackDialog = Dialog(ctx, R.style.DialogFullscreenPlayer)
+                this.selectTrackDialog = trackDialog
                 trackDialog.setContentView(binding.root)
                 trackDialog.show()
 
-//                selectTracksDialog = tracksDialog
+                fixSystemBarsPadding(binding.root)
+
+                // selectTracksDialog = tracksDialog
 
                 val videosList = binding.videoTracksList
                 val audioList = binding.autoTracksList
@@ -1441,29 +1427,56 @@ class GeneratorPlayer : FullScreenPlayer() {
 
                 trackDialog.setOnDismissListener {
                     dismiss()
-//                    selectTracksDialog = null
+                    // selectTracksDialog = null
                 }
 
-                var audioIndexStart = currentAudioTracks.indexOf(tracks.currentAudioTrack).takeIf {
-                    it != -1
-                } ?: currentVideoTracks.indexOfFirst {
-                    tracks.currentAudioTrack?.id == it.id
-                }
+                var audioIndexStart = currentAudioTracks.indexOfFirst { track ->
+                    track.id == tracks.currentAudioTrack?.id &&
+                            track.formatIndex == tracks.currentAudioTrack?.formatIndex
+                }.coerceAtLeast(0)
 
                 val audioArrayAdapter =
                     ArrayAdapter<String>(ctx, R.layout.sort_bottom_single_choice)
 
-                audioArrayAdapter.addAll(currentAudioTracks.mapIndexed { index, format ->
-                    when {
-                        format.label != null && format.language != null ->
-                            "${format.label} - [${fromTwoLettersToLanguage(format.language) ?: format.language}]"
+                audioArrayAdapter.addAll(
+                    currentAudioTracks.mapIndexed { _, track ->
+
+                        val language = (
+                                track.language?.trim()?.let { raw ->
+                                    fromTagToLanguageName(raw)
+                                        ?: fromTagToLanguageName(
+                                            raw.replace('_', '-').substringBefore('-').lowercase()
+                                        )
+                                        ?: raw
+                                }
+                                    ?: track.label
+                                    ?: "Audio"
+                                ).replaceFirstChar { it.uppercaseChar() }
+
+                        val codec = audioCodecName(track.sampleMimeType)
+
+                        val channelCount = track.channelCount
+
+                        val channels = when {
+                            // May be below 1 or null when unknown
+                            channelCount == null || channelCount <= 0 -> ""
+                            channelCount == 1 -> "Mono"
+                            channelCount == 2 -> "Stereo"
+                            channelCount == 6 -> "5.1"
+                            channelCount == 8 -> "7.1"
+                            else -> "${channelCount}ch"
+                        }
+
+                        listOfNotNull(
+                            language.takeIf { it.isNotBlank() }
+                                ?.replaceFirstChar { it.uppercaseChar() },
+                            channels.takeIf { it.isNotBlank() },
+                            codec.takeIf { it.isNotBlank() }?.uppercase()
+                        ).joinToString(" • ")
+
 
-                        else -> format.label
-                            ?: format.language?.let { fromTwoLettersToLanguage(it) }
-                            ?: format.language
-                            ?: index.toString()
                     }
-                })
+                )
 
                 audioList.adapter = audioArrayAdapter
                 audioList.choiceMode = AbsListView.CHOICE_MODE_SINGLE
@@ -1478,12 +1491,15 @@ class GeneratorPlayer : FullScreenPlayer() {
 
                 binding.cancelBtt.setOnClickListener {
                     trackDialog.dismissSafe(activity)
+                    this.selectTrackDialog = null
                 }
 
                 binding.applyBtt.setOnClickListener {
                     val currentTrack = currentAudioTracks.getOrNull(audioIndexStart)
                     player.setPreferredAudioTrack(
-                        currentTrack?.language, currentTrack?.id
+                        currentTrack?.language,
+                        currentTrack?.id,
+                        currentTrack?.formatIndex,
                     )
 
                     val currentVideo = currentVideoTracks.getOrNull(videoIndex)
@@ -1492,8 +1508,8 @@ class GeneratorPlayer : FullScreenPlayer() {
                     if (width != NO_VALUE && height != NO_VALUE) {
                         player.setMaxVideoSize(width, height, currentVideo?.id)
                     }
-
                     trackDialog.dismissSafe(activity)
+                    this.selectTrackDialog = null
                 }
             }
         } catch (e: Exception) {
@@ -1501,9 +1517,21 @@ class GeneratorPlayer : FullScreenPlayer() {
         }
     }
 
-
     override fun playerError(exception: Throwable) {
-        Log.i(TAG, "playerError = $currentSelectedLink")
+        val currentUrl =
+            currentSelectedLink?.let { it.first?.url ?: it.second?.uri?.toString() } ?: "unknown"
+        val headers = currentSelectedLink?.first?.headers?.toString() ?: "none"
+        val referer = currentSelectedLink?.first?.referer ?: "none"
+        Log.e(
+            TAG,
+            "playerError: $currentSelectedLink, " +
+                    "type=${exception::class.java.canonicalName}, " +
+                    "message=${exception.message}, url=$currentUrl, headers=$headers, " +
+                    "referer=$referer, position=${player.getPosition() ?: "unknown"}, " +
+                    "duration=${player.getDuration() ?: "unknown"}, " +
+                    "isPlaying=${player.getIsPlaying()}", exception
+        )
+
         if (!hasNextMirror()) {
             viewModel.forceClearCache = true
         }
@@ -1518,35 +1546,94 @@ class GeneratorPlayer : FullScreenPlayer() {
     }
 
     private fun startPlayer() {
-        if (isActive) return // we don't want double load when you skip loading
+        // We don't want double load when you skip loading
+        if (isPlayerActive.get()) {
+            return
+        }
 
-        val links = sortLinks(currentQualityProfile)
+        val links = viewModel.state.sortLinks(currentQualityProfile)
         if (links.isEmpty()) {
             noLinksFound()
             return
         }
+        // Atomic operation to prevent double loading
+        if (!isPlayerActive.compareAndSet(false, true)) {
+            return
+        }
         loadLink(links.first(), false)
+        showPlayerMetadata()
+    }
+
+    private fun showPlayerMetadata() {
+        val overlay = playerBinding?.playerMetadataScrim ?: return
+
+        val titleView = overlay.findViewById<TextView>(R.id.player_movie_title)
+        val logoView = overlay.findViewById<ImageView>(R.id.player_movie_logo)
+        val metaView = overlay.findViewById<TextView>(R.id.player_movie_meta)
+        val descView = overlay.findViewById<TextView>(R.id.player_movie_overview)
+
+        val load = viewModel.state.generatorState?.response ?: return
+        val episode = currentMeta as? ResultEpisode
+        titleView.text = load.name
+
+        bindLogo(
+            url = load.logoUrl,
+            headers = load.posterHeaders,
+            titleView = titleView,
+            logoView = logoView
+        )
+
+        val meta = arrayOf(
+            load.tags?.takeIf { it.isNotEmpty() }?.joinToString(", "),
+            load.year?.toString(),
+            if (!load.type.isMovieType())
+                context?.getShortSeasonText(
+                    episode = episode?.episode,
+                    season = episode?.season
+                )
+            else null,
+            load.score?.let { "⭐ $it" }
+        ).filterNotNull()
+            .joinToString(" • ")
+
+        metaView.text = meta
+        metaView.isVisible = meta.isNotBlank()
+
+
+        val description = load.plot
+
+        if (!description.isNullOrBlank()) {
+            descView.isVisible = true
+            descView.text = description
+        } else {
+            descView.isVisible = false
+
+        }
     }
 
     override fun nextEpisode() {
-        isNextEpisode = true
-        player.release()
-        viewModel.loadLinksNext()
+        if (viewModel.hasNextEpisode() == true) {
+            isNextEpisode = true
+            releasePlayer()
+            viewModel.loadLinksNext()
+        }
     }
 
     override fun prevEpisode() {
-        isNextEpisode = true
-        player.release()
-        viewModel.loadLinksPrev()
+        if (viewModel.hasPrevEpisode() == true) {
+            isNextEpisode = true
+            releasePlayer()
+            viewModel.loadLinksPrev()
+        }
     }
 
     override fun hasNextMirror(): Boolean {
-        val links = sortLinks(currentQualityProfile)
+        val links = viewModel.state.sortLinks(currentQualityProfile)
         return links.isNotEmpty() && links.indexOf(currentSelectedLink) + 1 < links.size
     }
 
     override fun nextMirror() {
-        val links = sortLinks(currentQualityProfile)
+        val links = viewModel.state.sortLinks(currentQualityProfile)
         if (links.isEmpty()) {
             noLinksFound()
             return
@@ -1590,49 +1677,15 @@ class GeneratorPlayer : FullScreenPlayer() {
                 viewModel.loadStamps(duration)
         }
 
-        viewModel.getId()?.let {
-            DataStoreHelper.setViewPos(it, position, duration)
-        }
-
         val percentage = position * 100L / duration
 
-        val nextEp = percentage >= NEXT_WATCH_EPISODE_PERCENTAGE
-        val resumeMeta = if (nextEp) nextMeta else currentMeta
-        if (resumeMeta == null && nextEp) {
-            // remove last watched as it is the last episode and you have watched too much
-            when (val newMeta = currentMeta) {
-                is ResultEpisode -> {
-                    DataStoreHelper.removeLastWatched(newMeta.parentId)
-                }
-
-                is ExtractorUri -> {
-                    DataStoreHelper.removeLastWatched(newMeta.parentId)
-                }
-            }
-        } else {
-            // save resume
-            when (resumeMeta) {
-                is ResultEpisode -> {
-                    DataStoreHelper.setLastWatched(
-                        resumeMeta.parentId,
-                        resumeMeta.id,
-                        resumeMeta.episode,
-                        resumeMeta.season,
-                        isFromDownload = false
-                    )
-                }
-
-                is ExtractorUri -> {
-                    DataStoreHelper.setLastWatched(
-                        resumeMeta.parentId,
-                        resumeMeta.id,
-                        resumeMeta.episode,
-                        resumeMeta.season,
-                        isFromDownload = true
-                    )
-                }
-            }
-        }
+        DataStoreHelper.setViewPosAndResume(
+            viewModel.state.generatorState?.id,
+            position,
+            duration,
+            currentMeta,
+            nextMeta
+        )
 
         var isOpVisible = false
         when (val meta = currentMeta) {
@@ -1661,8 +1714,12 @@ class GeneratorPlayer : FullScreenPlayer() {
                 playerBinding?.playerSkipEpisode?.isVisible =
                     !isOpVisible && viewModel.hasNextEpisode() == true
 
-            else ->
-                playerBinding?.playerGoForwardRoot?.isVisible = viewModel.hasNextEpisode() == true
+            else -> {
+                val hasNextEpisode = viewModel.hasNextEpisode() == true
+                playerBinding?.playerGoForward?.isVisible = hasNextEpisode
+                playerBinding?.playerGoForwardRoot?.isVisible = hasNextEpisode
+            }
+
         }
 
         if (percentage >= PRELOAD_NEXT_EPISODE_PERCENTAGE) {
@@ -1674,33 +1731,28 @@ class GeneratorPlayer : FullScreenPlayer() {
         subtitles: Set<SubtitleData>, settings: Boolean, downloads: Boolean
     ): SubtitleData? {
         val langCode = preferredAutoSelectSubtitles ?: return null
-        val lang = fromTwoLettersToLanguage(langCode) ?: return null
         if (downloads) {
-            return subtitles.firstOrNull { sub ->
-                (sub.origin == SubtitleOrigin.DOWNLOADED_FILE && sub.name == context?.getString(
-                    R.string.default_subtitles
-                ))
+            return sortSubs(subtitles).firstOrNull {
+                it.origin == SubtitleOrigin.DOWNLOADED_FILE && it.matchesLanguageCode(
+                    langCode
+                )
             }
         }
 
-        sortSubs(subtitles).firstOrNull { sub ->
-            val t = sub.name.replace(Regex("[^A-Za-z]"), " ").trim()
-            (settings) && t == lang || t.startsWith(lang) || t == langCode
-        }?.let { sub ->
-            return sub
-        }
+        if (!settings) return null
 
-        return null
+        return sortSubs(subtitles).firstOrNull { it.matchesLanguageCode(langCode) }
     }
 
     private fun autoSelectFromSettings(): Boolean {
-        // auto select subtitle based of settings
+        // auto select subtitle based on settings
         val langCode = preferredAutoSelectSubtitles
         val current = player.getCurrentPreferredSubtitle()
         Log.i(TAG, "autoSelectFromSettings = $current")
         context?.let { ctx ->
-            if (current != null) {
-                if (setSubtitles(current)) {
+            // Only use the player preferred subtitle if it matches the available language
+            if (current != null && (langCode == null || current.matchesLanguageCode(langCode))) {
+                if (setSubtitles(current, false)) {
                     player.saveData()
                     player.reloadPlayer(ctx)
                     player.handleEvent(CSPlayerEvent.Play)
@@ -1708,9 +1760,9 @@ class GeneratorPlayer : FullScreenPlayer() {
                 }
             } else if (!langCode.isNullOrEmpty()) {
                 getAutoSelectSubtitle(
-                    currentSubs, settings = true, downloads = false
+                    viewModel.state.subtitles, settings = true, downloads = false
                 )?.let { sub ->
-                    if (setSubtitles(sub)) {
+                    if (setSubtitles(sub, false)) {
                         player.saveData()
                         player.reloadPlayer(ctx)
                         player.handleEvent(CSPlayerEvent.Play)
@@ -1722,20 +1774,20 @@ class GeneratorPlayer : FullScreenPlayer() {
         return false
     }
 
-    private fun autoSelectFromDownloads(): Boolean {
-        if (player.getCurrentPreferredSubtitle() == null) {
-            getAutoSelectSubtitle(currentSubs, settings = false, downloads = true)?.let { sub ->
-                context?.let { ctx ->
-                    if (setSubtitles(sub)) {
-                        player.saveData()
-                        player.reloadPlayer(ctx)
-                        player.handleEvent(CSPlayerEvent.Play)
-                        return true
-                    }
-                }
-            }
+    private fun autoSelectFromDownloads() {
+        if (player.getCurrentPreferredSubtitle() != null) {
+            return
         }
-        return false
+        val sub =
+            getAutoSelectSubtitle(viewModel.state.subtitles, settings = false, downloads = true)
+                ?: return
+        val ctx = context ?: return
+        if (!setSubtitles(sub, false)) {
+            return
+        }
+        player.saveData()
+        player.reloadPlayer(ctx)
+        player.handleEvent(CSPlayerEvent.Play)
     }
 
     private fun autoSelectSubtitles() {
@@ -1747,6 +1799,14 @@ class GeneratorPlayer : FullScreenPlayer() {
         }
     }
 
+    private fun getHeaderName(): String? {
+        return when (val meta = currentMeta) {
+            is ResultEpisode -> meta.headerName
+            is ExtractorUri -> meta.headerName
+            else -> null
+        }
+    }
+
     private fun getPlayerVideoTitle(): String {
         var headerName: String? = null
         var subName: String? = null
@@ -1793,8 +1853,6 @@ class GeneratorPlayer : FullScreenPlayer() {
         return ""
     }
 
-
-    @SuppressLint("SetTextI18n")
     fun setTitle() {
         var playerVideoTitle = getPlayerVideoTitle()
 
@@ -1813,29 +1871,105 @@ class GeneratorPlayer : FullScreenPlayer() {
 
         playerBinding?.playerEpisodeFillerHolder?.isVisible = isFiller ?: false
         playerBinding?.playerVideoTitle?.text = playerVideoTitle
+        playerBinding?.offlinePin?.isVisible = viewModel.generator is DownloadFileGenerator
     }
 
-    @SuppressLint("SetTextI18n")
     fun setPlayerDimen(widthHeight: Pair<Int, Int>?) {
-        val extra = if (widthHeight != null) {
-            val (width, height) = widthHeight
-            "- ${width}x${height}"
-        } else {
-            ""
+        val resolution = widthHeight?.let { "${it.first}x${it.second}" }
+        val name = currentSelectedLink?.first?.name ?: currentSelectedLink?.second?.name
+        val title = getHeaderName()
+
+        val result = listOfNotNull(
+            title?.takeIf { showTitle && it.isNotBlank() },
+            name?.takeIf { showName && it.isNotBlank() },
+            resolution?.takeIf { showResolution && it.isNotBlank() },
+        ).joinToString(" - ")
+
+        playerBinding?.playerVideoTitleRez?.apply {
+            text = result
+            isVisible = result.isNotBlank()
         }
+    }
 
-        val source = currentSelectedLink?.first?.name ?: currentSelectedLink?.second?.name ?: "NULL"
 
-        val title = when (titleRez) {
-            0 -> ""
-            1 -> extra
-            2 -> source
-            3 -> "$source $extra"
+    private fun videoCodecName(mime: String?): String? {
+        val m = mime?.lowercase() ?: return null
+        return when {
+            m.contains("avc") || m.contains("h264") -> "AVC"
+            m.contains("hevc") || m.contains("h265") -> "HEVC"
+            m.contains("av1") -> "AV1"
+            m.contains("vp9") -> "VP9"
+            m.contains("vp8") -> "VP8"
+            "/" in m -> m.substringAfter("/").uppercase()
+            else -> m.uppercase()
+        }
+    }
+
+    private fun audioCodecName(mime: String?): String {
+        val m = mime?.lowercase()?.trim().orEmpty()
+        if (m.isBlank()) return ""
+        return when {
+            m.contains("eac3-joc") -> "Dolby Atmos"
+            m.contains("truehd") -> "TrueHD"
+            m.contains("eac3") -> "E-AC3"
+            m.contains("ac-3") || m.contains("ac3") -> "AC3"
+            m.contains("aac") || m.contains("mp4a") -> "AAC"
+            m.contains("opus") -> "Opus"
+            m.contains("vorbis") -> "Vorbis"
+            m.contains("mp3") -> "MP3"
+            m.contains("flac") -> "FLAC"
+            m.contains("dts") -> "DTS"
+            m.contains("pcm") -> "PCM"
+            m.contains("alac") -> "ALAC"
+            m.contains("amr") -> "AMR"
+            m.contains("/") -> m.substringAfter("/").uppercase().takeIf { it.isNotBlank() } ?: ""
             else -> ""
         }
-        playerBinding?.playerVideoTitleRez?.apply {
-            text = title
-            isVisible = title.isNotBlank()
+    }
+
+    private fun updatePlayerInfo() {
+        val tracks = player.getVideoTracks()
+
+        val videoTrack = tracks.currentVideoTrack
+        val audioTrack = tracks.currentAudioTrack
+
+        val ctx = context ?: return
+        val prefs = PreferenceManager.getDefaultSharedPreferences(ctx)
+        showMediaInfo = prefs.getBoolean(ctx.getString(R.string.show_media_info_key), false)
+
+        val videoCodec = videoCodecName(videoTrack?.sampleMimeType)
+        val audioCodec = audioCodecName(audioTrack?.sampleMimeType)
+        val languageName = fromTagToLanguageName(audioTrack?.language)
+        val label = audioTrack?.label
+
+        val channelCount = audioTrack?.channelCount
+
+        val channels = when {
+            // May be below 1 or null when unknown
+            channelCount == null || channelCount <= 0 -> ""
+            channelCount == 1 -> "Mono"
+            channelCount == 2 -> "Stereo"
+            channelCount == 6 -> "5.1"
+            channelCount == 8 -> "7.1"
+            else -> "${channelCount}ch"
+        }
+
+        val language = languageName?.takeIf { it.isNotBlank() }?.let { lang ->
+            label?.takeIf { it.isNotBlank() && !it.equals(lang, true) }
+                ?.let { lang }
+                ?: lang
+        } ?: label?.takeIf { it.isNotBlank() }
+
+        val stats = arrayOf(
+            videoCodec,
+            language,
+            channels,
+            audioCodec
+        ).filter { !it.isNullOrBlank() }.joinToString(" • ")
+
+        playerBinding?.playerVideoInfo?.apply {
+            text = stats
+            isVisible = showMediaInfo && stats.isNotBlank()
         }
     }
 
@@ -1851,31 +1985,13 @@ class GeneratorPlayer : FullScreenPlayer() {
         }
     }
 
-    override fun onCreateView(
-        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
-
-        viewModel = ViewModelProvider(this)[PlayerGeneratorViewModel::class.java]
-        sync = ViewModelProvider(this)[SyncViewModel::class.java]
-
-        viewModel.attachGenerator(lastUsedGenerator)
-        unwrapBundle(savedInstanceState)
-        unwrapBundle(arguments)
-
-        val root = super.onCreateView(inflater, container, savedInstanceState) ?: return null
-        binding = FragmentPlayerBinding.bind(root)
-        return root
-    }
-
-    override fun onDestroyView() {
-        binding = null
-        super.onDestroyView()
-    }
-
-    var timestampShowState = false
+    /**
+     * This is used instead of layout-television to follow the
+     * settings and some TV devices are not classified as TV
+     * for some reason.
+     */
+    override fun pickLayout(): Int =
+        if (isLayout(TV or EMULATOR)) R.layout.fragment_player_tv else R.layout.fragment_player
 
     var skipAnimator: ValueAnimator? = null
     var skipIndex = 0
@@ -1896,6 +2012,12 @@ class GeneratorPlayer : FullScreenPlayer() {
             skipAnimator?.cancel()
             isVisible = true
 
+            /** Focus instantly to make the focus color appear instantly */
+            if (show && !isShowing) {
+                // Automatically request focus if the menu is not opened
+                playerBinding?.skipChapterButton?.requestFocus()
+            }
+
             // just in case
             val lay = layoutParams
             lay.width = from
@@ -1904,12 +2026,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                 from, to
             ).apply {
                 addListener(onEnd = {
-                    if (show) {
-                        if (!isShowing) {
-                            // Automatically request focus if the menu is not opened
-                            playerBinding?.skipChapterButton?.requestFocus()
-                        }
-                    } else {
+                    if (!show) {
                         playerBinding?.skipChapterButton?.isVisible = false
                         if (!isShowing) {
                             // Automatically return focus to play pause
@@ -1929,11 +2046,11 @@ class GeneratorPlayer : FullScreenPlayer() {
         }
     }
 
-    override fun onTimestampSkipped(timestamp: EpisodeSkip.SkipStamp) {
+    override fun onTimestampSkipped(timestamp: VideoSkipStamp) {
         displayTimeStamp(false)
     }
 
-    override fun onTimestamp(timestamp: EpisodeSkip.SkipStamp?) {
+    override fun onTimestamp(timestamp: VideoSkipStamp?) {
         if (timestamp != null) {
             playerBinding?.skipChapterButton?.setText(timestamp.uiText)
             displayTimeStamp(true)
@@ -1947,26 +2064,143 @@ class GeneratorPlayer : FullScreenPlayer() {
         }
     }
 
-    @SuppressLint("SetTextI18n")
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        var langFilterList = listOf<String>()
-        var filterSubByLang = false
+    override fun isThereEpisodes(): Boolean {
+        // Checks if there is a second episode of type ResultEpisode
+        // => There exists more than 1 episode, and they are all ResultEpisode
+        return viewModel.state.generatorState?.allMeta?.getOrNull(1) as? ResultEpisode != null
+    }
+
+    override fun showEpisodesOverlay() {
+        try {
+            playerBinding?.apply {
+                playerEpisodeList.setRecycledViewPool(EpisodeAdapter.sharedPool)
+                playerEpisodeList.adapter = EpisodeAdapter(
+                    false,
+                    { episodeClick ->
+                        if (episodeClick.action == ACTION_CLICK_DEFAULT) {
+                            isNextEpisode = false
+                            releasePlayer()
+                            playerEpisodeOverlay.isGone = true
+                            episodeClick.position?.let { viewModel.loadThisEpisode(it) }
+                        }
+                    },
+                    { downloadClickEvent ->
+                        DownloadButtonSetup.handleDownloadClick(downloadClickEvent)
+                    }
+                )
+                playerEpisodeList.setLinearListLayout(
+                    isHorizontal = false,
+                    nextUp = FOCUS_SELF,
+                    nextDown = FOCUS_SELF,
+                    nextRight = FOCUS_SELF,
+                )
+                val episodes = allMeta ?: emptyList()
+                (playerEpisodeList.adapter as? EpisodeAdapter)?.submitList(episodes)
+
+                // Scroll to current episode
+                viewModel.state.generatorState?.index?.let { index ->
+                    playerEpisodeList.scrollToPosition(index)
+                    // Ensure focus on tv
+                    if (isLayout(TV)) {
+                        playerEpisodeList.post {
+                            val viewHolder =
+                                playerEpisodeList.findViewHolderForAdapterPosition(index)
+                            viewHolder?.itemView?.requestFocus()
+                            viewHolder?.itemView?.let { itemView ->
+                                itemView.isFocusableInTouchMode = true
+                                itemView.requestFocus()
+                            }
+                        }
+                    }
+                }
+
+                // update overlay season title
+                var lastTopIndex = -1
+                playerEpisodeList.addOnScrollListener(object : RecyclerView.OnScrollListener() {
+                    override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
+                        val layoutManager =
+                            recyclerView.layoutManager as? LinearLayoutManager ?: return
+                        val topIndex = layoutManager.findFirstCompletelyVisibleItemPosition()
+                        if (topIndex != RecyclerView.NO_POSITION && topIndex != lastTopIndex) {
+                            @Suppress("AssignedValueIsNeverRead")
+                            lastTopIndex = topIndex
+                            val topItem = episodes.getOrNull(topIndex)
+                            topItem?.let {
+                                playerEpisodeOverlayTitle.setText(
+                                    ResultViewModel2.seasonToTxt(
+                                        topItem.seasonData,
+                                        topItem.seasonIndex
+                                    )
+                                )
+                            }
+                        }
+                    }
+                })
+            }
+        } catch (e: Exception) {
+            logError(e)
+        }
+    }
+
+    @MainThread
+    fun releasePlayer() {
+        player.release()
+        currentSelectedSubtitles = null
+        currentSelectedLink = null
+        isPlayerActive.set(false)
+        binding?.overlayLoadingSkipButton?.isVisible = false
+        binding?.playerLoadingOverlay?.isVisible = true
+        uiReset()
+    }
+
+    fun exitPlayer() {
+        playerHostView?.exitFullscreen()
+        player.release()
+        activity?.popCurrentPage()
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        outState.putInt("index", viewModel.episodeIndex)
+        super.onSaveInstanceState(outState)
+    }
+
+    override fun onBindingCreated(binding: FragmentPlayerBinding, savedInstanceState: Bundle?) {
+        viewModel = ViewModelProvider(this)[PlayerGeneratorViewModel::class.java]
+        sync = ViewModelProvider(this)[SyncViewModel::class.java]
+
+        val uuid = savedInstanceState?.getString("uuid") ?: arguments?.getString("uuid")
+        val index = savedInstanceState?.getInt("index") ?: arguments?.getInt("index")
+        val generator = generators[uuid]
+
+        unwrapBundle(savedInstanceState)
+        unwrapBundle(arguments)
+
+        super.onBindingCreated(binding, savedInstanceState)
+
+        // Avoid showing no links found
+        if (generator == null || index == null) {
+            exitPlayer()
+            return
+        }
+        viewModel.attachGenerator(generator, index)
 
         context?.let { ctx ->
             val settingsManager = PreferenceManager.getDefaultSharedPreferences(ctx)
-            titleRez = settingsManager.getInt(ctx.getString(R.string.prefer_limit_title_rez_key), 3)
-            limitTitle = settingsManager.getInt(ctx.getString(R.string.prefer_limit_title_key), 0)
+            showName = settingsManager.getBoolean(ctx.getString(R.string.show_name_key), true)
+            showResolution =
+                settingsManager.getBoolean(ctx.getString(R.string.show_resolution_key), true)
+            showMediaInfo =
+                settingsManager.getBoolean(ctx.getString(R.string.show_media_info_key), false)
+            limitTitle = settingsManager.getInt(ctx.getString(R.string.prefer_title_limit_key), 0)
             updateForcedEncoding(ctx)
-
-            filterSubByLang =
+            viewModel.filterSubByLang =
                 settingsManager.getBoolean(getString(R.string.filter_sub_lang_key), false)
-            if (filterSubByLang) {
+            if (viewModel.filterSubByLang) {
                 val langFromPrefMedia = settingsManager.getStringSet(
                     this.getString(R.string.provider_lang_key), mutableSetOf("en")
                 )
-                langFilterList = langFromPrefMedia?.mapNotNull {
-                    fromTwoLettersToLanguage(it)?.lowercase() ?: return@mapNotNull null
+                viewModel.langFilterList = langFromPrefMedia?.mapNotNull {
+                    fromTagToEnglishLanguageName(it)?.lowercase() ?: return@mapNotNull null
                 } ?: listOf()
             }
         }
@@ -1976,20 +2210,25 @@ class GeneratorPlayer : FullScreenPlayer() {
 
         sync.updateUserData()
 
-        preferredAutoSelectSubtitles = getAutoSelectLanguageISO639_1()
+        preferredAutoSelectSubtitles = getAutoSelectLanguageTagIETF()
 
-        if (currentSelectedLink == null) {
+        val selectedLink = currentSelectedLink
+        if (selectedLink == null) {
             viewModel.loadLinks()
+        } else {
+            // Recreated view, so we need to recreate the
+            loadLink(selectedLink, true)
         }
 
-        binding?.overlayLoadingSkipButton?.setOnClickListener {
-            startPlayer()
+        binding.overlayLoadingSkipButton.setOnClickListener {
+            // Mark as "success" early
+            viewModel.modifyState {
+                copy(loading = Resource.Success(Unit))
+            }
         }
 
-        binding?.playerLoadingGoBack?.setOnClickListener {
-            exitFullscreen()
-            player.release()
-            activity?.popCurrentPage()
+        binding.playerLoadingGoBack.setOnClickListener {
+            exitPlayer()
         }
 
         playerBinding?.downloadHeader?.setOnClickListener {
@@ -2002,14 +2241,29 @@ class GeneratorPlayer : FullScreenPlayer() {
             }
         }
 
-        observe(viewModel.currentStamps) { stamps ->
+        observe(viewModel.currentStamps) { (stamps, instance) ->
+            if (instance != viewModel.state.instance) return@observe // Outdated observe
             player.addTimeStamps(stamps)
         }
 
-        observe(viewModel.loadingLinks) {
-            when (it) {
+        observe(viewModel.currentSubtitles) { (subtitles, instance) ->
+            if (instance != viewModel.state.instance) return@observe // Outdated observe
+            player.setActiveSubtitles(subtitles)
+
+            // If the file is downloaded then do not select auto select the subtitles
+            // Downloaded subtitles cannot be selected immediately after loading since
+            // player.getCurrentPreferredSubtitle() cannot fetch data from non-loaded subtitles
+            // Resulting in unselecting the downloaded subtitle
+            if (subtitles.lastOrNull()?.origin != SubtitleOrigin.DOWNLOADED_FILE) {
+                autoSelectSubtitles()
+            }
+        }
+        observe(viewModel.loadingLinks) { (loading, instance) ->
+            if (instance != viewModel.state.instance) return@observe // Outdated observe
+
+            when (loading) {
                 is Resource.Loading -> {
-                    startLoading()
+                    releasePlayer()
                 }
 
                 is Resource.Success -> {
@@ -2021,30 +2275,31 @@ class GeneratorPlayer : FullScreenPlayer() {
                 }
 
                 is Resource.Failure -> {
-                    showToast(it.errorString, Toast.LENGTH_LONG)
+                    showToast(loading.errorString, Toast.LENGTH_LONG)
                     startPlayer()
                 }
             }
         }
 
-        observe(viewModel.currentLinks) {
-            currentLinks = it
-            val turnVisible = it.isNotEmpty() && lastUsedGenerator?.canSkipLoading == true
-            val wasGone = binding?.overlayLoadingSkipButton?.isGone == true
+        observe(viewModel.currentLinks) { (links, instance) ->
+            if (instance != viewModel.state.instance) return@observe // Outdated observe
 
-            binding?.overlayLoadingSkipButton?.apply {
+            val turnVisible = links.isNotEmpty() && viewModel.generator?.canSkipLoading == true
+            val wasGone = binding.overlayLoadingSkipButton.isGone
+
+            binding.overlayLoadingSkipButton.apply {
                 isVisible = turnVisible
-                val value = viewModel.currentLinks.value
-                if (value.isNullOrEmpty()) {
+                if (links.isEmpty()) {
                     setText(R.string.skip_loading)
                 } else {
-                    text = "${context.getString(R.string.skip_loading)} (${value.size})"
+                    @SuppressLint("SetTextI18n")
+                    text = "${context.getString(R.string.skip_loading)} (${links.size})"
                 }
             }
 
             safe {
-                if (currentLinks.any { link ->
-                        getLinkPriority(currentQualityProfile, link) >=
+                if (!isPlayerActive.get() && viewModel.state.links.any { link ->
+                        getLinkPriority(currentQualityProfile, link.first) >=
                                 QualityDataHelper.AUTO_SKIP_PRIORITY
                     }
                 ) {
@@ -2053,33 +2308,7 @@ class GeneratorPlayer : FullScreenPlayer() {
             }
 
             if (turnVisible && wasGone) {
-                binding?.overlayLoadingSkipButton?.requestFocus()
-            }
-        }
-
-        observe(viewModel.currentSubs) { set ->
-            val setOfSub = mutableSetOf<SubtitleData>()
-            if (langFilterList.isNotEmpty() && filterSubByLang) {
-                Log.i("subfilter", "Filtering subtitle")
-                langFilterList.forEach { lang ->
-                    Log.i("subfilter", "Lang: $lang")
-                    setOfSub += set.filter {
-                        it.name.contains(lang, ignoreCase = true) ||
-                                it.origin != SubtitleOrigin.URL
-                    }
-                }
-                currentSubs = setOfSub
-            } else {
-                currentSubs = set
-            }
-            player.setActiveSubtitles(set)
-
-            // If the file is downloaded then do not select auto select the subtitles
-            // Downloaded subtitles cannot be selected immediately after loading since
-            // player.getCurrentPreferredSubtitle() cannot fetch data from non-loaded subtitles
-            // Resulting in unselecting the downloaded subtitle
-            if (set.lastOrNull()?.origin != SubtitleOrigin.DOWNLOADED_FILE) {
-                autoSelectSubtitles()
+                binding.overlayLoadingSkipButton.requestFocus()
             }
         }
     }
@@ -2090,4 +2319,4 @@ 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 4aaee7bb7ad..3ab46ce215a 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
@@ -25,27 +25,27 @@ val LOADTYPE_CHROMECAST = setOf(
 val LOADTYPE_ALL = ExtractorLinkType.entries.toSet()
 
 
-interface IGenerator {
-    val hasCache: Boolean
-    val canSkipLoading: Boolean
-
-    fun hasNext(): Boolean
-    fun hasPrev(): Boolean
-    fun next()
-    fun prev()
-    fun goto(index: Int)
-
-    fun getCurrentId(): Int?                    // this is used to save data or read data about this id
-    fun getCurrent(offset: Int = 0): Any?      // this is used to get metadata about the current playing, can return null
-    fun getAll(): List<Any>?                   // this us used to get the metadata about all entries, not needed
-
-    /* not safe, must use try catch */
-    suspend fun generateLinks(
+abstract class NoVideoGenerator(val id : Int?) : VideoGenerator<Nothing>(emptyList()) {
+    override val hasCache = false
+    override val canSkipLoading = false
+    override fun getId(index: Int): Int? = id
+}
+
+abstract class VideoGenerator<T : Any>(val videos: List<T>) {
+    abstract val hasCache: Boolean
+    abstract val canSkipLoading: Boolean
+    abstract fun getId(index : Int) : Int?
+
+    fun hasNext(videoIndex : Int): Boolean = videoIndex < videos.lastIndex
+    fun hasPrev(videoIndex : Int): Boolean = videoIndex > 0
+
+    @Throws
+    abstract suspend fun generateLinks(
         clearCache: Boolean,
         sourceTypes: Set<ExtractorLinkType>,
         callback: (Pair<ExtractorLink?, ExtractorUri?>) -> Unit,
         subtitleCallback: (SubtitleData) -> Unit,
-        offset: Int = 0,
-        isCasting: Boolean = false
+        offset: Int,
+        isCasting: Boolean
     ): Boolean
 }
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 01f2b17021c..0342372667f 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
@@ -3,30 +3,11 @@ package com.lagradost.cloudstream3.ui.player
 import android.content.Context
 import android.graphics.Bitmap
 import android.util.Rational
+import androidx.annotation.AnyThread
+import androidx.annotation.MainThread
 import com.lagradost.cloudstream3.ui.subtitles.SaveCaptionStyle
-import com.lagradost.cloudstream3.utils.EpisodeSkip
 import com.lagradost.cloudstream3.utils.ExtractorLink
-
-enum class PlayerEventType(val value: Int) {
-    Pause(0),
-    Play(1),
-    SeekForward(2),
-    SeekBack(3),
-
-    SkipCurrentChapter(4),
-    NextEpisode(5),
-    PrevEpisode(6),
-    PlayPauseToggle(7),
-    ToggleMute(8),
-    Lock(9),
-    ToggleHide(10),
-    ShowSpeed(11),
-    ShowMirrors(12),
-    Resize(13),
-    SearchSubtitlesOnline(14),
-    SkipOp(15),
-    Restart(16),
-}
+import com.lagradost.cloudstream3.utils.videoskip.VideoSkipStamp
 
 enum class CSPlayerEvent(val value: Int) {
     Pause(0),
@@ -47,6 +28,7 @@ enum class CSPlayerLoading {
     IsPaused,
     IsPlaying,
     IsBuffering,
+    IsEnded,
 }
 
 enum class PlayerEventSource {
@@ -85,13 +67,13 @@ data class ErrorEvent(
 
 /** Event when timestamps appear, null when it should disappear */
 data class TimestampInvokedEvent(
-    val timestamp: EpisodeSkip.SkipStamp,
+    val timestamp: VideoSkipStamp,
     override val source: PlayerEventSource = PlayerEventSource.Player,
 ) : PlayerEvent()
 
 /** Event for when a chapter is skipped, aka when event is handled (or for future use when skip automatically ads/sponsor) */
 data class TimestampSkippedEvent(
-    val timestamp: EpisodeSkip.SkipStamp,
+    val timestamp: VideoSkipStamp,
     override val source: PlayerEventSource = PlayerEventSource.Player,
 ) : PlayerEvent()
 
@@ -181,6 +163,7 @@ interface Track {
     val id: String?
     val label: String?
     val language: String?
+    val sampleMimeType : String?
 }
 
 data class VideoTrack(
@@ -189,19 +172,23 @@ data class VideoTrack(
     override val language: String?,
     val width: Int?,
     val height: Int?,
+    override val sampleMimeType: String?,
 ) : Track
 
 data class AudioTrack(
     override val id: String?,
     override val label: String?,
     override val language: String?,
+    override val sampleMimeType: String?,
+    val channelCount: Int?,
+    val formatIndex: Int?,
 ) : Track
 
 data class TextTrack(
     override val id: String?,
     override val label: String?,
     override val language: String?,
-    val mimeType: String?,
+    override val sampleMimeType: String?,
 ) : Track
 
 
@@ -214,8 +201,6 @@ data class CurrentTracks(
     val allTextTracks: List<TextTrack>,
 )
 
-class InvalidFileException(msg: String) : Exception(msg)
-
 //http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4
 const val ACTION_MEDIA_CONTROL = "media_control"
 const val EXTRA_CONTROL_TYPE = "control_type"
@@ -237,8 +222,9 @@ interface IPlayer {
     fun getSubtitleOffset(): Long // in ms
     fun setSubtitleOffset(offset: Long) // in ms
 
+    @AnyThread
     fun initCallbacks(
-        eventHandler: ((PlayerEvent) -> Unit),
+        @MainThread eventHandler: ((PlayerEvent) -> Unit),
         /** this is used to request when the player should report back view percentage */
         requestedListeningPercentages: List<Int>? = null,
     )
@@ -248,7 +234,7 @@ interface IPlayer {
     fun updateSubtitleStyle(style: SaveCaptionStyle)
     fun saveData()
 
-    fun addTimeStamps(timeStamps: List<EpisodeSkip.SkipStamp>)
+    fun addTimeStamps(timeStamps: List<VideoSkipStamp>)
 
     fun loadPlayer(
         context: Context,
@@ -301,8 +287,8 @@ interface IPlayer {
     fun setMaxVideoSize(width: Int = Int.MAX_VALUE, height: Int = Int.MAX_VALUE, id: String? = null)
 
     /** 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)
+    fun setPreferredAudioTrack(trackLanguage: String?, id: String? = null, formatIndex: Int? = 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 4416ce3b9cf..db06e26e9a6 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
@@ -40,36 +40,8 @@ class LinkGenerator(
     private val links: List<BasicLink>,
     private val extract: Boolean = true,
     private val refererUrl: String? = null,
-) : IGenerator {
-    override val hasCache = false
-    override val canSkipLoading = true
-
-    override fun getCurrentId(): Int? {
-        return null
-    }
-
-    override fun hasNext(): Boolean {
-        return false
-    }
-
-    override fun getAll(): List<Any>? {
-        return null
-    }
-
-    override fun hasPrev(): Boolean {
-        return false
-    }
-
-    override fun getCurrent(offset: Int): Any? {
-        return null
-    }
-
-    override fun goto(index: Int) {}
-
-    override fun next() {}
-
-    override fun prev() {}
-
+    id: Int?
+) : NoVideoGenerator(id) {
     override suspend fun generateLinks(
         clearCache: Boolean,
         sourceTypes: Set<ExtractorLinkType>,
@@ -107,37 +79,8 @@ class LinkGenerator(
 class MinimalLinkGenerator(
     private val links: List<CloudStreamPackage.MinimalVideoLink>,
     private val subs: List<CloudStreamPackage.MinimalSubtitleLink>,
-    private val id : Int? = null
-) : IGenerator {
-    override val hasCache = false
-    override val canSkipLoading = true
-
-    override fun getCurrentId(): Int? {
-        return id
-    }
-
-    override fun hasNext(): Boolean {
-        return false
-    }
-
-    override fun getAll(): List<Any>? {
-        return null
-    }
-
-    override fun hasPrev(): Boolean {
-        return false
-    }
-
-    override fun getCurrent(offset: Int): Any? {
-        return null
-    }
-
-    override fun goto(index: Int) {}
-
-    override fun next() {}
-
-    override fun prev() {}
-
+    id: Int?
+) : NoVideoGenerator(id) {
     override suspend fun generateLinks(
         clearCache: Boolean,
         sourceTypes: Set<ExtractorLinkType>,
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 eb9f5c249eb..ac25347b6bd 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
@@ -1,7 +1,6 @@
 package com.lagradost.cloudstream3.ui.player
 
 import android.app.Activity
-import android.content.ContentUris
 import android.content.Intent
 import android.net.Uri
 import androidx.core.content.ContextCompat.getString
@@ -19,8 +18,8 @@ object OfflinePlaybackHelper {
                 LinkGenerator(
                     listOf(
                         BasicLink(url)
-                    )
-                )
+                    ), id = url.hashCode()
+                ), 0
             )
         )
     }
@@ -52,7 +51,7 @@ object OfflinePlaybackHelper {
                     links,
                     subs,
                     if (id != -1) id else null,
-                )
+                ), 0
             )
         )
         return true
@@ -73,11 +72,10 @@ 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 = uri.lastPathSegment?.toLongOrNull()?.hashCode() ?: uri.lastPathSegment?.hashCode()
                         )
                     )
-                )
+                ), 0
             )
         )
     }
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 023cedd8a9a..e3c390d504c 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
@@ -9,34 +9,188 @@ import com.lagradost.cloudstream3.LoadResponse
 import com.lagradost.cloudstream3.mvvm.Resource
 import com.lagradost.cloudstream3.mvvm.launchSafe
 import com.lagradost.cloudstream3.mvvm.logError
-import com.lagradost.cloudstream3.mvvm.safe
 import com.lagradost.cloudstream3.mvvm.safeApiCall
+import com.lagradost.cloudstream3.ui.player.source_priority.QualityDataHelper.getLinkPriority
 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 com.lagradost.cloudstream3.utils.videoskip.SkipAPI
+import com.lagradost.cloudstream3.utils.videoskip.VideoSkipStamp
+import kotlinx.collections.immutable.PersistentList
+import kotlinx.collections.immutable.PersistentSet
+import kotlinx.collections.immutable.persistentListOf
+import kotlinx.collections.immutable.persistentSetOf
+import kotlinx.collections.immutable.toPersistentList
+import kotlinx.collections.immutable.toPersistentSet
 import kotlinx.coroutines.Job
+import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
+import org.jetbrains.annotations.Contract
+import java.util.concurrent.ConcurrentHashMap
+
+typealias VideoLink = Pair<ExtractorLink?, ExtractorUri?>
+
+data class GeneratorState(
+    val meta: Any?,
+    val nextMeta: Any?,
+    val allMeta: List<*>?,
+    val response: LoadResponse?,
+    val index: Int,
+    val id: Int?,
+)
+
+/** Immutable state of all current links relevant to displaying the video */
+// @MustUseReturnValues
+// @Immutable
+data class VideoState(
+    val subtitles: PersistentSet<SubtitleData> = persistentSetOf(),
+    val links: PersistentSet<VideoLink> = persistentSetOf(),
+    val stamps: PersistentList<VideoSkipStamp> = persistentListOf(),
+    val loading: Resource<Unit> = Resource.Loading(),
+    val generatorState: GeneratorState? = null,
+    val instance: Int,
+) {
+    /**
+     * This acts as a local cache for sorted links that are not copied over by the copy constructor.
+     *
+     * sortedBy is not exactly expensive, but each hasNextMirror does it again, so this alleviates unnecessary recomputation
+     * */
+    private val sortedLinks: ConcurrentHashMap<Int, List<VideoLink>> = ConcurrentHashMap()
+
+    fun clearSortedLinksCache() = sortedLinks.clear()
+
+    // Modifying sortedLinks is not considered a "visible" side effect, and rerunning it does not change the result
+    // It is by all standards, idempotent and by extension also pure as it has no "visible" side effect
+    /** Returns .links in the sorted order according to the qualityProfile.
+     * Use .links if order is not needed */
+    @Contract(pure = true)
+    fun sortLinks(qualityProfile: Int): List<VideoLink> {
+        return sortedLinks[qualityProfile] ?: links.sortedBy { link ->
+            // negative because we want to sort highest quality first
+            -getLinkPriority(qualityProfile, link.first)
+        }.also { value -> sortedLinks[qualityProfile] = value }
+    }
+
+    @Contract(pure = true)
+    fun add(item: SubtitleData): VideoState = copy(subtitles = subtitles.add(item))
+
+    @Contract(pure = true)
+    fun add(item: VideoLink): VideoState = copy(links = links.add(item))
+
+    @Contract(pure = true)
+    fun add(item: VideoSkipStamp): VideoState = copy(stamps = stamps.add(item))
+
+    @JvmName("addSubtitleData")
+    @Contract(pure = true)
+    fun add(items: Collection<SubtitleData>): VideoState = copy(subtitles = subtitles.addAll(items))
+
+    @JvmName("addVideoLink")
+    @Contract(pure = true)
+    fun add(items: Collection<VideoLink>): VideoState = copy(links = links.addAll(items))
+
+    @JvmName("addVideoSkipStamp")
+    @Contract(pure = true)
+    fun add(items: Collection<VideoSkipStamp>): VideoState = copy(stamps = stamps.addAll(items))
+
+    @Contract(pure = true)
+    fun set(item: SubtitleData): VideoState = copy(subtitles = persistentSetOf(item))
+
+    @Contract(pure = true)
+    fun set(item: VideoLink): VideoState = copy(links = persistentSetOf(item))
+
+    @Contract(pure = true)
+    fun set(item: VideoSkipStamp): VideoState = copy(stamps = persistentListOf(item))
+
+    @JvmName("setSubtitleData")
+    @Contract(pure = true)
+    fun set(items: Collection<SubtitleData>): VideoState = copy(subtitles = items.toPersistentSet())
+
+    @JvmName("setVideoLink")
+    @Contract(pure = true)
+    fun set(items: Collection<VideoLink>): VideoState = copy(links = items.toPersistentSet())
+
+    @JvmName("setVideoSkipStamp")
+    @Contract(pure = true)
+    fun set(items: Collection<VideoSkipStamp>): VideoState = copy(stamps = items.toPersistentList())
+}
+
+data class VideoLive<T>(
+    val value: T,
+    val instance: Int,
+)
 
 class PlayerGeneratorViewModel : ViewModel() {
     companion object {
         const val TAG = "PlayViewGen"
     }
 
-    private var generator: IGenerator? = null
+    @Volatile
+    var generator: VideoGenerator<*>? = null
 
-    private val _currentLinks = MutableLiveData<Set<Pair<ExtractorLink?, ExtractorUri?>>>(setOf())
-    val currentLinks: LiveData<Set<Pair<ExtractorLink?, ExtractorUri?>>> = _currentLinks
+    @Volatile
+    var episodeIndex: Int = 0
 
-    private val _currentSubs = MutableLiveData<Set<SubtitleData>>(setOf())
-    val currentSubs: LiveData<Set<SubtitleData>> = _currentSubs
+    /**
+     * The state of the video player, only modify it by modifyState to make sure observe is called,
+     * and avoid concurrency issues.
+     *
+     * This value can be used without Synchronized or locking when reading, as all fields are immutable.
+     * */
+    @Volatile
+    var state = VideoState(instance = 0)
+        private set
+
+    private val _currentLinks =
+        MutableLiveData<VideoLive<Set<Pair<ExtractorLink?, ExtractorUri?>>>>(null)
+    val currentLinks: LiveData<VideoLive<Set<Pair<ExtractorLink?, ExtractorUri?>>>> = _currentLinks
+
+    private val _currentSubtitles = MutableLiveData<VideoLive<Set<SubtitleData>>>(null)
+    val currentSubtitles: LiveData<VideoLive<Set<SubtitleData>>> = _currentSubtitles
+
+    private val _loadingLinks = MutableLiveData<VideoLive<Resource<Unit>>>()
+    val loadingLinks: LiveData<VideoLive<Resource<Unit>>> = _loadingLinks
 
-    private val _loadingLinks = MutableLiveData<Resource<Boolean?>>()
-    val loadingLinks: LiveData<Resource<Boolean?>> = _loadingLinks
+    private val _currentStamps = MutableLiveData<VideoLive<List<VideoSkipStamp>>>(null)
+    val currentStamps: LiveData<VideoLive<List<VideoSkipStamp>>> = _currentStamps
+
+    /**
+     * Modifies the `state` variable safely, and with the correct observe behavior.
+     *
+     * Synchronized to avoid concurrency issues, and make this operation atomic.
+     * Otherwise, one update may be lost if they are done in parallel.
+     * */
+    @Synchronized
+    fun modifyState(op: VideoState.() -> VideoState) {
+        val oldState = state
+        state = op.invoke(oldState)
+
+        /** New instance, always push state */
+        if (state.instance != oldState.instance) {
+            _currentSubtitles.postValue(VideoLive(state.subtitles, state.instance))
+            _currentStamps.postValue(VideoLive(state.stamps, state.instance))
+            _currentLinks.postValue(VideoLive(state.links, state.instance))
+            _loadingLinks.postValue(VideoLive(state.loading, state.instance))
+            return
+        }
 
-    private val _currentStamps = MutableLiveData<List<EpisodeSkip.SkipStamp>>(emptyList())
-    val currentStamps: LiveData<List<EpisodeSkip.SkipStamp>> = _currentStamps
+        /**
+         * Only post the changed values, this makes sure we do not invoke the "observe"
+         *
+         * We do this by "Referential equality" https://kotlinlang.org/docs/equality.html#referential-equality
+         * to avoid comparing the entire set or list as "Persistent" classes will hold the same reference if they are unchanged.
+         * */
+        if (state.links !== oldState.links)
+            _currentLinks.postValue(VideoLive(state.links, state.instance))
+        if (state.stamps !== oldState.stamps)
+            _currentStamps.postValue(VideoLive(state.stamps, state.instance))
+        if (state.subtitles !== oldState.subtitles)
+            _currentSubtitles.postValue(VideoLive(state.subtitles, state.instance))
+
+        /** Normal equality here as it is not a collection */
+        if (state.loading != oldState.loading)
+            _loadingLinks.postValue(VideoLive(state.loading, state.instance))
+    }
 
     private val _currentSubtitleYear = MutableLiveData<Int?>(null)
     val currentSubtitleYear: LiveData<Int?> = _currentSubtitleYear
@@ -52,37 +206,32 @@ class PlayerGeneratorViewModel : ViewModel() {
         _currentSubtitleYear.postValue(year)
     }
 
-    fun getId(): Int? {
-        return generator?.getCurrentId()
-    }
-
-    fun loadLinks(episode: Int) {
-        generator?.goto(episode)
-        loadLinks()
-    }
-
     fun loadLinksPrev() {
         Log.i(TAG, "loadLinksPrev")
-        if (generator?.hasPrev() == true) {
-            generator?.prev()
+        if (generator?.hasPrev(episodeIndex) == true) {
+            episodeIndex += 1
             loadLinks()
         }
     }
 
     fun loadLinksNext() {
         Log.i(TAG, "loadLinksNext")
-        if (generator?.hasNext() == true) {
-            generator?.next()
+        if (generator?.hasNext(episodeIndex) == true) {
+            episodeIndex += 1
             loadLinks()
         }
     }
 
     fun hasNextEpisode(): Boolean? {
-        return generator?.hasNext()
+        return generator?.hasNext(episodeIndex)
+    }
+
+    fun hasPrevEpisode(): Boolean? {
+        return generator?.hasPrev(episodeIndex)
     }
 
     fun preLoadNextLinks() {
-        val id = getId()
+        val id = generator?.getId(episodeIndex)
         // Do not preload if already loading
         if (id == currentLoadingEpisodeId) return
 
@@ -92,14 +241,15 @@ class PlayerGeneratorViewModel : ViewModel() {
 
         currentJob = viewModelScope.launch {
             try {
-                if (generator?.hasCache == true && generator?.hasNext() == true) {
+                if (generator?.hasCache == true && generator?.hasNext(episodeIndex) == true) {
                     safeApiCall {
                         generator?.generateLinks(
                             sourceTypes = LOADTYPE_INAPP,
                             clearCache = false,
+                            isCasting = false,
                             callback = {},
                             subtitleCallback = {},
-                            offset = 1
+                            offset = episodeIndex + 1
                         )
                     }
                 }
@@ -113,119 +263,137 @@ class PlayerGeneratorViewModel : ViewModel() {
         }
     }
 
-    fun getLoadResponse(): LoadResponse? {
-        return safe { (generator as? RepoLinkGenerator?)?.page }
-    }
-
-    fun getMeta(): Any? {
-        return safe { generator?.getCurrent() }
-    }
-
-    fun getAllMeta(): List<Any>? {
-        return safe { generator?.getAll() }
-    }
-
-    fun getNextMeta(): Any? {
-        return safe {
-            if (generator?.hasNext() == false) return@safe null
-            generator?.getCurrent(offset = 1)
-        }
+    fun loadThisEpisode(index: Int) {
+        episodeIndex = index
+        loadLinks()
     }
 
-    fun attachGenerator(newGenerator: IGenerator?) {
-        if (generator == null) {
-            generator = newGenerator
-        }
+    fun attachGenerator(newGenerator: VideoGenerator<*>, index: Int) {
+        Log.i(TAG, "attachGenerator with generator=$newGenerator and index=$index")
+        generator = newGenerator
+        episodeIndex = index
     }
 
-    private var extraSubtitles : MutableSet<SubtitleData> = mutableSetOf()
-
     /**
      * If duplicate nothing will happen
      * */
-    fun addSubtitles(file: Set<SubtitleData>) = synchronized(extraSubtitles) {
-        extraSubtitles += file
-        val current = _currentSubs.value ?: emptySet()
-        val next = extraSubtitles + current
-
-        // if it is of a different size then we have added distinct items
-        if (next.size != current.size) {
-            // Posting will refresh subtitles which will in turn
-            // make the subs to english if previously unselected
-            _currentSubs.postValue(next)
-        }
+    fun addSubtitles(file: Set<SubtitleData>) {
+        val validFile = file.filter(::isValidSubtitle)
+        if (validFile.isNotEmpty())
+            modifyState {
+                add(validFile)
+            }
     }
 
     private var currentJob: Job? = null
     private var currentStampJob: Job? = null
 
     fun loadStamps(duration: Long) {
-        //currentStampJob?.cancel()
         currentStampJob = ioSafe {
-            val meta = generator?.getCurrent()
-            val page = (generator as? RepoLinkGenerator?)?.page
-            if (page != null && meta is ResultEpisode) {
-                _currentStamps.postValue(listOf())
-                _currentStamps.postValue(
-                    EpisodeSkip.getStamps(
-                        page,
-                        meta,
-                        duration,
-                        hasNextEpisode() ?: false
-                    )
-                )
+            val genState = state.generatorState ?: return@ioSafe
+            val meta = genState.meta
+            val page = genState.response
+            val id = genState.id
+            if (page == null || meta !is ResultEpisode) {
+                return@ioSafe
+            }
+            val stamps = SkipAPI.videoStamps(
+                page,
+                meta,
+                duration,
+                hasNextEpisode() ?: false
+            )
+
+            /** Avoid adding stamps to the wrong video */
+            modifyState {
+                if (id != this.generatorState?.id) {
+                    this
+                } else {
+                    set(stamps)
+                }
             }
         }
     }
 
+    var langFilterList = listOf<String>()
+    var filterSubByLang = false
+
+    fun isValidSubtitle(subtitle: SubtitleData): Boolean {
+        if (langFilterList.isEmpty() || !filterSubByLang) {
+            return true
+        }
+
+        /** Only filter out subtitles fetched online */
+        if (subtitle.origin != SubtitleOrigin.URL) {
+            return true
+        }
+
+        return langFilterList.any { lang ->
+            subtitle.originalName.contains(lang, ignoreCase = true)
+        }
+    }
+
     fun loadLinks(sourceTypes: Set<ExtractorLinkType> = LOADTYPE_INAPP) {
-        Log.i(TAG, "loadLinks")
+        Log.i(TAG, "loadLinks with generator=$generator and index=$episodeIndex")
         currentJob?.cancel()
+        val index = episodeIndex
+
+        // Clear old data and reset the state
+        modifyState {
+            VideoState(
+                loading = Resource.Loading(),
+                generatorState = generator?.let { gen ->
+                    GeneratorState(
+                        meta = gen.videos.getOrNull(index),
+                        nextMeta = gen.videos.getOrNull(index + 1),
+                        id = gen.getId(index),
+                        response = (gen as? RepoLinkGenerator)?.page,
+                        index = index,
+                        allMeta = gen.videos
+                    )
+                },
+                instance = instance + 1
+            )
+        }
 
         currentJob = viewModelScope.launchSafe {
-            // if we load links then we clear the prev loaded links
-            synchronized(extraSubtitles) {
-                extraSubtitles.clear()
-            }
-            val currentLinks = mutableSetOf<Pair<ExtractorLink?, ExtractorUri?>>()
-            val currentSubs = mutableSetOf<SubtitleData>()
-
-            // clear old data
-            _currentSubs.postValue(emptySet())
-            _currentLinks.postValue(emptySet())
-
-            // load more data
-            _loadingLinks.postValue(Resource.Loading())
+            // Load more data
             val loadingState = safeApiCall {
                 generator?.generateLinks(
                     sourceTypes = sourceTypes,
                     clearCache = forceClearCache,
-                    callback = {
-                        synchronized(currentLinks) {
-                            currentLinks.add(it)
-                            // Clone to prevent ConcurrentModificationException
-                            safe {
-                                // Extra safe since .toSet() iterates.
-                                _currentLinks.postValue(currentLinks.toSet())
+                    callback = { link ->
+                        if (isActive)
+                            modifyState {
+                                add(link)
                             }
-                        }
                     },
-                    subtitleCallback = {
-                        synchronized(extraSubtitles) {
-                            currentSubs.add(it)
-                            safe {
-                                _currentSubs.postValue(currentSubs + extraSubtitles)
+                    isCasting = false,
+                    offset = index,
+                    subtitleCallback = { link ->
+                        if (isActive && isValidSubtitle(link))
+                            modifyState {
+                                add(link)
                             }
-                        }
                     })
+                Unit
             }
 
-            _loadingLinks.postValue(loadingState)
-            _currentLinks.postValue(currentLinks)
-            synchronized(extraSubtitles) {
-                _currentSubs.postValue(currentSubs + extraSubtitles)
+            if (!isActive) {
+                return@launchSafe
             }
-        }
 
+            /** Only mark as success if we have not skipped loading */
+            modifyState {
+                if (!isActive) {
+                    this
+                } else {
+                    when (loading) {
+                        is Resource.Loading -> copy(loading = loadingState)
+                        else -> this
+                    }
+                }
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerGestureHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerGestureHelper.kt
new file mode 100644
index 00000000000..1c7086d1238
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerGestureHelper.kt
@@ -0,0 +1,1220 @@
+package com.lagradost.cloudstream3.ui.player
+
+import android.animation.ValueAnimator
+import android.annotation.SuppressLint
+import android.app.Activity
+import android.content.Context
+import android.content.res.ColorStateList
+import android.graphics.Matrix
+import android.media.AudioManager
+import android.media.audiofx.LoudnessEnhancer
+import android.os.Build
+import android.os.Handler
+import android.os.Looper
+import android.provider.Settings
+import android.view.KeyEvent
+import android.view.LayoutInflater
+import android.view.MotionEvent
+import android.view.ScaleGestureDetector
+import android.view.View
+import android.view.ViewGroup
+import android.view.WindowInsets
+import android.view.animation.AlphaAnimation
+import android.view.animation.Animation
+import android.view.animation.AnimationUtils
+import androidx.annotation.OptIn
+import androidx.core.content.ContextCompat
+import androidx.core.view.isGone
+import androidx.core.view.isVisible
+import androidx.media3.common.util.UnstableApi
+import androidx.media3.exoplayer.ExoPlayer
+import androidx.media3.ui.AspectRatioFrameLayout
+import androidx.preference.PreferenceManager
+import com.lagradost.cloudstream3.CommonActivity.keyEventListener
+import com.lagradost.cloudstream3.CommonActivity.screenHeightWithOrientation
+import com.lagradost.cloudstream3.CommonActivity.screenWidthWithOrientation
+import com.lagradost.cloudstream3.CommonActivity.showToast
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.mvvm.logError
+import com.lagradost.cloudstream3.mvvm.safe
+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.DataStoreHelper
+import com.lagradost.cloudstream3.utils.UIHelper.getStatusBarHeight
+import com.lagradost.cloudstream3.utils.Vector2
+import kotlin.math.abs
+import kotlin.math.absoluteValue
+import kotlin.math.ceil
+import kotlin.math.max
+import kotlin.math.min
+import kotlin.math.round
+import kotlin.math.roundToInt
+
+/**
+ * Handles all gesture, volume, brightness, speed-up, zoom, and hardware-key-event input for a
+ * [PlayerView].  Keeps these separate from the player-view setup and lifecycle
+ * code in [PlayerView] itself.
+ *
+ * Instantiated and owned by [PlayerView]; accessed from host fragments via the delegate
+ * properties [PlayerView] exposes.
+ */
+@OptIn(UnstableApi::class)
+class PlayerGestureHelper(private val playerView: PlayerView) {
+
+    companion object {
+        /** Swipe-seek constants */
+        const val MINIMUM_SEEK_TIME = 7000L
+        const val MINIMUM_VERTICAL_SWIPE = 2.0f // % of screen height
+        const val MINIMUM_HORIZONTAL_SWIPE = 2.0f // % of screen height
+        const val VERTICAL_MULTIPLIER = 2.0f
+        const val HORIZONTAL_MULTIPLIER = 2.0f
+
+        /** Double-tap constants */
+        /** Maximum finger-hold time (ms) for a tap to qualify as a double-tap seek. */
+        const val DOUBLE_TAP_MAXIMUM_HOLD_TIME = 200L
+        /** Time window (ms) between taps to count as a double-tap.
+         *  Also determines how long a single-tap is delayed before firing. */
+        const val DOUBLE_TAP_MINIMUM_TIME_BETWEEN = 200L
+        /** Fraction of view width on each side that counts as "left" / "right" seek zone. */
+        const val DOUBLE_TAP_PAUSE_PERCENTAGE = 0.15
+
+        /** Zoom constants */
+        /** Minimum zoom; allows zooming out past 100% but snaps back. */
+        const val MINIMUM_ZOOM = 0.95f
+        /** Sensitivity for the auto-snap to 100% at the minimum zoom boundary. */
+        const val ZOOM_SNAP_SENSITIVITY = 0.07f
+        /** Maximum zoom to prevent the user from getting lost. */
+        const val MAXIMUM_ZOOM = 4.0f
+
+        /** Extracts translation and uniform scale from a matrix with no rotation. */
+        fun matrixToTranslationAndScale(matrix: Matrix): Triple<Float, Float, Float> {
+            val points = floatArrayOf(0f, 0f, 1f, 1f)
+            matrix.mapPoints(points)
+            val translationX = points[0]
+            val translationY = points[1]
+            val scale = points[2] - translationX
+            return Triple(translationX, translationY, scale)
+        }
+    }
+
+    private val context: Context get() = playerView.context
+
+    /** Set true by the host when the player occupies the full screen.
+     *  Controls whether hardware volume-key overrides are active (phones/emulators only). */
+    var isFullScreen: Boolean = false
+
+    /** Volume state */
+    var currentRequestedVolume: Float = 0.0f
+    var isVolumeLocked: Boolean = false
+    var hasShownVolumeToast: Boolean = false
+    private var loudnessEnhancer: LoudnessEnhancer? = null
+    private var progressBarLeftHideRunnable: Runnable? = null
+
+    /** Brightness state */
+    var currentRequestedBrightness: Float = 1.0f
+    var currentExtraBrightness: Float = 0.0f
+    var isBrightnessLocked: Boolean = false
+    var hasShownBrightnessToast: Boolean = false
+    /** When true, read/write system brightness via [Settings.System.SCREEN_BRIGHTNESS].
+     *  Automatically falls back to window-attribute brightness if the permission is missing. */
+    var useTrueSystemBrightness: Boolean = true
+    /** White overlay inflated into exo_content_frame; alpha encodes extra brightness (0–1). */
+    var brightnessOverlay: View? = null
+    private var progressBarRightHideRunnable: Runnable? = null
+
+    /** Gesture settings (read from prefs in initialize) */
+    var swipeVerticalEnabled: Boolean = true
+    var swipeHorizontalEnabled: Boolean = false
+    var extraBrightnessEnabled: Boolean = false
+    var speedupEnabled: Boolean = false
+
+    /** Hold / speed-up */
+    val holdHandler = Handler(Looper.getMainLooper())
+    var hasTriggeredSpeedUp = false
+    val holdRunnable = Runnable {
+        playerView.player.setPlaybackSpeed(2.0f)
+        showOrHideSpeedUp(true)
+        playerView.callbacks?.onHoldSpeedUp(true)
+        hasTriggeredSpeedUp = true
+    }
+
+    enum class TouchAction { Brightness, Volume, Time }
+
+    /** Mirrors the host's lock state; suppresses gesture interactions when true. */
+    var isLocked: Boolean = false
+
+    /** Touch tracking */
+    var isCurrentTouchValid = false
+        private set
+    private var currentTouchStart: Vector2? = null
+    private var currentTouchLast: Vector2? = null
+    /** Current in-progress swipe action, null when no swipe is active. */
+    var currentTouchAction: TouchAction? = null
+    /** Action from the previous touch sequence; guards against mis-detected double-taps after swipes. */
+    var currentLastTouchAction: TouchAction? = null
+    /** The time in the player when you first click. */
+    private var currentTouchStartPlayerTime: Long? = null
+    /** The system time when you first click. */
+    private var currentTouchStartTime: Long? = null
+    /** Whether the player UI was visible when the current swipe gesture began. */
+    var uiShowingBeforeGesture: Boolean = false
+
+    /** Icons */
+    private val brightnessIcons = listOf(
+        R.drawable.sun_1, R.drawable.sun_2, R.drawable.sun_3,
+        R.drawable.sun_4, R.drawable.sun_5, R.drawable.sun_6, R.drawable.sun_7,
+    )
+    private val volumeIcons = listOf(
+        R.drawable.ic_baseline_volume_mute_24,
+        R.drawable.ic_baseline_volume_down_24,
+        R.drawable.ic_baseline_volume_up_24,
+    )
+
+    /** Double-tap / tap state */
+
+    /** Whether double-tapping left/right seeks backward/forward. */
+    var doubleTapEnabled: Boolean = false
+
+    /** Whether double-tapping the center of the screen pauses (left/right still seeks if [doubleTapEnabled]). */
+    var doubleTapPauseEnabled: Boolean = false
+
+    /** Seek distance (ms) for each double-tap seek. Read from prefs in [initialize]. */
+    var fastForwardTime: Long = 10_000L
+
+    /** Monotonically-incremented token; cancels any pending single-tap runnable when a double-tap arrives. */
+    private var doubleTapToken = 0
+
+    /** Number of consecutive taps in the current double-tap window. */
+    private var tapCount = 0
+
+    /** System time of the most-recent touch end.  Updated by callers at the end of every ACTION_UP. */
+    var lastTouchEndTime: Long = 0L
+
+    /** Zoom state */
+
+    /** Optional view for showing the snap-hint outline during zoom (set by FullScreenPlayer). */
+    var videoOutline: View? = null
+
+    /** Current zoom+pan matrix, or null when no zoom is active. */
+    var zoomMatrix: Matrix? = null
+
+    /** The matrix the zoom will animate to after the user lifts fingers. */
+    var desiredMatrix: Matrix? = null
+
+    /** Running snap-back animation, or null. */
+    var matrixAnimation: ValueAnimator? = null
+
+    private var scaleGestureDetector: ScaleGestureDetector? = null
+
+    /** Midpoint of the two-finger pan, null when no pan is active. */
+    var lastPan: Vector2? = null
+
+    private var overlayLayoutListener: View.OnLayoutChangeListener? = null
+
+    /** Called from [PlayerView.initialize] after views are bound. */
+    fun initialize() {
+        try {
+            val sm = PreferenceManager.getDefaultSharedPreferences(context)
+            swipeVerticalEnabled = sm.getBoolean(context.getString(R.string.swipe_vertical_enabled_key), true)
+            swipeHorizontalEnabled = sm.getBoolean(context.getString(R.string.swipe_enabled_key), true)
+            extraBrightnessEnabled = sm.getBoolean(context.getString(R.string.extra_brightness_key), false)
+            speedupEnabled = sm.getBoolean(context.getString(R.string.speedup_key), false)
+            doubleTapEnabled = sm.getBoolean(context.getString(R.string.double_tap_enabled_key), false)
+            doubleTapPauseEnabled = sm.getBoolean(context.getString(R.string.double_tap_pause_enabled_key), false)
+            fastForwardTime = sm.getInt(context.getString(R.string.double_tap_seek_time_key), 10).toLong() * 1000L
+        } catch (_: Exception) {
+        }
+
+        // Inject the brightness overlay into the ExoPlayer content frame so it sits
+        // directly on top of the video surface.  Alpha is set by handleBrightnessAdjustment.
+        safe {
+            val pkg = context.packageName
+            @SuppressLint("DiscouragedApi")
+            val contentId = context.resources.getIdentifier("exo_content_frame", "id", pkg)
+            val contentFrame = playerView.exoPlayerView?.findViewById<ViewGroup>(contentId)
+            if (contentFrame != null) {
+                brightnessOverlay?.let {
+                    (it.parent as? ViewGroup)?.removeView(it)
+                }
+                brightnessOverlay = LayoutInflater.from(context)
+                    .inflate(R.layout.extra_brightness_overlay, contentFrame, false)
+                contentFrame.addView(brightnessOverlay)
+            }
+        }
+
+        setupTouchGestures()
+    }
+
+    /** Called from [PlayerView.release]. */
+    fun release() {
+        safe {
+            brightnessOverlay?.let {
+                (it.parent as? ViewGroup)?.removeView(it)
+            }
+        }
+        brightnessOverlay = null
+        loudnessEnhancer?.release()
+        loudnessEnhancer = null
+        holdHandler.removeCallbacksAndMessages(null)
+        clearZoomState()
+        releaseOverlayLayoutListener()
+    }
+
+    /** Key-event listener */
+
+    /**
+     * Registers the basic volume-key listener on [keyEventListener].
+     * Called from [PlayerView.initialize] and from the host fragment's onResume.
+     */
+    fun setupKeyEventListener() {
+        keyEventListener = { (event, _) ->
+            if (event != null && event.action == KeyEvent.ACTION_DOWN)
+                handleVolumeKey(event.keyCode)
+            else false
+        }
+    }
+
+    /** Nulls [keyEventListener]. Called from the host fragment's onPause. */
+    fun releaseKeyEventListener() {
+        keyEventListener = null
+    }
+
+    /** Speed-up */
+
+    fun showOrHideSpeedUp(show: Boolean) {
+        playerView.playerSpeedupButton?.let { btn ->
+            btn.clearAnimation()
+            btn.alpha = if (show) 0f else 1f
+            btn.isVisible = show
+            btn.animate()
+                .alpha(if (show) 1f else 0f)
+                .setDuration(200L)
+                .withEndAction { if (!show) btn.isVisible = false }
+                .start()
+        }
+    }
+
+    /** Volume helpers */
+
+    /**
+     * Syncs [currentRequestedVolume] with the current system stream volume.
+     *
+     * This is here to make returning to the player less jarring, if we change the volume outside
+     * the app. Note that this will make it a bit wierd when using loudness in PiP, then returning
+     * however that is the cost of correctness.
+     */
+    fun verifyVolume() {
+        ((context as? Activity)?.getSystemService(Context.AUDIO_SERVICE) as? AudioManager)?.let { am ->
+            val cur = am.getStreamVolume(AudioManager.STREAM_MUSIC)
+            val max = am.getStreamMaxVolume(AudioManager.STREAM_MUSIC)
+            if (cur < max || currentRequestedVolume <= 1.0f) {
+                currentRequestedVolume = cur.toFloat() / max.toFloat()
+                loudnessEnhancer?.release()
+                loudnessEnhancer = null
+            }
+        }
+    }
+
+    /**
+     * Handles a hardware volume key press.
+     * Only active on phones/emulators when [isFullScreen] is true.
+     *
+     * @return true if the key was consumed (suppresses the system volume UI).
+     */
+    fun handleVolumeKey(keyCode: Int): Boolean {
+        /**
+         * Some TVs do not support volume boosting, and overriding
+         * the volume buttons can be inconvenient for TV users.
+         * Since boosting volume is mainly useful on phones and emulators,
+         * we limit this feature to those devices.
+         */
+        if (!isLayout(PHONE or EMULATOR) || !isFullScreen) return false
+        if (keyCode != KeyEvent.KEYCODE_VOLUME_UP && keyCode != KeyEvent.KEYCODE_VOLUME_DOWN) return false
+        verifyVolume()
+        if (currentRequestedVolume <= 1.0f) hasShownVolumeToast = false
+        isVolumeLocked = currentRequestedVolume < 1.0f
+        // +- 5%
+        handleVolumeAdjustment(if (keyCode == KeyEvent.KEYCODE_VOLUME_UP) 0.05f else -0.05f, fromButton = true)
+        return true
+    }
+
+    fun handleVolumeAdjustment(delta: Float, fromButton: Boolean) {
+        val am = (context as? Activity)?.getSystemService(Context.AUDIO_SERVICE) as? AudioManager ?: return
+        val curStep = am.getStreamVolume(AudioManager.STREAM_MUSIC)
+        val maxStep = am.getStreamMaxVolume(AudioManager.STREAM_MUSIC)
+
+        val cur = currentRequestedVolume
+        val locked = isVolumeLocked
+        val next = (cur + delta).coerceIn(0.0f, if (locked) 1.0f else 2.0f)
+        val nextStep = (next * maxStep.toFloat()).roundToInt().coerceIn(0, maxStep)
+
+        // Show toast
+        if (fromButton) {
+            // For button related request we only show a toast when we exceeded the volume.
+            if (cur <= 1.0f && next > 1.0f && !hasShownVolumeToast) {
+                showToast(R.string.volume_exceeded_100)
+                hasShownVolumeToast = true
+            }
+        } else {
+            val raw = cur + delta
+            // For swipes, we show toast that we need to swipe again.
+            if (raw > 1.0 && locked && !hasShownVolumeToast) {
+                showToast(R.string.slide_up_again_to_exceed_100)
+                hasShownVolumeToast = true
+            }
+        }
+
+        // Set the current volume step.
+        if (nextStep != curStep) am.setStreamVolume(AudioManager.STREAM_MUSIC, nextStep, 0)
+
+        var hasBoostError = false
+        // Apply loudness enhancer for volumes > 100%, removes it if less.
+        if (next > 1.0f) {
+            val boost = ((next - 1.0f) * 1000).toInt()
+            val existing = loudnessEnhancer
+            if (existing != null) {
+                existing.setTargetGain(boost)
+            } else {
+                val sessionId = (playerView.exoPlayerView?.player as? ExoPlayer)?.audioSessionId
+                if (sessionId != null && sessionId != AudioManager.ERROR) {
+                    try {
+                        loudnessEnhancer = LoudnessEnhancer(sessionId).apply {
+                            setTargetGain(boost); enabled = true
+                        }
+                    } catch (t: Throwable) { logError(t); hasBoostError = true }
+                }
+            }
+        } else {
+            loudnessEnhancer?.release(); loudnessEnhancer = null
+        }
+
+        currentRequestedVolume = next
+
+        val leftHolder = playerView.playerProgressbarLeftHolder ?: return
+        val level1 = playerView.playerProgressbarLeftLevel1  ?: return
+        val level2 = playerView.playerProgressbarLeftLevel2  ?: return
+        val icon = playerView.playerProgressbarLeftIcon    ?: return
+
+        if (next > 1.0f) {
+            // Change color to show that LoudnessEnhancer broke
+            // this is not a real fix, but solves the crash issue.
+            level2.progressTintList = ColorStateList.valueOf(
+                ContextCompat.getColor(context, if (hasBoostError) R.color.colorPrimaryRed else R.color.colorPrimaryOrange)
+            )
+        }
+        // Max is set high to make it smooth.
+        level1.max = 100_000
+        level1.progress = (next * 100_000f).toInt().coerceIn(2_000, 100_000)
+        level2.max = 100_000
+        level2.progress = if (next > 1.0f) ((next - 1.0) * 100_000f).toInt().coerceIn(2_000, 100_000) else 0
+        level2.isVisible = next > 1.0f
+        // Calculate the clamped index for the volume icon based on the requested volume.
+        val iconIdx = (next * volumeIcons.lastIndex).roundToInt().coerceIn(0, volumeIcons.lastIndex)
+        icon.setImageResource(volumeIcons[iconIdx])
+
+        if (!leftHolder.isVisible || leftHolder.alpha < 1f) {
+            leftHolder.animate().cancel(); leftHolder.alpha = 1f; leftHolder.isVisible = true
+        }
+        progressBarLeftHideRunnable?.let { leftHolder.removeCallbacks(it) }
+        progressBarLeftHideRunnable = Runnable {
+            leftHolder.animate().cancel()
+            leftHolder.animate().alpha(0f).setDuration(300).withEndAction { leftHolder.isVisible = false }.start()
+        }
+        // Show the progress bar for 1.5 seconds.
+        leftHolder.postDelayed(progressBarLeftHideRunnable, 1500)
+    }
+
+    /** Brightness helpers */
+
+    /**
+     * Reads from [Settings.System.SCREEN_BRIGHTNESS], falling back to the window
+     * attribute if the permission is absent.
+     */
+    fun getBrightness(): Float? {
+        return if (useTrueSystemBrightness) {
+            try {
+                Settings.System.getInt(
+                    (context as? Activity)?.contentResolver,
+                    Settings.System.SCREEN_BRIGHTNESS
+                ) / 255f
+            } catch (_: Exception) {
+                // Because true system brightness requires
+                // permission, this is a lazy way to check
+                // as it will throw an error if we do not have it.
+                useTrueSystemBrightness = false
+                getBrightness()
+            }
+        } else {
+            try {
+                (context as? Activity)?.window?.attributes?.screenBrightness?.takeIf { it >= 0f }
+            } catch (e: Exception) {
+                logError(e)
+                null
+            }
+        }
+    }
+
+    /**
+     * Sets [Settings.System.SCREEN_BRIGHTNESS], falling back to the window
+     * attribute if the permission is absent.
+     */
+    fun setBrightness(brightness: Float) {
+        if (useTrueSystemBrightness) {
+            try {
+                Settings.System.putInt(
+                    (context as? Activity)?.contentResolver,
+                    Settings.System.SCREEN_BRIGHTNESS_MODE,
+                    Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL
+                )
+                Settings.System.putInt(
+                    (context as? Activity)?.contentResolver,
+                    Settings.System.SCREEN_BRIGHTNESS,
+                    min(1, (brightness.coerceIn(0.0f, 1.0f) * 255).toInt())
+                )
+            } catch (_: Exception) {
+                useTrueSystemBrightness = false
+                setBrightness(brightness)
+            }
+        } else {
+            try {
+                val lp = (context as? Activity)?.window?.attributes ?: return
+                // Use 0.004f instead of 0: on some devices a value too close to 0 causes the
+                // system to override with its own brightness, making fine-tuning impossible.
+                lp.screenBrightness = brightness.coerceIn(0.004f, 1.0f)
+                (context as? Activity)?.window?.attributes = lp
+            } catch (e: Exception) {
+                logError(e)
+            }
+        }
+    }
+
+    fun handleBrightnessAdjustment(verticalAddition: Float) {
+        val lastBrightness = currentRequestedBrightness
+        val raw = currentRequestedBrightness + verticalAddition
+        val next = raw.coerceIn(0.0f, if (extraBrightnessEnabled && !isBrightnessLocked) 2.0f else 1.0f)
+
+        if (extraBrightnessEnabled && isBrightnessLocked && raw > 1.0f && !hasShownBrightnessToast) {
+            showToast(R.string.slide_up_again_to_exceed_100)
+            hasShownBrightnessToast = true
+        }
+
+        currentRequestedBrightness = next
+        if (lastBrightness != currentRequestedBrightness) setBrightness(currentRequestedBrightness)
+
+        currentExtraBrightness = if (extraBrightnessEnabled && next > 1.0f) min(2.0f, next) - 1.0f else 0.0f
+        brightnessOverlay?.alpha = currentExtraBrightness
+        playerView.callbacks?.onBrightnessExtra(currentExtraBrightness)
+
+        val rightHolder = playerView.playerProgressbarRightHolder ?: return
+        val level1 = playerView.playerProgressbarRightLevel1 ?: return
+        val level2 = playerView.playerProgressbarRightLevel2 ?: return
+        val icon = playerView.playerProgressbarRightIcon   ?: return
+
+        level1.max = 100_000
+        level1.progress = max(2_000, (min(1.0f, next) * 100_000f).toInt())
+
+        if (extraBrightnessEnabled) {
+            level2.max = 100_000
+            level2.progress = (currentExtraBrightness * 100_000f).toInt().coerceIn(2_000, 100_000)
+            level2.isVisible = next > 1.0f
+        }
+
+        icon.setImageResource(
+            // Clamp the value in case of extra brightness.
+            brightnessIcons[min(brightnessIcons.lastIndex, max(0, round(next * brightnessIcons.lastIndex).toInt()))]
+        )
+
+        if (!rightHolder.isVisible || rightHolder.alpha < 1f) {
+            rightHolder.animate().cancel(); rightHolder.alpha = 1f; rightHolder.isVisible = true
+        }
+        progressBarRightHideRunnable?.let { rightHolder.removeCallbacks(it) }
+        progressBarRightHideRunnable = Runnable {
+            rightHolder.animate().cancel()
+            rightHolder.animate().alpha(0f).setDuration(300).withEndAction { rightHolder.isVisible = false }.start()
+        }
+        rightHolder.postDelayed(progressBarRightHideRunnable, 1500)
+    }
+
+    /** Zoom helpers */
+
+    /**
+     * Returns the current zoom matrix, accounting for RESIZE_MODE_ZOOM which already has
+     * an implicit zoom applied.
+     *
+     * This is different from `zoomMatrix ?: Matrix()`
+     * because it allows used to start zooming at different resizeModes.
+     *
+     * The main issue is that RESIZE_MODE_FIT = 100% zoom, but if you are in RESIZE_MODE_ZOOM
+     * 100% will make the zoom snap to less zoomed in then you already are.
+     */
+    fun currentZoomMatrix(): Matrix {
+        val current = zoomMatrix
+        if (current != null) return current
+
+        val exoView = playerView.exoPlayerView
+        val videoView = exoView?.videoSurfaceView
+
+        if (exoView == null || videoView == null ||
+            exoView.resizeMode != AspectRatioFrameLayout.RESIZE_MODE_ZOOM) {
+            return Matrix()
+        }
+
+        val videoWidth = videoView.width.toFloat()
+        val videoHeight = videoView.height.toFloat()
+        val playerWidth = screenWidthWithOrientation.toFloat()
+        val playerHeight = screenHeightWithOrientation.toFloat()
+
+        if (videoWidth <= 1f || videoHeight <= 1f || playerWidth <= 1f || playerHeight <= 1f) {
+            return Matrix()
+        }
+
+        val initAspect = (playerHeight * videoWidth) / (playerWidth * videoHeight)
+        val aspect = max(initAspect, 1f / initAspect)
+        return Matrix().apply { postScale(aspect, aspect) }
+    }
+
+    /**
+     * Applies [newMatrix] (scale + translation only) to the video surface view.
+     *
+     * @param newMatrix The new zoom matrix
+     * @param animation If this zoom is part of an animation, as then it will not auto zoom after we are done.
+     */
+    fun applyZoomMatrix(newMatrix: Matrix, animation: Boolean) {
+        val exoView = playerView.exoPlayerView ?: return
+        if (!animation) {
+            matrixAnimation?.cancel()
+            matrixAnimation = null
+        }
+        val (translationX, translationY, scale) = matrixToTranslationAndScale(newMatrix)
+
+        if (exoView.resizeMode == AspectRatioFrameLayout.RESIZE_MODE_FIT) {
+            exoView.resizeMode = AspectRatioFrameLayout.RESIZE_MODE_ZOOM
+        }
+
+        val videoView = exoView.videoSurfaceView ?: return
+        val videoWidth = videoView.width.toFloat()
+        val videoHeight = videoView.height.toFloat()
+        val playerWidth = screenWidthWithOrientation.toFloat()
+        val playerHeight = screenHeightWithOrientation.toFloat()
+
+        // Sanity check
+        if (videoWidth <= 1f || videoHeight <= 1f || playerWidth <= 1f || playerHeight <= 1f || scale <= 0.01f) return
+
+        // Calculate the scaled aspect ratio as the view height is not real, check the debugger
+        // and you will see videoView.height > screen.height.
+        val initAspect = (playerHeight * videoWidth) / (playerWidth * videoHeight)
+        val aspect = min(initAspect, 1f / initAspect)
+        val scaledAspect = scale * aspect
+
+        // Calculate clamp, this is very weird because we need to use aspect here as videoHeight > playerHeight.
+        val maxTransX = max(0f, videoWidth  * scaledAspect - playerWidth)  * 0.5f
+        val maxTransY = max(0f, videoHeight * scaledAspect - playerHeight) * 0.5f
+
+        // Correct the translation to clamp within the viewing area.
+        val expectedTranslationX = translationX.coerceIn(-maxTransX, maxTransX)
+        val expectedTranslationY = translationY.coerceIn(-maxTransY, maxTransY)
+
+        // Set the transform to the correct x and y.
+        newMatrix.postTranslate(
+            expectedTranslationX - translationX,
+            expectedTranslationY - translationY
+        )
+        zoomMatrix = newMatrix
+
+        if (!animation) {
+            // If we are not in an animation, set up the values for the animation.
+            if ((scaledAspect - 1f).absoluteValue < ZOOM_SNAP_SENSITIVITY) {
+                // We are within the correct scaling, so center and fit it.
+                videoOutline?.isVisible = true
+                val desired = Matrix()
+                desired.setScale(1f / aspect, 1f / aspect)
+                desiredMatrix = desired
+            } else if (scale < 1f) {
+                // We have zoomed too far, zoom to 100%.
+                videoOutline?.isVisible = false
+                desiredMatrix = Matrix()
+            } else {
+                // Keep the same scaling after zoom.
+                videoOutline?.isVisible = false
+                desiredMatrix = null
+            }
+        }
+
+        // Finally set the actual scale + translation.
+        videoView.scaleX = scaledAspect
+        videoView.scaleY = scaledAspect
+        videoView.translationX = expectedTranslationX
+        videoView.translationY = expectedTranslationY
+        updateBrightnessOverlayBounds()
+    }
+
+    /**
+     * Clears all zoom state and resets the video surface view to 1:1 scale.
+     * Does NOT change the ExoPlayer resize mode - call [PlayerView.resize] separately.
+     */
+    fun clearZoomState() {
+        matrixAnimation?.cancel()
+        matrixAnimation = null
+        zoomMatrix = null
+        desiredMatrix = null
+        scaleGestureDetector = null
+        lastPan = null
+        playerView.exoPlayerView?.videoSurfaceView?.apply {
+            scaleX = 1f
+            scaleY = 1f
+            translationX = 0f
+            translationY = 0f
+        }
+    }
+
+    /**
+     * Resets zoom to fit mode if any zoom is currently active.
+     * Calls [PlayerView.resize] to update the ExoPlayer resize mode.
+     */
+    fun resetZoomToDefault() {
+        if (zoomMatrix != null) {
+            clearZoomState()
+            playerView.resize(PlayerResize.Fit, false)
+        }
+    }
+
+    private fun createScaleGestureDetector(ctx: Context) {
+        scaleGestureDetector = ScaleGestureDetector(
+            ctx,
+            object : ScaleGestureDetector.SimpleOnScaleGestureListener() {
+                override fun onScale(detector: ScaleGestureDetector): Boolean {
+                    val matrix = currentZoomMatrix()
+                    val (_, _, scale) = matrixToTranslationAndScale(matrix)
+                    // Clamp scale of the zoom, do it here as it is easier than doing it within applyZoomMatrix.
+                    val newScale = (scale * detector.scaleFactor).coerceIn(MINIMUM_ZOOM, MAXIMUM_ZOOM)
+                    // This is how much we should scale it with to prevent infinite scaling.
+                    val actualScaleFactor = newScale / scale
+                    // Scale around the focus point, this is more natural than just zoom.
+                    val pivotX = detector.focusX - screenWidthWithOrientation.toFloat() * 0.5f
+                    val pivotY = detector.focusY - screenHeightWithOrientation.toFloat() * 0.5f
+                    matrix.postScale(actualScaleFactor, actualScaleFactor, pivotX, pivotY)
+                    applyZoomMatrix(matrix, false)
+                    return true
+                }
+            }
+        )
+    }
+
+    /**
+     * Processes a two-finger zoom/pan gesture event.
+     * Handles scale detection, panning, and the snap-back animation after finger lift.
+     *
+     * @param event              The motion event (should have pointerCount >= 2 or [lastPan] != null).
+     * @param ctx                Context used to create the [ScaleGestureDetector] on first call.
+     * @param onFirstPointerDown Called on [MotionEvent.ACTION_POINTER_DOWN] (e.g. hide player UI).
+     * @param onGestureEnd       Called when the gesture ends (e.g. reset caller touch state).
+     * @return Always true (event consumed).
+     */
+    fun handleZoomPanGesture(
+        event: MotionEvent,
+        ctx: Context,
+        onFirstPointerDown: () -> Unit,
+        onGestureEnd: () -> Unit
+    ): Boolean {
+        if (scaleGestureDetector == null) createScaleGestureDetector(ctx)
+        scaleGestureDetector?.onTouchEvent(event)
+
+        when (event.actionMasked) {
+            MotionEvent.ACTION_POINTER_DOWN -> {
+                onFirstPointerDown()
+            }
+
+            MotionEvent.ACTION_MOVE -> {
+                if (event.pointerCount >= 2) {
+                    val newPan = Vector2(
+                        (event.getX(0) + event.getX(1)) / 2f,
+                        (event.getY(0) + event.getY(1)) / 2f
+                    )
+                    val oldPan = lastPan
+                    if (oldPan != null) {
+                        val matrix = currentZoomMatrix()
+                        matrix.postTranslate(newPan.x - oldPan.x, newPan.y - oldPan.y)
+                        applyZoomMatrix(matrix, false)
+                    }
+                    lastPan = newPan
+                }
+            }
+
+            MotionEvent.ACTION_CANCEL,
+            MotionEvent.ACTION_POINTER_UP,
+            MotionEvent.ACTION_UP -> {
+                lastPan = null
+                videoOutline?.isVisible = false
+                matrixAnimation?.cancel()
+                matrixAnimation = null
+
+                // Snap to desired matrix after zoom gesture ends
+                matrixAnimation = ValueAnimator.ofFloat(0f, 1f).apply {
+                    startDelay = 0
+                    duration = 200
+                    val startMatrix = currentZoomMatrix()
+                    val endMatrix = desiredMatrix ?: return@apply
+                    val (startX, startY, startScale) = matrixToTranslationAndScale(startMatrix)
+                    val (endX, endY, endScale) = matrixToTranslationAndScale(endMatrix)
+                    addUpdateListener { anim ->
+                        val v = anim.animatedValue as Float
+                        val vInv = 1f - v
+                        val m = Matrix()
+                        m.setScale(startScale * vInv + endScale * v, startScale * vInv + endScale * v)
+                        m.postTranslate(startX * vInv + endX * v, startY * vInv + endY * v)
+                        applyZoomMatrix(m, true)
+                    }
+                    start()
+                }
+
+                onGestureEnd()
+            }
+        }
+        return true
+    }
+
+    /**
+     * Resizes and repositions [brightnessOverlay] to exactly match the visible video surface,
+     * accounting for zoom scale and translation.
+     */
+    fun updateBrightnessOverlayBounds() {
+        val overlay = brightnessOverlay ?: return
+        val pv = playerView.exoPlayerView ?: return
+        val video = pv.videoSurfaceView ?: return
+
+        // Compute accurate transformed bounding box of the video view after scale+translation.
+        val vw = video.width.toFloat()
+        val vh = video.height.toFloat()
+        val sx = video.scaleX
+        val sy = video.scaleY
+        if (vw <= 0f || vh <= 0f) return
+
+        // Pivot defaults to center if not set.
+        val pivotX = if (video.pivotX != 0f) video.pivotX else vw * 0.5f
+        val pivotY = if (video.pivotY != 0f) video.pivotY else vh * 0.5f
+        // Use view position (includes translation) as base; avoid double-counting translation.
+        val tx = video.x
+        val ty = video.y
+
+        // Transform function for a local point (lx,ly).
+        fun transform(lx: Float, ly: Float): Pair<Float, Float> {
+            val gx = tx + pivotX + (lx - pivotX) * sx
+            val gy = ty + pivotY + (ly - pivotY) * sy
+            return Pair(gx, gy)
+        }
+
+        val p0 = transform(0f, 0f);  val p1 = transform(vw, 0f)
+        val p2 = transform(0f, vh); val p3 = transform(vw, vh)
+
+        val minX = min(min(p0.first,  p1.first),  min(p2.first,  p3.first))
+        val maxX = max(max(p0.first,  p1.first),  max(p2.first,  p3.first))
+        val minY = min(min(p0.second, p1.second), min(p2.second, p3.second))
+        val maxY = max(max(p0.second, p1.second), max(p2.second, p3.second))
+
+        val newW = ceil(maxX - minX).toInt().coerceAtLeast(0)
+        val newH = ceil(maxY - minY).toInt().coerceAtLeast(0)
+
+        val lp = overlay.layoutParams
+        if (lp == null) {
+            overlay.layoutParams = ViewGroup.LayoutParams(newW, newH)
+        } else if (lp.width != newW || lp.height != newH) {
+            lp.width = newW; lp.height = newH
+            overlay.layoutParams = lp
+        }
+
+        overlay.scaleX = 1f; overlay.scaleY = 1f
+        overlay.x = minX;    overlay.y = minY
+    }
+
+    /**
+     * Attaches a persistent layout-change listener to the ExoPlayer view so
+     * [updateBrightnessOverlayBounds] is called on every layout pass (orientation change,
+     * aspect-ratio change, zoom, PiP transition, etc.).
+     */
+    fun requestUpdateBrightnessOverlayOnNextLayout() {
+        val exoView = playerView.exoPlayerView ?: return
+        overlayLayoutListener?.let { exoView.removeOnLayoutChangeListener(it) }
+        val listener = View.OnLayoutChangeListener { _, _, _, _, _, _, _, _, _ ->
+            safe { updateBrightnessOverlayBounds() }
+        }
+        overlayLayoutListener = listener
+        exoView.addOnLayoutChangeListener(listener)
+    }
+
+    /** Removes the overlay layout listener registered by [requestUpdateBrightnessOverlayOnNextLayout]. */
+    fun releaseOverlayLayoutListener() {
+        overlayLayoutListener?.let { playerView.exoPlayerView?.removeOnLayoutChangeListener(it) }
+        overlayLayoutListener = null
+    }
+
+    /** Rewind / fast-forward animations */
+
+    /** Resets the rewind button label to the standard "–Xs" format. */
+    fun resetRewindText() {
+        playerView.exoRewText?.text = context.getString(R.string.rew_text_regular_format)
+            .format(fastForwardTime / 1000)
+    }
+
+    /** Resets the fast-forward button label to the standard "+Xs" format. */
+    fun resetFastForwardText() {
+        playerView.exoFfwdText?.text = context.getString(R.string.ffw_text_regular_format)
+            .format(fastForwardTime / 1000)
+    }
+
+    /**
+     * Fades playerRewHolder, playerFfwdHolder, and playerPausePlay to [fadeTo] (0f or 1f).
+     * Always resets the holder alphas to 1f first so any stale fillAfter state is cleared.
+     * Called from host fragments' show/hide control animations so both GeneratorPlayer and trailer share
+     * the same fade logic.
+     */
+    fun animateCenterControls(fadeTo: Float) {
+        val from = if (fadeTo > 0.5f) 0f else 1f
+        fun makeAnim() = AlphaAnimation(from, fadeTo).apply { duration = 100; fillAfter = true }
+        // Each view needs its own Animation instance; sharing one causes fillAfter to
+        // not hold reliably across all views once any of them restarts the animation.
+        playerView.playerRewHolder?.let  { it.alpha = 1f; it.startAnimation(makeAnim()) }
+        playerView.playerFfwdHolder?.let { it.alpha = 1f; it.startAnimation(makeAnim()) }
+        playerView.playerPausePlay?.startAnimation(makeAnim())
+    }
+
+    /** Plays the rewind animation and seeks back by [fastForwardTime]. */
+    fun rewind() {
+        try {
+            val rewHolder = playerView.playerRewHolder ?: return
+            val rew = playerView.playerRew
+            val rewText = playerView.exoRewText
+            val wasShowing = playerView.callbacks?.isUIShowing() ?: false
+
+            // Only expose the parent chain when controls are currently hidden.
+            val prevCenterMenuGone = playerView.playerCenterMenu?.isGone ?: false
+            val prevVideoHolderVisible = playerView.playerVideoHolder?.isVisible ?: true
+            if (!wasShowing) {
+                playerView.playerCenterMenu?.isGone = false
+                playerView.playerVideoHolder?.isVisible = true
+            }
+            // Always clear any stale fillAfter alpha so the button is visible during animation.
+            rewHolder.alpha = 1f
+
+            rew?.startAnimation(AnimationUtils.loadAnimation(context, R.anim.rotate_left))
+            val goLeft = AnimationUtils.loadAnimation(context, R.anim.go_left)
+            goLeft.setAnimationListener(object : Animation.AnimationListener {
+                override fun onAnimationStart(animation: Animation?) {}
+                override fun onAnimationRepeat(animation: Animation?) {}
+                override fun onAnimationEnd(animation: Animation?) {
+                    rewText?.post {
+                        resetRewindText()
+                        // Restore parent chain only if we changed it and controls are still hidden.
+                        if (!wasShowing && !(playerView.callbacks?.isUIShowing() ?: false)) {
+                            playerView.playerCenterMenu?.isGone = prevCenterMenuGone
+                            playerView.playerVideoHolder?.isVisible = prevVideoHolderVisible
+                            rewHolder.alpha = 0f
+                        }
+                    }
+                }
+            })
+            rewText?.startAnimation(goLeft)
+            rewText?.text = context.getString(R.string.rew_text_format).format(fastForwardTime / 1000)
+            playerView.player.seekTime(-fastForwardTime)
+        } catch (e: Exception) { logError(e) }
+    }
+
+    /** Plays the fast-forward animation and seeks forward by [fastForwardTime]. */
+    fun fastForward() {
+        try {
+            val ffwdHolder = playerView.playerFfwdHolder ?: return
+            val ffwd = playerView.playerFfwd
+            val ffwdText = playerView.exoFfwdText
+            val wasShowing = playerView.callbacks?.isUIShowing() ?: false
+
+            val prevCenterMenuGone = playerView.playerCenterMenu?.isGone ?: false
+            val prevVideoHolderVisible = playerView.playerVideoHolder?.isVisible ?: true
+            if (!wasShowing) {
+                playerView.playerCenterMenu?.isGone = false
+                playerView.playerVideoHolder?.isVisible = true
+            }
+            // Always clear any stale fillAfter alpha so the button is visible during animation.
+            ffwdHolder.alpha = 1f
+
+            ffwd?.startAnimation(AnimationUtils.loadAnimation(context, R.anim.rotate_right))
+            val goRight = AnimationUtils.loadAnimation(context, R.anim.go_right)
+            goRight.setAnimationListener(object : Animation.AnimationListener {
+                override fun onAnimationStart(animation: Animation?) {}
+                override fun onAnimationRepeat(animation: Animation?) {}
+                override fun onAnimationEnd(animation: Animation?) {
+                    ffwdText?.post {
+                        resetFastForwardText()
+                        if (!wasShowing && !(playerView.callbacks?.isUIShowing() ?: false)) {
+                            playerView.playerCenterMenu?.isGone = prevCenterMenuGone
+                            playerView.playerVideoHolder?.isVisible = prevVideoHolderVisible
+                            ffwdHolder.alpha = 0f
+                        }
+                    }
+                }
+            })
+            ffwdText?.startAnimation(goRight)
+            ffwdText?.text = context.getString(R.string.ffw_text_format).format(fastForwardTime / 1000)
+            playerView.player.seekTime(fastForwardTime)
+        } catch (e: Exception) { logError(e) }
+    }
+
+    /** Double-tap detection */
+
+    /**
+     * Call when a valid tap is detected (short hold, minimal movement, valid touch area).
+     * Routes to double-tap seeking/pausing or schedules a delayed single-tap callback.
+     *
+     * Updates [lastTouchEndTime] when a confirmed tap (single or double) is recorded.
+     *
+     * @param x           X coordinate of the tap in the view's coordinate space.
+     * @param viewWidth   Width of the view (used to compute left/center/right zones).
+     * @param isLocked    Whether player controls are locked (suppresses double-tap seek).
+     * @param onSingleTap Invoked when it is determined to be a single tap; may be deferred.
+     * @return true if a double-tap action was performed.
+     */
+    fun onTapDetected(x: Float, viewWidth: Int, isLocked: Boolean, onSingleTap: () -> Unit): Boolean {
+        val anyDoubleTap = doubleTapEnabled || doubleTapPauseEnabled
+        if (!anyDoubleTap) {
+            onSingleTap()
+            return false
+        }
+
+        val timeSinceLast = System.currentTimeMillis() - lastTouchEndTime
+        return if (!isLocked && timeSinceLast < DOUBLE_TAP_MINIMUM_TIME_BETWEEN) {
+            /** Double-tap */
+            tapCount++
+            doubleTapToken++ // cancel any pending single-tap runnable
+            if (doubleTapPauseEnabled) {
+                when {
+                    x < viewWidth / 2f - (DOUBLE_TAP_PAUSE_PERCENTAGE * viewWidth) -> {
+                        if (doubleTapEnabled) rewind()
+                    }
+                    x > viewWidth / 2f + (DOUBLE_TAP_PAUSE_PERCENTAGE * viewWidth) -> {
+                        if (doubleTapEnabled) fastForward()
+                    }
+                    else -> {
+                        playerView.player.handleEvent(CSPlayerEvent.PlayPauseToggle, PlayerEventSource.UI)
+                    }
+                }
+            } else if (doubleTapEnabled) {
+                if (x < viewWidth / 2f) rewind() else fastForward()
+            }
+            true
+        } else {
+            /** Single tap (first tap, or too slow for double-tap) */
+            tapCount = 0
+            val token = ++doubleTapToken
+            playerView.playerHolder?.postDelayed({
+                if (token == doubleTapToken) {
+                    onSingleTap()
+                }
+            }, DOUBLE_TAP_MINIMUM_TIME_BETWEEN)
+            false
+        }
+    }
+
+    /** Seek time helpers */
+
+    private fun calculateNewTime(startTime: Long?, touchStart: Vector2?, touchEnd: Vector2?): Long? {
+        if (touchStart == null || touchEnd == null || startTime == null) return null
+        val diffX = (touchEnd.x - touchStart.x) * HORIZONTAL_MULTIPLIER / screenWidthWithOrientation.toFloat()
+        val duration = playerView.player.getDuration() ?: return null
+        return max(min(startTime + ((duration * (diffX * diffX)) * (if (diffX < 0) -1 else 1)).toLong(), duration), 0)
+    }
+
+    private fun forceLetters(inp: Long, letters: Int = 2): String {
+        val added = letters - inp.toString().length
+        return if (added > 0) "0".repeat(added) + inp.toString() else inp.toString()
+    }
+
+    private fun convertTimeToString(sec: Long): String {
+        val rsec = sec % 60L
+        val min = ceil((sec - rsec) / 60.0).toInt()
+        val rmin = min % 60L
+        val h = ceil((min - rmin) / 60.0).toLong()
+        // int rh = h;// h % 24;
+        return (if (h > 0) forceLetters(h) + ":" else "") +
+               (if (rmin >= 0 || h >= 0) forceLetters(rmin) + ":" else "") +
+               forceLetters(rsec)
+    }
+
+    /** Touch gestures */
+
+    fun setupTouchGestures() {
+        val holder = playerView.playerHolder ?: return
+        @SuppressLint("ClickableViewAccessibility")
+        holder.setOnTouchListener(::handleGesture)
+    }
+
+    private fun isValidTouch(rawX: Float, rawY: Float): Boolean {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            val holder = playerView.playerHolder ?: return true
+            val insets = holder.rootWindowInsets.getInsetsIgnoringVisibility(WindowInsets.Type.systemBars())
+            val validHeight = rawY > insets.top && rawY < screenHeightWithOrientation - insets.bottom
+            val validWidth = rawX > insets.left && rawX < screenWidthWithOrientation - insets.right
+            return validHeight && validWidth
+        }
+
+        return rawY > context.getStatusBarHeight() && rawX < screenWidthWithOrientation
+    }
+
+    private fun handleGesture(view: View, event: MotionEvent): Boolean {
+        val currentTouch = Vector2(event.x, event.y)
+        val startTouch = currentTouchStart
+
+        /** Two-finger zoom/pan (fullscreen, unlocked) */
+        if ((event.pointerCount >= 2 || lastPan != null) && isFullScreen && !isLocked
+                && !hasTriggeredSpeedUp && currentTouchAction == null) {
+            holdHandler.removeCallbacks(holdRunnable) // Remove 2x speed.
+            isCurrentTouchValid = false // Prevent other touches
+            return handleZoomPanGesture(
+                event = event,
+                ctx = view.context,
+                onFirstPointerDown = {
+                    uiShowingBeforeGesture = playerView.callbacks?.isUIShowing() ?: false
+                    playerView.callbacks?.onHidePlayerUI()
+                },
+                onGestureEnd = {
+                    currentTouchStart = null
+                    currentLastTouchAction = null
+                    currentTouchAction = null
+                    currentTouchStartPlayerTime = null
+                    currentTouchLast = null
+                    currentTouchStartTime = null
+                }
+            )
+        }
+
+        when (event.actionMasked) {
+            MotionEvent.ACTION_DOWN -> {
+                isCurrentTouchValid = isValidTouch(event.rawX, event.rawY)
+                if (isCurrentTouchValid) {
+                    playerView.callbacks?.onTouchDown()
+                    hasTriggeredSpeedUp = false
+                    if (speedupEnabled && playerView.player.getIsPlaying() && !isLocked) {
+                        holdHandler.postDelayed(holdRunnable, 500)
+                    }
+                    isVolumeLocked = currentRequestedVolume < 1.0f
+                    if (currentRequestedVolume <= 1.0f) hasShownVolumeToast = false
+                    isBrightnessLocked = currentRequestedBrightness < 1.0f
+                    if (currentRequestedBrightness <= 1.0f) hasShownBrightnessToast = false
+                    currentTouchStartTime = System.currentTimeMillis()
+                    currentTouchStart = currentTouch
+                    currentTouchLast = currentTouch
+                    currentTouchStartPlayerTime = playerView.player.getPosition()
+                    getBrightness()?.let { currentRequestedBrightness = it + currentExtraBrightness }
+                    verifyVolume()
+                }
+                return true
+            }
+
+            MotionEvent.ACTION_MOVE -> {
+                if (hasTriggeredSpeedUp) return true
+                if (!isCurrentTouchValid) return true
+
+                if (currentTouchAction == null && startTouch != null) {
+                    val diffFromStart = startTouch - currentTouch
+                    if (swipeVerticalEnabled) {
+                        if (abs(diffFromStart.y * 100 / screenHeightWithOrientation) > MINIMUM_VERTICAL_SWIPE) {
+                            holdHandler.removeCallbacks(holdRunnable)
+                            uiShowingBeforeGesture = playerView.callbacks?.isUIShowing() ?: false
+                            playerView.callbacks?.onHidePlayerUI()
+                            currentTouchAction = if ((startTouch.x) >= view.width / 2f)
+                                TouchAction.Volume else TouchAction.Brightness
+                        }
+                    }
+                    if (swipeHorizontalEnabled && !isLocked) {
+                        if (abs(diffFromStart.x * 100 / screenHeightWithOrientation) > MINIMUM_HORIZONTAL_SWIPE) {
+                            holdHandler.removeCallbacks(holdRunnable)
+                            currentTouchAction = TouchAction.Time
+                        }
+                    }
+                }
+
+                val lastTouch = currentTouchLast
+                if (lastTouch != null) {
+                    val diffFromLast = lastTouch - currentTouch
+                    val verticalAddition = diffFromLast.y * VERTICAL_MULTIPLIER / view.height.toFloat()
+                    when (currentTouchAction) {
+                        TouchAction.Time -> {
+                            // This simply updates UI as the seek logic happens on release
+                            // startTime is rounded to make the UI sync in a nice way.
+                            val startTime = currentTouchStartPlayerTime?.div(1000L)?.times(1000L)
+                            if (startTime != null) {
+                                calculateNewTime(startTime, startTouch, currentTouch)?.let { newMs ->
+                                    val skipMs = newMs - startTime
+                                    playerView.callbacks?.onSeekPreviewText(
+                                        "${convertTimeToString(newMs / 1000)} [${
+                                            if (abs(skipMs) < 1000) "" else if (skipMs > 0) "+" else "-"
+                                        }${convertTimeToString(abs(skipMs / 1000))}]"
+                                    )
+                                }
+                            }
+                        }
+                        TouchAction.Brightness -> if (!isLocked) handleBrightnessAdjustment(verticalAddition)
+                        TouchAction.Volume -> if (!isLocked) handleVolumeAdjustment(verticalAddition, false)
+                        null -> Unit
+                    }
+                    if (currentTouchAction != TouchAction.Time) {
+                        playerView.callbacks?.onSeekPreviewText(null)
+                    }
+                }
+                currentTouchLast = currentTouch
+                return true
+            }
+
+            MotionEvent.ACTION_CANCEL, MotionEvent.ACTION_UP -> {
+                holdHandler.removeCallbacks(holdRunnable)
+                if (hasTriggeredSpeedUp) {
+                    playerView.player.setPlaybackSpeed(DataStoreHelper.playBackSpeed)
+                    showOrHideSpeedUp(false)
+                    playerView.callbacks?.onHoldSpeedUp(false)
+                    hasTriggeredSpeedUp = false
+                }
+
+                if (isCurrentTouchValid) {
+                    // Horizontal seek on release
+                    if (swipeHorizontalEnabled && currentTouchAction == TouchAction.Time && !isLocked) {
+                        val startTime = currentTouchStartPlayerTime
+                        if (startTime != null) {
+                            calculateNewTime(startTime, startTouch, currentTouch)?.let { seekTo ->
+                                if (abs(seekTo - startTime) > MINIMUM_SEEK_TIME) {
+                                    playerView.player.seekTo(seekTo, PlayerEventSource.UI)
+                                }
+                            }
+                        }
+                    }
+                    // Tap detection: only fire if the finger was held briefly (not a long-press).
+                    val holdTime = currentTouchStartTime?.let { System.currentTimeMillis() - it }
+                    if (currentTouchAction == null && currentLastTouchAction == null
+                        && !hasTriggeredSpeedUp
+                        && (holdTime == null || holdTime < DOUBLE_TAP_MAXIMUM_HOLD_TIME)) {
+                        onTapDetected(
+                            x = currentTouch.x,
+                            viewWidth = view.width,
+                            isLocked = isLocked,
+                            onSingleTap = { playerView.callbacks?.onSingleTap() }
+                        )
+                    }
+                }
+
+                playerView.callbacks?.onSeekPreviewText(null)
+                val hadSwipe = currentTouchAction != null || currentLastTouchAction != null
+                playerView.callbacks?.onGestureEnd(hadSwipe, uiShowingBeforeGesture)
+
+                // Reset touch
+                lastTouchEndTime = System.currentTimeMillis()
+                isCurrentTouchValid = false
+                currentTouchStart = null
+                currentLastTouchAction = currentTouchAction
+                currentTouchAction = null
+                currentTouchStartPlayerTime = null
+                currentTouchLast = null
+                currentTouchStartTime = null
+                uiShowingBeforeGesture = false
+                return true
+            }
+        }
+        return false
+    }
+}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerPipHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerPipHelper.kt
index cc99b585f54..0db06499efe 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerPipHelper.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerPipHelper.kt
@@ -1,121 +1,205 @@
 package com.lagradost.cloudstream3.ui.player
 
 import android.app.Activity
+import android.app.AppOpsManager
 import android.app.PendingIntent
 import android.app.PictureInPictureParams
 import android.app.RemoteAction
+import android.content.Context
 import android.content.Intent
+import android.content.pm.PackageManager
 import android.graphics.drawable.Icon
 import android.os.Build
 import android.util.Rational
 import androidx.annotation.RequiresApi
 import androidx.annotation.StringRes
+import androidx.preference.PreferenceManager
+import com.lagradost.cloudstream3.CommonActivity
 import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.mvvm.safe
 import kotlin.math.roundToInt
 
-class PlayerPipHelper {
-    companion object {
-        @RequiresApi(Build.VERSION_CODES.O)
-        private fun getPen(activity: Activity, code: Int): PendingIntent {
-            return PendingIntent.getBroadcast(
-                activity,
-                code,
-                Intent(ACTION_MEDIA_CONTROL).putExtra(EXTRA_CONTROL_TYPE, code),
-                PendingIntent.FLAG_IMMUTABLE
-            )
+object PlayerPipHelper {
+    /** Is pip (Player in Player) supported, and enabled? */
+    fun Context.isPIPPossible() : Boolean {
+        return try {
+            this.hasPIPEnabled() && this.hasPIPFeature()
+        } catch (t : Throwable) {
+            // While both hasPIPEnabled and hasPIPFeature should never throw, this catches it just in case
+            logError(t)
+            false
         }
+    }
 
-        @RequiresApi(Build.VERSION_CODES.O)
-        private fun getRemoteAction(
-            activity: Activity,
-            id: Int,
-            @StringRes title: Int,
-            event: CSPlayerEvent
-        ): RemoteAction {
-            val text = activity.getString(title)
-            return RemoteAction(
-                Icon.createWithResource(activity, id),
-                text,
-                text,
-                getPen(activity, event.value)
-            )
+    /** Is pip enabled in app settings? */
+    private fun Context.hasPIPEnabled(): Boolean {
+        return try {
+            val settingsManager = PreferenceManager.getDefaultSharedPreferences(this)
+            settingsManager?.getBoolean(
+                getString(R.string.pip_enabled_key),
+                true
+            ) ?: true
+        } catch (e: Exception) {
+            logError(e)
+            false
         }
+    }
+
+
+    /**
+     * Is pip supported by the OS?
+     *
+     * Source:
+     * https://stackoverflow.com/questions/52594181/how-to-know-if-user-has-disabled-picture-in-picture-feature-permission
+     * https://developer.android.com/guide/topics/ui/picture-in-picture
+     * */
+    private fun Context.hasPIPFeature(): Boolean =
+        // OS Support
+        Build.VERSION.SDK_INT >= Build.VERSION_CODES.N &&
+                // Might have the feature, but OS blocked due to power drain
+                this.packageManager.hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE) &&
+                // Might have been disabled by the user
+                this.hasPIPPermission()
+
+    /** Is pip enabled in the OS settings? */
+    private fun Context.hasPIPPermission(): Boolean {
+        val appOps =
+            getSystemService(Context.APP_OPS_SERVICE) as AppOpsManager
+        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            appOps.checkOpNoThrow(
+                AppOpsManager.OPSTR_PICTURE_IN_PICTURE,
+                android.os.Process.myUid(),
+                packageName
+            ) == AppOpsManager.MODE_ALLOWED
+        } else true
+    }
+
+    @RequiresApi(Build.VERSION_CODES.O)
+    private fun getPen(activity: Activity, code: Int): PendingIntent {
+        return PendingIntent.getBroadcast(
+            activity,
+            code,
+            Intent(ACTION_MEDIA_CONTROL).putExtra(EXTRA_CONTROL_TYPE, code),
+            PendingIntent.FLAG_IMMUTABLE
+        )
+    }
 
-        @RequiresApi(Build.VERSION_CODES.O)
-        fun updatePIPModeActions(activity: Activity, isPlaying: Boolean, aspectRatio: Rational?) {
-            val actions: ArrayList<RemoteAction> = ArrayList()
+    @RequiresApi(Build.VERSION_CODES.O)
+    private fun getRemoteAction(
+        activity: Activity,
+        id: Int,
+        @StringRes title: Int,
+        event: CSPlayerEvent
+    ): RemoteAction {
+        val text = activity.getString(title)
+        return RemoteAction(
+            Icon.createWithResource(activity, id),
+            text,
+            text,
+            getPen(activity, event.value)
+        )
+    }
+
+    fun updatePIPModeActions(
+        activity: Activity?,
+        status: CSPlayerLoading,
+        pipEnabled: Boolean,
+        aspectRatio: Rational?
+    ) {
+        // Is it even desired to enter pip mode right now if we ignore all settings?
+        // This does not check for isPIPPossible as that is deferred to later
+        val isPipDesired = when (status) {
+            CSPlayerLoading.IsBuffering, CSPlayerLoading.IsPlaying -> pipEnabled
+            else -> false
+        }
+
+        // On lower api ver setPictureInPictureParams is not supported,
+        // so we enter pip manually in onUserLeaveHint
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+            CommonActivity.isPipDesired = isPipDesired
+            return
+        }
+
+        if(activity == null) return
+
+        val actions: ArrayList<RemoteAction> = ArrayList()
+        actions.add(
+            getRemoteAction(
+                activity,
+                R.drawable.baseline_headphones_24,
+                R.string.audio_singular,
+                CSPlayerEvent.PlayAsAudio
+            )
+        )
+        /*actions.add(
+            getRemoteAction(
+                activity,
+                R.drawable.go_back_30,
+                R.string.go_back_30,
+                CSPlayerEvent.SeekBack
+            )
+        )*/
+
+        if (status == CSPlayerLoading.IsPlaying) {
             actions.add(
                 getRemoteAction(
                     activity,
-                    R.drawable.baseline_headphones_24,
-                    R.string.audio_singluar,
-                    CSPlayerEvent.PlayAsAudio
+                    R.drawable.netflix_pause,
+                    R.string.pause,
+                    CSPlayerEvent.Pause
                 )
             )
-            /*actions.add(
-                getRemoteAction(
-                    activity,
-                    R.drawable.go_back_30,
-                    R.string.go_back_30,
-                    CSPlayerEvent.SeekBack
-                )
-            )*/
-
-            if (isPlaying) {
-                actions.add(
-                    getRemoteAction(
-                        activity,
-                        R.drawable.netflix_pause,
-                        R.string.pause,
-                        CSPlayerEvent.Pause
-                    )
-                )
-            } else {
-                actions.add(
-                    getRemoteAction(
-                        activity,
-                        R.drawable.ic_baseline_play_arrow_24,
-                        R.string.pause,
-                        CSPlayerEvent.Play
-                    )
-                )
-            }
-
+        } else {
             actions.add(
                 getRemoteAction(
                     activity,
-                    R.drawable.go_forward_30,
-                    R.string.go_forward_30,
-                    CSPlayerEvent.SeekForward
+                    R.drawable.ic_baseline_play_arrow_24,
+                    R.string.pause,
+                    CSPlayerEvent.Play
                 )
             )
+        }
+
+        actions.add(
+            getRemoteAction(
+                activity,
+                R.drawable.go_forward_30,
+                R.string.go_forward_30,
+                CSPlayerEvent.SeekForward
+            )
+        )
 
-            // Nessecary to prevent crashing.
-            val mixAspectRatio = 0.41841f // ~1/2.39
-            val maxAspectRatio = 2.39f // widescreen standard
-            val ratioAccuracy = 100000 // To convert the float to int
-
-            // java.lang.IllegalArgumentException: setPictureInPictureParams: Aspect ratio is too extreme (must be between 0.418410 and 2.390000)
-            val fixedRational =
-                aspectRatio?.toFloat()?.coerceIn(mixAspectRatio, maxAspectRatio)?.let {
-                    Rational((it * ratioAccuracy).roundToInt(), ratioAccuracy)
-                }
-
-            safe {
-                activity.setPictureInPictureParams(
-                    PictureInPictureParams.Builder()
-                        .apply {
-                            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-                                setSeamlessResizeEnabled(true)
-                                setAutoEnterEnabled(isPlaying)
-                            }
-                        }
-                        .setAspectRatio(fixedRational)
-                        .setActions(actions)
-                        .build()
-                )
+        // Necessary to prevent crashing.
+        val mixAspectRatio = 0.41841f // ~1/2.39
+        val maxAspectRatio = 2.39f // widescreen standard
+        val ratioAccuracy = 100000 // To convert the float to int
+
+        // java.lang.IllegalArgumentException: setPictureInPictureParams: Aspect ratio is too extreme
+        // (must be between 0.418410 and 2.390000)
+        val fixedRational =
+            aspectRatio?.toFloat()?.coerceIn(mixAspectRatio, maxAspectRatio)?.let {
+                Rational((it * ratioAccuracy).roundToInt(), ratioAccuracy)
             }
+
+        safe {
+            activity.setPictureInPictureParams(
+                PictureInPictureParams.Builder()
+                    .apply {
+                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+                            setSeamlessResizeEnabled(true)
+                            setAutoEnterEnabled(isPipDesired && activity.isPIPPossible())
+                        } else {
+                            // We enter pip manually in onUserLeaveHint as the smooth transition
+                            // is not supported yet
+                            CommonActivity.isPipDesired = isPipDesired
+                        }
+                    }
+                    .setAspectRatio(fixedRational)
+                    .setActions(actions)
+                    .build()
+            )
         }
     }
-}
\ No newline at end of file
+
+}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerSubtitleHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerSubtitleHelper.kt
index 0257521bd6e..ee6170aa53f 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
@@ -11,6 +11,7 @@ import androidx.media3.ui.SubtitleView
 import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.ui.subtitles.SaveCaptionStyle
 import com.lagradost.cloudstream3.ui.subtitles.SubtitlesFragment.Companion.setSubtitleViewStyle
+import com.lagradost.cloudstream3.utils.SubtitleHelper.fromLanguageToTagIETF
 import com.lagradost.cloudstream3.utils.UIHelper.toPx
 
 enum class SubtitleStatus {
@@ -30,7 +31,7 @@ enum class SubtitleOrigin {
  * @param nameSuffix An extra suffix added to the subtitle to make sure it is unique
  * @param url Url for the subtitle, when EMBEDDED_IN_VIDEO this variable is used as the real backend id
  * @param headers if empty it will use the base onlineDataSource headers else only the specified headers
- * @param languageCode Not guaranteed to follow any standard. Could be something like "English 4" or "en".
+ * @param languageCode usually, tags such as "en", "es-mx", or "zh-hant-TW". But it could be something like "English 4"
  * */
 data class SubtitleData(
     val originalName: String,
@@ -41,17 +42,23 @@ data class SubtitleData(
     val headers: Map<String, String>,
     val languageCode: String?,
 ) {
-    companion object {
-        fun constructName(originalName: String, nameSuffix: String) = "$originalName $nameSuffix"
-    }
-
     /** Internal ID for exoplayer, unique for each link*/
     fun getId(): String {
         return if (origin == SubtitleOrigin.EMBEDDED_IN_VIDEO) url
         else "$url|$name"
     }
 
-    val name = constructName(originalName, nameSuffix)
+    /** Returns true if langCode is the same as the IETF tag */
+    fun matchesLanguageCode(langCode: String): Boolean {
+        return getIETF_tag() == langCode
+    }
+
+    /** Tries hard to figure out a valid IETF tag based on language code and name. Will return null if not found. */
+    fun getIETF_tag(): String? {
+        return fromLanguageToTagIETF(this.languageCode) ?: fromLanguageToTagIETF(this.originalName, halfMatch = true)
+    }
+
+    val name = "$originalName $nameSuffix"
 
     /**
      * Gets the URL, but tries to fix it if it is malformed.
@@ -103,8 +110,8 @@ class PlayerSubtitleHelper {
                 url = subtitleFile.url,
                 origin = SubtitleOrigin.URL,
                 mimeType = subtitleFile.url.toSubtitleMimeType(),
-                headers = emptyMap(),
-                languageCode = subtitleFile.lang
+                headers = subtitleFile.headers ?: emptyMap(),
+                languageCode = subtitleFile.langTag ?: subtitleFile.lang
             )
         }
     }
@@ -122,7 +129,7 @@ class PlayerSubtitleHelper {
     fun setSubStyle(style: SaveCaptionStyle) {
         Log.i(TAG, "SET STYLE = $style")
         subtitleView?.translationY = -style.elevation.toPx.toFloat()
-        setSubtitleViewStyle(subtitleView, style)
+        setSubtitleViewStyle(subtitleView, style, true)
     }
 
     fun initSubtitles(subView: SubtitleView?, subHolder: FrameLayout?, style: SaveCaptionStyle?) {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerView.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerView.kt
new file mode 100644
index 00000000000..0e6f1a3677d
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerView.kt
@@ -0,0 +1,842 @@
+package com.lagradost.cloudstream3.ui.player
+
+import android.annotation.SuppressLint
+import android.app.Activity
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.content.pm.ActivityInfo
+import android.graphics.drawable.AnimatedImageDrawable
+import android.graphics.drawable.AnimatedVectorDrawable
+import android.media.metrics.PlaybackErrorEvent
+import android.os.Build
+import android.os.Handler
+import android.os.Looper
+import android.text.format.DateUtils
+import android.util.AttributeSet
+import android.util.Log
+import android.view.View
+import android.view.WindowManager
+import android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
+import android.widget.FrameLayout
+import android.widget.ImageView
+import android.widget.ProgressBar
+import android.widget.RelativeLayout
+import android.widget.TextView
+import android.widget.Toast
+import androidx.annotation.MainThread
+import androidx.annotation.OptIn
+import androidx.core.view.isGone
+import androidx.core.view.isInvisible
+import androidx.core.view.isVisible
+import androidx.core.widget.doOnTextChanged
+import androidx.fragment.app.FragmentActivity
+import androidx.media3.common.PlaybackException
+import androidx.media3.common.util.UnstableApi
+import androidx.media3.exoplayer.ExoPlayer
+import androidx.media3.session.MediaSession
+import androidx.media3.ui.AspectRatioFrameLayout
+import androidx.media3.ui.DefaultTimeBar
+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
+import com.github.rubensousa.previewseekbar.media3.PreviewTimeBar
+import com.lagradost.cloudstream3.CommonActivity.isInPIPMode
+import com.lagradost.cloudstream3.CommonActivity.screenWidth
+import com.lagradost.cloudstream3.CommonActivity.showToast
+import com.lagradost.cloudstream3.ErrorLoadingException
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.mvvm.logError
+import com.lagradost.cloudstream3.mvvm.safe
+import com.lagradost.cloudstream3.ui.player.live.LivePreviewTimeBar
+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.SaveCaptionStyle
+import com.lagradost.cloudstream3.ui.subtitles.SubtitlesFragment
+import com.lagradost.cloudstream3.utils.AppContextUtils
+import com.lagradost.cloudstream3.utils.AppContextUtils.requestLocalAudioFocus
+import com.lagradost.cloudstream3.utils.DataStoreHelper
+import com.lagradost.cloudstream3.utils.UIHelper.hideKeyboard
+import com.lagradost.cloudstream3.utils.UIHelper.hideSystemUI
+import com.lagradost.cloudstream3.utils.UIHelper.popCurrentPage
+import com.lagradost.cloudstream3.utils.UIHelper.showSystemUI
+import com.lagradost.cloudstream3.utils.UserPreferenceDelegate
+import com.lagradost.cloudstream3.utils.videoskip.VideoSkipStamp
+import java.net.SocketTimeoutException
+
+/**
+ * Shared player view - manages ExoPlayer setup, view binding, lifecycle, and event
+ * dispatching.  Gesture/volume/brightness/key-event input is handled by [gestureHelper]
+ * ([PlayerGestureHelper]), which is exposed via delegate properties for easier access.
+ */
+@OptIn(UnstableApi::class)
+class PlayerView @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null
+) : FrameLayout(context, attrs) {
+
+    companion object {
+        private const val TAG = "PlayerView"
+    }
+
+    /** All gesture, volume, brightness and key-event logic lives here. */
+    val gestureHelper = PlayerGestureHelper(this)
+
+    /** Delegate properties (forwarded to gestureHelper for external callers to have easier access) */
+    var isFullScreen: Boolean
+        get() = gestureHelper.isFullScreen
+        set(value) { gestureHelper.isFullScreen = value }
+
+    var isLocked: Boolean
+        get() = gestureHelper.isLocked
+        set(value) { gestureHelper.isLocked = value }
+
+    var videoOutline: View?
+        get() = gestureHelper.videoOutline
+        set(value) { gestureHelper.videoOutline = value }
+
+    /** Delegate methods */
+    fun handleVolumeKey(keyCode: Int) = gestureHelper.handleVolumeKey(keyCode)
+    fun verifyVolume() = gestureHelper.verifyVolume()
+    fun setupKeyEventListener() = gestureHelper.setupKeyEventListener()
+    fun releaseKeyEventListener() = gestureHelper.releaseKeyEventListener()
+    fun requestUpdateBrightnessOverlayOnNextLayout() = gestureHelper.requestUpdateBrightnessOverlayOnNextLayout()
+    fun releaseOverlayLayoutListener() = gestureHelper.releaseOverlayLayoutListener()
+
+    /** Callbacks */
+
+    /** Host-fragment-level callbacks invoked by [mainCallback]. */
+    interface Callbacks {
+        fun nextEpisode() {}
+        fun prevEpisode() {}
+        fun playerPositionChanged(position: Long, duration: Long) {}
+        fun playerStatusChanged() {}
+        fun playerDimensionsLoaded(width: Int, height: Int) {}
+        fun subtitlesChanged() {}
+        fun embeddedSubtitlesFetched(subtitles: List<SubtitleData>) {}
+        fun onTracksInfoChanged() {}
+        fun onTimestamp(timestamp: VideoSkipStamp?) {}
+        fun onTimestampSkipped(timestamp: VideoSkipStamp) {}
+        fun exitedPipMode() {}
+        fun hasNextMirror(): Boolean = false
+        fun nextMirror() {}
+        fun onDownload(event: DownloadEvent) {}
+        fun playerError(exception: Throwable) {}
+        /** Called after [PlayerView] finishes its own player-attached setup (MediaSession, ExoPlayer view). */
+        fun playerUpdated(player: Any?) {}
+        /** Called on a short single-tap on empty player area (no swipe, no double-tap). */
+        fun onSingleTap() {}
+        /** Called when the hold-for-speedup gesture starts (show=true) or ends (show=false). */
+        fun onHoldSpeedUp(show: Boolean) {}
+        /** Called during brightness swipe with the current extra-brightness alpha (0–1). */
+        fun onBrightnessExtra(alpha: Float) {}
+
+        /** Touch event callbacks */
+
+        /** Returns whether the player UI (controls overlay) is currently visible. */
+        fun isUIShowing(): Boolean = false
+        /** Called on a valid ACTION_DOWN; use for e.g. dismissing an episode overlay. */
+        fun onTouchDown() {}
+        /** Called with seek-preview text during a horizontal-swipe, or null to clear it. */
+        fun onSeekPreviewText(text: String?) {}
+        /** Called when a swipe gesture begins; hide the player UI if desired. */
+        fun onHidePlayerUI() {}
+        /**
+         * Called at the end of each touch sequence.
+         *  @param hadSwipe   true if a swipe (brightness/volume/time) was in progress.
+         *  @param wasUiShowing true if the UI was visible when the swipe began.
+         */
+        fun onGestureEnd(hadSwipe: Boolean, wasUiShowing: Boolean) {}
+        /**
+         * Called when the auto-hide timer fires: UI is showing, no touch is active.
+         * Implement to hide the player controls.
+         */
+        fun onAutoHideUI() {}
+    }
+
+    var callbacks: Callbacks? = null
+
+    /** Player state */
+
+    var player: IPlayer = CS3IPlayer()
+    var resizeMode: Int = 0
+    var hasPipModeSupport: Boolean = true
+    var currentPlayerStatus: CSPlayerLoading = CSPlayerLoading.IsBuffering
+    var mMediaSession: MediaSession? = null
+    private var pipReceiver: BroadcastReceiver? = null
+
+    /** Auto-hide */
+    private var autoHideToken = 0
+    private val autoHideHandler = Handler(Looper.getMainLooper())
+
+    /** View references (populated by bindViews) */
+
+    var subView: SubtitleView? = null
+    var playerPausePlayHolderHolder: FrameLayout? = null
+    var playerPausePlay: ImageView? = null
+    var playerBuffering: ProgressBar? = null
+    /** The Media3/ExoPlayer [androidx.media3.ui.PlayerView] widget. */
+    var exoPlayerView: androidx.media3.ui.PlayerView? = null
+    var piphide: FrameLayout? = null
+    var subtitleHolder: FrameLayout? = null
+    internal var playerRew: View? = null
+    internal var playerFfwd: View? = null
+    internal var exoRewText: TextView? = null
+    internal var exoFfwdText: TextView? = null
+    internal var playerCenterMenu: View? = null
+    internal var playerRewHolder: View? = null
+    internal var playerFfwdHolder: View? = null
+    internal var playerVideoHolder: View? = null
+    var playerProgressbarLeftHolder: RelativeLayout? = null
+    var playerProgressbarLeftIcon: ImageView? = null
+    var playerProgressbarLeftLevel1: ProgressBar? = null
+    var playerProgressbarLeftLevel2: ProgressBar? = null
+    var playerProgressbarRightHolder: RelativeLayout? = null
+    var playerProgressbarRightIcon: ImageView? = null
+    var playerProgressbarRightLevel1: ProgressBar? = null
+    var playerProgressbarRightLevel2: ProgressBar? = null
+    /** Accessed by [PlayerGestureHelper.showOrHideSpeedUp]. */
+    internal var playerSpeedupButton: View? = null
+    var playerHolder: FrameLayout? = null
+    private var exoDuration: TextView? = null
+    private var timeLeft: TextView? = null
+    private var exoPosition: TextView? = null
+    private var timeLive: View? = null
+    private var exoProgress: LivePreviewTimeBar? = null
+
+    /** Seek delta used by the basic rew/ffwd click listeners. Read from settings in [initialize]. */
+    var seekTime: Long = 10_000L
+
+    /** True when the current video is taller than it is wide. Set by [mainCallback] on [ResizedEvent]. */
+    var isVerticalOrientation: Boolean = false
+
+    /** When true, [dynamicOrientation] returns portrait for portrait videos. Read from settings in [initialize]. */
+    var autoPlayerRotateEnabled: Boolean = false
+
+    var durationMode: Boolean by UserPreferenceDelegate("duration_mode", false)
+
+    // Kept so SubtitlesFragment can unsubscribe the exact same reference.
+    private val subStyleListener: (SaveCaptionStyle) -> Unit = ::onSubStyleChanged
+
+    /** View discovery */
+
+    /**
+     * Discovers player-related views from [root].  IDs absent in compact layouts (e.g. trailer) simply
+     * remain null, all usage is null-safe.
+     */
+    fun bindViews(root: View) {
+        exoDuration = root.findViewById(androidx.media3.ui.R.id.exo_duration)
+        exoFfwdText = root.findViewById(R.id.exo_ffwd_text)
+        exoPlayerView = root.findViewById(R.id.player_view)
+        exoPosition = root.findViewById(R.id.exo_position)
+        exoRewText = root.findViewById(R.id.exo_rew_text)
+        piphide = root.findViewById(R.id.piphide)
+        playerBuffering = root.findViewById(R.id.player_buffering)
+        playerCenterMenu = root.findViewById(R.id.player_center_menu)
+        playerFfwd = root.findViewById(R.id.player_ffwd)
+        playerFfwdHolder = root.findViewById(R.id.player_ffwd_holder)
+        playerHolder = root.findViewById(R.id.player_holder)
+        playerPausePlay = root.findViewById(R.id.player_pause_play)
+        playerPausePlayHolderHolder = root.findViewById(R.id.player_pause_play_holder_holder)
+        playerProgressbarLeftHolder = root.findViewById(R.id.player_progressbar_left_holder)
+        playerProgressbarLeftIcon = root.findViewById(R.id.player_progressbar_left_icon)
+        playerProgressbarLeftLevel1 = root.findViewById(R.id.player_progressbar_left_level1)
+        playerProgressbarLeftLevel2 = root.findViewById(R.id.player_progressbar_left_level2)
+        playerProgressbarRightHolder = root.findViewById(R.id.player_progressbar_right_holder)
+        playerProgressbarRightIcon = root.findViewById(R.id.player_progressbar_right_icon)
+        playerProgressbarRightLevel1 = root.findViewById(R.id.player_progressbar_right_level1)
+        playerProgressbarRightLevel2 = root.findViewById(R.id.player_progressbar_right_level2)
+        playerRew = root.findViewById(R.id.player_rew)
+        playerRewHolder = root.findViewById(R.id.player_rew_holder)
+        playerSpeedupButton = root.findViewById(R.id.player_speedup_button)
+        playerVideoHolder = root.findViewById(R.id.player_video_holder)
+        subtitleHolder = root.findViewById(R.id.subtitle_holder)
+        timeLeft = root.findViewById(R.id.time_left)
+        timeLive = root.findViewById(R.id.time_live)
+    }
+
+    /**
+     * Called once after [bindViews].  Sets up the preview seek-bar, subtitle style listener,
+     * player callbacks and basic controls; then delegates gesture/input setup to [gestureHelper].
+     */
+    fun initialize() {
+        resizeMode = DataStoreHelper.resizeMode
+        resize(resizeMode, false)
+
+        player.releaseCallbacks()
+        player.initCallbacks(
+            eventHandler = ::mainCallback,
+            requestedListeningPercentages = listOf(
+                SKIP_OP_VIDEO_PERCENTAGE,
+                PRELOAD_NEXT_EPISODE_PERCENTAGE,
+                NEXT_WATCH_EPISODE_PERCENTAGE,
+                UPDATE_SYNC_PROGRESS_PERCENTAGE,
+            ),
+        )
+
+        if (player is CS3IPlayer) {
+            // Preview bar
+            val progressBar: PreviewTimeBar? = exoPlayerView?.findViewById(R.id.exo_progress)
+            exoProgress = progressBar as? LivePreviewTimeBar
+            val previewImageView: ImageView? = exoPlayerView?.findViewById(R.id.previewImageView)
+            val previewFrameLayout: FrameLayout? =
+                exoPlayerView?.findViewById(R.id.previewFrameLayout)
+
+            /** Hide the previewFrameLayout on TV to make the skip op button not float,
+             * as previewFrameLayout is normally invisible */
+            if(isLayout(TV)) {
+                previewFrameLayout?.isVisible = false
+            }
+
+            if (progressBar != null && previewImageView != null && previewFrameLayout != null && !isLayout(TV)) {
+                var resume = false
+                progressBar.addOnScrubListener(object : PreviewBar.OnScrubListener {
+                    override fun onScrubStart(previewBar: PreviewBar?) {
+                        val cs3 = player as? CS3IPlayer ?: return
+                        val hasPreview = cs3.hasPreview()
+                        progressBar.isPreviewEnabled = hasPreview
+                        resume = cs3.getIsPlaying()
+                        if (resume) cs3.handleEvent(CSPlayerEvent.Pause, PlayerEventSource.Player)
+                        // No clashing UI
+                        if (hasPreview) subView?.isVisible = false
+                    }
+
+                    override fun onScrubMove(previewBar: PreviewBar?, progress: Int, fromUser: Boolean) {}
+
+                    override fun onScrubStop(previewBar: PreviewBar?) {
+                        val cs3 = player as? CS3IPlayer ?: return
+                        if (resume) cs3.handleEvent(CSPlayerEvent.Play, PlayerEventSource.Player)
+                        // Delay to prevent the small flicker of subtitle before seeking.
+                        subView?.postDelayed({
+                            // If we are not scrubbing then show subtitles again.
+                            if (previewBar == null || !previewBar.isPreviewEnabled || !previewBar.isShowingPreview) {
+                                subView?.isVisible = true
+                            }
+                        }, 200)
+                    }
+                })
+                progressBar.attachPreviewView(previewFrameLayout)
+                progressBar.setPreviewLoader { currentPosition, max ->
+                    val cs3 = player as? CS3IPlayer ?: return@setPreviewLoader
+                    val bitmap = cs3.getPreview(currentPosition.toFloat().div(max.toFloat()))
+                    previewImageView.isGone = bitmap == null
+                    previewImageView.setImageBitmap(bitmap)
+                }
+            }
+
+            subView = exoPlayerView?.findViewById(androidx.media3.ui.R.id.exo_subtitles)
+            (player as? CS3IPlayer)?.initSubtitles(subView, subtitleHolder, CustomDecoder.style)
+            (player as? CS3IPlayer)?.let {
+                (it.imageGenerator as? PreviewGenerator)?.params =
+                    ImageParams.new16by9(screenWidth)
+            }
+
+            /**
+             * This might seam a bit fucky and that is because it is, the seek event is captured twice, once by the player
+             * and once by the UI even if it should only be registered once by the UI.
+             */
+            exoPlayerView?.findViewById<DefaultTimeBar>(R.id.exo_progress)
+                ?.addListener(object : TimeBar.OnScrubListener {
+                    override fun onScrubStart(timeBar: TimeBar, position: Long) = Unit
+                    override fun onScrubMove(timeBar: TimeBar, position: Long) = Unit
+                    override fun onScrubStop(timeBar: TimeBar, position: Long, canceled: Boolean) {
+                        if (canceled) return
+                        val playerDuration = player.getDuration() ?: return
+                        val playerPosition = player.getPosition() ?: return
+                        mainCallback(
+                            PositionEvent(
+                                source = PlayerEventSource.UI,
+                                durationMs = playerDuration,
+                                fromMs = playerPosition,
+                                toMs = position
+                            )
+                        )
+                    }
+                })
+
+            // Read seek time and rotation settings.
+            try {
+                val sm = PreferenceManager.getDefaultSharedPreferences(context)
+                seekTime = sm.getInt(context.getString(R.string.double_tap_seek_time_key), 10)
+                    .toLong() * 1000L
+                autoPlayerRotateEnabled = sm.getBoolean(
+                    context.getString(R.string.auto_rotate_video_key), true
+                )
+            } catch (_: Exception) {
+            }
+
+            val seekSecs = (seekTime / 1000).toInt()
+            exoRewText?.text = context.getString(R.string.rew_text_regular_format).format(seekSecs)
+            exoFfwdText?.text = context.getString(R.string.ffw_text_regular_format).format(seekSecs)
+
+            playerPausePlay?.setOnClickListener {
+                scheduleAutoHide()
+                if (currentPlayerStatus == CSPlayerLoading.IsEnded && isLayout(PHONE)) {
+                    player.handleEvent(CSPlayerEvent.Restart, PlayerEventSource.UI)
+                } else {
+                    player.handleEvent(CSPlayerEvent.PlayPauseToggle, PlayerEventSource.UI)
+                }
+            }
+            playerRew?.setOnClickListener  {
+                scheduleAutoHide()
+                gestureHelper.rewind()
+            }
+            playerFfwd?.setOnClickListener {
+                scheduleAutoHide()
+                gestureHelper.fastForward()
+            }
+
+            SubtitlesFragment.applyStyleEvent += subStyleListener
+
+            try {
+                val ctx = context
+                val settingsManager = PreferenceManager.getDefaultSharedPreferences(ctx)
+                val cs3 = player as? CS3IPlayer ?: return
+                cs3.cacheSize =
+                    settingsManager.getInt(context.getString(R.string.video_buffer_size_key), 0) * 1024L * 1024L
+                cs3.simpleCacheSize =
+                    settingsManager.getInt(context.getString(R.string.video_buffer_disk_key), 0) * 1024L * 1024L
+                cs3.videoBufferMs =
+                    settingsManager.getInt(context.getString(R.string.video_buffer_length_key), 0) * 1000L
+            } catch (e: Exception) {
+                logError(e)
+            }
+
+            // Duration toggle click listeners
+            exoDuration?.setOnClickListener { setRemainingTimeCounter(true) }
+            timeLeft?.setOnClickListener { setRemainingTimeCounter(false) }
+            // Keep remaining-time text in sync with playback position
+            exoPosition?.doOnTextChanged { _, _, _, _ -> updateRemainingTime() }
+
+            // Delegate gesture/input setup (settings, brightness overlay, touch gestures, key listener)
+            gestureHelper.initialize()
+            setupKeyEventListener()
+
+            // Apply duration-mode display (remaining time vs elapsed); TV always shows remaining
+            setRemainingTimeCounter(durationMode || isLayout(TV))
+        }
+    }
+
+    /** Lifecycle delegation */
+
+    var fullscreenNotch: Boolean = true // TODO SETTING
+
+    fun enterFullscreen(updateOrientation: () -> Unit = {}) {
+        val activity = context as? Activity
+        if (isFullScreen) {
+            activity?.hideSystemUI()
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && fullscreenNotch) {
+                val params = activity?.window?.attributes
+                params?.layoutInDisplayCutoutMode = LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
+                activity?.window?.attributes = params
+            }
+        }
+        updateOrientation()
+    }
+
+    fun exitFullscreen() {
+        val activity = context as? Activity
+        gestureHelper.resetZoomToDefault()
+        activity?.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_USER
+        // Simply resets brightness and notch settings that might have been overridden.
+        val lp = activity?.window?.attributes
+        lp?.screenBrightness = WindowManager.LayoutParams.BRIGHTNESS_OVERRIDE_NONE
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            lp?.layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_DEFAULT
+        }
+        activity?.window?.attributes = lp
+        activity?.showSystemUI()
+    }
+
+    fun onStop() {
+        player.onStop()
+    }
+
+    fun onResume(ctx: Context) {
+        player.onResume(ctx)
+    }
+
+    /** Releases all player resources. */
+    fun release() {
+        player.release()
+        player.releaseCallbacks()
+        player = CS3IPlayer()
+
+        // keyEventListener is deregistered in onPause so that the incoming player's
+        // onResume can register its own listener without racing against release().
+
+        PlayerPipHelper.updatePIPModeActions(
+            context as? Activity,
+            CSPlayerLoading.IsPaused,
+            false,
+            null
+        )
+
+        mMediaSession?.release()
+        mMediaSession = null
+        exoPlayerView?.player = null
+
+        SubtitlesFragment.applyStyleEvent -= subStyleListener
+
+        gestureHelper.release()
+        autoHideHandler.removeCallbacksAndMessages(null)
+
+        keepScreenOn(false)
+    }
+
+    fun onPictureInPictureModeChanged(
+        isInPictureInPictureMode: Boolean,
+        activity: Activity?
+    ) {
+        try {
+            isInPIPMode = isInPictureInPictureMode
+            if (isInPictureInPictureMode) {
+                // Hide the full-screen UI (controls, etc.) while in picture-in-picture mode.
+                piphide?.isVisible = false
+                pipReceiver = object : BroadcastReceiver() {
+                    override fun onReceive(context: Context, intent: Intent) {
+                        if (ACTION_MEDIA_CONTROL != intent.action) return
+                        player.handleEvent(
+                            CSPlayerEvent.entries[intent.getIntExtra(EXTRA_CONTROL_TYPE, 0)],
+                            source = PlayerEventSource.UI
+                        )
+                    }
+                }
+                val filter = IntentFilter().apply { addAction(ACTION_MEDIA_CONTROL) }
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                    activity?.registerReceiver(pipReceiver, filter, Context.RECEIVER_EXPORTED)
+                } else {
+                    @SuppressLint("UnspecifiedRegisterReceiverFlag")
+                    activity?.registerReceiver(pipReceiver, filter)
+                }
+                val isPlaying = player.getIsPlaying()
+                val status = if (isPlaying) CSPlayerLoading.IsPlaying else CSPlayerLoading.IsPaused
+                updateIsPlaying(status, status)
+            } else {
+                // Restore the full-screen UI.
+                piphide?.isVisible = true
+                callbacks?.exitedPipMode()
+                pipReceiver?.let {
+                    // Prevents java.lang.IllegalArgumentException: Receiver not registered
+                    safe { activity?.unregisterReceiver(it) }
+                }
+                activity?.hideSystemUI()
+                hideKeyboard(this)
+            }
+        } catch (e: Exception) {
+            logError(e)
+        }
+    }
+
+    /** Player UI helpers */
+
+    private fun keepScreenOn(on: Boolean) {
+        val window = (context as? Activity)?.window ?: return
+        if (on) window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
+        else window.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
+    }
+
+    fun updateIsPlaying(wasPlaying: CSPlayerLoading, isPlaying: CSPlayerLoading) {
+        val isPlayingRightNow = CSPlayerLoading.IsPlaying == isPlaying
+        val isBuffering = CSPlayerLoading.IsBuffering == isPlaying
+        currentPlayerStatus = isPlaying
+
+        keepScreenOn(isPlayingRightNow || isBuffering)
+
+        if (isBuffering) {
+            playerPausePlayHolderHolder?.isVisible = false
+            playerBuffering?.isVisible = true
+        } else {
+            playerPausePlayHolderHolder?.isVisible = true
+            playerBuffering?.isVisible = false
+
+            if (isPlaying == CSPlayerLoading.IsEnded && isLayout(PHONE)) {
+                playerPausePlay?.setImageResource(R.drawable.ic_baseline_replay_24)
+            } else if (wasPlaying != isPlaying) {
+                playerPausePlay?.setImageResource(
+                    if (isPlayingRightNow) R.drawable.play_to_pause else R.drawable.pause_to_play
+                )
+                val drawable = playerPausePlay?.drawable
+                var startedAnimation = false
+                if (Build.VERSION.SDK_INT > Build.VERSION_CODES.P) {
+                    if (drawable is AnimatedImageDrawable) { drawable.start(); startedAnimation = true }
+                }
+                if (drawable is AnimatedVectorDrawable) { drawable.start(); startedAnimation = true }
+                if (drawable is AnimatedVectorDrawableCompat) { drawable.start(); startedAnimation = true }
+                // Somehow the phone is wacked
+                if (!startedAnimation) {
+                    playerPausePlay?.setImageResource(
+                        if (isPlayingRightNow) R.drawable.netflix_pause else R.drawable.netflix_play
+                    )
+                }
+            } else {
+                playerPausePlay?.setImageResource(
+                    if (isPlayingRightNow) R.drawable.netflix_pause else R.drawable.netflix_play
+                )
+            }
+        }
+
+        PlayerPipHelper.updatePIPModeActions(
+            context as? Activity,
+            isPlaying,
+            hasPipModeSupport,
+            player.getAspectRatio()
+        )
+    }
+
+    private fun requestAudioFocus() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            (context as? Activity)?.requestLocalAudioFocus(AppContextUtils.getFocusRequest())
+        }
+    }
+
+    private fun playerUpdated(player: Any?) {
+        if (player is ExoPlayer) {
+            mMediaSession?.release()
+            mMediaSession = MediaSession.Builder(context, player)
+                // Ensure unique ID for concurrent players.
+                .setId(System.currentTimeMillis().toString())
+                .build()
+
+            // Necessary for multiple combined videos.
+            @Suppress("DEPRECATION")
+            exoPlayerView?.setShowMultiWindowTimeBar(true)
+            exoPlayerView?.player = player
+            exoPlayerView?.performClick()
+        }
+        callbacks?.playerUpdated(player)
+    }
+
+    private fun onSubStyleChanged(style: SaveCaptionStyle) {
+        player.updateSubtitleStyle(style)
+        // Forcefully update the subtitle encoding in case the edge size is changed.
+        player.seekTime(-1)
+    }
+
+    /** Error handling */
+
+    @MainThread
+    fun playerError(exception: Throwable) {
+        fun showErrorToast(message: String) {
+            if (callbacks?.hasNextMirror() == true) {
+                showToast(message, Toast.LENGTH_SHORT)
+                callbacks?.nextMirror()
+            } else {
+                showToast(
+                    context.getString(R.string.no_links_found_toast) + "\n" + message,
+                    Toast.LENGTH_LONG
+                )
+                (context as? FragmentActivity)?.popCurrentPage()
+            }
+        }
+
+        when (exception) {
+            is PlaybackException -> {
+                val msg = exception.message ?: ""
+                val errorName = exception.errorCodeName
+                when (val code = exception.errorCode) {
+                    PlaybackException.ERROR_CODE_IO_FILE_NOT_FOUND,
+                    PlaybackException.ERROR_CODE_IO_NO_PERMISSION,
+                    PlaybackException.ERROR_CODE_IO_READ_POSITION_OUT_OF_RANGE,
+                    PlaybackException.ERROR_CODE_IO_UNSPECIFIED,
+                    PlaybackException.ERROR_CODE_PARSING_CONTAINER_UNSUPPORTED ->
+                        showErrorToast("${context.getString(R.string.source_error)}\n$errorName ($code)\n$msg")
+
+                    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 ->
+                        showErrorToast("${context.getString(R.string.remote_error)}\n$errorName ($code)\n$msg")
+
+                    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 ->
+                        showErrorToast("${context.getString(R.string.render_error)}\n$errorName ($code)\n$msg")
+
+                    PlaybackException.ERROR_CODE_DECODING_FORMAT_UNSUPPORTED,
+                    PlaybackException.ERROR_CODE_DECODING_FORMAT_EXCEEDS_CAPABILITIES ->
+                        showErrorToast("${context.getString(R.string.unsupported_error)}\n$errorName ($code)\n$msg")
+
+                    PlaybackException.ERROR_CODE_PARSING_CONTAINER_MALFORMED,
+                    PlaybackException.ERROR_CODE_PARSING_MANIFEST_MALFORMED ->
+                        showErrorToast("${context.getString(R.string.encoding_error)}\n$errorName ($code)\n$msg")
+
+                    else ->
+                        showErrorToast("${context.getString(R.string.unexpected_error)}\n$errorName ($code)\n$msg")
+                }
+            }
+
+            is SocketTimeoutException ->
+                showErrorToast("${context.getString(R.string.remote_error)}\n${exception.message}")
+
+            is ErrorLoadingException ->
+                exception.message?.let { showErrorToast(it) }
+                    ?: showErrorToast(exception.toString())
+
+            else ->
+                exception.message?.let { showErrorToast(it) }
+                    ?: showErrorToast(exception.toString())
+        }
+    }
+
+    /** Resize */
+
+    fun nextResize() {
+        resizeMode = (resizeMode + 1) % PlayerResize.entries.size
+        resize(resizeMode, true)
+    }
+
+    fun resize(resize: Int, showToast: Boolean) {
+        // Clear all zoom state before applying the new resize mode
+        gestureHelper.clearZoomState()
+        resize(PlayerResize.entries[resize], showToast)
+    }
+
+    fun resize(resize: PlayerResize, showToast: Boolean) {
+        DataStoreHelper.resizeMode = resize.ordinal
+        val type = when (resize) {
+            PlayerResize.Fill -> AspectRatioFrameLayout.RESIZE_MODE_FILL
+            PlayerResize.Fit -> AspectRatioFrameLayout.RESIZE_MODE_FIT
+            PlayerResize.Zoom -> AspectRatioFrameLayout.RESIZE_MODE_ZOOM
+        }
+        exoPlayerView?.resizeMode = type
+        if (showToast) showToast(resize.nameRes, Toast.LENGTH_SHORT)
+    }
+
+    /** Orientation */
+
+    /**
+     * Returns the desired [ActivityInfo] orientation constant based on [isVerticalOrientation]
+     * and [autoPlayerRotateEnabled].  TV/emulator always returns sensor-landscape.
+     * Host fragments call this from [Callbacks.playerDimensionsLoaded] to apply rotation.
+     */
+    fun dynamicOrientation(): Int {
+        if (isLayout(TV or EMULATOR)) return ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE
+        return if (autoPlayerRotateEnabled && isVerticalOrientation)
+            ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT
+        else ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE
+    }
+
+    /** Event dispatch */
+
+    /**
+     * 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 WON'T stop it from changing in e.g. the player time
+     * or pause status.
+     */
+    @MainThread
+    fun mainCallback(event: PlayerEvent) {
+        // We don't want to spam DownloadEvent.
+        if (event !is DownloadEvent) Log.i(TAG, "Handle event: $event")
+        when (event) {
+            is DownloadEvent -> callbacks?.onDownload(event)
+            is ResizedEvent -> {
+                // Skip 0x0 dimensions that the player emits when going to STATE_IDLE
+                // to avoid incorrectly resetting the auto-detected orientation.
+                if (event.width > 0 && event.height > 0) {
+                    // TV never rotates; otherwise track whether the video is portrait.
+                    isVerticalOrientation = !isLayout(TV or EMULATOR) && event.height > event.width
+                }
+                callbacks?.playerDimensionsLoaded(event.width, event.height)
+            }
+            is PlayerAttachedEvent -> playerUpdated(event.player)
+            is SubtitlesUpdatedEvent -> callbacks?.subtitlesChanged()
+            is TimestampSkippedEvent -> callbacks?.onTimestampSkipped(event.timestamp)
+            is TimestampInvokedEvent -> callbacks?.onTimestamp(event.timestamp)
+            is TracksChangedEvent -> callbacks?.onTracksInfoChanged()
+            is EmbeddedSubtitlesFetchedEvent -> callbacks?.embeddedSubtitlesFetched(event.tracks)
+            is ErrorEvent -> callbacks?.playerError(event.error) ?: playerError(event.error)
+            is RequestAudioFocusEvent -> requestAudioFocus()
+            is EpisodeSeekEvent -> when (event.offset) {
+                -1 -> callbacks?.prevEpisode()
+                1 -> callbacks?.nextEpisode()
+            }
+            is StatusEvent -> {
+                updateIsPlaying(wasPlaying = event.wasPlaying, isPlaying = event.isPlaying)
+                scheduleAutoHide()
+                callbacks?.playerStatusChanged()
+            }
+            is PositionEvent -> callbacks?.playerPositionChanged(
+                position = event.toMs,
+                duration = event.durationMs
+            )
+            is VideoEndedEvent -> {
+                // Only play next episode if autoplay is on (default).
+                val ctx = context
+                if (PreferenceManager.getDefaultSharedPreferences(ctx)
+                        ?.getBoolean(ctx.getString(R.string.autoplay_next_key), true) == true
+                ) {
+                    player.handleEvent(CSPlayerEvent.NextEpisode, source = PlayerEventSource.Player)
+                }
+            }
+            is PauseEvent -> Unit
+            is PlayEvent -> Unit
+        }
+    }
+
+    /** Duration display */
+
+    fun setRemainingTimeCounter(showRemaining: Boolean) {
+        durationMode = showRemaining
+        exoDuration?.isInvisible = showRemaining
+        timeLeft?.isVisible = showRemaining
+        if (showRemaining) updateRemainingTime()
+    }
+
+    fun updateRemainingTime() {
+        val duration = player.getDuration()
+        val position = player.getPosition()
+
+        if (exoProgress?.isAtLiveEdge() == true) {
+            timeLeft?.alpha = 0f
+            exoDuration?.alpha = 0f
+            timeLive?.isVisible = true
+        } else {
+            timeLeft?.alpha = 1f
+            exoDuration?.alpha = 1f
+            timeLive?.isVisible = false
+        }
+
+        if (duration != null && duration > 1 && position != null) {
+            val remainingTimeSeconds = (duration - position + 500) / 1000
+            @SuppressLint("SetTextI18n")
+            timeLeft?.text = "-${DateUtils.formatElapsedTime(remainingTimeSeconds)}"
+        }
+    }
+
+    /** Auto-hide */
+
+    /**
+     * Schedules a delayed auto-hide of the player UI after [delayMs] ms.
+     * Any previously pending hide is canceled first.
+     * The hide fires only when no touch is active and [Callbacks.isUIShowing] is true;
+     * the actual hide action is delegated to [Callbacks.onAutoHideUI].
+     */
+    fun scheduleAutoHide(delayMs: Long = 3000L) {
+        val token = ++autoHideToken
+        autoHideHandler.removeCallbacksAndMessages(null)
+        autoHideHandler.postDelayed({
+            if (token != autoHideToken) return@postDelayed
+            if (gestureHelper.isCurrentTouchValid) return@postDelayed
+            if (callbacks?.isUIShowing() != true) return@postDelayed
+            callbacks?.onAutoHideUI()
+        }, delayMs)
+    }
+
+    /** Cancels any pending auto-hide scheduled by [scheduleAutoHide]. */
+    fun cancelAutoHide() {
+        autoHideToken++
+        autoHideHandler.removeCallbacksAndMessages(null)
+    }
+}
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 30e8d99ad8f..2893bcc47fd 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
@@ -9,7 +9,7 @@ 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.CloudStreamApp
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
@@ -65,7 +65,7 @@ interface IPreviewGenerator {
 
     companion object {
         fun new(): IPreviewGenerator {
-            val userDisabled = AcraApplication.context?.let { ctx ->
+            val userDisabled = CloudStreamApp.context?.let { ctx ->
                 PreferenceManager.getDefaultSharedPreferences(ctx)?.getBoolean(
                     ctx.getString(R.string.preview_seekbar_key), true
                 ) == false
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 bfddd9e0c53..0668a194bc3 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
@@ -9,8 +9,8 @@ import com.lagradost.cloudstream3.ui.result.ResultEpisode
 import com.lagradost.cloudstream3.utils.AppContextUtils.html
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.ExtractorLinkType
-import kotlin.math.max
-import kotlin.math.min
+import java.util.concurrent.ConcurrentHashMap
+import java.util.concurrent.atomic.AtomicInteger
 
 data class Cache(
     val linkCache: MutableSet<ExtractorLink>,
@@ -22,10 +22,9 @@ data class Cache(
 )
 
 class RepoLinkGenerator(
-    private val episodes: List<ResultEpisode>,
-    private var currentIndex: Int = 0,
+    episodes: List<ResultEpisode>,
     val page: LoadResponse? = null,
-) : IGenerator {
+) : VideoGenerator<ResultEpisode>(episodes) {
     companion object {
         const val TAG = "RepoLink"
         val cache: HashMap<Pair<String, Int>, Cache> =
@@ -34,44 +33,7 @@ class RepoLinkGenerator(
 
     override val hasCache = true
     override val canSkipLoading = true
-
-    override fun hasNext(): Boolean {
-        return currentIndex < episodes.size - 1
-    }
-
-    override fun hasPrev(): Boolean {
-        return currentIndex > 0
-    }
-
-    override fun next() {
-        Log.i(TAG, "next")
-        if (hasNext())
-            currentIndex++
-    }
-
-    override fun prev() {
-        Log.i(TAG, "prev")
-        if (hasPrev())
-            currentIndex--
-    }
-
-    override fun goto(index: Int) {
-        Log.i(TAG, "goto $index")
-        // clamps value
-        currentIndex = min(episodes.size - 1, max(0, index))
-    }
-
-    override fun getCurrentId(): Int {
-        return episodes[currentIndex].id
-    }
-
-    override fun getCurrent(offset: Int): Any? {
-        return episodes.getOrNull(currentIndex + offset)
-    }
-
-    override fun getAll(): List<Any> {
-        return episodes
-    }
+    override fun getId(index: Int): Int? = videos.getOrNull(index)?.id
 
     // this is a simple array that is used to instantly load links if they are already loaded
     //var linkCache = Array<Set<ExtractorLink>>(size = episodes.size, init = { setOf() })
@@ -80,14 +42,13 @@ class RepoLinkGenerator(
     @Throws
     override suspend fun generateLinks(
         clearCache: Boolean,
-        allowedTypes: Set<ExtractorLinkType>,
+        sourceTypes: Set<ExtractorLinkType>,
         callback: (Pair<ExtractorLink?, ExtractorUri?>) -> Unit,
         subtitleCallback: (SubtitleData) -> Unit,
         offset: Int,
         isCasting: Boolean,
     ): Boolean {
-        val index = currentIndex
-        val current = episodes.getOrNull(index + offset) ?: return false
+        val current = videos.getOrNull(offset) ?: return false
 
         val currentCache = synchronized(cache) {
             cache[current.apiName to current.id] ?: Cache(
@@ -100,10 +61,12 @@ class RepoLinkGenerator(
             }
         }
 
-        // these act as a general filter to prevent duplication of links or names
-        val currentLinksUrls = mutableSetOf<String>()       // makes all urls unique
-        val currentSubsUrls = mutableSetOf<String>()    // makes all subs urls unique
-        val currentSubsNames = mutableSetOf<String>()   // makes all subs names unique
+        // These act as a general filter to prevent duplication of links or names
+        // Avoid any possible ConcurrentModificationException
+        val currentLinksUrls = ConcurrentHashMap.newKeySet<String>()
+        val currentSubsUrls = ConcurrentHashMap.newKeySet<String>()
+        // Use atomics as otherwise we get race conditions when incrementing, while rare it did actually happen!
+        val lastCountedSuffix = ConcurrentHashMap<String, AtomicInteger>()
 
         synchronized(currentCache) {
             val outdatedCache =
@@ -114,20 +77,23 @@ class RepoLinkGenerator(
                 currentCache.subtitleCache.clear()
                 currentCache.saturated = false
             } else if (currentCache.linkCache.isNotEmpty()) {
-                Log.d(TAG, "Resumed previous loading from ${unixTime - currentCache.lastCachedTimestamp}s ago")
+                Log.d(
+                    TAG,
+                    "Resumed previous loading from ${unixTime - currentCache.lastCachedTimestamp}s ago"
+                )
             }
 
             // call all callbacks
             currentCache.linkCache.forEach { link ->
                 currentLinksUrls.add(link.url)
-                if (allowedTypes.contains(link.type)) {
+                if (sourceTypes.contains(link.type)) {
                     callback(link to null)
                 }
             }
 
             currentCache.subtitleCache.forEach { sub ->
                 currentSubsUrls.add(sub.url)
-                currentSubsNames.add(sub.name)
+                lastCountedSuffix.getOrPut(sub.originalName) { AtomicInteger(0) }.incrementAndGet()
                 subtitleCallback(sub)
             }
 
@@ -146,25 +112,18 @@ class RepoLinkGenerator(
             subtitleCallback = { file ->
                 Log.d(TAG, "Loaded SubtitleFile: $file")
                 val correctFile = PlayerSubtitleHelper.getSubtitleData(file)
-                if (correctFile.url.isBlank() || currentSubsUrls.contains(correctFile.url)) {
+                if (correctFile.url.isBlank() || !currentSubsUrls.add(correctFile.url)) {
                     return@loadLinks
                 }
-                currentSubsUrls.add(correctFile.url)
 
                 // this part makes sure that all names are unique for UX
-                val fixedName = correctFile.name.html().toString().trim()
-
-                var name = fixedName
-                var count = 1
-                while (currentSubsNames.contains(name)) {
-                    count++
-                    name =
-                        SubtitleData.constructName(originalName = fixedName, nameSuffix = "$count")
-                }
+                val nameDecoded = correctFile.originalName.html().toString()
+                    .trim() // `%3Ch1%3Esub%20name…` → `<h1>sub name…` → `sub name…`
+                val suffixCount =
+                    lastCountedSuffix.getOrPut(nameDecoded) { AtomicInteger(0) }.incrementAndGet()
 
-                currentSubsNames.add(name)
                 val updatedFile =
-                    correctFile.copy(originalName = fixedName, nameSuffix = "$count")
+                    correctFile.copy(originalName = nameDecoded, nameSuffix = "$suffixCount")
 
                 synchronized(currentCache) {
                     if (currentCache.subtitleCache.add(updatedFile)) {
@@ -175,14 +134,13 @@ class RepoLinkGenerator(
             },
             callback = { link ->
                 Log.d(TAG, "Loaded ExtractorLink: $link")
-                if (link.url.isBlank() || currentLinksUrls.contains(link.url)) {
+                if (link.url.isBlank() || !currentLinksUrls.add(link.url)) {
                     return@loadLinks
                 }
-                currentLinksUrls.add(link.url)
 
                 synchronized(currentCache) {
                     if (currentCache.linkCache.add(link)) {
-                        if (allowedTypes.contains(link.type)) {
+                        if (sourceTypes.contains(link.type)) {
                             callback(Pair(link, null))
                         }
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/RoundedBackgroundColorSpan.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/RoundedBackgroundColorSpan.kt
index fcc5d85892f..824b5d1a2f3 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/RoundedBackgroundColorSpan.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/RoundedBackgroundColorSpan.kt
@@ -23,6 +23,7 @@ package com.lagradost.cloudstream3.ui.player
 import android.graphics.Canvas
 import android.graphics.Color
 import android.graphics.Paint
+import android.os.Build
 import android.text.Layout.Alignment
 import android.text.StaticLayout
 import android.text.TextPaint
@@ -58,9 +59,16 @@ class RoundedBackgroundColorSpan(
             return
         }
 
-        // we cant use StaticLayout.Builder() due to API
         val width = p.measureText(text, start, end)
-        val textLayout =
+        val textLayout: StaticLayout = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            StaticLayout.Builder
+                .obtain(text, 0, text.length, TextPaint(p), width.toInt())
+                .setAlignment(alignment)
+                .setLineSpacing(0.0f, 1.0f)
+                .setIncludePad(true)
+                .build()
+        } else {
+            @Suppress("DEPRECATION")
             StaticLayout(
                 text,
                 TextPaint(p),
@@ -70,6 +78,7 @@ class RoundedBackgroundColorSpan(
                 0.0f,
                 true
             )
+        }
 
         val center = (left + right).toFloat() * 0.5f
 
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
index 9e3e778beb9..fa65c322ec1 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/SubtitleOffsetItemAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/SubtitleOffsetItemAdapter.kt
@@ -5,9 +5,10 @@ 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 com.lagradost.cloudstream3.ui.BaseDiffCallback
+import com.lagradost.cloudstream3.ui.NoStateAdapter
+import com.lagradost.cloudstream3.ui.ViewHolderState
 import kotlin.math.roundToInt
 
 data class SubtitleCue(val startTimeMs: Long, val durationMs: Long, val text: List<String>) {
@@ -16,25 +17,67 @@ data class SubtitleCue(val startTimeMs: Long, val durationMs: Long, val text: Li
 
 class SubtitleOffsetItemAdapter(
     private var currentTimeMs: Long,
-    override val items: MutableList<SubtitleCue>,
     val clickCallback: (SubtitleCue) -> Unit
 ) :
-    AppContextUtils.DiffAdapter<SubtitleCue>(items) {
+    NoStateAdapter<SubtitleCue>(diffCallback = BaseDiffCallback(itemSame = { a, b ->
+        a.startTimeMs == b.startTimeMs
+    })) {
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+    override fun onCreateContent(parent: ViewGroup): ViewHolderState<Any> {
         val inflater = LayoutInflater.from(parent.context)
         val binding = SubtitleOffsetItemBinding.inflate(inflater, parent, false)
-        return SubtitleViewHolder(binding)
+        return ViewHolderState(binding)
     }
 
-    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-        when (holder) {
-            is SubtitleViewHolder -> holder.bind(items[position])
+    override fun onBindContent(holder: ViewHolderState<Any>, item: SubtitleCue, position: Int) {
+        val binding = holder.view as? SubtitleOffsetItemBinding ?: return
+
+        binding.root.setOnClickListener {
+            clickCallback.invoke(item)
+        }
+
+        binding.subtitleText.text = item.text.joinToString("\n")
+
+        val timeMs = currentTimeMs
+        val startTime = item.startTimeMs
+        val endTime = item.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 / item.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
         }
     }
 
     fun getLatestActiveItem(position: Long): Int {
-        return items.withIndex().lastOrNull {
+        return immutableCurrentList.withIndex().lastOrNull {
             position >= it.value.startTimeMs
         }?.index ?: 0
     }
@@ -45,7 +88,9 @@ class SubtitleOffsetItemAdapter(
 
         val earlyTime = minOf(previousTime, timeMs)
         val lateTime = maxOf(previousTime, timeMs)
-        val affectedItems = items.withIndex().filter { cue ->
+
+        // TODO Add binary search and notifyItemRangeChanged
+        val affectedItems = immutableCurrentList.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)
@@ -56,57 +101,4 @@ class SubtitleOffsetItemAdapter(
             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
index 005ac71e5b8..2e554f75eaf 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/Torrent.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/Torrent.kt
@@ -8,6 +8,7 @@ import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.ExtractorLinkType
+import com.lagradost.cloudstream3.utils.newExtractorLink
 import torrServer.TorrServer
 import java.io.File
 import java.net.ConnectException
@@ -222,14 +223,15 @@ object Torrent {
         }
         val status = add(link.url)
 
-        return ExtractorLink(
+        return newExtractorLink(
             source = link.source,
-            link.name,
+            name = link.name,
             url = status.streamUrl(link.url),
-            type = ExtractorLinkType.VIDEO,
-            referer = "",
-            quality = link.quality
-        ) to status
+            type = ExtractorLinkType.VIDEO
+        ) {
+            this.referer = ""
+            this.quality = link.quality
+        } to status
     }
 
     private val trackers = listOf(
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/UpdatedDefaultExtractorsFactory.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/UpdatedDefaultExtractorsFactory.kt
index 14ae1b2dbdf..b3873bd32de 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/UpdatedDefaultExtractorsFactory.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/UpdatedDefaultExtractorsFactory.kt
@@ -1,7 +1,19 @@
+@file:Suppress(
+    "ALL",
+    "DEPRECATION",
+    "RedundantVisibilityModifier",
+    "RemoveRedundantQualifierName",
+    "UNCHECKED_CAST",
+    "UNUSED",
+    "UNUSED_PARAMETER",
+    "UNUSED_VARIABLE"
+)
+
 package com.lagradost.cloudstream3.ui.player
 
 import android.net.Uri
 import androidx.annotation.GuardedBy
+import androidx.media3.common.C
 import androidx.media3.common.FileTypes
 import androidx.media3.common.Format
 import androidx.media3.common.util.TimestampAdjuster
@@ -37,7 +49,6 @@ import java.lang.reflect.Constructor
 import java.lang.reflect.InvocationTargetException
 import java.util.concurrent.atomic.AtomicBoolean
 
-
 /**
  * An [ExtractorsFactory] that provides an array of extractors for the following formats:
  *
@@ -92,13 +103,16 @@ class UpdatedDefaultExtractorsFactory : ExtractorsFactory {
     private var tsTimestampSearchBytes: Int
     private var textTrackTranscodingEnabled: Boolean
     private var subtitleParserFactory: SubtitleParser.Factory
+    private var codecsToParseWithinGopSampleDependencies: @C.VideoCodecFlags Int
     private var jpegFlags: @JpegExtractor.Flags Int = 0
+    private var heifFlags: @HeifExtractor.Flags Int = 0
 
     init {
         tsMode = TsExtractor.MODE_SINGLE_PMT
         tsTimestampSearchBytes = TsExtractor.DEFAULT_TIMESTAMP_SEARCH_BYTES
         subtitleParserFactory = DefaultSubtitleParserFactory()
         textTrackTranscodingEnabled = true
+        codecsToParseWithinGopSampleDependencies = C.VIDEO_CODEC_FLAG_H264 or C.VIDEO_CODEC_FLAG_H265
     }
 
     /**
@@ -287,7 +301,7 @@ class UpdatedDefaultExtractorsFactory : ExtractorsFactory {
      */
     @Synchronized
     fun setTsSubtitleFormats(subtitleFormats: List<Format>?): UpdatedDefaultExtractorsFactory {
-        tsSubtitleFormats = ImmutableList.copyOf(subtitleFormats)
+        tsSubtitleFormats = subtitleFormats?.let { ImmutableList.copyOf(it) }
         return this
     }
 
@@ -335,6 +349,14 @@ class UpdatedDefaultExtractorsFactory : ExtractorsFactory {
         return this
     }
 
+    @Synchronized
+    override fun experimentalSetCodecsToParseWithinGopSampleDependencies(
+        codecsToParseWithinGopSampleDependencies: @C.VideoCodecFlags Int
+    ): UpdatedDefaultExtractorsFactory {
+        this.codecsToParseWithinGopSampleDependencies = codecsToParseWithinGopSampleDependencies
+        return this
+    }
+
     /**
      * Sets flags for [JpegExtractor] instances created by the factory.
      *
@@ -350,6 +372,21 @@ class UpdatedDefaultExtractorsFactory : ExtractorsFactory {
         return this
     }
 
+    /**
+     * Sets flags for [HeifExtractor] instances created by the factory.
+     *
+     * @see HeifExtractor.HeifExtractor
+     * @param flags The flags to use.
+     * @return The factory, for convenience.
+     */
+    @Synchronized
+    fun setHeifExtractorFlags(
+        flags: @HeifExtractor.Flags Int
+    ): UpdatedDefaultExtractorsFactory {
+        this.heifFlags = flags
+        return this
+    }
+
     @Synchronized
     override fun createExtractors(): Array<Extractor> {
         return createExtractors(Uri.EMPTY, HashMap())
@@ -457,21 +494,26 @@ class UpdatedDefaultExtractorsFactory : ExtractorsFactory {
                 extractors.add(
                     FragmentedMp4Extractor(
                         subtitleParserFactory,
-                        fragmentedMp4Flags
-                                or (if (textTrackTranscodingEnabled)
-                            0
-                        else
-                            FragmentedMp4Extractor.FLAG_EMIT_RAW_SUBTITLE_DATA)
+                        fragmentedMp4Flags or
+                            FragmentedMp4Extractor
+                                .codecsToParseWithinGopSampleDependenciesAsFlags(
+                                    codecsToParseWithinGopSampleDependencies
+                                ) or
+                        if (textTrackTranscodingEnabled) 0
+                        else FragmentedMp4Extractor.FLAG_EMIT_RAW_SUBTITLE_DATA
                     )
                 )
+
                 extractors.add(
                     Mp4Extractor(
                         subtitleParserFactory,
-                        mp4Flags
-                                or (if (textTrackTranscodingEnabled)
-                            0
-                        else
-                            Mp4Extractor.FLAG_EMIT_RAW_SUBTITLE_DATA)
+                        mp4Flags or
+                            Mp4Extractor
+                                .codecsToParseWithinGopSampleDependenciesAsFlags(
+                                    codecsToParseWithinGopSampleDependencies
+                                ) or
+                        if (textTrackTranscodingEnabled) 0
+                        else Mp4Extractor.FLAG_EMIT_RAW_SUBTITLE_DATA
                     )
                 )
             }
@@ -513,12 +555,7 @@ class UpdatedDefaultExtractorsFactory : ExtractorsFactory {
             FileTypes.PNG -> extractors.add(PngExtractor())
             FileTypes.WEBP -> extractors.add(WebpExtractor())
             FileTypes.BMP -> extractors.add(BmpExtractor())
-            FileTypes.HEIF -> if ((mp4Flags and Mp4Extractor.FLAG_READ_MOTION_PHOTO_METADATA) == 0
-                && (mp4Flags and Mp4Extractor.FLAG_READ_SEF_DATA) == 0
-            ) {
-                extractors.add(HeifExtractor())
-            }
-
+            FileTypes.HEIF -> extractors.add(HeifExtractor(heifFlags))
             FileTypes.AVIF -> extractors.add(AvifExtractor())
             FileTypes.WEBVTT, FileTypes.UNKNOWN -> {}
             else -> {}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/UpdatedMatroskaExtractor.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/UpdatedMatroskaExtractor.kt
index 016e7d20317..5937b1973ed 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/UpdatedMatroskaExtractor.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/UpdatedMatroskaExtractor.kt
@@ -1,3 +1,14 @@
+@file:Suppress(
+    "ALL",
+    "DEPRECATION",
+    "RedundantVisibilityModifier",
+    "RemoveRedundantQualifierName",
+    "UNCHECKED_CAST",
+    "UNUSED",
+    "UNUSED_PARAMETER",
+    "UNUSED_VARIABLE"
+)
+
 /*
  * Copyright (C) 2016 The Android Open Source Project
  *
@@ -30,18 +41,20 @@ import androidx.media3.common.ColorInfo
 import androidx.media3.common.DrmInitData
 import androidx.media3.common.DrmInitData.SchemeData
 import androidx.media3.common.Format
+import androidx.media3.common.Metadata
 import androidx.media3.common.MimeTypes
 import androidx.media3.common.ParserException
-import androidx.media3.common.util.Assertions
 import androidx.media3.common.util.Log
 import androidx.media3.common.util.ParsableByteArray
 import androidx.media3.common.util.UnstableApi
 import androidx.media3.common.util.Util
+import androidx.media3.container.DolbyVisionConfig
 import androidx.media3.container.NalUnitUtil
 import androidx.media3.extractor.AacUtil
 import androidx.media3.extractor.AvcConfig
 import androidx.media3.extractor.ChunkIndex
-import androidx.media3.container.DolbyVisionConfig
+import androidx.media3.extractor.ChunkIndexProvider
+import androidx.media3.extractor.DtsUtil
 import androidx.media3.extractor.Extractor
 import androidx.media3.extractor.ExtractorInput
 import androidx.media3.extractor.ExtractorOutput
@@ -50,12 +63,18 @@ import androidx.media3.extractor.HevcConfig
 import androidx.media3.extractor.MpegAudioUtil
 import androidx.media3.extractor.PositionHolder
 import androidx.media3.extractor.SeekMap
-import androidx.media3.extractor.SeekMap.Unseekable
+import androidx.media3.extractor.SeekMap.SeekPoints
+import androidx.media3.extractor.SeekPoint
+import androidx.media3.extractor.TrackAwareSeekMap
 import androidx.media3.extractor.TrackOutput
 import androidx.media3.extractor.TrackOutput.CryptoData
 import androidx.media3.extractor.TrueHdSampleRechunker
+import androidx.media3.extractor.metadata.ThumbnailMetadata
 import androidx.media3.extractor.text.SubtitleParser
 import androidx.media3.extractor.text.SubtitleTranscodingExtractorOutput
+import com.google.common.base.Preconditions.checkArgument
+import com.google.common.base.Preconditions.checkNotNull
+import com.google.common.base.Preconditions.checkState
 import com.google.common.collect.ImmutableList
 import java.io.IOException
 import java.nio.ByteBuffer
@@ -63,13 +82,14 @@ import java.nio.ByteOrder
 import java.util.Arrays
 import java.util.Collections
 import java.util.Locale
+import java.util.Objects
 import java.util.UUID
 import kotlin.math.max
 import kotlin.math.min
 
 /** Extracts data from the Matroska and WebM container formats.  */
 @UnstableApi
-class UpdatedMatroskaExtractor internal constructor(
+class UpdatedMatroskaExtractor private constructor(
     private val reader: EbmlReader,
     flags: @Flags Int,
     subtitleParserFactory: SubtitleParser.Factory
@@ -108,6 +128,8 @@ class UpdatedMatroskaExtractor internal constructor(
     private var timecodeScale = C.TIME_UNSET
     private var durationTimecode = C.TIME_UNSET
     private var durationUs = C.TIME_UNSET
+    private var isWebm: Boolean = false
+    private var pendingEndTracks: Boolean
 
     // The track corresponding to the current TrackEntry element, or null.
     private var currentTrack: Track? = null
@@ -120,6 +142,13 @@ class UpdatedMatroskaExtractor internal constructor(
     private var seekEntryPosition: Long = 0
 
     // Cue related elements.
+    private val perTrackCues: SparseArray<MutableList<MatroskaSeekMap.CuePointData>>
+    private var inCuesElement = false
+    private var currentCueTimeUs: Long = C.TIME_UNSET
+    private var currentCueTrackNumber: Int = C.INDEX_UNSET
+    private var currentCueClusterPosition: Long = C.INDEX_UNSET.toLong()
+    private var currentCueRelativePosition: Long = C.INDEX_UNSET.toLong()
+    private var primarySeekTrackNumber: Int = C.INDEX_UNSET
     private var seekForCues = false
     private var seekForSeekContent = false
     private var visitedSeekHeads: HashSet<Long> = HashSet()
@@ -128,9 +157,6 @@ class UpdatedMatroskaExtractor internal constructor(
     private var cuesContentPosition = C.INDEX_UNSET.toLong()
     private var seekPositionAfterBuildingCues = C.INDEX_UNSET.toLong()
     private var clusterTimecodeUs = C.TIME_UNSET
-    private var cueTimesUs: androidx.media3.common.util.LongArray? = null
-    private var cueClusterPositions: androidx.media3.common.util.LongArray? = null
-    private var seenClusterPositionForCurrentCuePoint = false
 
     // Reading state.
     private var haveOutputSample = false
@@ -207,6 +233,7 @@ class UpdatedMatroskaExtractor internal constructor(
     init {
         reader.init(InnerEbmlProcessor())
         this.subtitleParserFactory = subtitleParserFactory
+        this.perTrackCues = SparseArray()
         seekForCuesEnabled = (flags and FLAG_DISABLE_SEEK_FOR_CUES) == 0
         parseSubtitlesDuringExtraction = (flags and FLAG_EMIT_RAW_SUBTITLE_DATA) == 0
         varintReader = VarintReader()
@@ -222,6 +249,7 @@ class UpdatedMatroskaExtractor internal constructor(
         encryptionSubsampleData = ParsableByteArray()
         supplementalData = ParsableByteArray()
         blockSampleSizes = IntArray(1)
+        pendingEndTracks = true
     }
 
     @Throws(IOException::class)
@@ -244,6 +272,17 @@ class UpdatedMatroskaExtractor internal constructor(
         reader.reset()
         varintReader.reset()
         resetWriteSampleData()
+        inCuesElement = false
+        currentCueTimeUs = C.TIME_UNSET
+        currentCueTrackNumber = C.INDEX_UNSET
+        currentCueClusterPosition = C.INDEX_UNSET.toLong()
+        currentCueRelativePosition = C.INDEX_UNSET.toLong()
+        // To prevent creating duplicate cue points on a re-parse, clear any existing cue data if the
+        // seek map has not yet been sent. Once sent, the cue data is considered final, and subsequent
+        // Cues elements will be ignored by the parsing logic.
+        if (!sentSeekMap) {
+            perTrackCues.clear()
+        }
         for (i in 0..<tracks.size()) {
             tracks.valueAt(i).reset()
         }
@@ -284,7 +323,7 @@ class UpdatedMatroskaExtractor internal constructor(
         return when (id) {
             ID_EBML, ID_SEGMENT, ID_SEEK_HEAD, ID_SEEK, ID_INFO, ID_CLUSTER, ID_TRACKS, ID_TRACK_ENTRY, ID_BLOCK_ADDITION_MAPPING, ID_AUDIO, ID_VIDEO, ID_CONTENT_ENCODINGS, ID_CONTENT_ENCODING, ID_CONTENT_COMPRESSION, ID_CONTENT_ENCRYPTION, ID_CONTENT_ENCRYPTION_AES_SETTINGS, ID_CUES, ID_CUE_POINT, ID_CUE_TRACK_POSITIONS, ID_BLOCK_GROUP, ID_BLOCK_ADDITIONS, ID_BLOCK_MORE, ID_PROJECTION, ID_COLOUR, ID_MASTERING_METADATA -> EbmlProcessor.ELEMENT_TYPE_MASTER
 
-            ID_EBML_READ_VERSION, ID_DOC_TYPE_READ_VERSION, ID_SEEK_POSITION, ID_TIMECODE_SCALE, ID_TIME_CODE, ID_BLOCK_DURATION, ID_PIXEL_WIDTH, ID_PIXEL_HEIGHT, ID_DISPLAY_WIDTH, ID_DISPLAY_HEIGHT, ID_DISPLAY_UNIT, ID_TRACK_NUMBER, ID_TRACK_TYPE, ID_FLAG_DEFAULT, ID_FLAG_FORCED, ID_DEFAULT_DURATION, ID_MAX_BLOCK_ADDITION_ID, ID_BLOCK_ADD_ID_TYPE, ID_CODEC_DELAY, ID_SEEK_PRE_ROLL, ID_DISCARD_PADDING, ID_CHANNELS, ID_AUDIO_BIT_DEPTH, ID_CONTENT_ENCODING_ORDER, ID_CONTENT_ENCODING_SCOPE, ID_CONTENT_COMPRESSION_ALGORITHM, ID_CONTENT_ENCRYPTION_ALGORITHM, ID_CONTENT_ENCRYPTION_AES_SETTINGS_CIPHER_MODE, ID_CUE_TIME, ID_CUE_CLUSTER_POSITION, ID_REFERENCE_BLOCK, ID_STEREO_MODE, ID_COLOUR_BITS_PER_CHANNEL, ID_COLOUR_RANGE, ID_COLOUR_TRANSFER, ID_COLOUR_PRIMARIES, ID_MAX_CLL, ID_MAX_FALL, ID_PROJECTION_TYPE, ID_BLOCK_ADD_ID -> EbmlProcessor.ELEMENT_TYPE_UNSIGNED_INT
+            ID_EBML_READ_VERSION, ID_DOC_TYPE_READ_VERSION, ID_SEEK_POSITION, ID_TIMECODE_SCALE, ID_TIME_CODE, ID_BLOCK_DURATION, ID_PIXEL_WIDTH, ID_PIXEL_HEIGHT, ID_DISPLAY_WIDTH, ID_DISPLAY_HEIGHT, ID_DISPLAY_UNIT, ID_TRACK_NUMBER, ID_TRACK_TYPE, ID_FLAG_DEFAULT, ID_FLAG_FORCED, ID_DEFAULT_DURATION, ID_MAX_BLOCK_ADDITION_ID, ID_BLOCK_ADD_ID_TYPE, ID_CODEC_DELAY, ID_SEEK_PRE_ROLL, ID_DISCARD_PADDING, ID_CHANNELS, ID_AUDIO_BIT_DEPTH, ID_CONTENT_ENCODING_ORDER, ID_CONTENT_ENCODING_SCOPE, ID_CONTENT_COMPRESSION_ALGORITHM, ID_CONTENT_ENCRYPTION_ALGORITHM, ID_CONTENT_ENCRYPTION_AES_SETTINGS_CIPHER_MODE, ID_CUE_TIME, ID_CUE_CLUSTER_POSITION, ID_CUE_RELATIVE_POSITION, ID_CUE_TRACK, ID_REFERENCE_BLOCK, ID_STEREO_MODE, ID_COLOUR_BITS_PER_CHANNEL, ID_COLOUR_RANGE, ID_COLOUR_TRANSFER, ID_COLOUR_PRIMARIES, ID_MAX_CLL, ID_MAX_FALL, ID_PROJECTION_TYPE, ID_BLOCK_ADD_ID -> EbmlProcessor.ELEMENT_TYPE_UNSIGNED_INT
 
             ID_DOC_TYPE, ID_NAME, ID_CODEC_ID, ID_LANGUAGE -> EbmlProcessor.ELEMENT_TYPE_STRING
             ID_SEEK_ID, ID_BLOCK_ADD_ID_EXTRA_DATA, ID_CONTENT_COMPRESSION_SETTINGS, ID_CONTENT_ENCRYPTION_KEY_ID, ID_SIMPLE_BLOCK, ID_BLOCK, ID_CODEC_PRIVATE, ID_PROJECTION_PRIVATE, ID_BLOCK_ADDITIONAL -> EbmlProcessor.ELEMENT_TYPE_BINARY
@@ -330,11 +369,27 @@ class UpdatedMatroskaExtractor internal constructor(
             }
 
             ID_CUES -> {
-                cueTimesUs = androidx.media3.common.util.LongArray()
-                cueClusterPositions = androidx.media3.common.util.LongArray()
+                if (!sentSeekMap) {
+                    inCuesElement = true
+                }
+            }
+
+            ID_CUE_POINT -> {
+                if (!sentSeekMap) {
+                    assertInCues(id)
+                    currentCueTimeUs = C.TIME_UNSET
+                }
+            }
+
+            ID_CUE_TRACK_POSITIONS -> {
+                if (!sentSeekMap) {
+                    assertInCues(id)
+                    currentCueTrackNumber = C.INDEX_UNSET
+                    currentCueClusterPosition = C.INDEX_UNSET.toLong()
+                    currentCueRelativePosition = C.INDEX_UNSET.toLong()
+                }
             }
 
-            ID_CUE_POINT -> seenClusterPositionForCurrentCuePoint = false
             ID_CLUSTER -> if (!sentSeekMap) {
                 // We need to build cues before parsing the cluster.
                 if (seekForCuesEnabled && cuesContentPosition != C.INDEX_UNSET.toLong()) {
@@ -347,7 +402,7 @@ class UpdatedMatroskaExtractor internal constructor(
                 } else {
                     // We don't know where the Cues element is located. It's most likely omitted. Allow
                     // playback, but disable seeking.
-                    extractorOutput!!.seekMap(Unseekable(durationUs))
+                    extractorOutput!!.seekMap(SeekMap.Unseekable(durationUs))
                     sentSeekMap = true
                 }
             }
@@ -359,7 +414,10 @@ class UpdatedMatroskaExtractor internal constructor(
 
             ID_CONTENT_ENCODING -> {}
             ID_CONTENT_ENCRYPTION -> getCurrentTrack(id).hasContentEncryption = true
-            ID_TRACK_ENTRY -> currentTrack = Track()
+            ID_TRACK_ENTRY -> {
+                currentTrack = Track()
+                currentTrack!!.isWebm = isWebm
+            }
             ID_MASTERING_METADATA -> getCurrentTrack(id).hasColorInfo = true
             else -> {}
         }
@@ -398,7 +456,7 @@ class UpdatedMatroskaExtractor internal constructor(
                     } else {
                         // Otherwise, if we not found any cues nor any more seek heads then we mark
                         // this as unseekable.
-                        extractorOutput!!.seekMap(Unseekable(durationUs))
+                        extractorOutput!!.seekMap(SeekMap.Unseekable(durationUs))
                         sentSeekMap = true
                     }
                 }
@@ -427,13 +485,67 @@ class UpdatedMatroskaExtractor internal constructor(
 
             ID_CUES -> {
                 if (!sentSeekMap) {
-                    extractorOutput!!.seekMap(buildSeekMap(cueTimesUs, cueClusterPositions))
+                    var hasAnyCues = false
+                    for (i in 0 until perTrackCues.size()) {
+                        if (perTrackCues.valueAt(i).isNotEmpty()) {
+                            hasAnyCues = true
+                            break
+                        }
+                    }
+
+                    if (!hasAnyCues || durationUs == C.TIME_UNSET) {
+                        // Cues are missing, empty, or duration is unknown.
+                        extractorOutput!!.seekMap(SeekMap.Unseekable(durationUs))
+                    } else {
+                        for (i in 0 until perTrackCues.size()) {
+                            perTrackCues.valueAt(i).sort()
+                        }
+
+                        val seekMap = MatroskaSeekMap(
+                            perTrackCues,
+                            durationUs,
+                            primarySeekTrackNumber,
+                            segmentContentPosition,
+                            segmentContentSize
+                        )
+                        extractorOutput!!.seekMap(seekMap)
+                    }
                     sentSeekMap = true
-                } else {
-                    // We have already built the cues. Ignore.
+                    inCuesElement = false
+                    for (i in 0 until tracks.size()) {
+                        val track: Track = tracks.valueAt(i)
+                        track.maybeAddThumbnailMetadata(perTrackCues, durationUs, segmentContentPosition, segmentContentSize)
+                        if (!track.waitingForDtsAnalysis) {
+                            track.assertOutputInitialized()
+                            track.output!!.format(requireNotNull(track.format))
+                        }
+                    }
+                    maybeEndTracks()
+                }
+            }
+
+            ID_CUE_TRACK_POSITIONS -> {
+                if (!sentSeekMap) {
+                    assertInCues(id)
+                    if (currentCueTimeUs != C.TIME_UNSET
+                        && currentCueTrackNumber != C.INDEX_UNSET
+                        && currentCueClusterPosition != C.INDEX_UNSET.toLong()
+                    ) {
+                        var trackCues = perTrackCues[currentCueTrackNumber]
+                        if (trackCues == null) {
+                            trackCues = ArrayList()
+                            perTrackCues.put(currentCueTrackNumber, trackCues)
+                        }
+
+                        trackCues.add(
+                            MatroskaSeekMap.CuePointData(
+                                currentCueTimeUs,
+                                /* clusterPosition= */ segmentContentPosition + currentCueClusterPosition,
+                                /* relativePosition= */ currentCueRelativePosition
+                            )
+                        )
+                    }
                 }
-                this.cueTimesUs = null
-                this.cueClusterPositions = null
             }
 
             ID_BLOCK_GROUP -> {
@@ -509,17 +621,15 @@ class UpdatedMatroskaExtractor internal constructor(
             }
 
             ID_TRACK_ENTRY -> {
-                val currentTrack = Assertions.checkStateNotNull(this.currentTrack)
+                val currentTrack = checkNotNull(this.currentTrack)
                 if (currentTrack.codecId == null) {
                     throw ParserException.createForMalformedContainer(
                         "CodecId is missing in TrackEntry element",  /* cause= */null
                     )
                 } else {
-                    if (isCodecSupported(
-                            currentTrack.codecId!!
-                        )
-                    ) {
-                        currentTrack.initializeOutput(extractorOutput!!, currentTrack.number)
+                    if (isCodecSupported(currentTrack.codecId!!)) {
+                        currentTrack.initializeFormat(currentTrack.number);
+                        currentTrack.output = extractorOutput!!.track(currentTrack.number, currentTrack.type);
                         tracks.put(currentTrack.number, currentTrack)
                     }
                 }
@@ -529,10 +639,63 @@ class UpdatedMatroskaExtractor internal constructor(
             ID_TRACKS -> {
                 if (tracks.size() == 0) {
                     throw ParserException.createForMalformedContainer(
-                        "No valid tracks were found",  /* cause= */null
+                        "No valid tracks were found",  /* cause= */ null
                     )
                 }
-                extractorOutput!!.endTracks()
+
+                // Determine the track to use for default seeking.
+                var defaultVideoTrackNumber: Int = C.INDEX_UNSET
+                var firstVideoTrackNumber: Int = C.INDEX_UNSET
+                var defaultAudioTrackNumber: Int = C.INDEX_UNSET
+                var firstAudioTrackNumber: Int = C.INDEX_UNSET
+
+                // If we're not going to seek for cues, output the formats immediately.
+                val mayBeSendFormatsEarly = !seekForCuesEnabled || cuesContentPosition == C.INDEX_UNSET.toLong();
+
+                for (i in 0 until tracks.size()) {
+                    val trackItem: Track = tracks.valueAt(i)
+
+                    val trackType: @C.TrackType Int = trackItem.type
+                    when (trackType) {
+                        C.TRACK_TYPE_VIDEO -> {
+                            if (trackItem.flagDefault) {
+                                defaultVideoTrackNumber = trackItem.number
+                            }
+                            if (firstVideoTrackNumber == C.INDEX_UNSET) {
+                                firstVideoTrackNumber = trackItem.number
+                            }
+                        }
+
+                        C.TRACK_TYPE_AUDIO -> {
+                            if (trackItem.flagDefault) {
+                                defaultAudioTrackNumber = trackItem.number
+                            }
+                            if (firstAudioTrackNumber == C.INDEX_UNSET) {
+                                firstAudioTrackNumber = trackItem.number
+                            }
+                        }
+                    }
+
+                    if (mayBeSendFormatsEarly) {
+                        trackItem.assertOutputInitialized()
+                        if (!trackItem.waitingForDtsAnalysis) {
+                            trackItem.output!!.format(checkNotNull(trackItem.format))
+                        }
+                    }
+                }
+
+                primarySeekTrackNumber = when {
+                    defaultVideoTrackNumber != C.INDEX_UNSET -> defaultVideoTrackNumber
+                    firstVideoTrackNumber != C.INDEX_UNSET -> firstVideoTrackNumber
+                    defaultAudioTrackNumber != C.INDEX_UNSET -> defaultAudioTrackNumber
+                    firstAudioTrackNumber != C.INDEX_UNSET -> firstAudioTrackNumber
+                    tracks.size() > 0 -> tracks.valueAt(0).number
+                    else -> C.INDEX_UNSET
+                }
+
+                if (mayBeSendFormatsEarly) {
+                    maybeEndTracks()
+                }
             }
 
             else -> {}
@@ -575,7 +738,16 @@ class UpdatedMatroskaExtractor internal constructor(
             ID_TRACK_NUMBER -> getCurrentTrack(id).number = value.toInt()
             ID_FLAG_DEFAULT -> getCurrentTrack(id).flagDefault = value == 1L
             ID_FLAG_FORCED -> getCurrentTrack(id).flagForced = value == 1L
-            ID_TRACK_TYPE -> getCurrentTrack(id).type = value.toInt()
+            ID_TRACK_TYPE -> {
+                val matroskaTrackType = value.toInt()
+                getCurrentTrack(id).type = when (matroskaTrackType) {
+                    1 -> C.TRACK_TYPE_VIDEO // Matroska video
+                    2 -> C.TRACK_TYPE_AUDIO // Matroska audio
+                    17 -> C.TRACK_TYPE_TEXT // Matroska subtitle
+                    33 -> C.TRACK_TYPE_METADATA // Matroska metadata
+                    else -> C.TRACK_TYPE_UNKNOWN
+                }
+            }
             ID_DEFAULT_DURATION -> getCurrentTrack(id).defaultSampleDurationNs = value.toInt()
             ID_MAX_BLOCK_ADDITION_ID -> getCurrentTrack(id).maxBlockAdditionId = value.toInt()
             ID_BLOCK_ADD_ID_TYPE -> getCurrentTrack(id).blockAddIdType = value.toInt()
@@ -621,17 +793,35 @@ class UpdatedMatroskaExtractor internal constructor(
                 }
 
             ID_CUE_TIME -> {
-                assertInCues(id)
-                cueTimesUs!!.add(scaleTimecodeToUs(value))
+                if (!sentSeekMap) {
+                    assertInCues(id)
+                    currentCueTimeUs = scaleTimecodeToUs(value)
+                }
+            }
+
+            ID_CUE_TRACK -> {
+                if (!sentSeekMap) {
+                    assertInCues(id)
+                    currentCueTrackNumber = value.toInt()
+                }
+            }
+
+            ID_CUE_CLUSTER_POSITION -> {
+                if (!sentSeekMap) {
+                    assertInCues(id)
+                    if (currentCueClusterPosition == C.INDEX_UNSET.toLong()) {
+                        currentCueClusterPosition = value
+                    }
+                }
             }
 
-            ID_CUE_CLUSTER_POSITION -> if (!seenClusterPositionForCurrentCuePoint) {
-                assertInCues(id)
-                // If there's more than one video/audio track, then there could be more than one
-                // CueTrackPositions within a single CuePoint. In such a case, ignore all but the first
-                // one (since the cluster position will be quite close for all the tracks).
-                cueClusterPositions!!.add(value)
-                seenClusterPositionForCurrentCuePoint = true
+            ID_CUE_RELATIVE_POSITION -> {
+                if (!sentSeekMap) {
+                    assertInCues(id)
+                    if (currentCueRelativePosition == C.INDEX_UNSET.toLong()) {
+                        currentCueRelativePosition = value
+                    }
+                }
             }
 
             ID_TIME_CODE -> clusterTimecodeUs = scaleTimecodeToUs(value)
@@ -943,7 +1133,7 @@ class UpdatedMatroskaExtractor internal constructor(
                         (scratch.data[0].toInt() shl 8) or (scratch.data[1].toInt() and 0xFF)
                     blockTimeUs = clusterTimecodeUs + scaleTimecodeToUs(timecode.toLong())
                     val isKeyframe =
-                        track.type == TRACK_TYPE_AUDIO
+                        track.type == C.TRACK_TYPE_AUDIO
                                 || (id == ID_SIMPLE_BLOCK && (scratch.data[2].toInt() and 0x80) == 0x80)
                     blockFlags = if (isKeyframe) C.BUFFER_FLAG_KEY_FRAME else 0
                     blockState = BLOCK_STATE_DATA
@@ -1035,9 +1225,7 @@ class UpdatedMatroskaExtractor internal constructor(
         }
     }
 
-    @Throws(
-        ParserException::class
-    )
+    @Throws(ParserException::class)
     private fun assertInTrackEntry(id: Int) {
         if (currentTrack == null) {
             throw ParserException.createForMalformedContainer(
@@ -1046,11 +1234,9 @@ class UpdatedMatroskaExtractor internal constructor(
         }
     }
 
-    @Throws(
-        ParserException::class
-    )
+    @Throws(ParserException::class)
     private fun assertInCues(id: Int) {
-        if (cueTimesUs == null || cueClusterPositions == null) {
+        if (!inCuesElement) {
             throw ParserException.createForMalformedContainer(
                 "Element $id must be in a Cues",  /* cause= */null
             )
@@ -1079,6 +1265,7 @@ class UpdatedMatroskaExtractor internal constructor(
         } else {
             if (CODEC_ID_SUBRIP == track.codecId
                 || CODEC_ID_ASS == track.codecId
+                || CODEC_ID_SSA == track.codecId
                 || CODEC_ID_VTT == track.codecId
             ) {
                 if (blockSampleCount > 1) {
@@ -1168,7 +1355,7 @@ class UpdatedMatroskaExtractor internal constructor(
         if (CODEC_ID_SUBRIP == track.codecId) {
             writeSubtitleSampleData(input, SUBRIP_PREFIX, size)
             return finishWriteSampleData()
-        } else if (CODEC_ID_ASS == track.codecId) {
+        } else if (CODEC_ID_ASS == track.codecId || CODEC_ID_SSA == track.codecId) {
             writeSubtitleSampleData(input, SSA_PREFIX, size)
             return finishWriteSampleData()
         } else if (CODEC_ID_VTT == track.codecId) {
@@ -1176,6 +1363,20 @@ class UpdatedMatroskaExtractor internal constructor(
             return finishWriteSampleData()
         }
 
+        if (track.waitingForDtsAnalysis) {
+            checkNotNull(track.format)
+            if (DtsUtil.isSampleDtsHd(input, size)) {
+                track.format = track.format!!
+                    .buildUpon()
+                    .setSampleMimeType(MimeTypes.AUDIO_DTS_HD)
+                    .build()
+            }
+
+            track.output!!.format(track.format!!)
+            track.waitingForDtsAnalysis = false
+            maybeEndTracks()
+        }
+
         val output = track.output
         if (!sampleEncodingHandled) {
             if (track.hasContentEncryption) {
@@ -1342,7 +1543,7 @@ class UpdatedMatroskaExtractor internal constructor(
             }
         } else {
             if (track.trueHdSampleRechunker != null) {
-                Assertions.checkState(sampleStrippedBytes.limit() == 0)
+                checkState(sampleStrippedBytes.limit() == 0)
                 track.trueHdSampleRechunker!!.startSample(input)
             }
             while (sampleBytesRead < size) {
@@ -1441,57 +1642,6 @@ class UpdatedMatroskaExtractor internal constructor(
         return bytesWritten
     }
 
-    /**
-     * Builds a [SeekMap] from the recently gathered Cues information.
-     *
-     * @return The built [SeekMap]. The returned [SeekMap] may be unseekable if cues
-     * information was missing or incomplete.
-     */
-    private fun buildSeekMap(
-        cueTimesUs: androidx.media3.common.util.LongArray?,
-        cueClusterPositions: androidx.media3.common.util.LongArray?
-    ): SeekMap {
-        if (segmentContentPosition == C.INDEX_UNSET.toLong() || durationUs == C.TIME_UNSET || cueTimesUs == null || cueTimesUs.size() == 0 || cueClusterPositions == null || cueClusterPositions.size() != cueTimesUs.size()) {
-            // Cues information is missing or incomplete.
-            return Unseekable(durationUs)
-        }
-        val cuePointsSize = cueTimesUs.size()
-        var sizes = IntArray(cuePointsSize)
-        var offsets = LongArray(cuePointsSize)
-        var durationsUs = LongArray(cuePointsSize)
-        var timesUs = LongArray(cuePointsSize)
-        for (i in 0..<cuePointsSize) {
-            timesUs[i] = cueTimesUs[i]
-            offsets[i] = segmentContentPosition + cueClusterPositions[i]
-        }
-        for (i in 0..<cuePointsSize - 1) {
-            sizes[i] = (offsets[i + 1] - offsets[i]).toInt()
-            durationsUs[i] = timesUs[i + 1] - timesUs[i]
-        }
-
-        // Start from the last cue point and move backward until a valid duration is found.
-        var lastValidIndex = cuePointsSize - 1
-        while (lastValidIndex > 0 && timesUs[lastValidIndex] > durationUs) {
-            lastValidIndex--
-        }
-
-        // Calculate sizes and durations for the last valid index
-        sizes[lastValidIndex] =
-            (segmentContentPosition + segmentContentSize - offsets[lastValidIndex]).toInt()
-        durationsUs[lastValidIndex] = durationUs - timesUs[lastValidIndex]
-
-        // If the last valid index is not the last cue point, truncate the arrays
-        if (lastValidIndex < cuePointsSize - 1) {
-            Log.w(TAG, "Discarding trailing cue points with timestamps greater than total duration")
-            sizes = sizes.copyOf(lastValidIndex + 1)
-            offsets = offsets.copyOf(lastValidIndex + 1)
-            durationsUs = durationsUs.copyOf(lastValidIndex + 1)
-            timesUs = timesUs.copyOf(lastValidIndex + 1)
-        }
-
-        return ChunkIndex(sizes, offsets, durationsUs, timesUs)
-    }
-
     /**
      * Updates the position of the holder to Cues element's position if the extractor configuration
      * permits use of master seek entry. After building Cues sets the holder's position back to where
@@ -1511,7 +1661,7 @@ class UpdatedMatroskaExtractor internal constructor(
         // (until cues or end of segment). However this also means that we only need to seek
         // back to the top once, instead seeking back in a stack like manner.
         if (seekForSeekContent) {
-            Assertions.checkArgument(pendingSeekHeads.isNotEmpty(), "Illegal value of seekForSeekContent")
+            checkArgument(pendingSeekHeads.isNotEmpty(), "Illegal value of seekForSeekContent")
             // The exact order does not really matter, but it is easiest to just do stack (FILO)
             val next = pendingSeekHeads.removeAt(pendingSeekHeads.size - 1)
             seekPosition.position = next
@@ -1558,11 +1708,22 @@ class UpdatedMatroskaExtractor internal constructor(
     }
 
     private fun assertInitialized() {
-        Assertions.checkStateNotNull<ExtractorOutput?>(
+        checkNotNull<ExtractorOutput?>(
             extractorOutput
         )
     }
 
+    private fun maybeEndTracks() {
+        if (!pendingEndTracks) return
+
+        for (i in 0 until tracks.size()) {
+            if (tracks.valueAt(i).waitingForDtsAnalysis) return
+        }
+
+        checkNotNull(extractorOutput).endTracks()
+        pendingEndTracks = false
+    }
+
     /** Passes events through to the outer [UpdatedMatroskaExtractor].  */
     private inner class InnerEbmlProcessor : EbmlProcessor {
         override fun getElementType(id: Int): @EbmlProcessor.ElementType Int {
@@ -1607,10 +1768,11 @@ class UpdatedMatroskaExtractor internal constructor(
     /** Holds data corresponding to a single track.  */
     protected class Track {
         // Common elements.
+        var isWebm: Boolean = false
         var name: String? = null
         var codecId: String? = null
         var number: Int = 0
-        var type: Int = 0
+        var type: @C.TrackType Int = 0
         var defaultSampleDurationNs: Int = 0
         var maxBlockAdditionId: Int = 0
         var blockAddIdType: Int = 0
@@ -1660,23 +1822,24 @@ class UpdatedMatroskaExtractor internal constructor(
         var sampleRate: Int = 8000
         var codecDelayNs: Long = 0
         var seekPreRollNs: Long = 0
-        var trueHdSampleRechunker: TrueHdSampleRechunker? =
-            null
+        var trueHdSampleRechunker: TrueHdSampleRechunker? = null
+        var waitingForDtsAnalysis: Boolean = false
 
         // Text elements.
         var flagForced: Boolean = false
+
+        // Common track elements.
         var flagDefault: Boolean = true
         var language: String = "eng"
 
         // Set when the output is initialized. nalUnitLengthFieldLength is only set for H264/H265.
         var output: TrackOutput? = null
+        var format: Format? = null
         var nalUnitLengthFieldLength: Int = 0
 
-        /** Initializes the track with an output.  */
-        @Throws(
-            ParserException::class
-        )
-        fun initializeOutput(output: ExtractorOutput, trackId: Int) {
+        /** Builds the [Format] for the track. */
+        @Throws(ParserException::class)
+        fun initializeFormat(trackId: Int) {
             var mimeType: String
             var maxInputSize = Format.NO_VALUE
             var pcmEncoding: @PcmEncoding Int = Format.NO_VALUE
@@ -1684,8 +1847,20 @@ class UpdatedMatroskaExtractor internal constructor(
             var codecs: String? = null
             when (codecId) {
                 CODEC_ID_VP8 -> mimeType = MimeTypes.VIDEO_VP8
-                CODEC_ID_VP9 -> mimeType = MimeTypes.VIDEO_VP9
-                CODEC_ID_AV1 -> mimeType = MimeTypes.VIDEO_AV1
+                CODEC_ID_VP9 -> {
+                    mimeType = MimeTypes.VIDEO_VP9
+                    initializationData =
+                        if (codecPrivate == null) null else ImmutableList.of(
+                            codecPrivate!!
+                        )
+                }
+                CODEC_ID_AV1 -> {
+                    mimeType = MimeTypes.VIDEO_AV1
+                    initializationData =
+                        if (codecPrivate == null) null else ImmutableList.of(
+                            codecPrivate!!
+                        )
+                }
                 CODEC_ID_MPEG2 -> mimeType = MimeTypes.VIDEO_MPEG2
                 CODEC_ID_MPEG4_SP, CODEC_ID_MPEG4_ASP, CODEC_ID_MPEG4_AP -> {
                     mimeType = MimeTypes.VIDEO_MP4V
@@ -1797,7 +1972,10 @@ class UpdatedMatroskaExtractor internal constructor(
                     trueHdSampleRechunker = TrueHdSampleRechunker()
                 }
 
-                CODEC_ID_DTS, CODEC_ID_DTS_EXPRESS -> mimeType = MimeTypes.AUDIO_DTS
+                CODEC_ID_DTS, CODEC_ID_DTS_EXPRESS -> {
+                    mimeType = MimeTypes.AUDIO_DTS // temporary
+                    waitingForDtsAnalysis = true
+                }
                 CODEC_ID_DTS_LOSSLESS -> mimeType = MimeTypes.AUDIO_DTS_HD
                 CODEC_ID_FLAC -> {
                     mimeType = MimeTypes.AUDIO_FLAC
@@ -1896,7 +2074,7 @@ class UpdatedMatroskaExtractor internal constructor(
                 }
 
                 CODEC_ID_SUBRIP -> mimeType = MimeTypes.APPLICATION_SUBRIP
-                CODEC_ID_ASS -> {
+                CODEC_ID_ASS, CODEC_ID_SSA -> {
                     mimeType = MimeTypes.TEXT_SSA
                     initializationData = ImmutableList.of(
                         SSA_DIALOGUE_FORMAT, getCodecPrivate(
@@ -1942,18 +2120,15 @@ class UpdatedMatroskaExtractor internal constructor(
             selectionFlags = selectionFlags or if (flagDefault) C.SELECTION_FLAG_DEFAULT else 0
             selectionFlags = selectionFlags or if (flagForced) C.SELECTION_FLAG_FORCED else 0
 
-            val type: Int
             val formatBuilder = Format.Builder()
             // TODO: Consider reading the name elements of the tracks and, if present, incorporating them
             // into the trackId passed when creating the formats.
             if (MimeTypes.isAudio(mimeType)) {
-                type = C.TRACK_TYPE_AUDIO
                 formatBuilder
                     .setChannelCount(channelCount)
                     .setSampleRate(sampleRate)
                     .setPcmEncoding(pcmEncoding)
             } else if (MimeTypes.isVideo(mimeType)) {
-                type = C.TRACK_TYPE_VIDEO
                 if (displayUnit == DISPLAY_UNIT_PIXELS) {
                     displayWidth = if (displayWidth == Format.NO_VALUE) width else displayWidth
                     displayHeight = if (displayHeight == Format.NO_VALUE) height else displayHeight
@@ -2014,7 +2189,6 @@ class UpdatedMatroskaExtractor internal constructor(
                 || MimeTypes.APPLICATION_PGS == mimeType
                 || MimeTypes.APPLICATION_DVBSUBS == mimeType
             ) {
-                type = C.TRACK_TYPE_TEXT
             } else {
                 throw ParserException.createForMalformedContainer(
                     "Unexpected MIME type.",  /* cause= */null
@@ -2025,9 +2199,10 @@ class UpdatedMatroskaExtractor internal constructor(
                 formatBuilder.setLabel(name)
             }
 
-            val format =
+            format =
                 formatBuilder
                     .setId(trackId)
+                    .setContainerMimeType(if (isWebm) MimeTypes.VIDEO_WEBM else MimeTypes.VIDEO_MATROSKA)
                     .setSampleMimeType(mimeType)
                     .setMaxInputSize(maxInputSize)
                     .setLanguage(language)
@@ -2036,9 +2211,6 @@ class UpdatedMatroskaExtractor internal constructor(
                     .setCodecs(codecs)
                     .setDrmInitData(drmInitData)
                     .build()
-
-            this.output = output.track(number, type)
-            this.output!!.format(format)
         }
 
         /** Forces any pending sample metadata to be flushed to the output.  */
@@ -2113,6 +2285,90 @@ class UpdatedMatroskaExtractor internal constructor(
                 return hdrStaticInfoData
             }
 
+        /**
+         * Finds the best thumbnail timestamp from the cue points and adds it to the track's format as
+         * [ThumbnailMetadata].
+         */
+        fun maybeAddThumbnailMetadata(
+            perTrackCues: SparseArray<MutableList<MatroskaSeekMap.CuePointData>>,
+            durationUs: Long,
+            segmentContentPosition: Long,
+            segmentContentSize: Long
+        ) {
+            if (type != C.TRACK_TYPE_VIDEO) return
+
+            val cuePoints = perTrackCues[number]
+            if (cuePoints.isNullOrEmpty()) return
+
+            val thumbnailTimestampUs = findBestThumbnailPresentationTimeUs(
+                cuePoints, durationUs, segmentContentPosition, segmentContentSize
+            )
+
+            if (thumbnailTimestampUs != C.TIME_UNSET) {
+                val currentFormat = requireNotNull(format)
+                val existingMetadata = currentFormat.metadata
+                val thumbnailMetadata = ThumbnailMetadata(thumbnailTimestampUs)
+                val newMetadata = if (existingMetadata == null) {
+                    Metadata(thumbnailMetadata)
+                } else {
+                    existingMetadata.copyWithAppendedEntries(thumbnailMetadata)
+                }
+                format = currentFormat.buildUpon().setMetadata(newMetadata).build()
+            }
+        }
+
+        /**
+         * Finds the best thumbnail timestamp from the provided cue points.
+         *
+         * <p>The heuristic seeks to find a visually interesting frame by assuming that a larger chunk
+         * size corresponds to a more complex and representative frame. It calculates an approximate
+         * bitrate for each chunk and selects the timestamp of the chunk with the highest bitrate.
+         */
+        private fun findBestThumbnailPresentationTimeUs(
+            cuePoints: MutableList<MatroskaSeekMap.CuePointData>,
+            durationUs: Long,
+            segmentContentPosition: Long,
+            segmentContentSize: Long
+        ): Long {
+            if (cuePoints.isEmpty()) return C.TIME_UNSET
+
+            var maxBitrate = 0.0
+            var bestCueIndex = -1
+            val scanLimit = min(cuePoints.size, MAX_CHUNKS_TO_SCAN_FOR_THUMBNAIL)
+
+            for (i in 0 until scanLimit) {
+                val cue = cuePoints[i]
+
+                if (cue.timeUs > MAX_DURATION_US_TO_SCAN_FOR_THUMBNAIL) break
+
+                val bytesBetweenCues: Long
+                val durationBetweenCuesUs: Long
+
+                if (i < cuePoints.size - 1) {
+                    val nextCue = cuePoints[i + 1]
+                    bytesBetweenCues = (nextCue.clusterPosition + nextCue.relativePosition) -
+                        (cue.clusterPosition + cue.relativePosition)
+                    durationBetweenCuesUs = nextCue.timeUs - cue.timeUs
+                } else {
+                    // Last cue point
+                    bytesBetweenCues = (segmentContentPosition + segmentContentSize) -
+                        (cue.clusterPosition + cue.relativePosition)
+                    durationBetweenCuesUs = durationUs - cue.timeUs
+                }
+
+                if (durationBetweenCuesUs > 0) {
+                    // This is an approximation of the bitrate for thumbnail heuristic.
+                    val bitrate = bytesBetweenCues.toDouble() / durationBetweenCuesUs
+                    if (bitrate > maxBitrate) {
+                        maxBitrate = bitrate
+                        bestCueIndex = i
+                    }
+                }
+            }
+
+            return if (bestCueIndex == -1) C.TIME_UNSET else cuePoints[bestCueIndex].timeUs
+        }
+
         /**
          * Checks that the track has an output.
          *
@@ -2122,14 +2378,12 @@ class UpdatedMatroskaExtractor internal constructor(
          * fact at runtime.
          */
         fun assertOutputInitialized() {
-            Assertions.checkNotNull<TrackOutput?>(
+            checkNotNull<TrackOutput?>(
                 output
             )
         }
 
-        @Throws(
-            ParserException::class
-        )
+        @Throws(ParserException::class)
         private fun getCodecPrivate(codecId: String): ByteArray {
             if (codecPrivate == null) {
                 throw ParserException.createForMalformedContainer(
@@ -2368,6 +2622,7 @@ class UpdatedMatroskaExtractor internal constructor(
         private const val CODEC_ID_PCM_FLOAT = "A_PCM/FLOAT/IEEE"
         private const val CODEC_ID_SUBRIP = "S_TEXT/UTF8"
         private const val CODEC_ID_ASS = "S_TEXT/ASS"
+        private const val CODEC_ID_SSA = "S_TEXT/SSA"
         private const val CODEC_ID_VTT = "S_TEXT/WEBVTT"
         private const val CODEC_ID_VOBSUB = "S_VOBSUB"
         private const val CODEC_ID_PGS = "S_HDMV/PGS"
@@ -2444,8 +2699,10 @@ class UpdatedMatroskaExtractor internal constructor(
         private const val ID_CUES = 0x1C53BB6B
         private const val ID_CUE_POINT = 0xBB
         private const val ID_CUE_TIME = 0xB3
+        private const val ID_CUE_TRACK = 0xF7
         private const val ID_CUE_TRACK_POSITIONS = 0xB7
         private const val ID_CUE_CLUSTER_POSITION = 0xF1
+        private const val ID_CUE_RELATIVE_POSITION = 0xF0
         private const val ID_LANGUAGE = 0x22B59C
         private const val ID_PROJECTION = 0x7670
         private const val ID_PROJECTION_TYPE = 0x7671
@@ -2500,6 +2757,12 @@ class UpdatedMatroskaExtractor internal constructor(
         private const val FOURCC_COMPRESSION_H263 = 0x33363248
         private const val FOURCC_COMPRESSION_VC1 = 0x31435657
 
+        /** The maximum number of chunks to scan when searching for a thumbnail. */
+        private const val MAX_CHUNKS_TO_SCAN_FOR_THUMBNAIL = 20
+
+        /** The maximum duration to scan for a thumbnail, in microseconds. */
+        private const val MAX_DURATION_US_TO_SCAN_FOR_THUMBNAIL = 10_000_000L
+
         /**
          * A template for the prefix that must be added to each subrip sample.
          *
@@ -2721,8 +2984,8 @@ class UpdatedMatroskaExtractor internal constructor(
          * See documentation on [.SSA_DIALOGUE_FORMAT] and [.SUBRIP_PREFIX] for why we use
          * the duration as the end timecode.
          *
-         * @param codecId The subtitle codec; must be [.CODEC_ID_SUBRIP], [.CODEC_ID_ASS] or
-         * [.CODEC_ID_VTT].
+         * @param codecId The subtitle codec; must be [.CODEC_ID_SUBRIP], [.CODEC_ID_ASS],
+         * [.CODEC_ID_SSA] or [.CODEC_ID_VTT].
          * @param durationUs The duration of the sample, in microseconds.
          * @param subtitleData The subtitle sample in which to overwrite the end timecode (output
          * parameter).
@@ -2741,7 +3004,7 @@ class UpdatedMatroskaExtractor internal constructor(
                     endTimecodeOffset = SUBRIP_PREFIX_END_TIMECODE_OFFSET
                 }
 
-                CODEC_ID_ASS -> {
+                CODEC_ID_ASS, CODEC_ID_SSA -> {
                     endTimecode =
                         formatSubtitleTimecode(
                             durationUs, SSA_TIMECODE_FORMAT, SSA_TIMECODE_LAST_VALUE_SCALING_FACTOR
@@ -2769,7 +3032,7 @@ class UpdatedMatroskaExtractor internal constructor(
             timeUs: Long, timecodeFormat: String, lastTimecodeValueScalingFactor: Long
         ): ByteArray {
             var timeUs = timeUs
-            Assertions.checkArgument(timeUs != C.TIME_UNSET)
+            checkArgument(timeUs != C.TIME_UNSET)
             val timeCodeData: ByteArray
             val hours = (timeUs / (3600 * C.MICROS_PER_SECOND)).toInt()
             timeUs -= (hours * 3600L * C.MICROS_PER_SECOND)
@@ -2787,7 +3050,7 @@ class UpdatedMatroskaExtractor internal constructor(
 
         private fun isCodecSupported(codecId: String): Boolean {
             return when (codecId) {
-                CODEC_ID_VP8, CODEC_ID_VP9, CODEC_ID_AV1, CODEC_ID_MPEG2, CODEC_ID_MPEG4_SP, CODEC_ID_MPEG4_ASP, CODEC_ID_MPEG4_AP, CODEC_ID_H264, CODEC_ID_H265, CODEC_ID_FOURCC, CODEC_ID_THEORA, CODEC_ID_OPUS, CODEC_ID_VORBIS, CODEC_ID_AAC, CODEC_ID_MP2, CODEC_ID_MP3, CODEC_ID_AC3, CODEC_ID_E_AC3, CODEC_ID_TRUEHD, CODEC_ID_DTS, CODEC_ID_DTS_EXPRESS, CODEC_ID_DTS_LOSSLESS, CODEC_ID_FLAC, CODEC_ID_ACM, CODEC_ID_PCM_INT_LIT, CODEC_ID_PCM_INT_BIG, CODEC_ID_PCM_FLOAT, CODEC_ID_SUBRIP, CODEC_ID_ASS, CODEC_ID_VTT, CODEC_ID_VOBSUB, CODEC_ID_PGS, CODEC_ID_DVBSUB -> true
+                CODEC_ID_VP8, CODEC_ID_VP9, CODEC_ID_AV1, CODEC_ID_MPEG2, CODEC_ID_MPEG4_SP, CODEC_ID_MPEG4_ASP, CODEC_ID_MPEG4_AP, CODEC_ID_H264, CODEC_ID_H265, CODEC_ID_FOURCC, CODEC_ID_THEORA, CODEC_ID_OPUS, CODEC_ID_VORBIS, CODEC_ID_AAC, CODEC_ID_MP2, CODEC_ID_MP3, CODEC_ID_AC3, CODEC_ID_E_AC3, CODEC_ID_TRUEHD, CODEC_ID_DTS, CODEC_ID_DTS_EXPRESS, CODEC_ID_DTS_LOSSLESS, CODEC_ID_FLAC, CODEC_ID_ACM, CODEC_ID_PCM_INT_LIT, CODEC_ID_PCM_INT_BIG, CODEC_ID_PCM_FLOAT, CODEC_ID_SUBRIP, CODEC_ID_ASS, CODEC_ID_SSA, CODEC_ID_VTT, CODEC_ID_VOBSUB, CODEC_ID_PGS, CODEC_ID_DVBSUB -> true
 
                 else -> false
             }
@@ -2811,4 +3074,169 @@ class UpdatedMatroskaExtractor internal constructor(
             }
         }
     }
-}
\ No newline at end of file
+
+    class MatroskaSeekMap(
+        private val perTrackCues: SparseArray<MutableList<CuePointData>>,
+        private val durationUs: Long,
+        private val primarySeekTrackNumber: Int,
+        segmentContentPosition: Long,
+        segmentContentSize: Long
+    ) : TrackAwareSeekMap, ChunkIndexProvider {
+
+        private val chunkIndex: ChunkIndex? =
+            buildChunkIndex(
+                perTrackCues,
+                durationUs,
+                primarySeekTrackNumber,
+                segmentContentPosition,
+                segmentContentSize
+            )
+
+        override fun isSeekable(): Boolean {
+            // The media is seekable overall only if the primary seek track has cue points.
+            return isSeekable(primarySeekTrackNumber)
+        }
+
+        override fun isSeekable(trackId: Int): Boolean {
+            val cuePoints = perTrackCues[trackId]
+            return !cuePoints.isNullOrEmpty()
+        }
+
+        override fun getDurationUs(): Long = durationUs
+
+        override fun getSeekPoints(timeUs: Long): SeekPoints =
+            chunkIndex?.getSeekPoints(timeUs)
+                ?: SeekPoints(SeekPoint.START)
+
+        override fun getSeekPoints(timeUs: Long, trackId: Int): SeekPoints {
+            var cuePoints = perTrackCues[trackId]
+
+            if ((cuePoints.isNullOrEmpty()) && trackId != primarySeekTrackNumber) {
+                cuePoints = perTrackCues[primarySeekTrackNumber]
+            }
+
+            if (cuePoints.isNullOrEmpty()) {
+                return SeekPoints(SeekPoint.START)
+            }
+
+            val bestIndex = Util.binarySearchFloor(
+                cuePoints,
+                CuePointData(timeUs, C.INDEX_UNSET.toLong(), C.INDEX_UNSET.toLong()),
+                /* inclusive= */ true,
+                /* stayInBounds= */ false
+            )
+
+            return if (bestIndex != -1) {
+                val bestCue = cuePoints[bestIndex]
+                val firstPoint = SeekPoint(bestCue.timeUs, bestCue.clusterPosition)
+
+                if (bestCue.timeUs < timeUs && bestIndex + 1 < cuePoints.size) {
+                    val nextCue = cuePoints[bestIndex + 1]
+                    val secondPoint = SeekPoint(nextCue.timeUs, nextCue.clusterPosition)
+                    SeekPoints(firstPoint, secondPoint)
+                } else {
+                    SeekPoints(firstPoint)
+                }
+            } else {
+                val firstCue = cuePoints[0]
+                SeekPoints(SeekPoint(firstCue.timeUs, firstCue.clusterPosition))
+            }
+        }
+
+        override fun getChunkIndex(): ChunkIndex? = chunkIndex
+
+        private companion object {
+
+            private fun buildChunkIndex(
+                perTrackCues: SparseArray<MutableList<CuePointData>>,
+                durationUs: Long,
+                primarySeekTrackNumber: Int,
+                segmentContentPosition: Long,
+                segmentContentSize: Long
+            ): ChunkIndex? {
+
+                val primaryTrackCuePoints =
+                    perTrackCues[primarySeekTrackNumber] ?: return null
+
+                if (primaryTrackCuePoints.isEmpty()) {
+                    return null
+                }
+
+                val cuePointsSize = primaryTrackCuePoints.size
+                var sizes = IntArray(cuePointsSize)
+                var offsets = LongArray(cuePointsSize)
+                var durationsUs = LongArray(cuePointsSize)
+                var timesUs = LongArray(cuePointsSize)
+
+                for (i in 0 until cuePointsSize) {
+                    val cue = primaryTrackCuePoints[i]
+                    timesUs[i] = cue.timeUs
+                    offsets[i] = cue.clusterPosition
+                }
+
+                for (i in 0 until cuePointsSize - 1) {
+                    sizes[i] = (offsets[i + 1] - offsets[i]).toInt()
+                    durationsUs[i] = timesUs[i + 1] - timesUs[i]
+                }
+
+                // Start from the last cue point and move backward until a valid duration is found.
+                var lastValidIndex = cuePointsSize - 1
+                while (lastValidIndex > 0 && timesUs[lastValidIndex] >= durationUs) {
+                    lastValidIndex--
+                }
+
+                // Calculate sizes and durations for the last valid index
+                sizes[lastValidIndex] =
+                    (segmentContentPosition + segmentContentSize - offsets[lastValidIndex]).toInt()
+                durationsUs[lastValidIndex] = durationUs - timesUs[lastValidIndex]
+
+                // If trailing cue points were found, truncate the arrays to the last valid index.
+                if (lastValidIndex < cuePointsSize - 1) {
+                    Log.w(TAG, "Discarding trailing cue points with timestamps greater than total duration.")
+                    sizes = sizes.copyOf(lastValidIndex + 1)
+                    offsets = offsets.copyOf(lastValidIndex + 1)
+                    durationsUs = durationsUs.copyOf(lastValidIndex + 1)
+                    timesUs = timesUs.copyOf(lastValidIndex + 1)
+                }
+
+                return ChunkIndex(sizes, offsets, durationsUs, timesUs)
+            }
+        }
+
+        class CuePointData(
+            /** The timestamp of the cue point, in microseconds. */
+            val timeUs: Long,
+
+            /** The absolute byte offset of the start of the cluster containing this cue point. */
+            val clusterPosition: Long,
+
+            /**
+             * The relative byte offset of the cue point's data block within its cluster.
+             *
+             * <p>Note: For seeking, use {@link #clusterPosition} to prevent A/V desync.
+             */
+            val relativePosition: Long
+        ) : Comparable<CuePointData> {
+
+            override fun compareTo(other: CuePointData): Int {
+                return timeUs.compareTo(other.timeUs)
+            }
+
+            override fun equals(other: Any?): Boolean {
+                if (this === other) {
+                    return true
+                }
+                if (other !is CuePointData) {
+                    return false
+                }
+                return this.timeUs == other.timeUs &&
+                    this.clusterPosition == other.clusterPosition &&
+                    this.relativePosition == other.relativePosition
+            }
+
+            override fun hashCode(): Int {
+                return Objects.hash(timeUs, clusterPosition, relativePosition)
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/live/LiveHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/live/LiveHelper.kt
new file mode 100644
index 00000000000..52cd4361bab
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/live/LiveHelper.kt
@@ -0,0 +1,77 @@
+package com.lagradost.cloudstream3.ui.player.live
+
+import androidx.annotation.OptIn
+import androidx.media3.common.Player
+import androidx.media3.common.Timeline
+import androidx.media3.common.util.UnstableApi
+import com.lagradost.cloudstream3.mvvm.debugWarning
+import java.util.WeakHashMap
+
+object LiveHelper {
+    private val liveManagers = WeakHashMap<Player, Pair<LiveManager, Player.Listener>>()
+
+    @OptIn(UnstableApi::class)
+    fun registerPlayer(player: Player?) {
+        if (player == null) {
+            debugWarning { "LiveHelper registerPlayer called with null player!" }
+            return
+        }
+
+        // Prevent duplicates
+        if (liveManagers.contains(player)) {
+            return
+        }
+
+        val liveManager = LiveManager(player)
+        val listener = object : Player.Listener {
+            override fun onTimelineChanged(timeline: Timeline, reason: Int) {
+                val window = Timeline.Window()
+                timeline.getWindow(player.currentMediaItemIndex, window)
+                if (window.isDynamic) {
+                    liveManager.submitLivestreamChunk(LivestreamChunk(window.durationMs))
+                }
+                super.onTimelineChanged(timeline, reason)
+            }
+
+            override fun onPositionDiscontinuity(
+                oldPosition: Player.PositionInfo,
+                newPosition: Player.PositionInfo,
+                reason: Int
+            ) {
+                super.onPositionDiscontinuity(oldPosition, newPosition, reason)
+                val timeAheadOfLive = liveManager.getTimeAheadOfLive(newPosition.positionMs)
+
+                // Seek back to the optimal live spot
+                if (timeAheadOfLive > 100) {
+                    player.seekTo(newPosition.positionMs - timeAheadOfLive)
+                }
+            }
+        }
+
+        synchronized(liveManagers) {
+            player.addListener(listener)
+            liveManagers[player] = liveManager to listener
+        }
+    }
+
+    fun unregisterPlayer(player: Player?) {
+        if (player == null) {
+            debugWarning { "LiveHelper unregisterPlayer called with null player!" }
+            return
+        }
+
+        // Prevent duplicates
+        if (!liveManagers.contains(player)) {
+            return
+        }
+
+        synchronized(liveManagers) {
+            liveManagers[player]?.let { (_, listener) ->
+                player.removeListener(listener)
+            }
+            liveManagers.remove(player)
+        }
+    }
+
+    fun getLiveManager(player: Player?) = liveManagers[player]?.first
+}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/live/LiveManager.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/live/LiveManager.kt
new file mode 100644
index 00000000000..8d848d46aa9
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/live/LiveManager.kt
@@ -0,0 +1,97 @@
+package com.lagradost.cloudstream3.ui.player.live
+
+import androidx.media3.common.C
+import androidx.media3.common.Player
+import java.lang.ref.WeakReference
+
+// How much margin from the live point is still considered "live"
+const val LIVE_MARGIN = 6_000L
+
+// How many ms should we be behind the real live point?
+// Too low, and we cannot pre-buffer
+// Too high, and we are no longer live
+const val PREFERRED_LIVE_OFFSET = 5_000L
+
+// An extra offset from the optimal calculated timestamp
+// This is to account for chunk updates not always being the same size
+const val CHUNK_VARIANCE = 3000L
+
+// A livestream chunk from the player, the time we get it and the duration can be used to calculate
+// the expected live timestamp.
+class LivestreamChunk(
+    durationMs: Long, val receiveTimeMs: Long = System.currentTimeMillis()
+) {
+    // We want to be PREFERRED_LIVE_OFFSET ms after the latest update, but we cannot be ahead of the middle point.
+    // If we are ahead of the middle point we will reach the end before the new chunk is expected to be released.
+    val targetPosition = maxOf(0,minOf(
+        durationMs - PREFERRED_LIVE_OFFSET,
+        durationMs / 2 - CHUNK_VARIANCE
+    ))
+
+    fun isPositionLive(position: Long): Boolean {
+        val currentTime = System.currentTimeMillis()
+        val livePosition = targetPosition + (currentTime - receiveTimeMs)
+        val withinLive = position + LIVE_MARGIN > livePosition - PREFERRED_LIVE_OFFSET
+        // println("Position: $position, livePosition: ${livePosition}, Behind live: ${livePosition-position}, within live: $withinLive")
+        return withinLive
+    }
+
+    fun getTimeAheadOfLive(position: Long): Long {
+        val currentTime = System.currentTimeMillis()
+        val livePosition = targetPosition + (currentTime - receiveTimeMs)
+        // println("Ahead of live: ${position-livePosition}")
+        return position - livePosition
+    }
+}
+
+// There are two types of livestreams we need to manage
+// 1. A livestream with no history, a continually sliding window.
+// This livestream has no currentLiveOffset, which means we need to calculate
+// the real live point based on when we receive the latest update and the size of that update.
+// 2. A livestream with history.
+// This livestream has a currentLiveOffset and therefore requires no calculation to get the live point.
+// currentLiveOffset can however be inaccurate, and we need to be able to fall back to manual calculations.
+class LiveManager {
+    private var _currentPlayer: WeakReference<Player>? = null
+    val currentPlayer: Player? get() = _currentPlayer?.get()
+
+    constructor(player: Player?) {
+        _currentPlayer = WeakReference(player)
+    }
+
+    private var lastLivestreamChunk: LivestreamChunk? = null
+
+    fun submitLivestreamChunk(chunk: LivestreamChunk) {
+        lastLivestreamChunk = chunk
+    }
+
+    /** Returns how much a position is ahead of the calculated live window. Returns 0 if not ahead of live window */
+    fun getTimeAheadOfLive(position: Long): Long {
+        val player = currentPlayer ?: return 0
+        if (!player.isCurrentMediaItemDynamic || player.duration == C.TIME_UNSET) return 0
+
+        // If the currentLiveOffset is wrong we fall back to manual calculations
+        val ahead = if (player.currentLiveOffset != C.TIME_UNSET && player.currentLiveOffset < player.duration) {
+            val relativeOffset = player.currentLiveOffset - player.currentPosition + position
+            PREFERRED_LIVE_OFFSET - relativeOffset
+        } else {
+            lastLivestreamChunk?.getTimeAheadOfLive(position) ?: 0
+        }
+
+        // Ensure min of 0
+        return maxOf(0, ahead)
+    }
+
+    /** Check if the stream is currently at the expected live edge, with margins */
+    fun isAtLiveEdge(): Boolean {
+        val player = currentPlayer ?: return false
+        if (!player.isCurrentMediaItemDynamic || player.duration == C.TIME_UNSET) return false
+
+        // If the currentLiveOffset is wrong we fall back to manual calculations
+        return if (player.currentLiveOffset != C.TIME_UNSET && player.currentLiveOffset < player.duration) {
+            player.currentLiveOffset < LIVE_MARGIN + PREFERRED_LIVE_OFFSET
+        } else {
+            lastLivestreamChunk?.isPositionLive(player.currentPosition) == true
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/live/LivePreviewTimeBar.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/live/LivePreviewTimeBar.kt
new file mode 100644
index 00000000000..3001281fd45
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/live/LivePreviewTimeBar.kt
@@ -0,0 +1,38 @@
+package com.lagradost.cloudstream3.ui.player.live
+
+import android.content.Context
+import android.util.AttributeSet
+import androidx.annotation.OptIn
+import androidx.media3.common.Player
+import androidx.media3.common.util.UnstableApi
+import androidx.media3.ui.PlayerControlView
+import androidx.media3.ui.PlayerView
+import androidx.media3.ui.R
+import com.github.rubensousa.previewseekbar.media3.PreviewTimeBar
+import java.lang.ref.WeakReference
+
+
+@OptIn(UnstableApi::class)
+class LivePreviewTimeBar(val ctx: Context, attrs: AttributeSet) : PreviewTimeBar(ctx, attrs) {
+
+    private var _currentPlayerView: WeakReference<PlayerView>? = null
+    val currentPlayer: Player? get() = _currentPlayerView?.get()?.player
+
+    fun registerPlayerView(player: PlayerView?) {
+        _currentPlayerView = WeakReference(player)
+        val controller =
+            _currentPlayerView?.get()?.findViewById<PlayerControlView>(R.id.exo_controller)
+
+        controller?.setProgressUpdateListener { position, bufferedPosition ->
+            currentPlayer?.let { player ->
+                if (isAtLiveEdge()) {
+                    setPosition(player.duration)
+                }
+            }
+        }
+    }
+
+    fun isAtLiveEdge(): Boolean {
+        return LiveHelper.getLiveManager(currentPlayer)?.isAtLiveEdge() == true
+    }
+}
\ 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 ce457740d34..11dd39105a6 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
@@ -2,9 +2,9 @@ package com.lagradost.cloudstream3.ui.player.source_priority
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
 import com.lagradost.cloudstream3.databinding.PlayerPrioritizeItemBinding
-import com.lagradost.cloudstream3.utils.AppContextUtils
+import com.lagradost.cloudstream3.ui.NoStateAdapter
+import com.lagradost.cloudstream3.ui.ViewHolderState
 
 data class SourcePriority<T>(
     val data: T,
@@ -12,41 +12,41 @@ data class SourcePriority<T>(
     var priority: Int
 )
 
-class PriorityAdapter<T>(override val items: MutableList<SourcePriority<T>>) :
-    AppContextUtils.DiffAdapter<SourcePriority<T>>(items) {
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-        return PriorityViewHolder(
-            PlayerPrioritizeItemBinding.inflate(LayoutInflater.from(parent.context),parent,false),
+class PriorityAdapter<T>() :
+    NoStateAdapter<SourcePriority<T>>() {
+
+    override fun onCreateContent(parent: ViewGroup): ViewHolderState<Any> {
+        return ViewHolderState(
+            PlayerPrioritizeItemBinding.inflate(
+                LayoutInflater.from(parent.context),
+                parent,
+                false
+            )
         )
     }
 
-    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-        when (holder) {
-            is PriorityViewHolder -> holder.bind(items[position])
-        }
-    }
+    override fun onBindContent(
+        holder: ViewHolderState<Any>,
+        item: SourcePriority<T>,
+        position: Int
+    ) {
+        val binding = holder.view as? PlayerPrioritizeItemBinding ?: return
+        binding.priorityText.text = item.name
 
-    class PriorityViewHolder(
-        val binding: PlayerPrioritizeItemBinding,
-    ) : RecyclerView.ViewHolder(binding.root) {
-        fun <T> bind(item: SourcePriority<T>) {
-            binding.priorityText.text = item.name
+        fun updatePriority() {
+            binding.priorityNumber.text = item.priority.toString()
+        }
 
-            fun updatePriority() {
-                binding.priorityNumber.text = item.priority.toString()
-            }
+        updatePriority()
+        binding.addButton.setOnClickListener {
+            // If someone clicks til the integer limit then they deserve to crash.
+            item.priority++
+            updatePriority()
+        }
 
+        binding.subtractButton.setOnClickListener {
+            item.priority--
             updatePriority()
-            binding.addButton.setOnClickListener {
-                // If someone clicks til the integer limit then they deserve to crash.
-                item.priority++
-                updatePriority()
-            }
-
-            binding.subtractButton.setOnClickListener {
-                item.priority--
-                updatePriority()
-            }
         }
     }
 }
\ No newline at end of file
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 821bccd6a84..85c2a85df39 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
@@ -10,45 +10,25 @@ 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.utils.AppContextUtils
+import com.lagradost.cloudstream3.ui.BaseDiffCallback
+import com.lagradost.cloudstream3.ui.NoStateAdapter
+import com.lagradost.cloudstream3.ui.ViewHolderState
 import com.lagradost.cloudstream3.utils.ImageLoader.loadImage
 import com.lagradost.cloudstream3.utils.drawableToBitmap
+import com.lagradost.cloudstream3.utils.setText
 
 class ProfilesAdapter(
-    override val items: MutableList<QualityDataHelper.QualityProfile>,
-    val usedProfile: Int,
+    val usedProfile: Int?,
     val clickCallback: (oldIndex: Int?, newIndex: Int) -> Unit,
 ) :
-    AppContextUtils.DiffAdapter<QualityDataHelper.QualityProfile>(
-        items,
-        comparison = { first: QualityDataHelper.QualityProfile, second: QualityDataHelper.QualityProfile ->
-            first.id == second.id
-        }) {
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-        return ProfilesViewHolder(
-            PlayerQualityProfileItemBinding.inflate(LayoutInflater.from(parent.context),parent,false)
-        )
-    }
-
-    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-        when (holder) {
-            is ProfilesViewHolder -> holder.bind(items[position], position)
-        }
-    }
-
-    private var currentItem: Pair<Int, QualityDataHelper.QualityProfile>? = null
-
-    fun getCurrentProfile(): QualityDataHelper.QualityProfile? {
-        return currentItem?.second
-    }
+    NoStateAdapter<QualityDataHelper.QualityProfile>(diffCallback = BaseDiffCallback(itemSame = { a, b ->
+        a.id == b.id
+    })) {
 
-    inner class ProfilesViewHolder(
-        val binding: PlayerQualityProfileItemBinding,
-    ) : RecyclerView.ViewHolder(binding.root) {
-        private val art = listOf(
+    companion object {
+        private val art = arrayOf(
             R.drawable.profile_bg_teal,
             R.drawable.profile_bg_blue,
             R.drawable.profile_bg_dark_blue,
@@ -57,67 +37,101 @@ class ProfilesAdapter(
             R.drawable.profile_bg_red,
             R.drawable.profile_bg_orange,
         )
+    }
 
-        fun bind(item: QualityDataHelper.QualityProfile, index: Int) {
-            val priorityText: TextView = binding.profileText
-            val profileBg: ImageView = binding.profileImageBackground
-            val wifiText: TextView = binding.textIsWifi
-            val dataText: TextView = binding.textIsMobileData
-            val outline: View = binding.outline
-            val cardView: View = binding.cardView
-
-            priorityText.text = item.name.asString(itemView.context)
-            dataText.isVisible = item.type == QualityDataHelper.QualityProfileType.Data
-            wifiText.isVisible = item.type == QualityDataHelper.QualityProfileType.WiFi
-
-            fun setCurrentItem() {
-                val prevIndex = currentItem?.first
-                // Prevent UI bug when re-selecting the item quickly
-                if (prevIndex == index) {
-                    return
-                }
-                currentItem = index to item
-                clickCallback.invoke(prevIndex, index)
+    override fun onCreateContent(parent: ViewGroup): ViewHolderState<Any> {
+        return ViewHolderState(
+            PlayerQualityProfileItemBinding.inflate(
+                LayoutInflater.from(parent.context),
+                parent,
+                false
+            )
+        )
+    }
+
+    override fun onClearView(holder: ViewHolderState<Any>) {
+        when (val binding = holder.view) {
+            is PlayerQualityProfileItemBinding -> {
+                clearImage(binding.profileImageBackground)
             }
+        }
+    }
 
-            outline.isVisible = currentItem?.second?.id == item.id
-            val drawableResId = art[index % art.size]
-            profileBg.loadImage(drawableResId)
-
-            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
-                            )
+    override fun onBindContent(
+        holder: ViewHolderState<Any>,
+        item: QualityDataHelper.QualityProfile,
+        position: Int
+    ) {
+        val binding = holder.view as? PlayerQualityProfileItemBinding ?: return
+
+        val priorityText: TextView = binding.profileText
+        val profileBg: ImageView = binding.profileImageBackground
+        val wifiText: TextView = binding.textIsWifi
+        val dataText: TextView = binding.textIsMobileData
+        val downloadText: TextView = binding.textIsDownloadData
+        val outline: View = binding.outline
+        val cardView: View = binding.cardView
+        val itemView = holder.itemView
+
+        priorityText.setText(item.name)
+        dataText.isVisible = item.types.contains(QualityDataHelper.QualityProfileType.Data)
+        wifiText.isVisible = item.types.contains(QualityDataHelper.QualityProfileType.WiFi)
+        downloadText.isVisible = item.types.contains(QualityDataHelper.QualityProfileType.Download)
+
+        fun setCurrentItem() {
+            val prevIndex = currentItem
+            // Prevent UI bug when re-selecting the item quickly
+            if (prevIndex == position) {
+                return
+            }
+            currentItem = position
+            clickCallback.invoke(prevIndex, position)
+        }
+
+        outline.isVisible = currentItem == position
+        val drawableResId = art[position % art.size]
+        profileBg.loadImage(drawableResId)
+
+        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)
-                        }
+                    if (color != null) {
+                        wifiText.backgroundTintList = ColorStateList.valueOf(color)
+                        dataText.backgroundTintList = ColorStateList.valueOf(color)
+                        downloadText.backgroundTintList = ColorStateList.valueOf(color)
                     }
                 }
             }
+        }
 
-            val textStyle =
-                if (item.id == usedProfile) {
-                    Typeface.BOLD
-                } else {
-                    Typeface.NORMAL
-                }
+        val textStyle =
+            if (item.id == usedProfile) {
+                Typeface.BOLD
+            } else {
+                Typeface.NORMAL
+            }
 
-            priorityText.setTypeface(null, textStyle)
+        priorityText.setTypeface(null, textStyle)
 
-            cardView.setOnClickListener {
-                setCurrentItem()
-            }
+        cardView.setOnClickListener {
+            setCurrentItem()
         }
     }
+
+    private var currentItem: Int? = null
+
+    fun getCurrentProfile(): QualityDataHelper.QualityProfile? {
+        return currentItem?.let { index -> immutableCurrentList.getOrNull(index) }
+    }
 }
\ No newline at end of file
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 0922bdb5aa6..02470484ea1 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,22 +1,32 @@
 package com.lagradost.cloudstream3.ui.player.source_priority
 
 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.CloudStreamApp.Companion.getKey
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.getKeys
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.removeKey
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.setKey
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.mvvm.debugAssert
 import com.lagradost.cloudstream3.utils.UiText
 import com.lagradost.cloudstream3.utils.txt
 import com.lagradost.cloudstream3.utils.DataStoreHelper.currentAccount
+import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.Qualities
+import kotlin.math.abs
 
 object QualityDataHelper {
     private const val VIDEO_SOURCE_PRIORITY = "video_source_priority"
     private const val VIDEO_PROFILE_NAME = "video_profile_name"
     private const val VIDEO_QUALITY_PRIORITY = "video_quality_priority"
+
+    // Old key only supporting one type per profile
+    @Deprecated("Changed to support multiple types per profile")
     private const val VIDEO_PROFILE_TYPE = "video_profile_type"
+    // New key supporting more than one type per profile
+
+    private const val VIDEO_PROFILE_TYPES = "video_profile_types_2"
     private const val DEFAULT_SOURCE_PRIORITY = 1
+
     /**
      * Automatically skip loading links once this priority is reached
      **/
@@ -33,13 +43,14 @@ object QualityDataHelper {
     enum class QualityProfileType(@StringRes val stringRes: Int, val unique: Boolean) {
         None(R.string.none, false),
         WiFi(R.string.wifi, true),
-        Data(R.string.mobile_data, true)
+        Data(R.string.mobile_data, true),
+        Download(R.string.download, true)
     }
 
     data class QualityProfile(
         val name: UiText,
         val id: Int,
-        val type: QualityProfileType
+        val types: Set<QualityProfileType>
     )
 
     fun getSourcePriority(profile: Int, name: String?): Int {
@@ -51,8 +62,21 @@ object QualityDataHelper {
         ) ?: DEFAULT_SOURCE_PRIORITY
     }
 
+    fun getAllSourcePriorityNames(profile: Int): List<String> {
+        val folder = "$currentAccount/$VIDEO_SOURCE_PRIORITY/$profile"
+        return getKeys(folder)?.map { key ->
+            key.substringAfter("$folder/")
+        } ?: emptyList()
+    }
+
     fun setSourcePriority(profile: Int, name: String, priority: Int) {
-        setKey("$currentAccount/$VIDEO_SOURCE_PRIORITY/$profile", name, priority)
+        val folder = "$currentAccount/$VIDEO_SOURCE_PRIORITY/$profile"
+        // Prevent unnecessary keys
+        if (priority == DEFAULT_SOURCE_PRIORITY) {
+            removeKey(folder, name)
+        } else {
+            setKey(folder, name, priority)
+        }
     }
 
     fun setProfileName(profile: Int, name: String?) {
@@ -85,16 +109,40 @@ object QualityDataHelper {
         )
     }
 
-    fun getQualityProfileType(profile: Int): QualityProfileType {
-        return getKey("$currentAccount/$VIDEO_PROFILE_TYPE/$profile") ?: QualityProfileType.None
-    }
 
-    fun setQualityProfileType(profile: Int, type: QualityProfileType?) {
-        val path = "$currentAccount/$VIDEO_PROFILE_TYPE/$profile"
-        if (type == QualityProfileType.None) {
-            removeKey(path)
+    @Suppress("DEPRECATION")
+    fun getQualityProfileTypes(profile: Int): Set<QualityProfileType> {
+        val newKey = "$currentAccount/$VIDEO_PROFILE_TYPES/$profile"
+        // Use arrays for to make with work with setKey properly (weird crashes otherwise)
+        val newProfiles = getKey<Array<QualityProfileType>>(newKey)?.toSet()
+
+        // Migrate to new profile key
+        if (newProfiles == null) {
+            val oldProfile =
+                getKey<QualityProfileType>("$currentAccount/$VIDEO_PROFILE_TYPE/$profile")
+            val newSet = oldProfile?.let { arrayOf(it) } ?: arrayOf()
+            setKey(newKey, newSet)
+            return newSet.toSet()
         } else {
-            setKey(path, type)
+            return newProfiles
+        }
+    }
+
+    fun addQualityProfileType(profile: Int, type: QualityProfileType) {
+        val path = "$currentAccount/$VIDEO_PROFILE_TYPES/$profile"
+        val currentTypes = getQualityProfileTypes(profile)
+
+        if (type != QualityProfileType.None) {
+            setKey(path, (currentTypes + type).toTypedArray())
+        }
+    }
+
+    fun removeQualityProfileType(profile: Int, type: QualityProfileType) {
+        val path = "$currentAccount/$VIDEO_PROFILE_TYPES/$profile"
+        val currentTypes = getQualityProfileTypes(profile)
+
+        if (type != QualityProfileType.None) {
+            setKey(path, (currentTypes - type).toTypedArray())
         }
     }
 
@@ -106,37 +154,39 @@ object QualityDataHelper {
         val availableTypes = QualityProfileType.entries.toMutableList()
         val profiles = (1..PROFILE_COUNT).map { profileNumber ->
             // Get the real type
-            val type = getQualityProfileType(profileNumber)
-
-            // This makes it impossible to get more than one of each type
-            // Duplicates will be turned to None
-            val uniqueType = if (type.unique && !availableTypes.remove(type)) {
-                QualityProfileType.None
-            } else {
-                type
-            }
+            val types = getQualityProfileTypes(profileNumber)
+
+            val uniqueTypes = types.mapNotNull { type ->
+                // This makes it impossible to get more than one of each type
+                if (type.unique && !availableTypes.remove(type)) {
+                    null
+                } else {
+                    type
+                }
+            }.toSet()
 
             QualityProfile(
                 getProfileName(profileNumber),
                 profileNumber,
-                uniqueType
+                uniqueTypes
             )
         }.toMutableList()
 
         /**
-         * If no profile of this type exists: insert it on the earliest profile with None type
+         * If no profile of this type exists: insert it on the earliest profile
          **/
         fun insertType(
             list: MutableList<QualityProfile>,
             type: QualityProfileType
         ) {
-            if (list.any { it.type == type }) return
-            val index =
-                list.indexOfFirst { it.type == QualityProfileType.None }
-            list.getOrNull(index)?.copy(type = type)
-                ?.let { fixed ->
-                    list.set(index, fixed)
-                }
+            if (list.any { it.types.contains(type) }) return
+
+            synchronized(list) {
+                val firstItem = list.firstOrNull() ?: return
+                val fixedTypes = firstItem.types + type
+                val fixedItem = firstItem.copy(types = fixedTypes)
+                list.set(0, fixedItem)
+            }
         }
 
         QualityProfileType.entries.forEach {
@@ -145,7 +195,7 @@ object QualityDataHelper {
 
         debugAssert({
             !QualityProfileType.entries.all { type ->
-                !type.unique || profiles.any { it.type == type }
+                !type.unique || profiles.any { it.types.contains(type) }
             }
         }, { "All unique quality types do not exist" })
 
@@ -155,4 +205,22 @@ object QualityDataHelper {
 
         return profiles
     }
+
+    fun getLinkPriority(
+        qualityProfile: Int,
+        linkData: ExtractorLink?
+    ): Int {
+        val qualityPriority = getQualityPriority(
+            qualityProfile,
+            closestQuality(linkData?.quality)
+        )
+        val sourcePriority = getSourcePriority(qualityProfile, linkData?.source)
+
+        return qualityPriority + sourcePriority
+    }
+
+    private fun closestQuality(target: Int?): Qualities {
+        if (target == null) return Qualities.Unknown
+        return Qualities.entries.minBy { abs(it.value - target) }
+    }
 }
\ No newline at end of file
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 19e98138cbd..6a0f12e9a4e 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
@@ -2,47 +2,78 @@ package com.lagradost.cloudstream3.ui.player.source_priority
 
 import android.app.Dialog
 import androidx.annotation.StyleRes
+import androidx.core.view.isVisible
 import androidx.fragment.app.FragmentActivity
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.databinding.PlayerQualityProfileDialogBinding
+import com.lagradost.cloudstream3.ui.player.source_priority.QualityDataHelper.getAllSourcePriorityNames
 import com.lagradost.cloudstream3.ui.player.source_priority.QualityDataHelper.getProfileName
 import com.lagradost.cloudstream3.ui.player.source_priority.QualityDataHelper.getProfiles
+import com.lagradost.cloudstream3.utils.Coroutines.ioWork
 import com.lagradost.cloudstream3.utils.txt
 import com.lagradost.cloudstream3.utils.ExtractorLink
-import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialog
+import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showMultiDialog
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
+import com.lagradost.cloudstream3.utils.UIHelper.fixSystemBarsPadding
+import com.lagradost.cloudstream3.utils.setText
 
-class QualityProfileDialog(
+/** Simplified ExtractorLink for the quality profile dialog */
+data class LinkSource(
+    val source: String
+) {
+    constructor(extractorLink: ExtractorLink) : this(extractorLink.source)
+}
+
+
+class QualityProfileDialog private constructor(
     val activity: FragmentActivity,
     @StyleRes val themeRes: Int,
-    private val links: List<ExtractorLink>,
-    private val usedProfile: Int,
-    private val profileSelectionCallback: (QualityDataHelper.QualityProfile) -> Unit
+    private val links: List<LinkSource>,
+    private val usedProfile: Int?,
+    private val profileSelectionCallback: ((QualityDataHelper.QualityProfile) -> Unit)?,
+    private val useProfileSelection: Boolean
 ) : Dialog(activity, themeRes) {
-    override fun show() {
+    constructor(
+        activity: FragmentActivity,
+        @StyleRes themeRes: Int,
+        links: List<LinkSource>,
+        usedProfile: Int,
+        profileSelectionCallback: ((QualityDataHelper.QualityProfile) -> Unit),
+    ) : this(activity, themeRes, links, usedProfile, profileSelectionCallback, true)
+
+    constructor(
+        activity: FragmentActivity,
+        @StyleRes themeRes: Int,
+        links: List<LinkSource>
+    ) : this(activity, themeRes, links, null, null, false)
 
+    companion object {
+        // Run on IO as this may be a heavy operation
+        suspend fun getAllDefaultSources(): List<LinkSource> = ioWork {
+            getProfiles().flatMap {
+                getAllSourcePriorityNames(it.id)
+            }.distinct().map { LinkSource(it) }
+        }
+    }
+
+    override fun show() {
         val binding = PlayerQualityProfileDialogBinding.inflate(this.layoutInflater, null, false)
 
-        setContentView(binding.root)//R.layout.player_quality_profile_dialog)
-        /*val profilesRecyclerView: RecyclerView = profiles_recyclerview
-        val useBtt: View = use_btt
-        val editBtt: View = edit_btt
-        val cancelBtt: View = cancel_btt
-        val defaultBtt: View = set_default_btt
-        val currentProfileText: TextView = currently_selected_profile_text
-        val selectedItemActionsHolder: View = selected_item_holder*/
+        setContentView(binding.root)
+        fixSystemBarsPadding(binding.root)
         binding.apply {
             fun getCurrentProfile(): QualityDataHelper.QualityProfile? {
                 return (profilesRecyclerview.adapter as? ProfilesAdapter)?.getCurrentProfile()
             }
 
             fun refreshProfiles() {
-                currentlySelectedProfileText.text = getProfileName(usedProfile).asString(context)
-                (profilesRecyclerview.adapter as? ProfilesAdapter)?.updateList(getProfiles())
+                if (usedProfile != null) {
+                    currentlySelectedProfileText.setText(getProfileName(usedProfile))
+                }
+                (profilesRecyclerview.adapter as? ProfilesAdapter)?.submitList(getProfiles())
             }
 
             profilesRecyclerview.adapter = ProfilesAdapter(
-                mutableListOf(),
                 usedProfile,
             ) { oldIndex: Int?, newIndex: Int ->
                 profilesRecyclerview.adapter?.notifyItemChanged(newIndex)
@@ -65,37 +96,52 @@ class QualityProfileDialog(
 
             setDefaultBtt.setOnClickListener {
                 val currentProfile = getCurrentProfile() ?: return@setOnClickListener
-                val choices = QualityDataHelper.QualityProfileType.entries
-                    .filter { it != QualityDataHelper.QualityProfileType.None }
+                val choices =
+                    QualityDataHelper.QualityProfileType.entries.filter { it != QualityDataHelper.QualityProfileType.None }
                 val choiceNames = choices.map { txt(it.stringRes).asString(context) }
+                val selectedIndices = choices.mapIndexed { index, type -> index to type }
+                    .filter { currentProfile.types.contains(it.second) }.map { it.first }
 
-                activity.showBottomDialog(
+                activity.showMultiDialog(
                     choiceNames,
-                    choices.indexOf(currentProfile.type),
+                    selectedIndices,
                     txt(R.string.set_default).asString(context),
-                    false,
                     {},
                     { index ->
-                        val pickedChoice = choices.getOrNull(index) ?: return@showBottomDialog
-                        // Remove previous picks
-                        if (pickedChoice.unique) {
-                            getProfiles().filter { it.type == pickedChoice }.forEach {
-                                QualityDataHelper.setQualityProfileType(it.id, null)
+                        val pickedChoices = index.mapNotNull { choices.getOrNull(it) }
+
+                        pickedChoices.forEach { pickedChoice ->
+                            // Remove previous picks
+                            if (pickedChoice.unique) {
+                                getProfiles().filter { it.types.contains(pickedChoice) }.forEach {
+                                    QualityDataHelper.removeQualityProfileType(it.id, pickedChoice)
+                                }
                             }
+
+                            QualityDataHelper.addQualityProfileType(currentProfile.id, pickedChoice)
                         }
 
-                        QualityDataHelper.setQualityProfileType(currentProfile.id, pickedChoice)
                         refreshProfiles()
                     })
             }
 
-            cancelBtt.setOnClickListener {
-                this@QualityProfileDialog.dismissSafe()
-            }
+            cancelBtt.isVisible = useProfileSelection
+            useBtt.isVisible = useProfileSelection
+            applyBtt.isVisible = !useProfileSelection
 
-            useBtt.setOnClickListener {
-                getCurrentProfile()?.let {
-                    profileSelectionCallback.invoke(it)
+            if (useProfileSelection) {
+                cancelBtt.setOnClickListener {
+                    this@QualityProfileDialog.dismissSafe()
+                }
+
+                useBtt.setOnClickListener {
+                    getCurrentProfile()?.let {
+                        profileSelectionCallback?.invoke(it)
+                        this@QualityProfileDialog.dismissSafe()
+                    }
+                }
+            } else {
+                applyBtt.setOnClickListener {
                     this@QualityProfileDialog.dismissSafe()
                 }
             }
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 4c74ec80f39..c8ac96ebbf6 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
@@ -8,14 +8,14 @@ import androidx.appcompat.app.AlertDialog
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.databinding.PlayerSelectSourcePriorityBinding
 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
+import com.lagradost.cloudstream3.utils.UIHelper.fixSystemBarsPadding
 
 class SourcePriorityDialog(
     val ctx: Context,
     @StyleRes themeRes: Int,
-    val links: List<ExtractorLink>,
+    val links: List<LinkSource>,
     private val profile: QualityDataHelper.QualityProfile,
     /**
      * Notify that the profile overview should be updated, for example if the name has been updated
@@ -24,8 +24,10 @@ class SourcePriorityDialog(
     private val updatedCallback: () -> Unit
 ) : Dialog(ctx, themeRes) {
     override fun show() {
-        val binding = PlayerSelectSourcePriorityBinding.inflate(LayoutInflater.from(ctx), null, false)
+        val binding =
+            PlayerSelectSourcePriorityBinding.inflate(LayoutInflater.from(ctx), null, false)
         setContentView(binding.root)
+        fixSystemBarsPadding(binding.root)
         val sourcesRecyclerView = binding.sortSources
         val qualitiesRecyclerView = binding.sortQualities
         val profileText = binding.profileTextEditable
@@ -36,45 +38,46 @@ class SourcePriorityDialog(
         profileText.setText(QualityDataHelper.getProfileName(profile.id).asString(context))
         profileText.hint = txt(R.string.profile_number, profile.id).asString(context)
 
-        sourcesRecyclerView.adapter = PriorityAdapter(
-            links.map { link ->
+        sourcesRecyclerView.adapter = PriorityAdapter<Nothing?>(
+        ).apply {
+            submitList(links.map { link ->
                 SourcePriority(
                     null,
                     link.source,
                     QualityDataHelper.getSourcePriority(profile.id, link.source)
                 )
-            }.distinctBy { it.name }.sortedBy { -it.priority }.toMutableList()
-        )
+            }.distinctBy { it.name }.sortedBy { -it.priority })
+        }
 
-        qualitiesRecyclerView.adapter = PriorityAdapter(
-            Qualities.entries.mapNotNull {
+        qualitiesRecyclerView.adapter = PriorityAdapter<Qualities>(
+        ).apply {
+            submitList(Qualities.entries.mapNotNull {
                 SourcePriority(
                     it,
                     Qualities.getStringByIntFull(it.value).ifBlank { return@mapNotNull null },
                     QualityDataHelper.getQualityPriority(profile.id, it)
                 )
-            }.sortedBy { -it.priority }.toMutableList()
-        )
+            }.sortedBy { -it.priority })
+        }
 
         @Suppress("UNCHECKED_CAST") // We know the types
         saveBtt.setOnClickListener {
             val qualityAdapter = qualitiesRecyclerView.adapter as? PriorityAdapter<Qualities>
-            val sourcesAdapter = sourcesRecyclerView.adapter as? PriorityAdapter<Nothing>
+            val sourcesAdapter = sourcesRecyclerView.adapter as? PriorityAdapter<Nothing?>
 
-            val qualities = qualityAdapter?.items ?: emptyList()
-            val sources = sourcesAdapter?.items ?: emptyList()
+            val qualities = qualityAdapter?.immutableCurrentList ?: emptyList()
+            val sources = sourcesAdapter?.immutableCurrentList ?: emptyList()
 
             qualities.forEach {
-                val data = it.data as? Qualities ?: return@forEach
-                QualityDataHelper.setQualityPriority(profile.id, data, it.priority)
+                QualityDataHelper.setQualityPriority(profile.id, it.data, it.priority)
             }
 
             sources.forEach {
                 QualityDataHelper.setSourcePriority(profile.id, it.name, it.priority)
             }
 
-            qualityAdapter?.updateList(qualities.sortedBy { -it.priority })
-            sourcesAdapter?.updateList(sources.sortedBy { -it.priority })
+            qualityAdapter?.submitList(qualities.sortedBy { -it.priority })
+            sourcesAdapter?.submitList(sources.sortedBy { -it.priority })
 
             val savedProfileName = profileText.text.toString()
             if (savedProfileName.isBlank()) {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/quicksearch/QuickSearchFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/quicksearch/QuickSearchFragment.kt
index 12adc04007f..cf9bc9975c0 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/quicksearch/QuickSearchFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/quicksearch/QuickSearchFragment.kt
@@ -2,9 +2,7 @@ package com.lagradost.cloudstream3.ui.quicksearch
 
 import android.app.Activity
 import android.content.Context
-import android.content.res.Configuration
 import android.os.Bundle
-import android.util.TypedValue
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -13,9 +11,9 @@ import android.widget.ImageView
 import androidx.appcompat.widget.SearchView
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
-import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.lagradost.cloudstream3.APIHolder.getApiFromNameNull
 import com.lagradost.cloudstream3.CommonActivity.activity
@@ -25,28 +23,35 @@ import com.lagradost.cloudstream3.databinding.QuickSearchBinding
 import com.lagradost.cloudstream3.mvvm.Resource
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.mvvm.observe
+import com.lagradost.cloudstream3.ui.BaseFragment
 import com.lagradost.cloudstream3.ui.home.HomeFragment
 import com.lagradost.cloudstream3.ui.home.HomeFragment.Companion.loadHomepageList
+import com.lagradost.cloudstream3.ui.home.HomeViewModel
 import com.lagradost.cloudstream3.ui.home.ParentItemAdapter
 import com.lagradost.cloudstream3.ui.search.SearchAdapter
 import com.lagradost.cloudstream3.ui.search.SearchClickCallback
 import com.lagradost.cloudstream3.ui.search.SearchHelper
 import com.lagradost.cloudstream3.ui.search.SearchViewModel
+import com.lagradost.cloudstream3.ui.setRecycledViewPool
 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.utils.AppContextUtils.filterProviderByPreferredMedia
 import com.lagradost.cloudstream3.utils.AppContextUtils.filterSearchResultByFilmQuality
+import com.lagradost.cloudstream3.utils.AppContextUtils.isRecyclerScrollable
 import com.lagradost.cloudstream3.utils.AppContextUtils.ownShow
-import com.lagradost.cloudstream3.utils.UIHelper
-import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
+import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
+import com.lagradost.cloudstream3.utils.UIHelper.fixSystemBarsPadding
 import com.lagradost.cloudstream3.utils.UIHelper.getSpanCount
+import com.lagradost.cloudstream3.utils.UIHelper.hideKeyboard
 import com.lagradost.cloudstream3.utils.UIHelper.navigate
 import com.lagradost.cloudstream3.utils.UIHelper.popCurrentPage
 import java.util.concurrent.locks.ReentrantLock
 
-class QuickSearchFragment : Fragment() {
+class QuickSearchFragment : BaseFragment<QuickSearchBinding>(
+    BaseFragment.BindingCreator.Inflate(QuickSearchBinding::inflate)
+) {
     companion object {
         const val AUTOSEARCH_KEY = "autosearch"
         const val PROVIDER_KEY = "providers"
@@ -85,30 +90,29 @@ class QuickSearchFragment : Fragment() {
 
     private var providers: Set<String>? = null
     private lateinit var searchViewModel: SearchViewModel
-    var binding: QuickSearchBinding? = null
-
 
     private var bottomSheetDialog: BottomSheetDialog? = null
 
+    override fun fixLayout(view: View) {
+        fixSystemBarsPadding(view)
+
+        // Fix grid
+        HomeFragment.currentSpan = view.context.getSpanCount()
+        binding?.quickSearchAutofitResults?.spanCount = HomeFragment.currentSpan
+        HomeFragment.configEvent.invoke()
+    }
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View {
+    ): View? {
         activity?.window?.setSoftInputMode(
             WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE
         )
         searchViewModel = ViewModelProvider(this)[SearchViewModel::class.java]
         bottomSheetDialog?.ownShow()
-        val localBinding = QuickSearchBinding.inflate(inflater, container, false)
-        binding = localBinding
-        return localBinding.root
-        //return inflater.inflate(R.layout.quick_search, container, false)
-    }
-
-    override fun onDestroyView() {
-        binding = null
-        super.onDestroyView()
+        return super.onCreateView(inflater, container, savedInstanceState)
     }
 
     override fun onDestroy() {
@@ -130,25 +134,7 @@ class QuickSearchFragment : Fragment() {
         return false
     }
 
-    private fun fixGrid() {
-        activity?.getSpanCount()?.let {
-            HomeFragment.currentSpan = it
-        }
-        binding?.quickSearchAutofitResults?.spanCount = HomeFragment.currentSpan
-        HomeFragment.currentSpan = HomeFragment.currentSpan
-        HomeFragment.configEvent.invoke(HomeFragment.currentSpan)
-    }
-
-    override fun onConfigurationChanged(newConfig: Configuration) {
-        super.onConfigurationChanged(newConfig)
-        fixGrid()
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        fixPaddingStatusbar(binding?.quickSearchRoot)
-        fixGrid()
-
+    override fun onBindingCreated(binding: QuickSearchBinding) {
         arguments?.getStringArray(PROVIDER_KEY)?.let {
             providers = it.toSet()
         }
@@ -158,55 +144,101 @@ class QuickSearchFragment : Fragment() {
             getApiFromNameNull(providers?.first())?.hasQuickSearch ?: false
         } else false
 
-        if (isSingleProvider) {
-            binding?.quickSearchAutofitResults?.apply {
+        val firstProvider = providers?.firstOrNull()
+        if (isSingleProvider && firstProvider != null) {
+            binding.quickSearchAutofitResults.apply {
+                setRecycledViewPool(SearchAdapter.sharedPool)
                 adapter = SearchAdapter(
-                    ArrayList(),
                     this,
                 ) { callback ->
                     SearchHelper.handleSearchClickCallback(callback)
                 }
             }
 
+            binding.quickSearchAutofitResults.addOnScrollListener(object :
+                RecyclerView.OnScrollListener() {
+                var expandCount = 0
+
+                override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
+                    super.onScrollStateChanged(recyclerView, newState)
+
+                    val adapter = recyclerView.adapter
+                    if (adapter !is SearchAdapter) return
+
+                    val count = adapter.itemCount
+                    val currentHasNext = adapter.hasNext
+
+                    if (!recyclerView.isRecyclerScrollable() && currentHasNext && expandCount != count) {
+                        expandCount = count
+                        ioSafe {
+                            searchViewModel.expandAndReturn(firstProvider)
+                        }
+                    }
+                }
+            })
+
             try {
-                binding?.quickSearch?.queryHint =
-                    getString(R.string.search_hint_site).format(providers?.first())
+                binding.quickSearch.queryHint =
+                    getString(R.string.search_hint_site).format(firstProvider)
             } catch (e: Exception) {
                 logError(e)
             }
         } else {
-            binding?.quickSearchMasterRecycler?.adapter =
-                ParentItemAdapter(fragment = this, id = "quickSearchMasterRecycler".hashCode(), { callback ->
-                    SearchHelper.handleSearchClickCallback(callback)
-                    //when (callback.action) {
-                    //SEARCH_ACTION_LOAD -> {
-                    //    clickCallback?.invoke(callback)
-                    //}
-                    //    else -> SearchHelper.handleSearchClickCallback(activity, callback)
-                    //}
-                }, { item ->
-                    bottomSheetDialog = activity?.loadHomepageList(item, dismissCallback = {
-                        bottomSheetDialog = null
+            binding.quickSearchMasterRecycler.setRecycledViewPool(ParentItemAdapter.sharedPool)
+            binding.quickSearchMasterRecycler.adapter =
+                ParentItemAdapter(
+                    id = "quickSearchMasterRecycler".hashCode(),
+                    { callback ->
+                        SearchHelper.handleSearchClickCallback(callback)
+                        //when (callback.action) {
+                        //SEARCH_ACTION_LOAD -> {
+                        //    clickCallback?.invoke(callback)
+                        //}
+                        //    else -> SearchHelper.handleSearchClickCallback(activity, callback)
+                        //}
+                    },
+                    { item ->
+                        bottomSheetDialog = activity?.loadHomepageList(item, dismissCallback = {
+                            bottomSheetDialog = null
+                        }, expandCallback = { searchViewModel.expandAndReturn(it) })
+                    },
+                    expandCallback = { name ->
+                        ioSafe {
+                            searchViewModel.expandAndReturn(name)
+                        }
                     })
-                })
-            binding?.quickSearchMasterRecycler?.layoutManager = GridLayoutManager(context, 1)
+            binding.quickSearchMasterRecycler.layoutManager = GridLayoutManager(context, 1)
         }
-        binding?.quickSearchAutofitResults?.isVisible = isSingleProvider
-        binding?.quickSearchMasterRecycler?.isGone = isSingleProvider
+        binding.quickSearchAutofitResults.isVisible = isSingleProvider
+        binding.quickSearchMasterRecycler.isGone = isSingleProvider
 
         val listLock = ReentrantLock()
         observe(searchViewModel.currentSearch) { list ->
             try {
                 // https://stackoverflow.com/questions/6866238/concurrent-modification-exception-adding-to-an-arraylist
                 listLock.lock()
-                (binding?.quickSearchMasterRecycler?.adapter as ParentItemAdapter?)?.apply {
-                    updateList(list.map { ongoing ->
-                        val ongoingList = HomePageList(
-                            ongoing.apiName,
-                            if (ongoing.data is Resource.Success) ongoing.data.value else ArrayList()
+                (binding.quickSearchMasterRecycler.adapter as? ParentItemAdapter)?.apply {
+                    val newItems = list.map { ongoing ->
+                        val dataList = ongoing.value.list
+                        val dataListFiltered =
+                            context?.filterSearchResultByFilmQuality(dataList) ?: dataList
+
+                        val homePageList = HomePageList(
+                            ongoing.key,
+                            dataListFiltered
                         )
-                        ongoingList
-                    })
+
+                        val expandableList = HomeViewModel.ExpandableHomepageList(
+                            homePageList,
+                            ongoing.value.currentPage,
+                            ongoing.value.hasNext
+                        )
+
+                        expandableList
+                    }
+
+                    submitList(newItems)
+                    //notifyDataSetChanged()
                 }
             } catch (e: Exception) {
                 logError(e)
@@ -216,24 +248,12 @@ class QuickSearchFragment : Fragment() {
         }
 
         val searchExitIcon =
-            binding?.quickSearch?.findViewById<ImageView>(androidx.appcompat.R.id.search_close_btn)
-
-        //val searchMagIcon =
-        //    binding?.quickSearch?.findViewById<ImageView>(androidx.appcompat.R.id.search_mag_icon)
+            binding.quickSearch.findViewById<ImageView>(androidx.appcompat.R.id.search_close_btn)
 
-        // searchMagIcon?.scaleX = 0.65f
-        // searchMagIcon?.scaleY = 0.65f
-
-        // Set the color for the search exit icon to the correct theme text color
-        val searchExitIconColor = TypedValue()
-
-        activity?.theme?.resolveAttribute(android.R.attr.textColor, searchExitIconColor, true)
-        searchExitIcon?.setColorFilter(searchExitIconColor.data)
-
-        binding?.quickSearch?.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
+        binding.quickSearch.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
             override fun onQueryTextSubmit(query: String): Boolean {
                 if (search(context, query, false))
-                    UIHelper.hideKeyboard(binding?.quickSearch)
+                    hideKeyboard(binding.quickSearch)
                 return true
             }
 
@@ -243,41 +263,37 @@ class QuickSearchFragment : Fragment() {
                 return true
             }
         })
-        binding?.quickSearchLoadingBar?.alpha = 0f
+        binding.quickSearchLoadingBar.alpha = 0f
         observe(searchViewModel.searchResponse) {
             when (it) {
                 is Resource.Success -> {
                     it.value.let { data ->
-                        (binding?.quickSearchAutofitResults?.adapter as? SearchAdapter)?.updateList(
-                            context?.filterSearchResultByFilmQuality(data) ?: data
+                        val adapter =
+                            (binding.quickSearchAutofitResults.adapter as? SearchAdapter)
+                        adapter?.submitList(
+                            context?.filterSearchResultByFilmQuality(data.list) ?: data.list
                         )
+                        adapter?.hasNext = data.hasNext
                     }
                     searchExitIcon?.alpha = 1f
-                    binding?.quickSearchLoadingBar?.alpha = 0f
+                    binding.quickSearchLoadingBar.alpha = 0f
                 }
 
                 is Resource.Failure -> {
                     // Toast.makeText(activity, "Server error", Toast.LENGTH_LONG).show()
                     searchExitIcon?.alpha = 1f
-                    binding?.quickSearchLoadingBar?.alpha = 0f
+                    binding.quickSearchLoadingBar.alpha = 0f
                 }
 
                 is Resource.Loading -> {
                     searchExitIcon?.alpha = 0f
-                    binding?.quickSearchLoadingBar?.alpha = 1f
+                    binding.quickSearchLoadingBar.alpha = 1f
                 }
             }
         }
 
-
-        //quick_search.setOnQueryTextFocusChangeListener { _, b ->
-        //    if (b) {
-        //        // https://stackoverflow.com/questions/12022715/unable-to-show-keyboard-automatically-in-the-searchview
-        //        UIHelper.showInputMethod(view.findFocus())
-        //    }
-        //}
         if (isLayout(PHONE or EMULATOR)) {
-            binding?.quickSearchBack?.apply {
+            binding.quickSearchBack.apply {
                 isVisible = true
                 setOnClickListener {
                     activity?.popCurrentPage()
@@ -286,11 +302,11 @@ class QuickSearchFragment : Fragment() {
         }
 
         if (isLayout(TV)) {
-            binding?.quickSearch?.requestFocus()
+            binding.quickSearch.requestFocus()
         }
 
         arguments?.getString(AUTOSEARCH_KEY)?.let {
-            binding?.quickSearch?.setQuery(it, true)
+            binding.quickSearch.setQuery(it, true)
             arguments?.remove(AUTOSEARCH_KEY)
         }
     }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ActorAdaptor.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ActorAdaptor.kt
index b9893193be1..056588d0bb0 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
@@ -6,12 +6,14 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.view.isVisible
-import androidx.recyclerview.widget.DiffUtil
-import androidx.recyclerview.widget.RecyclerView
 import com.lagradost.cloudstream3.ActorData
 import com.lagradost.cloudstream3.ActorRole
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.databinding.CastItemBinding
+import com.lagradost.cloudstream3.ui.BaseDiffCallback
+import com.lagradost.cloudstream3.ui.NoStateAdapter
+import com.lagradost.cloudstream3.ui.ViewHolderState
+import com.lagradost.cloudstream3.ui.newSharedPool
 import com.lagradost.cloudstream3.ui.settings.Globals.PHONE
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
 import com.lagradost.cloudstream3.utils.ImageLoader.loadImage
@@ -19,163 +21,120 @@ import com.lagradost.cloudstream3.utils.ImageLoader.loadImage
 class ActorAdaptor(
     private var nextFocusUpId: Int? = null,
     private val focusCallback: (View?) -> Unit = {}
-) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
-    data class ActorMetaData(
-        var isInverted: Boolean,
-        val actor: ActorData,
-    )
-
-    private val actors: MutableList<ActorMetaData> = mutableListOf()
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-        return CardViewHolder(
-            CastItemBinding.inflate(LayoutInflater.from(parent.context), parent, false),
-            focusCallback
-        )
-    }
-
-    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-        when (holder) {
-            is CardViewHolder -> {
-                holder.bind(actors[position].actor, actors[position].isInverted, position) {
-                    actors[position].isInverted = !actors[position].isInverted
-                    this.notifyItemChanged(position)
-                }
-            }
-        }
+) : NoStateAdapter<ActorData>(diffCallback = BaseDiffCallback(itemSame = { a, b ->
+    a.actor.name == b.actor.name
+})) {
+    companion object {
+        val sharedPool =
+            newSharedPool { setMaxRecycledViews(CONTENT, 10) }
     }
 
-    override fun getItemCount(): Int {
-        return actors.size
-    }
+    // Easier to store it here than to store it in the ActorData
+    val inverted: HashMap<ActorData, Boolean> = hashMapOf()
 
-    private fun updateActorList(newList: List<ActorMetaData>) {
-        val diffResult = DiffUtil.calculateDiff(
-            ActorDiffCallback(this.actors, newList)
+    override fun onCreateContent(parent: ViewGroup): ViewHolderState<Any> {
+        return ViewHolderState(
+            CastItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
         )
-
-        actors.clear()
-        actors.addAll(newList)
-
-        diffResult.dispatchUpdatesTo(this)
     }
 
-    fun updateList(newList: List<ActorData>) {
-        if (actors.size >= newList.size) {
-            updateActorList(newList.mapIndexed { i, data -> actors[i].copy(actor = data) })
-        } else {
-            updateActorList(newList.mapIndexed { i, data ->
-                if (i < actors.size)
-                    actors[i].copy(actor = data)
-                else ActorMetaData(isInverted = false, actor = data)
-            })
+    override fun onClearView(holder: ViewHolderState<Any>) {
+        when (val binding = holder.view) {
+            is CastItemBinding -> {
+                clearImage(binding.actorImage)
+            }
         }
     }
 
-    private inner class CardViewHolder(
-        val binding: CastItemBinding,
-        private val focusCallback: (View?) -> Unit = {}
-    ) :
-        RecyclerView.ViewHolder(binding.root) {
-
-        fun bind(actor: ActorData, isInverted: Boolean, position: Int, callback: (Int) -> Unit) {
-            val (mainImg, vaImage) = if (!isInverted || actor.voiceActor?.image.isNullOrBlank()) {
-                Pair(actor.actor.image, actor.voiceActor?.image)
-            } else {
-                Pair(actor.voiceActor?.image, actor.actor.image)
-            }
+    override fun onBindContent(holder: ViewHolderState<Any>, item: ActorData, position: Int) {
+        when (val binding = holder.view) {
+            is CastItemBinding -> {
+                val itemView = binding.root
+                val isInverted = inverted.getOrDefault(item, false)
 
-            // Fix tv focus escaping the recyclerview
-            if (position == 0) {
-                itemView.nextFocusLeftId = R.id.result_cast_items
-            } else if ((position - 1) == itemCount) {
-                itemView.nextFocusRightId = R.id.result_cast_items
-            }
-            nextFocusUpId?.let {
-                itemView.nextFocusUpId = it
-            }
+                val (mainImg, vaImage) = if (!isInverted || item.voiceActor?.image.isNullOrBlank()) {
+                    Pair(item.actor.image, item.voiceActor?.image)
+                } else {
+                    Pair(item.voiceActor?.image, item.actor.image)
+                }
 
-            itemView.setOnFocusChangeListener { v, hasFocus ->
-                if (hasFocus) {
-                    focusCallback(v)
+                // Fix tv focus escaping the recyclerview
+                if (position == 0) {
+                    itemView.nextFocusLeftId = R.id.result_cast_items
+                } else if ((position - 1) == itemCount) {
+                    itemView.nextFocusRightId = R.id.result_cast_items
+                }
+                nextFocusUpId?.let {
+                    itemView.nextFocusUpId = it
                 }
-            }
 
-            itemView.setOnClickListener {
-                callback(position)
-            }
+                itemView.setOnFocusChangeListener { v, hasFocus ->
+                    if (hasFocus) {
+                        focusCallback(v)
+                    }
+                }
 
-            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)
+                itemView.setOnClickListener {
+                    inverted[item] = !isInverted
+                    this.onUpdateContent(holder, getItem(position), position)
+                }
+
+                itemView.setOnLongClickListener {
+                    if (isLayout(PHONE)) {
+                        Intent(Intent.ACTION_WEB_SEARCH).apply {
+                            putExtra(SearchManager.QUERY, item.actor.name)
+                        }.also { intent ->
+                            itemView.context.packageManager?.let { pm ->
+                                if (intent.resolveActivity(pm) != null) {
+                                    itemView.context.startActivity(intent)
+                                }
                             }
                         }
                     }
+                    true
                 }
-                true
-            }
 
-            binding.apply {
-                actorImage.loadImage(mainImg)
+                binding.apply {
+                    actorImage.loadImage(mainImg)
 
-                actorName.text = actor.actor.name
-                actor.role?.let {
-                    actorExtra.context?.getString(
-                        when (it) {
-                            ActorRole.Main -> {
-                                R.string.actor_main
-                            }
+                    actorName.text = item.actor.name
+                    item.role?.let {
+                        actorExtra.context?.getString(
+                            when (it) {
+                                ActorRole.Main -> {
+                                    R.string.actor_main
+                                }
 
-                            ActorRole.Supporting -> {
-                                R.string.actor_supporting
-                            }
+                                ActorRole.Supporting -> {
+                                    R.string.actor_supporting
+                                }
 
-                            ActorRole.Background -> {
-                                R.string.actor_background
+                                ActorRole.Background -> {
+                                    R.string.actor_background
+                                }
                             }
+                        )?.let { text ->
+                            actorExtra.isVisible = true
+                            actorExtra.text = text
                         }
-                    )?.let { text ->
+                    } ?: item.roleString?.let {
                         actorExtra.isVisible = true
-                        actorExtra.text = text
+                        actorExtra.text = it
+                    } ?: run {
+                        actorExtra.isVisible = false
                     }
-                } ?: actor.roleString?.let {
-                    actorExtra.isVisible = true
-                    actorExtra.text = it
-                } ?: run {
-                    actorExtra.isVisible = false
-                }
 
-                if (actor.voiceActor == null) {
-                    voiceActorImageHolder.isVisible = false
-                    voiceActorName.isVisible = false
-                } else {
-                    voiceActorName.text = actor.voiceActor?.name
-                    if (!vaImage.isNullOrEmpty())
-                        voiceActorImageHolder.isVisible = true
-                    voiceActorImage.loadImage(vaImage)
+                    if (item.voiceActor == null) {
+                        voiceActorImageHolder.isVisible = false
+                        voiceActorName.isVisible = false
+                    } else {
+                        voiceActorName.text = item.voiceActor?.name
+                        if (!vaImage.isNullOrEmpty())
+                            voiceActorImageHolder.isVisible = true
+                        voiceActorImage.loadImage(vaImage)
+                    }
                 }
             }
         }
     }
-}
-
-class ActorDiffCallback(
-    private val oldList: List<ActorAdaptor.ActorMetaData>,
-    private val newList: List<ActorAdaptor.ActorMetaData>
-) :
-    DiffUtil.Callback() {
-    override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int) =
-        oldList[oldItemPosition].actor.actor.name == newList[newItemPosition].actor.actor.name
-
-    override fun getOldListSize() = oldList.size
-
-    override fun getNewListSize() = newList.size
-
-    override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int) =
-        oldList[oldItemPosition] == newList[newItemPosition]
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/EpisodeAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/EpisodeAdapter.kt
index 1e0438cdd71..5e550416477 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
@@ -1,31 +1,37 @@
 package com.lagradost.cloudstream3.ui.result
 
-import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
+import androidx.core.view.setPadding
 import androidx.preference.PreferenceManager
-import androidx.recyclerview.widget.DiffUtil
-import androidx.recyclerview.widget.RecyclerView
+import coil3.dispose
 import com.lagradost.cloudstream3.APIHolder.unixTimeMS
+import com.lagradost.cloudstream3.CommonActivity
 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
+import com.lagradost.cloudstream3.ui.BaseDiffCallback
+import com.lagradost.cloudstream3.ui.NoStateAdapter
+import com.lagradost.cloudstream3.ui.ViewHolderState
 import com.lagradost.cloudstream3.ui.download.DOWNLOAD_ACTION_DOWNLOAD
 import com.lagradost.cloudstream3.ui.download.DOWNLOAD_ACTION_LONG_CLICK
 import com.lagradost.cloudstream3.ui.download.DownloadClickEvent
+import com.lagradost.cloudstream3.ui.newSharedPool
 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.utils.AppContextUtils.html
+import com.lagradost.cloudstream3.utils.Coroutines.main
 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.downloader.DownloadObjects
+import com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager
 import com.lagradost.cloudstream3.utils.setText
 import com.lagradost.cloudstream3.utils.txt
 import java.text.DateFormat
@@ -38,7 +44,6 @@ import java.util.Locale
  * @see VideoClickActionHolder
  */
 const val ACTION_PLAY_EPISODE_IN_PLAYER = 1
-
 const val ACTION_CHROME_CAST_EPISODE = 4
 const val ACTION_CHROME_CAST_MIRROR = 5
 
@@ -59,83 +64,74 @@ const val ACTION_DOWNLOAD_EPISODE_SUBTITLE_MIRROR = 14
 const val ACTION_MARK_AS_WATCHED = 18
 
 const val TV_EP_SIZE = 400
+const val ACTION_MARK_WATCHED_UP_TO_THIS_EPISODE = 19
 
-data class EpisodeClickEvent(val action: Int, val data: ResultEpisode)
+data class EpisodeClickEvent(val position: Int?, val action: Int, val data: ResultEpisode) {
+    constructor(action: Int, data: ResultEpisode) : this(null, action, data)
+}
 
 class EpisodeAdapter(
     private val hasDownloadSupport: Boolean,
     private val clickCallback: (EpisodeClickEvent) -> Unit,
     private val downloadClickCallback: (DownloadClickEvent) -> Unit,
-) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+) : NoStateAdapter<ResultEpisode>(diffCallback = BaseDiffCallback(itemSame = { a, b ->
+    a.id == b.id
+}, contentSame = { a, b ->
+    a == b
+})) {
     companion object {
+        const val HAS_POSTER: Int = 0
+        const val HAS_NO_POSTER: Int = 1
         fun getPlayerAction(context: Context): Int {
             val settingsManager = PreferenceManager.getDefaultSharedPreferences(context)
-            val playerPref = settingsManager.getString(context.getString(R.string.player_default_key), "")
-            
+            val playerPref =
+                settingsManager.getString(context.getString(R.string.player_default_key), "")
+
             return VideoClickActionHolder.uniqueIdToId(playerPref) ?: ACTION_PLAY_EPISODE_IN_PLAYER
         }
-    }
 
-    var cardList: MutableList<ResultEpisode> = mutableListOf()
+        val sharedPool =
+            newSharedPool {
+                setMaxRecycledViews(HAS_POSTER or CONTENT, 10)
+                setMaxRecycledViews(HAS_NO_POSTER or CONTENT, 10)
+            }
+    }
 
-    override fun onViewDetachedFromWindow(holder: RecyclerView.ViewHolder) {
+    override fun onClearView(holder: ViewHolderState<Any>) {
         if (holder.itemView.hasFocus()) {
             holder.itemView.clearFocus()
         }
-    }
 
-    fun updateList(newList: List<ResultEpisode>) {
-        val diffResult = DiffUtil.calculateDiff(
-            ResultDiffCallback(this.cardList, newList)
-        )
-
-        cardList.clear()
-        cardList.addAll(newList)
-
-        diffResult.dispatchUpdatesTo(this)
-    }
-
-    private fun getItem(position: Int): ResultEpisode {
-        return cardList[position]
-    }
-
-    override fun getItemViewType(position: Int): Int {
-        val item = getItem(position)
-        return if (item.poster.isNullOrBlank() && item.description.isNullOrBlank()) 0 else 1
+        when (val binding = holder.view) {
+            is ResultEpisodeLargeBinding -> {
+                clearImage(binding.episodePoster)
+            }
+        }
+        super.onClearView(holder)
     }
 
+    override fun customContentViewType(item: ResultEpisode): Int =
+        if (item.poster.isNullOrBlank() && item.description.isNullOrBlank()) HAS_NO_POSTER else HAS_POSTER
 
-    // private val layout = R.layout.result_episode_both
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-        /*val layout = if (cardList.filter { it.poster != null }.size >= cardList.size / 2)
-            R.layout.result_episode_large
-        else R.layout.result_episode*/
-
+    override fun onCreateCustomContent(parent: ViewGroup, viewType: Int): ViewHolderState<Any> {
         return when (viewType) {
-            0 -> {
-                EpisodeCardViewHolderSmall(
+            HAS_NO_POSTER -> {
+                ViewHolderState(
                     ResultEpisodeBinding.inflate(
                         LayoutInflater.from(parent.context),
                         parent,
                         false
-                    ),
-                    hasDownloadSupport,
-                    clickCallback,
-                    downloadClickCallback
+                    )
                 )
             }
 
-            1 -> {
-                EpisodeCardViewHolderLarge(
+            HAS_POSTER -> {
+                ViewHolderState(
                     ResultEpisodeLargeBinding.inflate(
                         LayoutInflater.from(parent.context),
                         parent,
                         false
-                    ),
-                    hasDownloadSupport,
-                    clickCallback,
-                    downloadClickCallback
+                    )
                 )
             }
 
@@ -143,252 +139,223 @@ class EpisodeAdapter(
         }
     }
 
-    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-        when (holder) {
-            is EpisodeCardViewHolderLarge -> {
-                holder.bind(getItem(position))
-            }
-
-            is EpisodeCardViewHolderSmall -> {
-                holder.bind(getItem(position))
-            }
-        }
-    }
+    override fun onBindContent(holder: ViewHolderState<Any>, item: ResultEpisode, position: Int) {
+        val itemView = holder.itemView
+        when (val binding = holder.view) {
+            is ResultEpisodeLargeBinding -> {
+                val setWidth =
+                    if (isLayout(TV or EMULATOR)) TV_EP_SIZE.toPx else ViewGroup.LayoutParams.MATCH_PARENT
 
-    override fun getItemCount(): Int {
-        return cardList.size
-    }
+                binding.apply {
+                    episodeLinHolder.layoutParams.width = setWidth
+                    episodeHolderLarge.layoutParams.width = setWidth
+                    episodeHolder.layoutParams.width = setWidth
 
-    class EpisodeCardViewHolderLarge(
-        val binding: ResultEpisodeLargeBinding,
-        private val hasDownloadSupport: Boolean,
-        private val clickCallback: (EpisodeClickEvent) -> Unit,
-        private val downloadClickCallback: (DownloadClickEvent) -> Unit,
-    ) : RecyclerView.ViewHolder(binding.root) {
-        var localCard: ResultEpisode? = null
-
-        @SuppressLint("SetTextI18n")
-        fun bind(card: ResultEpisode) {
-            localCard = card
-            val setWidth =
-                if (isLayout(TV or EMULATOR)) TV_EP_SIZE.toPx else ViewGroup.LayoutParams.MATCH_PARENT
-
-            binding.episodeLinHolder.layoutParams.width = setWidth
-            binding.episodeHolderLarge.layoutParams.width = setWidth
-            binding.episodeHolder.layoutParams.width = setWidth
-
-
-            binding.apply {
-                downloadButton.isVisible = hasDownloadSupport
-                downloadButton.setDefaultClickListener(
-                    VideoDownloadHelper.DownloadEpisodeCached(
-                        name = card.name,
-                        poster = card.poster,
-                        episode = card.episode,
-                        season = card.season,
-                        id = card.id,
-                        parentId = card.parentId,
-                        rating = card.rating,
-                        description = card.description,
-                        cacheTime = System.currentTimeMillis(),
-                    ), null
-                ) {
-                    when (it.action) {
-                        DOWNLOAD_ACTION_DOWNLOAD -> {
-                            clickCallback.invoke(EpisodeClickEvent(ACTION_DOWNLOAD_EPISODE, card))
-                        }
+                    if (isLayout(PHONE or EMULATOR) && CommonActivity.appliedTheme == R.style.AmoledMode) {
+                        episodeHolderLarge.radius = 0.0f
+                        episodeHolder.setPadding(0)
+                    }
 
-                        DOWNLOAD_ACTION_LONG_CLICK -> {
-                            clickCallback.invoke(EpisodeClickEvent(ACTION_DOWNLOAD_MIRROR, card))
-                        }
+                    downloadButton.isVisible = hasDownloadSupport
+                    downloadButton.setDefaultClickListener(
+                        DownloadObjects.DownloadEpisodeCached(
+                            name = item.name,
+                            poster = item.poster,
+                            episode = item.episode,
+                            season = item.season,
+                            id = item.id,
+                            parentId = item.parentId,
+                            score = item.score,
+                            description = item.description,
+                            cacheTime = System.currentTimeMillis(),
+                        ), null
+                    ) {
+                        when (it.action) {
+                            DOWNLOAD_ACTION_DOWNLOAD -> {
+                                clickCallback.invoke(
+                                    EpisodeClickEvent(
+                                        position,
+                                        ACTION_DOWNLOAD_EPISODE,
+                                        item
+                                    )
+                                )
+                            }
+
+                            DOWNLOAD_ACTION_LONG_CLICK -> {
+                                clickCallback.invoke(
+                                    EpisodeClickEvent(
+                                        position,
+                                        ACTION_DOWNLOAD_MIRROR,
+                                        item
+                                    )
+                                )
+                            }
 
-                        else -> {
-                            downloadClickCallback.invoke(it)
+                            else -> {
+                                downloadClickCallback.invoke(it)
+                            }
                         }
                     }
-                }
-
-                val name =
-                    if (card.name == null) "${episodeText.context.getString(R.string.episode)} ${card.episode}" else "${card.episode}. ${card.name}"
-                episodeFiller.isVisible = card.isFiller == true
-                episodeText.text =
-                    name//if(card.isFiller == true) episodeText.context.getString(R.string.filler).format(name) else name
-                episodeText.isSelected = true // is needed for text repeating
-
-                if (card.videoWatchState == VideoWatchState.Watched) {
-                    // This cannot be done in getDisplayPosition() as when you have not watched something
-                    // the duration and position is 0
-                    episodeProgress.max = 1
-                    episodeProgress.progress = 1
-                    episodeProgress.isVisible = true
-                } else {
-                    val displayPos = card.getDisplayPosition()
-                    episodeProgress.max = (card.duration / 1000).toInt()
-                    episodeProgress.progress = (displayPos / 1000).toInt()
-                    episodeProgress.isVisible = displayPos > 0L
-                }
-
-                episodePoster.loadImage(card.poster)
 
-                if (card.rating != null) {
-                    episodeRating.text = episodeRating.context?.getString(R.string.rated_format)
-                        ?.format(card.rating.toFloat() / 10f)
-                } else {
-                    episodeRating.text = ""
-                }
-
-                episodeRating.isGone = episodeRating.text.isNullOrBlank()
-
-                episodeDescript.apply {
-                    text = card.description.html()
-                    isGone = text.isNullOrBlank()
+                    val status = VideoDownloadManager.downloadStatus[item.id]
+                    downloadButton.resetView()
+                    downloadButton.setPersistentId(item.id)
+                    downloadButton.setStatus(status)
+
+                    val name =
+                        if (item.name == null) "${episodeText.context.getString(R.string.episode)} ${item.episode}" else "${item.episode}. ${item.name}"
+                    episodeFiller.isVisible = item.isFiller == true
+                    episodeText.text =
+                        name//if(card.isFiller == true) episodeText.context.getString(R.string.filler).format(name) else name
+                    episodeText.isSelected = true // is needed for text repeating
+
+                    if (item.videoWatchState == VideoWatchState.Watched) {
+                        // This cannot be done in getDisplayPosition() as when you have not watched something
+                        // the duration and position is 0
+                        //episodeProgress.max = 1
+                        //episodeProgress.progress = 1
+                        episodePlayIcon.setImageResource(R.drawable.ic_baseline_check_24)
+                        episodeProgress.isVisible = false
+                    } else {
+                        val displayPos = item.getDisplayPosition()
+                        val durationSec = (item.duration / 1000).toInt()
+                        val progressSec = (displayPos / 1000).toInt()
 
-                    var isExpanded = false
-                    setOnClickListener {
-                        if (isLayout(TV)) {
-                            clickCallback.invoke(EpisodeClickEvent(ACTION_SHOW_DESCRIPTION, card))
+                        if (displayPos >= item.duration && displayPos > 0) {
+                            episodePlayIcon.setImageResource(R.drawable.ic_baseline_check_24)
+                            episodeProgress.isVisible = false
                         } else {
-                            isExpanded = !isExpanded
-                            maxLines = if (isExpanded) {
-                                Integer.MAX_VALUE
-                            } else 4
+                            episodePlayIcon.setImageResource(R.drawable.netflix_play)
+                            episodeProgress.apply {
+                                max = durationSec
+                                progress = progressSec
+                                isVisible = displayPos > 0L
+                            }
                         }
                     }
-                }
 
-                if (card.airDate != null) {
-                    val isUpcoming = unixTimeMS < card.airDate
-
-                    if (isUpcoming) {
-                        episodePlayIcon.isVisible = false
-                        episodeUpcomingIcon.isVisible = !episodePoster.isVisible
-                        episodeDate.setText(
-                            com.lagradost.cloudstream3.utils.txt(
-                                R.string.episode_upcoming_format,
-                                secondsToReadable(
-                                    card.airDate.minus(unixTimeMS).div(1000).toInt(),
-                                    ""
-                                )
-                            )
-                        )
+                    val posterVisible = !item.poster.isNullOrBlank()
+                    if (posterVisible) {
+                        val isUpcoming = item.airDate != null && unixTimeMS < item.airDate
+                        episodePoster.loadImage(item.poster) {
+                            if (isUpcoming) {
+                                error {
+                                    // If the poster has an url, but it is faulty then
+                                    // we use the episodeUpcomingIcon if it is an upcoming episode
+                                    main {
+                                        // Make sure it is on the main thread
+                                        episodeUpcomingIcon.isVisible = true
+                                    }
+
+                                    null // We only care about the runnable
+                                }
+                            }
+                        }
                     } else {
-                        episodeUpcomingIcon.isVisible = false
-
-                        val formattedAirDate = SimpleDateFormat.getDateInstance(
-                            DateFormat.LONG,
-                            Locale.getDefault()
-                        ).apply {
-                        }.format(Date(card.airDate))
-
-                        episodeDate.setText(txt(formattedAirDate))
+                        // Clear the image
+                        episodePoster.dispose()
                     }
-                } else {
-                    episodeDate.isVisible = false
-                }
-
-                episodeRuntime.setText(
-                    txt(
-                        card.runTime?.times(60L)?.toInt()?.let { secondsToReadable(it, "") }
-                    )
-                )
+                    episodePoster.isVisible = posterVisible
 
-                if (isLayout(EMULATOR or PHONE)) {
-                    episodePoster.setOnClickListener {
-                        clickCallback.invoke(EpisodeClickEvent(ACTION_CLICK_DEFAULT, card))
+                    val rating10p = item.score?.toFloat(10)
+                    if (rating10p != null && rating10p > 0.1) {
+                        episodeRating.text = episodeRating.context?.getString(R.string.rated_format)
+                            ?.format(rating10p) // TODO Change rated_format to use card.score.toString()
+                    } else {
+                        episodeRating.text = ""
                     }
 
-                    episodePoster.setOnLongClickListener {
-                        clickCallback.invoke(EpisodeClickEvent(ACTION_SHOW_TOAST, card))
-                        return@setOnLongClickListener true
+                    episodeRating.isGone = episodeRating.text.isNullOrBlank()
+
+                    episodeDescript.apply {
+                        text = item.description.html()
+                        isGone = text.isNullOrBlank()
+
+                        var isExpanded = false
+                        setOnClickListener {
+                            if (isLayout(TV)) {
+                                clickCallback.invoke(
+                                    EpisodeClickEvent(
+                                        position,
+                                        ACTION_SHOW_DESCRIPTION,
+                                        item
+                                    )
+                                )
+                            } else {
+                                isExpanded = !isExpanded
+                                maxLines = if (isExpanded) {
+                                    Integer.MAX_VALUE
+                                } else 4
+                            }
+                        }
                     }
-                }
-            }
-
-            itemView.setOnClickListener {
-                clickCallback.invoke(EpisodeClickEvent(ACTION_CLICK_DEFAULT, card))
-            }
-
-            if (isLayout(TV)) {
-                itemView.isFocusable = true
-                itemView.isFocusableInTouchMode = true
-                //itemView.touchscreenBlocksFocus = false
-            }
-
-            itemView.setOnLongClickListener {
-                clickCallback.invoke(EpisodeClickEvent(ACTION_SHOW_OPTIONS, card))
-                return@setOnLongClickListener true
-            }
 
-            //binding.resultEpisodeDownload.isVisible = hasDownloadSupport
-            //binding.resultEpisodeProgressDownloaded.isVisible = hasDownloadSupport
-        }
-    }
+                    if (item.airDate != null) {
+                        val isUpcoming = unixTimeMS < item.airDate
+
+                        if (isUpcoming) {
+                            episodeProgress.isVisible = false
+                            episodePlayIcon.isVisible = false
+                            episodeUpcomingIcon.isVisible = !posterVisible
+                            episodeDate.setText(
+                                txt(
+                                    R.string.episode_upcoming_format,
+                                    secondsToReadable(
+                                        item.airDate.minus(unixTimeMS).div(1000).toInt(),
+                                        ""
+                                    )
+                                )
+                            )
+                        } else {
+                            episodePlayIcon.isVisible = true
+                            episodeUpcomingIcon.isVisible = false
 
-    class EpisodeCardViewHolderSmall(
-        val binding: ResultEpisodeBinding,
-        private val hasDownloadSupport: Boolean,
-        private val clickCallback: (EpisodeClickEvent) -> Unit,
-        private val downloadClickCallback: (DownloadClickEvent) -> Unit,
-    ) : RecyclerView.ViewHolder(binding.root) {
-        @SuppressLint("SetTextI18n")
-        fun bind(card: ResultEpisode) {
-            binding.episodeHolder.layoutParams.apply {
-                width =
-                    if (isLayout(TV or EMULATOR)) TV_EP_SIZE.toPx else ViewGroup.LayoutParams.MATCH_PARENT
-            }
+                            val formattedAirDate = SimpleDateFormat.getDateInstance(
+                                DateFormat.LONG,
+                                Locale.getDefault()
+                            ).apply {
+                            }.format(Date(item.airDate))
 
-            binding.apply {
-                downloadButton.isVisible = hasDownloadSupport
-                downloadButton.setDefaultClickListener(
-                    VideoDownloadHelper.DownloadEpisodeCached(
-                        name = card.name,
-                        poster = card.poster,
-                        episode = card.episode,
-                        season = card.season,
-                        id = card.id,
-                        parentId = card.parentId,
-                        rating = card.rating,
-                        description = card.description,
-                        cacheTime = System.currentTimeMillis(),
-                    ), null
-                ) {
-                    when (it.action) {
-                        DOWNLOAD_ACTION_DOWNLOAD -> {
-                            clickCallback.invoke(EpisodeClickEvent(ACTION_DOWNLOAD_EPISODE, card))
+                            episodeDate.setText(txt(formattedAirDate))
                         }
+                    } else {
+                        episodeUpcomingIcon.isVisible = false
+                        episodePlayIcon.isVisible = true
+                        episodeDate.isVisible = false
+                    }
 
-                        DOWNLOAD_ACTION_LONG_CLICK -> {
-                            clickCallback.invoke(EpisodeClickEvent(ACTION_DOWNLOAD_MIRROR, card))
+                    episodeRuntime.setText(
+                        txt(
+                            item.runTime?.times(60L)?.toInt()?.let { secondsToReadable(it, "") }
+                        )
+                    )
+
+                    if (isLayout(EMULATOR or PHONE)) {
+                        episodePoster.setOnClickListener {
+                            clickCallback.invoke(
+                                EpisodeClickEvent(
+                                    position,
+                                    ACTION_CLICK_DEFAULT,
+                                    item
+                                )
+                            )
                         }
 
-                        else -> {
-                            downloadClickCallback.invoke(it)
+                        episodePoster.setOnLongClickListener {
+                            clickCallback.invoke(
+                                EpisodeClickEvent(
+                                    position,
+                                    ACTION_SHOW_TOAST,
+                                    item
+                                )
+                            )
+                            return@setOnLongClickListener true
                         }
                     }
                 }
 
-                val name =
-                    if (card.name == null) "${episodeText.context.getString(R.string.episode)} ${card.episode}" else "${card.episode}. ${card.name}"
-                episodeFiller.isVisible = card.isFiller == true
-                episodeText.text =
-                    name//if(card.isFiller == true) episodeText.context.getString(R.string.filler).format(name) else name
-                episodeText.isSelected = true // is needed for text repeating
-
-                if (card.videoWatchState == VideoWatchState.Watched) {
-                    // This cannot be done in getDisplayPosition() as when you have not watched something
-                    // the duration and position is 0
-                    episodeProgress.max = 1
-                    episodeProgress.progress = 1
-                    episodeProgress.isVisible = true
-                } else {
-                    val displayPos = card.getDisplayPosition()
-                    episodeProgress.max = (card.duration / 1000).toInt()
-                    episodeProgress.progress = (displayPos / 1000).toInt()
-                    episodeProgress.isVisible = displayPos > 0L
-                }
-
                 itemView.setOnClickListener {
-                    clickCallback.invoke(EpisodeClickEvent(ACTION_CLICK_DEFAULT, card))
+                    clickCallback.invoke(EpisodeClickEvent(position, ACTION_CLICK_DEFAULT, item))
                 }
 
                 if (isLayout(TV)) {
@@ -398,29 +365,117 @@ class EpisodeAdapter(
                 }
 
                 itemView.setOnLongClickListener {
-                    clickCallback.invoke(EpisodeClickEvent(ACTION_SHOW_OPTIONS, card))
+                    clickCallback.invoke(EpisodeClickEvent(position, ACTION_SHOW_OPTIONS, item))
                     return@setOnLongClickListener true
                 }
-
-                //binding.resultEpisodeDownload.isVisible = hasDownloadSupport
-                //binding.resultEpisodeProgressDownloaded.isVisible = hasDownloadSupport
             }
-        }
-    }
-}
 
-class ResultDiffCallback(
-    private val oldList: List<ResultEpisode>,
-    private val newList: List<ResultEpisode>
-) :
-    DiffUtil.Callback() {
-    override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int) =
-        oldList[oldItemPosition].id == newList[newItemPosition].id
+            is ResultEpisodeBinding -> {
+                binding.episodeHolder.layoutParams.apply {
+                    width =
+                        if (isLayout(TV or EMULATOR)) TV_EP_SIZE.toPx else ViewGroup.LayoutParams.MATCH_PARENT
+                }
+
+                binding.apply {
+                    downloadButton.isVisible = hasDownloadSupport
+                    downloadButton.setDefaultClickListener(
+                        DownloadObjects.DownloadEpisodeCached(
+                            name = item.name,
+                            poster = item.poster,
+                            episode = item.episode,
+                            season = item.season,
+                            id = item.id,
+                            parentId = item.parentId,
+                            score = item.score,
+                            description = item.description,
+                            cacheTime = System.currentTimeMillis(),
+                        ), null
+                    ) {
+                        when (it.action) {
+                            DOWNLOAD_ACTION_DOWNLOAD -> {
+                                clickCallback.invoke(
+                                    EpisodeClickEvent(
+                                        position,
+                                        ACTION_DOWNLOAD_EPISODE,
+                                        item
+                                    )
+                                )
+                            }
+
+                            DOWNLOAD_ACTION_LONG_CLICK -> {
+                                clickCallback.invoke(
+                                    EpisodeClickEvent(
+                                        position,
+                                        ACTION_DOWNLOAD_MIRROR,
+                                        item
+                                    )
+                                )
+                            }
+
+                            else -> {
+                                downloadClickCallback.invoke(it)
+                            }
+                        }
+                    }
 
-    override fun getOldListSize() = oldList.size
+                    val status = VideoDownloadManager.downloadStatus[item.id]
+                    downloadButton.resetView()
+                    downloadButton.setPersistentId(item.id)
+                    downloadButton.setStatus(status)
+
+                    val name =
+                        if (item.name == null) "${episodeText.context.getString(R.string.episode)} ${item.episode}" else "${item.episode}. ${item.name}"
+                    episodeFiller.isVisible = item.isFiller == true
+                    episodeText.text =
+                        name//if(card.isFiller == true) episodeText.context.getString(R.string.filler).format(name) else name
+                    episodeText.isSelected = true // is needed for text repeating
+
+                    if (item.videoWatchState == VideoWatchState.Watched) {
+                        episodePlayIcon.setImageResource(R.drawable.ic_baseline_check_24)
+                        episodeProgress.isVisible = false
+                    } else {
+                        val displayPos = item.getDisplayPosition()
+                        val durationSec = (item.duration / 1000).toInt()
+                        val progressSec = (displayPos / 1000).toInt()
 
-    override fun getNewListSize() = newList.size
+                        if (displayPos >= item.duration && displayPos > 0) {
+                            episodePlayIcon.setImageResource(R.drawable.ic_baseline_check_24)
+                            episodeProgress.isVisible = false
+                        } else {
+                            episodePlayIcon.setImageResource(R.drawable.play_button_transparent)
+                            episodeProgress.apply {
+                                max = durationSec
+                                progress = progressSec
+                                isVisible = displayPos > 0L
+                            }
+                        }
+                    }
 
-    override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int) =
-        oldList[oldItemPosition] == newList[newItemPosition]
-}
+                    itemView.setOnClickListener {
+                        clickCallback.invoke(
+                            EpisodeClickEvent(
+                                position,
+                                ACTION_CLICK_DEFAULT,
+                                item
+                            )
+                        )
+                    }
+
+                    if (isLayout(TV)) {
+                        itemView.isFocusable = true
+                        itemView.isFocusableInTouchMode = true
+                        //itemView.touchscreenBlocksFocus = false
+                    }
+
+                    itemView.setOnLongClickListener {
+                        clickCallback.invoke(EpisodeClickEvent(position, ACTION_SHOW_OPTIONS, item))
+                        return@setOnLongClickListener true
+                    }
+
+                    //binding.resultEpisodeDownload.isVisible = hasDownloadSupport
+                    //binding.resultEpisodeProgressDownloaded.isVisible = hasDownloadSupport
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
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 eecd6262f0a..54657ed5730 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
@@ -2,11 +2,14 @@ package com.lagradost.cloudstream3.ui.result
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
-import androidx.recyclerview.widget.DiffUtil
-import androidx.recyclerview.widget.RecyclerView
 import com.lagradost.cloudstream3.databinding.ResultMiniImageBinding
+import com.lagradost.cloudstream3.ui.BaseDiffCallback
+import com.lagradost.cloudstream3.ui.NoStateAdapter
+import com.lagradost.cloudstream3.ui.ViewHolderState
+import com.lagradost.cloudstream3.ui.newSharedPool
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
+import com.lagradost.cloudstream3.utils.ImageLoader.loadImage
 
 const val IMAGE_CLICK = 0
 const val IMAGE_LONG_CLICK = 1
@@ -16,89 +19,54 @@ class ImageAdapter(
     val nextFocusUp: Int? = null,
     val nextFocusDown: Int? = null,
 ) :
-    RecyclerView.Adapter<RecyclerView.ViewHolder>() {
-    private val images: MutableList<Int> = mutableListOf()
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-        return ImageViewHolder(
-            //result_mini_image
-            ResultMiniImageBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-           // LayoutInflater.from(parent.context).inflate(layout, parent, false)
+    NoStateAdapter<Int>(
+        diffCallback = BaseDiffCallback(
+            itemSame = Int::equals,
+            contentSame = Int::equals
         )
+    ) {
+    companion object {
+        val sharedPool =
+            newSharedPool { setMaxRecycledViews(CONTENT, 10) }
     }
 
-    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-        when (holder) {
-            is ImageViewHolder -> {
-                holder.bind(images[position], clickCallback, nextFocusUp, nextFocusDown)
-            }
-        }
-    }
-
-    override fun getItemCount(): Int {
-        return images.size
+    override fun onCreateContent(parent: ViewGroup): ViewHolderState<Any> {
+        return ViewHolderState(
+            ResultMiniImageBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        )
     }
 
-    override fun getItemId(position: Int): Long {
-        return images[position].toLong()
+    override fun onClearView(holder: ViewHolderState<Any>) {
+        val binding = holder.view as? ResultMiniImageBinding ?: return
+        clearImage(binding.root)
     }
 
-    fun updateList(newList: List<Int>) {
-        val diffResult = DiffUtil.calculateDiff(
-            DiffCallback(this.images, newList)
-        )
-
-        images.clear()
-        images.addAll(newList)
-
-        diffResult.dispatchUpdatesTo(this)
-    }
+    override fun onBindContent(holder: ViewHolderState<Any>, item: Int, position: Int) {
+        val binding = holder.view as? ResultMiniImageBinding ?: return
 
-    class ImageViewHolder(val binding: ResultMiniImageBinding) :
-        RecyclerView.ViewHolder(binding.root) {
-        fun bind(
-            img: Int,
-            clickCallback: ((Int) -> Unit)?,
-            nextFocusUp: Int?,
-            nextFocusDown: Int?,
-        ) {
-            binding.root.apply {
-                setImageResource(img)
-                if (nextFocusDown != null) {
-                    this.nextFocusDownId = nextFocusDown
+        binding.root.apply {
+            loadImage(item)
+            if (nextFocusDown != null) {
+                this.nextFocusDownId = nextFocusDown
+            }
+            if (nextFocusUp != null) {
+                this.nextFocusUpId = nextFocusUp
+            }
+            if (clickCallback != null) {
+                if (isLayout(TV)) {
+                    isClickable = true
+                    isLongClickable = true
+                    isFocusable = true
+                    isFocusableInTouchMode = true
                 }
-                if (nextFocusUp != null) {
-                    this.nextFocusUpId = nextFocusUp
+                setOnClickListener {
+                    clickCallback.invoke(IMAGE_CLICK)
                 }
-                if (clickCallback != null) {
-                    if (isLayout(TV)) {
-                        isClickable = true
-                        isLongClickable = true
-                        isFocusable = true
-                        isFocusableInTouchMode = true
-                    }
-                    setOnClickListener {
-                        clickCallback.invoke(IMAGE_CLICK)
-                    }
-                    setOnLongClickListener {
-                        clickCallback.invoke(IMAGE_LONG_CLICK)
-                        return@setOnLongClickListener true
-                    }
+                setOnLongClickListener {
+                    clickCallback.invoke(IMAGE_LONG_CLICK)
+                    return@setOnLongClickListener true
                 }
             }
         }
     }
-}
-
-class DiffCallback<T>(private val oldList: List<T>, private val newList: List<T>) :
-    DiffUtil.Callback() {
-    override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int) =
-        oldList[oldItemPosition] == newList[newItemPosition]
-
-    override fun getOldListSize() = oldList.size
-
-    override fun getNewListSize() = newList.size
-
-    override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int) =
-        oldList[oldItemPosition] == newList[newItemPosition]
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/LinearListLayout.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/LinearListLayout.kt
index b4e3062b4da..3a0edba2f8e 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/LinearListLayout.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/LinearListLayout.kt
@@ -8,6 +8,8 @@ import com.lagradost.cloudstream3.CommonActivity
 import com.lagradost.cloudstream3.CommonActivity.activity
 import com.lagradost.cloudstream3.FocusDirection
 import com.lagradost.cloudstream3.mvvm.logError
+import com.lagradost.cloudstream3.ui.settings.Globals.TV
+import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
 
 const val FOCUS_SELF = View.NO_ID - 1
 const val FOCUS_INHERIT = FOCUS_SELF - 1
@@ -21,18 +23,17 @@ fun RecyclerView?.setLinearListLayout(
 ) {
     if (this == null) return
     val ctx = this.context ?: return
-    this.layoutManager =
-        LinearListLayout(ctx).apply {
-            if (isHorizontal) setHorizontal() else setVertical()
-            nextFocusLeft =
-                if (nextLeft == FOCUS_INHERIT) this@setLinearListLayout.nextFocusLeftId else nextLeft
-            nextFocusRight =
-                if (nextRight == FOCUS_INHERIT) this@setLinearListLayout.nextFocusRightId else nextRight
-            nextFocusUp =
-                if (nextUp == FOCUS_INHERIT) this@setLinearListLayout.nextFocusUpId else nextUp
-            nextFocusDown =
-                if (nextDown == FOCUS_INHERIT) this@setLinearListLayout.nextFocusDownId else nextDown
-        }
+    this.layoutManager = (this.layoutManager as? LinearListLayout ?: LinearListLayout(ctx)).apply {
+        if (isHorizontal) setHorizontal() else setVertical()
+        nextFocusLeft =
+            if (nextLeft == FOCUS_INHERIT) this@setLinearListLayout.nextFocusLeftId else nextLeft
+        nextFocusRight =
+            if (nextRight == FOCUS_INHERIT) this@setLinearListLayout.nextFocusRightId else nextRight
+        nextFocusUp =
+            if (nextUp == FOCUS_INHERIT) this@setLinearListLayout.nextFocusUpId else nextUp
+        nextFocusDown =
+            if (nextDown == FOCUS_INHERIT) this@setLinearListLayout.nextFocusDownId else nextDown
+    }
 }
 
 open class LinearListLayout(context: Context?) :
@@ -104,13 +105,33 @@ open class LinearListLayout(context: Context?) :
         }
     }
 
+    fun redirectRecycleToFirstItem(focused: View): View? {
+        return when (focused) {
+            is RecyclerView -> {
+                (focused.layoutManager as? LinearListLayout)?.let { focusedLayoutManager ->
+                    val firstPosition = focusedLayoutManager.findFirstVisibleItemPosition()
+                    val firstView = focusedLayoutManager.findViewByPosition(firstPosition)
+                    firstView
+                } ?: focused
+            }
+
+            else -> focused
+        }
+    }
+
     override fun onInterceptFocusSearch(focused: View, direction: Int): View? {
         val dir = if (orientation == HORIZONTAL) {
-            if (direction == View.FOCUS_DOWN) getNextDirection(focused, FocusDirection.Down)?.let { newFocus ->
-                return newFocus
+            if (direction == View.FOCUS_DOWN) getNextDirection(
+                focused,
+                FocusDirection.Down
+            )?.let { newFocus ->
+                return redirectRecycleToFirstItem(newFocus)
             }
-            if (direction == View.FOCUS_UP) getNextDirection(focused, FocusDirection.Up)?.let { newFocus ->
-                return newFocus
+            if (direction == View.FOCUS_UP) getNextDirection(
+                focused,
+                FocusDirection.Up
+            )?.let { newFocus ->
+                return redirectRecycleToFirstItem(newFocus)
             }
 
             if (direction == View.FOCUS_DOWN || direction == View.FOCUS_UP) {
@@ -129,10 +150,16 @@ open class LinearListLayout(context: Context?) :
             }
             ret
         } else {
-            if (direction == View.FOCUS_RIGHT) getNextDirection(focused, FocusDirection.End)?.let { newFocus ->
+            if (direction == View.FOCUS_RIGHT) getNextDirection(
+                focused,
+                FocusDirection.End
+            )?.let { newFocus ->
                 return newFocus
             }
-            if (direction == View.FOCUS_LEFT) getNextDirection(focused, FocusDirection.Start)?.let { newFocus ->
+            if (direction == View.FOCUS_LEFT) getNextDirection(
+                focused,
+                FocusDirection.Start
+            )?.let { newFocus ->
                 return newFocus
             }
 
@@ -151,9 +178,15 @@ open class LinearListLayout(context: Context?) :
 
             // if out of bounds then refocus as specified
             return if (lookFor >= itemCount) {
-                getNextDirection(focused, if(orientation == HORIZONTAL) FocusDirection.End else FocusDirection.Down)
+                getNextDirection(
+                    focused,
+                    if (orientation == HORIZONTAL) FocusDirection.End else FocusDirection.Down
+                )
             } else if (lookFor < 0) {
-                getNextDirection(focused, if(orientation == HORIZONTAL) FocusDirection.Start else FocusDirection.Up)
+                getNextDirection(
+                    focused,
+                    if (orientation == HORIZONTAL) FocusDirection.Start else FocusDirection.Up
+                )
             } else {
                 getViewFromPos(lookFor) ?: run {
                     scrollToPosition(lookFor)
@@ -166,6 +199,38 @@ open class LinearListLayout(context: Context?) :
         }
     }
 
+    override fun requestChildRectangleOnScreen(
+        parent: RecyclerView,
+        child: View,
+        rect: android.graphics.Rect,
+        immediate: Boolean,
+        focusedChildVisible: Boolean
+    ): Boolean {
+        if (isLayout(TV) && orientation == HORIZONTAL) {
+            val dx = when {
+                isLayoutRTL -> getDecoratedRight(child) - (parent.width - parent.paddingRight)
+                else -> getDecoratedLeft(child) - parent.paddingLeft
+            }
+            return if (dx != 0) {
+                when {
+                    immediate -> parent.scrollBy(dx, 0)
+                    else -> parent.smoothScrollBy(dx, 0)
+                }
+                true
+            } else {
+                false
+            }
+        } else {
+            return super.requestChildRectangleOnScreen(
+                parent,
+                child,
+                rect,
+                immediate,
+                focusedChildVisible
+            )
+        }
+    }
+
     /*override fun onRequestChildFocus(
         parent: RecyclerView,
         state: RecyclerView.State,
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 c12f011831b..cbf94fd9796 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt
@@ -1,11 +1,17 @@
 package com.lagradost.cloudstream3.ui.result
 
 import android.os.Bundle
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.preference.PreferenceManager
+import coil3.dispose
 import com.lagradost.cloudstream3.DubStatus
 import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.Score
 import com.lagradost.cloudstream3.SearchResponse
+import com.lagradost.cloudstream3.SeasonData
 import com.lagradost.cloudstream3.TvType
 import com.lagradost.cloudstream3.ui.result.EpisodeAdapter.Companion.getPlayerAction
 import com.lagradost.cloudstream3.utils.AppContextUtils.getApiDubstatusSettings
@@ -13,6 +19,8 @@ import com.lagradost.cloudstream3.utils.DataStoreHelper
 import com.lagradost.cloudstream3.utils.DataStoreHelper.getVideoWatchState
 import com.lagradost.cloudstream3.utils.DataStoreHelper.getViewPos
 import com.lagradost.cloudstream3.utils.Event
+import com.lagradost.cloudstream3.utils.ImageLoader.loadImage
+import com.lagradost.cloudstream3.utils.UiImage
 
 const val START_ACTION_RESUME_LATEST = 1
 const val START_ACTION_LOAD_EP = 2
@@ -39,7 +47,7 @@ data class ResultEpisode(
     val index: Int,
     val position: Long, // time in MS
     val duration: Long, // duration in MS
-    val rating: Int?,
+    val score: Score?,
     val description: String?,
     val isFiller: Boolean?,
     val tvType: TvType,
@@ -52,6 +60,7 @@ data class ResultEpisode(
     val totalEpisodeIndex: Int? = null,
     val airDate: Long? = null,
     val runTime: Int? = null,
+    val seasonData: SeasonData? = null,
 )
 
 fun ResultEpisode.getRealPosition(): Long {
@@ -81,7 +90,7 @@ fun buildResultEpisode(
     apiName: String,
     id: Int,
     index: Int,
-    rating: Int? = null,
+    rating: Score? = null,
     description: String? = null,
     isFiller: Boolean? = null,
     tvType: TvType,
@@ -89,31 +98,33 @@ fun buildResultEpisode(
     totalEpisodeIndex: Int? = null,
     airDate: Long? = null,
     runTime: Int? = null,
+    seasonData: SeasonData? = null,
 ): ResultEpisode {
     val posDur = getViewPos(id)
     val videoWatchState = getVideoWatchState(id) ?: VideoWatchState.None
     return ResultEpisode(
-        headerName,
-        name,
-        poster,
-        episode,
-        seasonIndex,
-        season,
-        data,
-        apiName,
-        id,
-        index,
-        posDur?.position ?: 0,
-        posDur?.duration ?: 0,
-        rating,
-        description,
-        isFiller,
-        tvType,
-        parentId,
-        videoWatchState,
-        totalEpisodeIndex,
-        airDate,
-        runTime,
+        headerName = headerName,
+        name = name,
+        poster = poster,
+        episode = episode,
+        seasonIndex = seasonIndex,
+        season = season,
+        data = data,
+        apiName = apiName,
+        id = id,
+        index = index,
+        position = posDur?.position ?: 0,
+        duration = posDur?.duration ?: 0,
+        score = rating,
+        description = description,
+        isFiller = isFiller,
+        tvType = tvType,
+        parentId = parentId,
+        videoWatchState = videoWatchState,
+        totalEpisodeIndex = totalEpisodeIndex,
+        airDate = airDate,
+        runTime = runTime,
+        seasonData = seasonData
     )
 }
 
@@ -157,7 +168,7 @@ object ResultFragment {
     fun newInstance(
         url: String,
         apiName: String,
-        name : String,
+        name: String,
         startAction: Int = 0,
         startValue: Int = 0
     ): Bundle {
@@ -172,9 +183,10 @@ object ResultFragment {
     }
 
     fun updateUI(id: Int? = null) {
-       // updateUIListener?.invoke()
+        // updateUIListener?.invoke()
         updateUIEvent.invoke(id)
     }
+
     val updateUIEvent = Event<Int?>()
 
     //private var updateUIListener: (() -> Unit)? = null
@@ -202,10 +214,7 @@ object ResultFragment {
      override fun onResume() {
          afterPluginsLoadedEvent += ::reloadViewModel
          super.onResume()
-         activity?.let {
-             it.window?.navigationBarColor =
-                 it.colorFromAttribute(R.attr.primaryBlackBackground)
-         }
+         activity?.setNavigationBarColorCompat(R.attr.primaryBlackBackground)
      }
 
      override fun onDestroy() {
@@ -222,14 +231,52 @@ object ResultFragment {
     data class StoredData(
         val url: String,
         val apiName: String,
-        val name : String,
+        val name: String,
         val showFillers: Boolean,
         val dubStatus: DubStatus,
         val start: AutoResume?,
         val playerAction: Int,
-        val restart : Boolean,
+        val restart: Boolean,
     )
 
+    fun bindLogo(
+        url: String?,
+        headers: Map<String, String>?,
+        logoView: ImageView,
+        titleView: TextView
+    ) {
+        // Cancel it, as we want to remove the listener onSuccess race condition
+        logoView.dispose()
+
+        if (url.isNullOrBlank()) {
+            logoView.isVisible = false
+            titleView.isVisible = true
+            return
+        }
+
+        logoView.isVisible = true
+        titleView.isVisible = false
+
+        logoView.loadImage(
+            imageData = UiImage.Image(url, headers = headers),
+            builder = {
+                listener(
+                    onSuccess = { _, _ ->
+                        logoView.isVisible = true
+                        titleView.isVisible = false
+                    },
+                    onError = { _, _ ->
+                        logoView.isVisible = false
+                        titleView.isVisible = true
+                    },
+                    onCancel = {
+                        // If we manually cancel, then it should not do anything
+                    }
+                )
+            }
+        )
+    }
+
     fun Fragment.getStoredData(): StoredData? {
         val context = this.context ?: this.activity ?: return null
         val settingsManager = PreferenceManager.getDefaultSharedPreferences(context)
@@ -299,8 +346,6 @@ object ResultFragment {
         context?.updateHasTrailers()
         activity?.loadCache()
 
-        //activity?.fixPaddingStatusbar(result_barstatus)
-
         /* val backParameter = result_back.layoutParams as FrameLayout.LayoutParams
          backParameter.setMargins(
              backParameter.leftMargin,
@@ -310,8 +355,6 @@ object ResultFragment {
          )
          result_back.layoutParams = backParameter*/
 
-        // activity?.fixPaddingStatusbar(result_toolbar)
-
         val storedData = (activity ?: context)?.let {
             getStoredData(it)
         }
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 3d992d87331..38b24b26517 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
@@ -5,10 +5,10 @@ import android.app.Dialog
 import android.content.Intent
 import android.content.res.ColorStateList
 import android.graphics.Rect
+import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.text.Editable
-import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.animation.AlphaAnimation
@@ -17,18 +17,19 @@ import android.view.animation.DecelerateInterpolator
 import android.widget.AbsListView
 import android.widget.ArrayAdapter
 import android.widget.Toast
+import androidx.appcompat.app.AlertDialog
 import androidx.core.view.isGone
 import androidx.core.view.isInvisible
 import androidx.core.view.isVisible
 import androidx.core.widget.NestedScrollView
 import androidx.core.widget.doOnTextChanged
 import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.viewModelScope
 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
-import com.google.android.gms.cast.framework.CastState
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.button.MaterialButton
 import com.lagradost.cloudstream3.APIHolder
@@ -37,53 +38,79 @@ import com.lagradost.cloudstream3.DubStatus
 import com.lagradost.cloudstream3.LoadResponse
 import com.lagradost.cloudstream3.MainActivity.Companion.afterPluginsLoadedEvent
 import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.Score
 import com.lagradost.cloudstream3.SearchResponse
+import com.lagradost.cloudstream3.base64Encode
 import com.lagradost.cloudstream3.databinding.FragmentResultBinding
 import com.lagradost.cloudstream3.databinding.FragmentResultSwipeBinding
 import com.lagradost.cloudstream3.databinding.ResultRecommendationsBinding
 import com.lagradost.cloudstream3.databinding.ResultSyncBinding
+import com.lagradost.cloudstream3.databinding.TrailerCustomLayoutBinding
 import com.lagradost.cloudstream3.mvvm.Resource
+import com.lagradost.cloudstream3.mvvm.launchSafe
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.mvvm.observe
 import com.lagradost.cloudstream3.mvvm.observeNullable
 import com.lagradost.cloudstream3.mvvm.safe
 import com.lagradost.cloudstream3.services.SubscriptionWorkManager
+import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.APP_STRING_SHARE
+import com.lagradost.cloudstream3.ui.BaseFragment
 import com.lagradost.cloudstream3.ui.WatchType
 import com.lagradost.cloudstream3.ui.download.DOWNLOAD_ACTION_DOWNLOAD
 import com.lagradost.cloudstream3.ui.download.DOWNLOAD_ACTION_LONG_CLICK
 import com.lagradost.cloudstream3.ui.download.DownloadButtonSetup
+import com.lagradost.cloudstream3.ui.player.CS3IPlayer
 import com.lagradost.cloudstream3.ui.player.CSPlayerEvent
-import com.lagradost.cloudstream3.ui.player.FullScreenPlayer
+import com.lagradost.cloudstream3.ui.player.IPlayer
+import com.lagradost.cloudstream3.ui.player.PlayerView
+import com.lagradost.cloudstream3.ui.player.source_priority.QualityProfileDialog
 import com.lagradost.cloudstream3.ui.quicksearch.QuickSearchFragment
+import com.lagradost.cloudstream3.ui.result.ResultFragment.bindLogo
 import com.lagradost.cloudstream3.ui.result.ResultFragment.getStoredData
 import com.lagradost.cloudstream3.ui.result.ResultFragment.updateUIEvent
 import com.lagradost.cloudstream3.ui.search.SearchAdapter
 import com.lagradost.cloudstream3.ui.search.SearchHelper
+import com.lagradost.cloudstream3.ui.setRecycledViewPool
+import com.lagradost.cloudstream3.ui.settings.SettingsGeneral.Companion.pickDownloadPath
+import com.lagradost.cloudstream3.ui.settings.utils.getChooseFolderLauncher
 import com.lagradost.cloudstream3.utils.AppContextUtils.getNameFull
 import com.lagradost.cloudstream3.utils.AppContextUtils.isCastApiAvailable
 import com.lagradost.cloudstream3.utils.AppContextUtils.loadCache
 import com.lagradost.cloudstream3.utils.AppContextUtils.openBrowser
 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.BatteryOptimizationChecker.openBatteryOptimizationSettings
+import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 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
-import com.lagradost.cloudstream3.utils.UIHelper
 import com.lagradost.cloudstream3.utils.UIHelper.clipboardHelper
 import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
+import com.lagradost.cloudstream3.utils.UIHelper.fixSystemBarsPadding
 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.VideoDownloadHelper
+import com.lagradost.cloudstream3.utils.UIHelper.setListViewHeightBasedOnItems
+import com.lagradost.cloudstream3.utils.UIHelper.setNavigationBarColorCompat
+import com.lagradost.cloudstream3.utils.downloader.DownloadFileManagement.getBasePath
+import com.lagradost.cloudstream3.utils.downloader.DownloadObjects
+import com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager
 import com.lagradost.cloudstream3.utils.getImageFromDrawable
 import com.lagradost.cloudstream3.utils.setText
 import com.lagradost.cloudstream3.utils.setTextHtml
-
-open class ResultFragmentPhone : FullScreenPlayer() {
+import com.lagradost.cloudstream3.utils.txt
+import java.net.URLEncoder
+import java.util.concurrent.ConcurrentLinkedDeque
+import kotlin.math.roundToInt
+
+open class ResultFragmentPhone : BaseFragment<FragmentResultSwipeBinding>(
+    BindingCreator.Inflate(FragmentResultSwipeBinding::inflate)
+), PlayerView.Callbacks {
     private val gestureRegionsListener =
         object : PanelsChildGestureRegionObserver.GestureRegionsListener {
             override fun onGestureRegionsUpdate(gestureRegions: List<Rect>) {
@@ -91,48 +118,115 @@ open class ResultFragmentPhone : FullScreenPlayer() {
             }
         }
 
+    /** Queue of pending actions that is deferred to after a custom path is set */
+    private val pendingPathActions = ConcurrentLinkedDeque<Pair<Int, ResultEpisode>>()
+
+    /**
+     * Appends all actions to a queue, and asks for a user to enter the download folder if not already set up.
+     *
+     * Then processes the queue in the given order, only after the user has selected a folder.
+     * This is to defer the download to after a file path is set, due to perms.
+     * */
+    private fun requirePathForActions(list: Collection<Pair<Int, ResultEpisode>>) {
+        pendingPathActions.addAll(list)
+        val (_, path) = context?.getBasePath() ?: return
+        if (path == null) {
+            /** If we have not set any download path, then ask the user for it before we download it */
+            try {
+                /** Give the user some info of what we are doing and why, even if it may be missed */
+                showToast(R.string.download_path_pref)
+                pathPicker.launch(Uri.EMPTY)
+            } catch (t: Throwable) {
+                logError(t)
+                /** Something went wrong, TV Device?
+                 * Use the fallback behavior of just downloading it even if no path is selected,
+                 * and hope it works */
+                processPendingActions()
+            }
+        } else {
+            /**
+             * Otherwise dispatch everything, as we already have a valid download path
+             * Even if this is "wrong", we do not care as the user has entered something
+             * */
+            processPendingActions()
+        }
+    }
+
+    /** Clear all the items in the queue and dispatch them to the viewmodel in order */
+    private fun processPendingActions() = viewModel.viewModelScope.launchSafe {
+        while (!pendingPathActions.isEmpty()) {
+            try {
+                val (action, data) = pendingPathActions.pop()
+                viewModel.handleAction(
+                    EpisodeClickEvent(
+                        action,
+                        data
+                    )
+                )
+            } catch (_: NoSuchElementException) {
+                /** In case of a race */
+            }
+        }
+    }
+
+    private val pathPicker = getChooseFolderLauncher { uri, path ->
+        if (uri == null) {
+            /** No path selected, clear the list without acting on it, canceling */
+            if (!pendingPathActions.isEmpty()) {
+                /** Only show on non-empty, just in case */
+                showToast(R.string.download_canceled)
+                pendingPathActions.clear()
+            }
+        } else {
+            /** Select the folder, and dispatch everything */
+            pickDownloadPath(uri, path)
+            processPendingActions()
+        }
+    }
+
     protected lateinit var viewModel: ResultViewModel2
     protected lateinit var syncModel: SyncViewModel
 
-    protected var binding: FragmentResultSwipeBinding? = null
     protected var resultBinding: FragmentResultBinding? = null
     protected var recommendationBinding: ResultRecommendationsBinding? = null
     protected var syncBinding: ResultSyncBinding? = null
 
-    override var layout = R.layout.fragment_result_swipe
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        viewModel =
-            ViewModelProvider(this)[ResultViewModel2::class.java]
-        syncModel =
-            ViewModelProvider(this)[SyncViewModel::class.java]
-        updateUIEvent += ::updateUI
+    var player: IPlayer = CS3IPlayer()
+    protected open var hasPipModeSupport: Boolean = false
+    protected open var isFullScreenPlayer: Boolean = true
+    protected open var lockRotation: Boolean = true
+    protected var playerBinding: TrailerCustomLayoutBinding? = null
+    protected var isShowing: Boolean = false
 
-        val root = super.onCreateView(inflater, container, savedInstanceState) ?: return null
-        FragmentResultSwipeBinding.bind(root).let { bind ->
-            resultBinding =
-                bind.fragmentResult//FragmentResultBinding.bind(binding.root.findViewById(R.id.fragment_result))
-            recommendationBinding = bind.resultRecommendations
-            syncBinding = bind.resultSync
-            binding = bind
-        }
+    protected var playerHostView: PlayerView? = null
+
+    open fun updateUIVisibility() {}
+
+    protected fun uiReset() {
+        isShowing = false
+        updateUIVisibility()
+    }
+
+    open fun showMirrorsDialogue() {}
+    open fun showTracksDialogue() {}
+    open fun openOnlineSubPicker(
+        context: android.content.Context,
+        loadResponse: LoadResponse?,
+        dismissCallback: () -> Unit
+    ) {}
 
-        return root
+    override fun fixLayout(view: View) {
+        fixSystemBarsPadding(view)
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-
         PanelsChildGestureRegionObserver.Provider.get().apply {
             resultBinding?.resultCastItems?.let { register(it) }
         }
     }
 
-    var currentTrailers: List<ExtractorLink> = emptyList()
+    var currentTrailers: List<Pair<ExtractorLink, String>> = emptyList()
     var currentTrailerIndex = 0
 
     override fun nextMirror() {
@@ -146,33 +240,35 @@ open class ResultFragmentPhone : FullScreenPlayer() {
 
     override fun playerError(exception: Throwable) {
         if (player.getIsPlaying()) { // because we don't want random toasts in player
-            super.playerError(exception)
+            playerHostView?.playerError(exception)
         } else {
             nextMirror()
         }
     }
 
     private fun loadTrailer(index: Int? = null) {
+
         val isSuccess =
-            currentTrailers.getOrNull(index ?: currentTrailerIndex)?.let { trailer ->
-                context?.let { ctx ->
-                    player.onPause()
-                    player.loadPlayer(
-                        ctx,
-                        false,
-                        trailer,
-                        null,
-                        startPosition = 0L,
-                        subtitles = emptySet(),
-                        subtitle = null,
-                        autoPlay = false,
-                        preview = false
-                    )
-                    true
+            currentTrailers.getOrNull(index ?: currentTrailerIndex)
+                ?.let { (extractedTrailerLink, _) ->
+                    context?.let { ctx ->
+                        player.onPause()
+                        player.loadPlayer(
+                            ctx,
+                            false,
+                            extractedTrailerLink,
+                            null,
+                            startPosition = 0L,
+                            subtitles = emptySet(),
+                            subtitle = null,
+                            autoPlay = false,
+                            preview = false
+                        )
+                        true
+                    } ?: run {
+                        false
+                    }
                 } ?: run {
-                    false
-                }
-            } ?: run {
                 false
             }
         //result_trailer_thumbnail?.setImageBitmap(result_poster_background?.drawable?.toBitmap())
@@ -181,6 +277,17 @@ open class ResultFragmentPhone : FullScreenPlayer() {
         // result_trailer_loading?.isVisible = isSuccess
         val turnVis = !isSuccess && !isFullScreenPlayer
         resultBinding?.apply {
+            // If we load a trailer, then cancel the big logo and only show the small title
+            if (isSuccess) {
+                // This is still a bit of a race condition, but it should work if we have the
+                // trailers observe after the page observe!
+                bindLogo(
+                    url = null,
+                    headers = null,
+                    logoView = backgroundPosterWatermarkBadge,
+                    titleView = resultTitle
+                )
+            }
             resultSmallscreenHolder.isVisible = turnVis
             resultPosterBackgroundHolder.apply {
                 val fadeIn: Animation = AlphaAnimation(alpha, if (turnVis) 1.0f else 0.0f).apply {
@@ -216,10 +323,10 @@ open class ResultFragmentPhone : FullScreenPlayer() {
         //}
     }
 
-    private fun setTrailers(trailers: List<ExtractorLink>?) {
+    private fun setTrailers(trailers: List<Pair<ExtractorLink, String>>?) {
         context?.updateHasTrailers()
         if (!LoadResponse.isTrailersEnabled) return
-        currentTrailers = trailers?.sortedBy { -it.quality } ?: emptyList()
+        currentTrailers = trailers?.sortedBy { -it.first.quality } ?: emptyList()
         loadTrailer()
     }
 
@@ -233,11 +340,13 @@ open class ResultFragmentPhone : FullScreenPlayer() {
         }
 
         updateUIEvent -= ::updateUI
-        binding = null
+        playerHostView?.release()
+        playerBinding = null
         resultBinding?.resultScroll?.setOnClickListener(null)
         resultBinding = null
         syncBinding = null
         recommendationBinding = null
+        activity?.detachBackPressedCallback(this@ResultFragmentPhone.toString())
         super.onDestroyView()
     }
 
@@ -256,7 +365,6 @@ open class ResultFragmentPhone : FullScreenPlayer() {
 
     var selectSeason: String? = null
     var selectEpisodeRange: String? = null
-    var selectSort: EpisodeSortType? = null
 
     private fun setUrl(url: String?) {
         if (url == null) {
@@ -298,10 +406,10 @@ open class ResultFragmentPhone : FullScreenPlayer() {
 
     override fun onResume() {
         afterPluginsLoadedEvent += ::reloadViewModel
-        activity?.let {
-            @Suppress("DEPRECATION")
-            it.window?.navigationBarColor =
-                it.colorFromAttribute(R.attr.primaryBlackBackground)
+        activity?.setNavigationBarColorCompat(R.attr.primaryBlackBackground)
+        context?.let { ctx ->
+            playerHostView?.onResume(ctx)
+            playerHostView?.setupKeyEventListener()
         }
         super.onResume()
         PanelsChildGestureRegionObserver.Provider.get()
@@ -310,25 +418,44 @@ open class ResultFragmentPhone : FullScreenPlayer() {
 
     override fun onStop() {
         afterPluginsLoadedEvent -= ::reloadViewModel
+        playerHostView?.onStop()
         super.onStop()
     }
 
+    @Suppress("UNUSED_PARAMETER")
     private fun updateUI(id: Int?) {
         syncModel.updateUserData()
         viewModel.reloadEpisodes()
     }
 
-    @SuppressLint("SetTextI18n")
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
+    override fun onBindingCreated(binding: FragmentResultSwipeBinding, savedInstanceState: Bundle?) {
+        // Set up sub-binding references
+        viewModel = ViewModelProvider(this)[ResultViewModel2::class.java]
+        syncModel = ViewModelProvider(this)[SyncViewModel::class.java]
+        updateUIEvent += ::updateUI
+
+        resultBinding = binding.fragmentResult
+        recommendationBinding = binding.resultRecommendations
+        syncBinding = binding.resultSync
+
+        // Set up trailer player
+        val ctx = context ?: return
+        playerHostView = PlayerView(ctx)
+        playerHostView?.player = player
+        playerHostView?.hasPipModeSupport = hasPipModeSupport
+        playerHostView?.callbacks = this
+        playerHostView?.bindViews(binding.root)
+        playerBinding = binding.root.findViewById<View?>(R.id.player_holder)?.let {
+            TrailerCustomLayoutBinding.bind(it)
+        }
+        playerHostView?.initialize()
 
         // ===== setup =====
-        UIHelper.fixPaddingStatusbar(binding?.resultTopBar)
         val storedData = getStoredData() ?: return
         activity?.window?.decorView?.clearFocus()
         activity?.loadCache()
         context?.updateHasTrailers()
-        hideKeyboard()
+        hideKeyboard(binding.root)
         if (storedData.restart || !viewModel.hasLoaded())
             viewModel.load(
                 activity,
@@ -346,7 +473,7 @@ open class ResultFragmentPhone : FullScreenPlayer() {
         // 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(
+        binding.resultOverlappingPanels.registerEndPanelStateListeners(
             object : OverlappingPanelsLayout.PanelStateListener {
                 override fun onPanelStateChange(panelState: PanelState) {
                     PanelsChildGestureRegionObserver.Provider.get().apply {
@@ -358,8 +485,8 @@ open class ResultFragmentPhone : FullScreenPlayer() {
 
         // ===== ===== =====
 
-        binding?.resultSearch?.isGone = storedData.name.isBlank()
-        binding?.resultSearch?.setOnClickListener {
+        binding.resultSearch.isGone = storedData.name.isBlank()
+        binding.resultSearch.setOnClickListener {
             QuickSearchFragment.pushSearch(activity, storedData.name)
         }
 
@@ -388,7 +515,7 @@ open class ResultFragmentPhone : FullScreenPlayer() {
                     focused: View?
                 ): Boolean {
                     // Make the cast always focus the first visible item when focused
-                    // from somewhere else. Otherwise it jumps to the last item.
+                    // from somewhere else. Otherwise, it jumps to the last item.
                     return if (parent.focusedChild == null) {
                         scrollToPosition(this.findFirstCompletelyVisibleItemPosition())
                         true
@@ -399,13 +526,20 @@ open class ResultFragmentPhone : FullScreenPlayer() {
             }.apply {
                 this.orientation = RecyclerView.HORIZONTAL
             }*/
+            resultCastItems.setRecycledViewPool(ActorAdaptor.sharedPool)
             resultCastItems.adapter = ActorAdaptor()
-
+            resultEpisodes.setRecycledViewPool(EpisodeAdapter.sharedPool)
             resultEpisodes.adapter =
                 EpisodeAdapter(
                     api?.hasDownloadSupport == true,
                     { episodeClick ->
-                        viewModel.handleAction(episodeClick)
+                        when (episodeClick.action) {
+                            ACTION_DOWNLOAD_EPISODE, ACTION_DOWNLOAD_MIRROR -> {
+                                requirePathForActions(listOf(episodeClick.action to episodeClick.data))
+                            }
+
+                            else -> viewModel.handleAction(episodeClick)
+                        }
                     },
                     { downloadClickEvent ->
                         DownloadButtonSetup.handleDownloadClick(downloadClickEvent)
@@ -428,7 +562,7 @@ open class ResultFragmentPhone : FullScreenPlayer() {
                         activity?.showDialog(
                             names.map { it.second },
                             viewModel.selectedSortingIndex.value ?: -1,
-                            "",
+                            ctx.getString(R.string.sort_by),
                             false,
                             {}) { itemId ->
                             viewModel.setSort(names[itemId].first)
@@ -440,9 +574,9 @@ open class ResultFragmentPhone : FullScreenPlayer() {
             resultScroll.setOnScrollChangeListener(NestedScrollView.OnScrollChangeListener { _, _, scrollY, _, oldScrollY ->
                 val dy = scrollY - oldScrollY
                 if (dy > 0) { //check for scroll down
-                    binding?.resultBookmarkFab?.shrink()
+                    binding.resultBookmarkFab.shrink()
                 } else if (dy < -5) {
-                    binding?.resultBookmarkFab?.extend()
+                    binding.resultBookmarkFab.extend()
                 }
                 if (!isFullScreenPlayer && player.getIsPlaying()) {
                     if (scrollY > (resultBinding?.fragmentTrailer?.playerBackground?.height
@@ -454,25 +588,37 @@ open class ResultFragmentPhone : FullScreenPlayer() {
             })
         }
 
-        binding?.apply {
+        binding.apply {
             resultOverlappingPanels.setStartPanelLockState(OverlappingPanelsLayout.LockState.CLOSE)
             resultOverlappingPanels.setEndPanelLockState(OverlappingPanelsLayout.LockState.CLOSE)
             resultBack.setOnClickListener {
                 activity?.popCurrentPage()
             }
 
+            activity?.attachBackPressedCallback(this@ResultFragmentPhone.toString()) {
+                if (resultOverlappingPanels.getSelectedPanel().ordinal == 1) {
+                    runDefault()
+                } else resultOverlappingPanels.closePanels()
+            }
+
+            resultMiniSync.setOnClickListener {
+                if (resultOverlappingPanels.getSelectedPanel().ordinal == 1) {
+                    resultOverlappingPanels.openStartPanel()
+                } else resultOverlappingPanels.closePanels()
+            }
 
+            /*
+            resultMiniSync.setRecycledViewPool(ImageAdapter.sharedPool)
             resultMiniSync.adapter = ImageAdapter(
                 nextFocusDown = R.id.result_sync_set_score,
                 clickCallback = { action ->
                     if (action == IMAGE_CLICK || action == IMAGE_LONG_CLICK) {
-                        if (binding?.resultOverlappingPanels?.getSelectedPanel()?.ordinal == 1) {
-                            binding?.resultOverlappingPanels?.openStartPanel()
-                        } else {
-                            binding?.resultOverlappingPanels?.closePanels()
-                        }
+                        if (resultOverlappingPanels.getSelectedPanel().ordinal == 1) {
+                            resultOverlappingPanels.openStartPanel()
+                        } else resultOverlappingPanels.closePanels()
                     }
                 })
+            */
             resultSubscribe.setOnClickListener {
                 viewModel.toggleSubscriptionStatus(context) { newStatus: Boolean? ->
                     if (newStatus == null) return@toggleSubscriptionStatus
@@ -532,12 +678,7 @@ open class ResultFragmentPhone : FullScreenPlayer() {
                             CastContext.getSharedInstance(act.applicationContext) {
                                 it.run()
                             }.addOnCompleteListener {
-                                isGone = if (it.isSuccessful) {
-                                    it.result.castState == CastState.NO_DEVICES_AVAILABLE
-                                } else {
-                                    true
-                                }
-
+                                isGone = !it.isSuccessful
                             }
                             // this shit leaks for some reason
                             //castContext.addCastStateListener { state ->
@@ -553,8 +694,8 @@ open class ResultFragmentPhone : FullScreenPlayer() {
 
         playerBinding?.apply {
             playerOpenSource.setOnClickListener {
-                currentTrailers.getOrNull(currentTrailerIndex)?.let {
-                    context?.openBrowser(it.url)
+                currentTrailers.getOrNull(currentTrailerIndex)?.let { (_, ogTrailerLink) ->
+                    context?.openBrowser(ogTrailerLink)
                 }
             }
         }
@@ -562,9 +703,9 @@ open class ResultFragmentPhone : FullScreenPlayer() {
         recommendationBinding?.apply {
             resultRecommendationsList.apply {
                 spanCount = 3
+                setRecycledViewPool(SearchAdapter.sharedPool)
                 adapter =
                     SearchAdapter(
-                        ArrayList(),
                         this,
                     ) { callback ->
                         SearchHelper.handleSearchClickCallback(callback)
@@ -588,10 +729,13 @@ open class ResultFragmentPhone : FullScreenPlayer() {
             resultBinding?.apply {
                 if (resume == null) {
                     resultResumeParent.isVisible = false
+                    resultPlayParent.isVisible = true
+                    resultResumeProgressHolder.isVisible = false
                     return@observeNullable
                 }
                 resultResumeParent.isVisible = true
                 resume.progress?.let { progress ->
+                    resultNextSeriesButton.isVisible = false
                     resultResumeSeriesTitle.apply {
                         isVisible = !resume.isMovie
                         text =
@@ -601,8 +745,11 @@ open class ResultFragmentPhone : FullScreenPlayer() {
                                 resume.result.season
                             )
                     }
-
-                    resultResumeSeriesProgressText.setText(progress.progressLeft)
+                    if (resume.isMovie) {
+                        resultPlayParent.isGone = true
+                        resultResumeSeriesProgressText.isVisible = true
+                        resultResumeSeriesProgressText.setText(progress.progressLeft)
+                    }
                     resultResumeSeriesProgress.apply {
                         isVisible = true
                         this.max = progress.maxProgress
@@ -611,25 +758,30 @@ open class ResultFragmentPhone : FullScreenPlayer() {
                     resultResumeProgressHolder.isVisible = true
                 } ?: run {
                     resultResumeProgressHolder.isVisible = false
+                    if (!resume.isMovie) {
+                        resultNextSeriesButton.isVisible = true
+                        resultNextSeriesButton.text = context?.getNameFull(
+                            resume.result.name,
+                            resume.result.episode,
+                            resume.result.season
+                        )
+                    }
                     resultResumeSeriesProgress.isVisible = false
                     resultResumeSeriesTitle.isVisible = false
                     resultResumeSeriesProgressText.isVisible = false
                 }
 
-                resultResumeSeriesButton.isVisible = !resume.isMovie
                 resultResumeSeriesButton.setOnClickListener {
-                    viewModel.handleAction(
-                        EpisodeClickEvent(
-                            storedData.playerAction, //?: ACTION_PLAY_EPISODE_IN_PLAYER,
-                            resume.result
-                        )
-                    )
+                    resumeAction(storedData, resume)
+                }
+                resultNextSeriesButton.setOnClickListener {
+                    resumeAction(storedData, resume)
                 }
             }
         }
 
         observeNullable(viewModel.subscribeStatus) { isSubscribed ->
-            binding?.resultSubscribe?.isVisible = isSubscribed != null
+            binding.resultSubscribe.isVisible = isSubscribed != null
             if (isSubscribed == null) return@observeNullable
 
             val drawable = if (isSubscribed) {
@@ -638,11 +790,11 @@ open class ResultFragmentPhone : FullScreenPlayer() {
                 R.drawable.baseline_notifications_none_24
             }
 
-            binding?.resultSubscribe?.setImageResource(drawable)
+            binding.resultSubscribe.setImageResource(drawable)
         }
 
         observeNullable(viewModel.favoriteStatus) { isFavorite ->
-            binding?.resultFavorite?.isVisible = isFavorite != null
+            binding.resultFavorite.isVisible = isFavorite != null
             if (isFavorite == null) return@observeNullable
 
             val drawable = if (isFavorite) {
@@ -651,11 +803,7 @@ open class ResultFragmentPhone : FullScreenPlayer() {
                 R.drawable.ic_baseline_favorite_border_24
             }
 
-            binding?.resultFavorite?.setImageResource(drawable)
-        }
-
-        observe(viewModel.trailers) { trailers ->
-            setTrailers(trailers.flatMap { it.mirros }) // I dont care about subtitles yet!
+            binding.resultFavorite.setImageResource(drawable)
         }
 
         observeNullable(viewModel.episodes) { episodes ->
@@ -663,8 +811,58 @@ open class ResultFragmentPhone : FullScreenPlayer() {
                 // no failure?
                 resultEpisodeLoading.isVisible = episodes is Resource.Loading
                 resultEpisodes.isVisible = episodes is Resource.Success
+                resultBatchDownloadButton.isVisible =
+                    episodes is Resource.Success && episodes.value.isNotEmpty()
+
                 if (episodes is Resource.Success) {
-                    (resultEpisodes.adapter as? EpisodeAdapter)?.updateList(episodes.value)
+                    (resultEpisodes.adapter as? EpisodeAdapter)?.submitList(episodes.value)
+
+                    // Show quality dialog with all sources
+                    resultBatchDownloadButton.setOnLongClickListener {
+                        ioSafe {
+                            val defaultSources = QualityProfileDialog.getAllDefaultSources()
+                            val activity = activity ?: return@ioSafe
+                            activity.runOnUiThread {
+                                QualityProfileDialog(
+                                    activity,
+                                    R.style.DialogFullscreenPlayer,
+                                    defaultSources,
+                                ).show()
+                            }
+                        }
+
+                        true
+                    }
+
+                    resultBatchDownloadButton.setOnClickListener { view ->
+                        val episodeStart =
+                            episodes.value.firstOrNull()?.episode ?: return@setOnClickListener
+                        val episodeEnd =
+                            episodes.value.lastOrNull()?.episode ?: return@setOnClickListener
+
+                        val episodeRange = if (episodeStart == episodeEnd) {
+                            episodeStart.toString()
+                        } else {
+                            txt(
+                                R.string.episodes_range,
+                                episodeStart,
+                                episodeEnd
+                            ).asString(view.context)
+                        }
+
+                        val rangeMessage = txt(
+                            R.string.download_episode_range,
+                            episodeRange
+                        ).asString(view.context)
+
+                        AlertDialog.Builder(view.context, R.style.AlertDialogCustom)
+                            .setTitle(R.string.download_all)
+                            .setMessage(rangeMessage)
+                            .setPositiveButton(R.string.yes) { _, _ ->
+                                requirePathForActions(episodes.value.map { ACTION_DOWNLOAD_EPISODE to it })
+                            }
+                            .setNegativeButton(R.string.cancel) { _, _ -> }.show()
+                    }
                 }
             }
         }
@@ -688,16 +886,25 @@ open class ResultFragmentPhone : FullScreenPlayer() {
                         )
                         return@setOnLongClickListener true
                     }
+                    resultResumeSeriesButton.setOnLongClickListener {
+                        viewModel.handleAction(
+                            EpisodeClickEvent(ACTION_SHOW_OPTIONS, ep)
+                        )
+                        return@setOnLongClickListener true
+                    }
+
+                    val status = VideoDownloadManager.downloadStatus[ep.id]
+                    downloadButton.setStatus(status)
                     downloadButton.setDefaultClickListener(
-                        VideoDownloadHelper.DownloadEpisodeCached(
+                        DownloadObjects.DownloadEpisodeCached(
                             name = ep.name,
                             poster = ep.poster,
                             episode = 0,
                             season = null,
                             id = ep.id,
                             parentId = ep.id,
-                            rating = null,
-                            description = null,
+                            score = ep.score,
+                            description = ep.description,
                             cacheTime = System.currentTimeMillis(),
                         ),
                         null
@@ -706,18 +913,11 @@ open class ResultFragmentPhone : FullScreenPlayer() {
 
                         when (click.action) {
                             DOWNLOAD_ACTION_DOWNLOAD -> {
-                                viewModel.handleAction(
-                                    EpisodeClickEvent(ACTION_DOWNLOAD_EPISODE, ep)
-                                )
+                                requirePathForActions(listOf(ACTION_DOWNLOAD_EPISODE to ep))
                             }
 
                             DOWNLOAD_ACTION_LONG_CLICK -> {
-                                viewModel.handleAction(
-                                    EpisodeClickEvent(
-                                        ACTION_DOWNLOAD_MIRROR,
-                                        ep
-                                    )
-                                )
+                                requirePathForActions(listOf(ACTION_DOWNLOAD_MIRROR to ep))
                             }
 
                             else -> DownloadButtonSetup.handleDownloadClick(click)
@@ -768,6 +968,13 @@ open class ResultFragmentPhone : FullScreenPlayer() {
                         }
                     }
 
+                    bindLogo(
+                        url = d.logoUrl,
+                        headers = d.posterHeaders,
+                        titleView = resultTitle,
+                        logoView = backgroundPosterWatermarkBadge
+                    )
+
                     var isExpanded = false
                     resultDescription.apply {
                         setTextHtml(d.plotText)
@@ -784,8 +991,15 @@ open class ResultFragmentPhone : FullScreenPlayer() {
                     resultComingSoon.isVisible = d.comingSoon
                     resultDataHolder.isGone = d.comingSoon
 
-                    resultCastItems.isGone = d.actors.isNullOrEmpty()
-                    (resultCastItems.adapter as? ActorAdaptor)?.updateList(d.actors ?: emptyList())
+                    val prefs =
+                        androidx.preference.PreferenceManager.getDefaultSharedPreferences(root.context)
+                    val showCast = prefs.getBoolean(
+                        root.context.getString(R.string.show_cast_in_details_key),
+                        true
+                    )
+
+                    resultCastItems.isGone = !showCast || d.actors.isNullOrEmpty()
+                    (resultCastItems.adapter as? ActorAdaptor)?.submitList(if (showCast) d.actors else emptyList())
 
                     if (d.contentRatingText == null) {
                         // If there is no rating to display, we don't want an empty gap
@@ -799,7 +1013,7 @@ open class ResultFragmentPhone : FullScreenPlayer() {
                         syncModel.addFromUrl(d.url)
                     }
 
-                    binding?.apply {
+                    binding.apply {
                         resultSearch.isGone = d.title.isBlank()
                         resultSearch.setOnClickListener {
                             QuickSearchFragment.pushSearch(activity, d.title)
@@ -808,15 +1022,23 @@ open class ResultFragmentPhone : FullScreenPlayer() {
                         resultShare.setOnClickListener {
                             try {
                                 val i = Intent(Intent.ACTION_SEND)
+                                val nameBase64 =
+                                    base64Encode(d.apiName.toString().toByteArray(Charsets.UTF_8))
+                                val urlBase64 = base64Encode(d.url.toByteArray(Charsets.UTF_8))
+                                val encodedUri = URLEncoder.encode(
+                                    "$APP_STRING_SHARE:$nameBase64?$urlBase64",
+                                    "UTF-8"
+                                )
+                                val redirectUrl =
+                                    "https://recloudstream.github.io/csredirect?redirectto=$encodedUri"
                                 i.type = "text/plain"
                                 i.putExtra(Intent.EXTRA_SUBJECT, d.title)
-                                i.putExtra(Intent.EXTRA_TEXT, d.url)
+                                i.putExtra(Intent.EXTRA_TEXT, redirectUrl)
                                 startActivity(Intent.createChooser(i, d.title))
                             } catch (e: Exception) {
                                 logError(e)
                             }
                         }
-
                         setUrl(d.url)
                         resultBookmarkFab.apply {
                             isVisible = true
@@ -826,10 +1048,11 @@ open class ResultFragmentPhone : FullScreenPlayer() {
                 }
 
                 (data as? Resource.Failure)?.let { data ->
+                    @SuppressLint("SetTextI18n")
                     resultErrorText.text = storedData.url.plus("\n") + data.errorString
                 }
 
-                binding?.resultBookmarkFab?.isVisible = data is Resource.Success
+                binding.resultBookmarkFab.isVisible = data is Resource.Success
                 resultFinishLoading.isVisible = data is Resource.Success
 
                 resultLoading.isVisible = data is Resource.Loading
@@ -876,14 +1099,17 @@ open class ResultFragmentPhone : FullScreenPlayer() {
             }
         }
 
+        observe(viewModel.trailers) { trailers ->
+            setTrailers(trailers.flatMap { it.mirros }) // I don't care about subtitles yet!
+        }
+
         observe(syncModel.synced) { list ->
             syncBinding?.resultSyncNames?.text =
                 list.filter { it.isSynced && it.hasAccount }.joinToString { it.name }
 
             val newList = list.filter { it.isSynced && it.hasAccount }
 
-            binding?.resultMiniSync?.isVisible = newList.isNotEmpty()
-            (binding?.resultMiniSync?.adapter as? ImageAdapter)?.updateList(newList.mapNotNull { it.icon })
+            binding.resultMiniSync.isVisible = newList.isNotEmpty()
         }
 
 
@@ -944,7 +1170,11 @@ open class ResultFragmentPhone : FullScreenPlayer() {
                         resultSyncHolder.isVisible = true
 
                         val d = status.value
-                        resultSyncRating.value = d.score?.toFloat() ?: 0.0f
+                        val desiredScore = d.score?.toFloat(1) ?: 0.0f
+                        val totalSteps = (resultSyncRating.valueTo / resultSyncRating.stepSize)
+                        val desiredStep = (totalSteps * desiredScore).roundToInt()
+                        resultSyncRating.value = desiredStep * resultSyncRating.stepSize
+
                         resultSyncCheck.setItemChecked(d.status.internalId + 1, true)
                         val watchedEpisodes = d.watchedEpisodes ?: 0
                         currentSyncProgress = watchedEpisodes
@@ -962,10 +1192,10 @@ open class ResultFragmentPhone : FullScreenPlayer() {
                         resultSyncCurrentEpisodes.text =
                             Editable.Factory.getInstance()?.newEditable(watchedEpisodes.toString())
                         safe { // format might fail
-                            context?.getString(R.string.sync_score_format)?.format(d.score ?: 0)
-                                ?.let {
-                                    resultSyncScoreText.text = it
-                                }
+                            val text = d.score?.toFloat(10)?.roundToInt()?.let {
+                                context?.getString(R.string.sync_score_format)?.format(it)
+                            } ?: "?"
+                            resultSyncScoreText.text = text
                         }
                     }
 
@@ -974,7 +1204,7 @@ open class ResultFragmentPhone : FullScreenPlayer() {
                     }
                 }
             }
-            binding?.resultOverlappingPanels?.setStartPanelLockState(if (closed) OverlappingPanelsLayout.LockState.CLOSE else OverlappingPanelsLayout.LockState.UNLOCKED)
+            binding.resultOverlappingPanels.setStartPanelLockState(if (closed) OverlappingPanelsLayout.LockState.CLOSE else OverlappingPanelsLayout.LockState.UNLOCKED)
         }
         observe(viewModel.recommendations) { recommendations ->
             setRecommendations(recommendations, null)
@@ -1003,14 +1233,14 @@ open class ResultFragmentPhone : FullScreenPlayer() {
             syncBinding?.apply {
                 resultSyncCheck.choiceMode = AbsListView.CHOICE_MODE_SINGLE
                 resultSyncCheck.adapter = arrayAdapter
-                UIHelper.setListViewHeightBasedOnItems(resultSyncCheck)
+                setListViewHeightBasedOnItems(resultSyncCheck)
 
                 resultSyncCheck.setOnItemClickListener { _, _, which, _ ->
                     syncModel.setStatus(which - 1)
                 }
 
-                resultSyncRating.addOnChangeListener { _, value, _ ->
-                    syncModel.setScore(value.toInt())
+                resultSyncRating.addOnChangeListener { it, value, fromUser ->
+                    if (fromUser) syncModel.setScore(Score.from(value, it.valueTo.roundToInt()))
                 }
 
                 resultSyncAddEpisode.setOnClickListener {
@@ -1035,7 +1265,7 @@ open class ResultFragmentPhone : FullScreenPlayer() {
         }
 
         observe(viewModel.watchStatus) { watchType ->
-            binding?.resultBookmarkFab?.apply {
+            binding.resultBookmarkFab.apply {
                 setText(watchType.stringRes)
                 if (watchType == WatchType.NONE) {
                     context?.colorFromAttribute(R.attr.white)
@@ -1090,6 +1320,7 @@ open class ResultFragmentPhone : FullScreenPlayer() {
                         viewModel.skipLoading()
                     }
                     isVisible = true
+                    @SuppressLint("SetTextI18n")
                     text = "${context.getString(R.string.skip_loading)} (${load.linksLoaded})"
                 }
             }
@@ -1159,7 +1390,7 @@ open class ResultFragmentPhone : FullScreenPlayer() {
                     activity?.showDialog(
                         names.map { it.second },
                         names.indexOfFirst { it.second == selectEpisodeRange },
-                        "",
+                        ctx.getString(R.string.episodes),
                         false,
                         {}) { itemId ->
                         viewModel.changeRange(names[itemId].first)
@@ -1180,7 +1411,7 @@ open class ResultFragmentPhone : FullScreenPlayer() {
                     activity?.showDialog(
                         names.map { it.second },
                         names.indexOfFirst { it.second == selectSeason },
-                        "",
+                        ctx.getString(R.string.season),
                         false,
                         {}) { itemId ->
                         viewModel.changeSeason(names[itemId].first)
@@ -1197,7 +1428,20 @@ open class ResultFragmentPhone : FullScreenPlayer() {
         }
     }
 
+    private fun resumeAction(
+        storedData: ResultFragment.StoredData,
+        resume: ResumeWatchingStatus
+    ) {
+        viewModel.handleAction(
+            EpisodeClickEvent(
+                storedData.playerAction, //?: ACTION_PLAY_EPISODE_IN_PLAYER,
+                resume.result
+            )
+        )
+    }
+
     override fun onPause() {
+        playerHostView?.releaseKeyEventListener()
         super.onPause()
         PanelsChildGestureRegionObserver.Provider.get()
             .addGestureRegionsUpdateListener(gestureRegionsListener)
@@ -1211,7 +1455,7 @@ open class ResultFragmentPhone : FullScreenPlayer() {
             root.isGone = isInvalid
             root.post {
                 rec?.let { list ->
-                    (resultRecommendationsList.adapter as? SearchAdapter)?.updateList(list.filter { it.apiName == matchAgainst })
+                    (resultRecommendationsList.adapter as? SearchAdapter)?.submitList(list.filter { it.apiName == matchAgainst })
                 }
             }
         }
@@ -1255,4 +1499,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 ebbe0cd8fbe..cfbacc5d13f 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
@@ -14,7 +14,6 @@ import androidx.core.view.isGone
 import androidx.core.view.isInvisible
 import androidx.core.view.isVisible
 import androidx.core.widget.NestedScrollView
-import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.bottomsheet.BottomSheetDialog
@@ -30,20 +29,24 @@ import com.lagradost.cloudstream3.mvvm.Resource
 import com.lagradost.cloudstream3.mvvm.observe
 import com.lagradost.cloudstream3.mvvm.observeNullable
 import com.lagradost.cloudstream3.services.SubscriptionWorkManager
+import com.lagradost.cloudstream3.ui.BaseFragment
 import com.lagradost.cloudstream3.ui.WatchType
 import com.lagradost.cloudstream3.ui.download.DownloadButtonSetup
 import com.lagradost.cloudstream3.ui.player.ExtractorLinkGenerator
 import com.lagradost.cloudstream3.ui.player.GeneratorPlayer
 import com.lagradost.cloudstream3.ui.player.NEXT_WATCH_EPISODE_PERCENTAGE
 import com.lagradost.cloudstream3.ui.quicksearch.QuickSearchFragment
+import com.lagradost.cloudstream3.ui.result.ResultFragment.bindLogo
 import com.lagradost.cloudstream3.ui.result.ResultFragment.getStoredData
 import com.lagradost.cloudstream3.ui.result.ResultFragment.updateUIEvent
 import com.lagradost.cloudstream3.ui.search.SEARCH_ACTION_FOCUSED
 import com.lagradost.cloudstream3.ui.search.SearchAdapter
 import com.lagradost.cloudstream3.ui.search.SearchHelper
+import com.lagradost.cloudstream3.ui.setRecycledViewPool
 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.AppContextUtils.getNameFull
 import com.lagradost.cloudstream3.utils.AppContextUtils.html
 import com.lagradost.cloudstream3.utils.AppContextUtils.isRtl
 import com.lagradost.cloudstream3.utils.AppContextUtils.loadCache
@@ -53,22 +56,26 @@ import com.lagradost.cloudstream3.utils.BackPressedCallbackHelper.detachBackPres
 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
-import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
+import com.lagradost.cloudstream3.utils.UIHelper.fixSystemBarsPadding
 import com.lagradost.cloudstream3.utils.UIHelper.hideKeyboard
 import com.lagradost.cloudstream3.utils.UIHelper.navigate
+import com.lagradost.cloudstream3.utils.UIHelper.populateChips
+import com.lagradost.cloudstream3.utils.UIHelper.setNavigationBarColorCompat
 import com.lagradost.cloudstream3.utils.getImageFromDrawable
 import com.lagradost.cloudstream3.utils.setText
 import com.lagradost.cloudstream3.utils.setTextHtml
+import com.lagradost.cloudstream3.utils.txt
+
+class ResultFragmentTv : BaseFragment<FragmentResultTvBinding>(
+    BindingCreator.Inflate(FragmentResultTvBinding::inflate)
+) {
 
-class ResultFragmentTv : Fragment() {
     private lateinit var viewModel: ResultViewModel2
-    private var binding: FragmentResultTvBinding? = null
 
     override fun onDestroyView() {
-        binding = null
         updateUIEvent -= ::updateUI
+        activity?.detachBackPressedCallback(this@ResultFragmentTv.toString())
         super.onDestroyView()
     }
 
@@ -76,15 +83,13 @@ class ResultFragmentTv : Fragment() {
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View {
+    ): View? {
         viewModel =
             ViewModelProvider(this)[ResultViewModel2::class.java]
         viewModel.EPISODE_RANGE_SIZE = 50
         updateUIEvent += ::updateUI
 
-        val localBinding = FragmentResultTvBinding.inflate(inflater, container, false)
-        binding = localBinding
-        return localBinding.root
+        return super.onCreateView(inflater, container, savedInstanceState)
     }
 
     private fun updateUI(id: Int?) {
@@ -118,7 +123,7 @@ class ResultFragmentTv : Fragment() {
     }
 
     private fun RecyclerView?.update(data: List<SelectData>) {
-        (this?.adapter as? SelectAdaptor?)?.updateSelectionList(data)
+        (this?.adapter as? SelectAdaptor?)?.submitList(data)
         this?.isVisible = data.size > 1
     }
 
@@ -151,14 +156,14 @@ class ResultFragmentTv : Fragment() {
             resultRecommendationsList.isGone = isInvalid
             resultRecommendationsHolder.isGone = isInvalid
             val matchAgainst = validApiName ?: rec?.firstOrNull()?.apiName
-            (resultRecommendationsList.adapter as? SearchAdapter)?.updateList(rec?.filter { it.apiName == matchAgainst }
+            (resultRecommendationsList.adapter as? SearchAdapter)?.submitList(rec?.filter { it.apiName == matchAgainst }
                 ?: emptyList())
 
             rec?.map { it.apiName }?.distinct()?.let { apiNames ->
                 // very dirty selection
                 resultRecommendationsFilterSelection.isVisible = apiNames.size > 1
                 resultRecommendationsFilterSelection.update(apiNames.map {
-                    com.lagradost.cloudstream3.utils.txt(
+                    txt(
                         it
                     ) to it
                 })
@@ -187,11 +192,7 @@ class ResultFragmentTv : Fragment() {
     }
 
     override fun onResume() {
-        activity?.let {
-            @Suppress("DEPRECATION")
-            it.window?.navigationBarColor =
-                it.colorFromAttribute(R.attr.primaryBlackBackground)
-        }
+        activity?.setNavigationBarColorCompat(R.attr.primaryBlackBackground)
         afterPluginsLoadedEvent += ::reloadViewModel
         super.onResume()
     }
@@ -230,11 +231,6 @@ class ResultFragmentTv : Fragment() {
         }
     }
 
-    override fun onDestroy() {
-        super.onDestroy()
-        activity?.detachBackPressedCallback(this@ResultFragmentTv.toString())
-    }
-
     private fun toggleEpisodes(show: Boolean) {
         binding?.apply {
             if (show) {
@@ -254,10 +250,12 @@ class ResultFragmentTv : Fragment() {
         }
     }
 
-    @SuppressLint("SetTextI18n")
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
+    override fun fixLayout(view: View) {
+        fixSystemBarsPadding(view, padTop = false)
+    }
 
+    @SuppressLint("SetTextI18n")
+    override fun onBindingCreated(binding: FragmentResultTvBinding) {
         // ===== setup =====
         val storedData = getStoredData() ?: return
         activity?.window?.decorView?.clearFocus()
@@ -275,7 +273,7 @@ class ResultFragmentTv : Fragment() {
         // ===== ===== =====
         var comingSoon = false
 
-        binding?.apply {
+        binding.apply {
             //episodesShadow.rotationX = 180.0f//if(episodesShadow.isRtl()) 180.0f else 0.0f
 
             // parallax on background
@@ -287,7 +285,7 @@ class ResultFragmentTv : Fragment() {
                 if (!hasFocus) return@setOnFocusChangeListener
                 toggleEpisodes(false)
 
-                binding?.apply {
+                binding.apply {
                     val views = listOf(
                         resultPlayMovieButton,
                         resultPlaySeriesButton,
@@ -308,7 +306,7 @@ class ResultFragmentTv : Fragment() {
             redirectToEpisodes.setOnFocusChangeListener { _, hasFocus ->
                 if (!hasFocus) return@setOnFocusChangeListener
                 toggleEpisodes(true)
-                binding?.apply {
+                binding.apply {
                     val views = listOf(
                         resultDubSelection,
                         resultSeasonSelection,
@@ -412,24 +410,24 @@ class ResultFragmentTv : Fragment() {
 
             resultCastItems.setOnFocusChangeListener { _, hasFocus ->
                 // Always escape focus
-                if (hasFocus) binding?.resultBookmarkButton?.requestFocus()
+                if (hasFocus) binding.resultBookmarkButton.requestFocus()
             }
             //resultBack.setOnClickListener {
             //    activity?.popCurrentPage()
             //}
 
             resultRecommendationsList.spanCount = 8
+            resultRecommendationsList.setRecycledViewPool(SearchAdapter.sharedPool)
             resultRecommendationsList.adapter =
                 SearchAdapter(
-                    ArrayList(),
                     resultRecommendationsList,
                 ) { callback ->
-                    if (callback.action == SEARCH_ACTION_FOCUSED)
+                    if (callback.action == SEARCH_ACTION_FOCUSED) {
                         toggleEpisodes(false)
-                    else
-                        SearchHelper.handleSearchClickCallback(callback)
+                    } else SearchHelper.handleSearchClickCallback(callback)
                 }
 
+            resultEpisodes.setRecycledViewPool(EpisodeAdapter.sharedPool)
             resultEpisodes.adapter =
                 EpisodeAdapter(
                     false,
@@ -441,8 +439,7 @@ class ResultFragmentTv : Fragment() {
                     }
                 )
 
-            resultCastItems.layoutManager = object : LinearListLayout(view.context) {
-
+            resultCastItems.layoutManager = object : LinearListLayout(root.context) {
                 override fun onRequestChildFocus(
                     parent: RecyclerView,
                     state: RecyclerView.State,
@@ -458,35 +455,48 @@ class ResultFragmentTv : Fragment() {
                         super.onRequestChildFocus(parent, state, child, focused)
                     }
                 }
-            }.apply {
-                setHorizontal()
-            }
+            }.apply { setHorizontal() }
 
             val aboveCast = listOf(
-                binding?.resultEpisodesShow,
-                binding?.resultBookmark,
-                binding?.resultFavorite,
-                binding?.resultSubscribe,
-            ).firstOrNull {
-                it?.isVisible == true
-            }
+                binding.resultEpisodesShow,
+                binding.resultBookmark,
+                binding.resultFavorite,
+                binding.resultSubscribe,
+            ).firstOrNull { it.isVisible }
+
+            resultCastItems.setRecycledViewPool(ActorAdaptor.sharedPool)
             resultCastItems.adapter = ActorAdaptor(aboveCast?.id) {
                 toggleEpisodes(false)
             }
+
+            if (isLayout(EMULATOR)) {
+                episodesShadow.setOnClickListener {
+                    toggleEpisodes(false)
+                }
+            }
         }
 
         observeNullable(viewModel.resumeWatching) { resume ->
-            binding?.apply {
-
+            binding.apply {
                 if (resume == null) {
                     return@observeNullable
                 }
+
                 resultResumeSeries.isVisible = true
                 resultPlayMovie.isVisible = false
                 resultPlaySeries.isVisible = false
 
                 // show progress no matter if series or movie
                 resume.progress?.let { progress ->
+                    resultResumeSeriesTitle.apply {
+                        isVisible = !resume.isMovie
+                        text =
+                            if (resume.isMovie) null else context?.getNameFull(
+                                resume.result.name,
+                                resume.result.episode,
+                                resume.result.season
+                            )
+                    }
                     resultResumeSeriesProgressText.setText(progress.progressLeft)
                     resultResumeSeriesProgress.apply {
                         isVisible = true
@@ -538,17 +548,18 @@ class ResultFragmentTv : Fragment() {
         observe(viewModel.trailers) { trailersLinks ->
             context?.updateHasTrailers()
             if (!LoadResponse.isTrailersEnabled) return@observe
-            val trailers = trailersLinks.flatMap { it.mirros }
-            binding?.apply {
-                resultPlayTrailer.isGone = trailers.isEmpty()
+            val extractedTrailerLinks = trailersLinks.flatMap { it.mirros }
+                .map { (extractedTrailerLink, _) -> extractedTrailerLink }
+            binding.apply {
+                resultPlayTrailer.isGone = extractedTrailerLinks.isEmpty()
                 resultPlayTrailerButton.setOnClickListener {
-                    if (trailers.isEmpty()) return@setOnClickListener
+                    if (extractedTrailerLinks.isEmpty()) return@setOnClickListener
                     activity.navigate(
                         R.id.global_to_navigation_player, GeneratorPlayer.newInstance(
                             ExtractorLinkGenerator(
-                                trailers,
+                                extractedTrailerLinks,
                                 emptyList()
-                            )
+                            ), 0
                         )
                     )
                 }
@@ -556,16 +567,13 @@ class ResultFragmentTv : Fragment() {
         }
 
         observe(viewModel.watchStatus) { watchType ->
-            binding?.apply {
+            binding.apply {
                 resultBookmarkText.setText(watchType.stringRes)
 
                 resultBookmarkButton.apply {
-
                     val drawable = if (watchType.stringRes == R.string.type_none) {
                         R.drawable.outline_bookmark_add_24
-                    } else {
-                        R.drawable.ic_baseline_bookmark_24
-                    }
+                    } else R.drawable.ic_baseline_bookmark_24
                     setIconResource(drawable)
 
                     setOnClickListener { view ->
@@ -583,19 +591,13 @@ class ResultFragmentTv : Fragment() {
         }
 
         observeNullable(viewModel.favoriteStatus) { isFavorite ->
-
-            binding?.resultFavorite?.isVisible = isFavorite != null
-
-            binding?.resultFavoriteButton?.apply {
-
+            binding.resultFavorite.isVisible = isFavorite != null
+            binding.resultFavoriteButton.apply {
                 if (isFavorite == null) return@observeNullable
 
                 val drawable = if (isFavorite) {
                     R.drawable.ic_baseline_favorite_24
-                } else {
-                    R.drawable.ic_baseline_favorite_border_24
-                }
-
+                } else R.drawable.ic_baseline_favorite_border_24
                 setIconResource(drawable)
 
                 setOnClickListener {
@@ -604,15 +606,13 @@ class ResultFragmentTv : Fragment() {
 
                         val message = if (newStatus) {
                             R.string.favorite_added
-                        } else {
-                            R.string.favorite_removed
-                        }
+                        } else R.string.favorite_removed
 
                         val name = (viewModel.page.value as? Resource.Success)?.value?.title
-                            ?: com.lagradost.cloudstream3.utils.txt(R.string.no_data)
+                            ?: txt(R.string.no_data)
                                 .asStringNull(context) ?: ""
                         CommonActivity.showToast(
-                            com.lagradost.cloudstream3.utils.txt(
+                            txt(
                                 message,
                                 name
                             ), Toast.LENGTH_SHORT
@@ -621,28 +621,22 @@ class ResultFragmentTv : Fragment() {
                 }
             }
 
-            binding?.resultFavoriteText?.apply {
+            binding.resultFavoriteText.apply {
                 val text = if (isFavorite == true) {
                     R.string.unfavorite
-                } else {
-                    R.string.favorite
-                }
+                } else R.string.favorite
                 setText(text)
             }
         }
 
         observeNullable(viewModel.subscribeStatus) { isSubscribed ->
-            binding?.resultSubscribe?.isVisible = isSubscribed != null && isLayout(EMULATOR)
-            binding?.resultSubscribeButton?.apply {
-
+            binding.resultSubscribe.isVisible = isSubscribed != null && isLayout(EMULATOR)
+            binding.resultSubscribeButton.apply {
                 if (isSubscribed == null) return@observeNullable
 
                 val drawable = if (isSubscribed) {
                     R.drawable.ic_baseline_notifications_active_24
-                } else {
-                    R.drawable.baseline_notifications_none_24
-                }
-
+                } else R.drawable.baseline_notifications_none_24
                 setIconResource(drawable)
 
                 setOnClickListener {
@@ -653,15 +647,13 @@ class ResultFragmentTv : Fragment() {
                             // Kinda icky to have this here, but it works.
                             SubscriptionWorkManager.enqueuePeriodicWork(context)
                             R.string.subscription_new
-                        } else {
-                            R.string.subscription_deleted
-                        }
+                        } else R.string.subscription_deleted
 
                         val name = (viewModel.page.value as? Resource.Success)?.value?.title
-                            ?: com.lagradost.cloudstream3.utils.txt(R.string.no_data)
+                            ?: txt(R.string.no_data)
                                 .asStringNull(context) ?: ""
                         CommonActivity.showToast(
-                            com.lagradost.cloudstream3.utils.txt(
+                            txt(
                                 message,
                                 name
                             ), Toast.LENGTH_SHORT
@@ -669,12 +661,10 @@ class ResultFragmentTv : Fragment() {
                     }
                 }
 
-                binding?.resultSubscribeText?.apply {
+                binding.resultSubscribeText.apply {
                     val text = if (isSubscribed) {
                         R.string.action_unsubscribe
-                    } else {
-                        R.string.action_subscribe
-                    }
+                    } else R.string.action_subscribe
                     setText(text)
                 }
             }
@@ -685,10 +675,8 @@ class ResultFragmentTv : Fragment() {
                 return@observeNullable
             }
 
-            binding?.apply {
-
+            binding.apply {
                 (data as? Resource.Success)?.value?.let { (_, ep) ->
-
                     resultPlayMovieButton.setOnClickListener {
                         viewModel.handleAction(
                             EpisodeClickEvent(ACTION_CLICK_DEFAULT, ep)
@@ -702,10 +690,9 @@ class ResultFragmentTv : Fragment() {
                     }
 
                     resultPlayMovie.isVisible = !comingSoon && resultResumeSeries.isGone
-                    if (comingSoon)
+                    if (comingSoon) {
                         resultBookmarkButton.requestFocus()
-                    else
-                        resultPlayMovieButton.requestFocus()
+                    } else resultPlayMovieButton.requestFocus()
 
                     // Stops last button right focus
                     resultSearchButton.nextFocusRightId = R.id.result_search_Button
@@ -774,26 +761,26 @@ class ResultFragmentTv : Fragment() {
 
 
         observeNullable(viewModel.episodesCountText) { count ->
-            binding?.resultEpisodesText.setText(count)
+            binding.resultEpisodesText.setText(count)
         }
 
         observe(viewModel.selectedRangeIndex) { selected ->
-            binding?.resultRangeSelection.select(selected)
+            binding.resultRangeSelection.select(selected)
         }
         observe(viewModel.selectedSeasonIndex) { selected ->
-            binding?.resultSeasonSelection.select(selected)
+            binding.resultSeasonSelection.select(selected)
         }
         observe(viewModel.selectedDubStatusIndex) { selected ->
-            binding?.resultDubSelection.select(selected)
+            binding.resultDubSelection.select(selected)
         }
         observe(viewModel.rangeSelections) {
-            binding?.resultRangeSelection.update(it)
+            binding.resultRangeSelection.update(it)
         }
         observe(viewModel.dubSubSelections) {
-            binding?.resultDubSelection.update(it)
+            binding.resultDubSelection.update(it)
         }
         observe(viewModel.seasonSelections) {
-            binding?.resultSeasonSelection.update(it)
+            binding.resultSeasonSelection.update(it)
         }
         observe(viewModel.recommendations) { recommendations ->
             setRecommendations(recommendations, null)
@@ -801,7 +788,7 @@ class ResultFragmentTv : Fragment() {
 
         if (isLayout(TV)) {
             observe(viewModel.episodeSynopsis) { description ->
-                view.context?.let { ctx ->
+                context?.let { ctx ->
                     val builder: AlertDialog.Builder =
                         AlertDialog.Builder(ctx, R.style.AlertDialogCustom)
                     builder.setMessage(description.html())
@@ -818,15 +805,11 @@ class ResultFragmentTv : Fragment() {
         var hasLoadedEpisodesOnce = false
         observeNullable(viewModel.episodes) { episodes ->
             if (episodes == null) return@observeNullable
-
-            binding?.apply {
-
-                if (comingSoon)
-                    resultBookmarkButton.requestFocus()
+            binding.apply {
+                if (comingSoon) resultBookmarkButton.requestFocus()
 
                 //    resultEpisodeLoading.isVisible = episodes is Resource.Loading
                 if (episodes is Resource.Success) {
-
                     val lastWatchedIndex = episodes.value.indexOfLast { ep ->
                         ep.getWatchProgress() >= NEXT_WATCH_EPISODE_PERCENTAGE.toFloat() / 100.0f || ep.videoWatchState == VideoWatchState.Watched
                     }
@@ -869,14 +852,14 @@ class ResultFragmentTv : Fragment() {
                     }
 
 
-                    (resultEpisodes.adapter as? EpisodeAdapter)?.updateList(episodes.value)
+                    (resultEpisodes.adapter as? EpisodeAdapter)?.submitList(episodes.value)
                 }
             }
         }
 
         observeNullable(viewModel.page) { data ->
             if (data == null) return@observeNullable
-            binding?.apply {
+            binding.apply {
                 when (data) {
                     is Resource.Success -> {
                         val d = data.value
@@ -906,7 +889,7 @@ class ResultFragmentTv : Fragment() {
                                         Integer.MAX_VALUE
                                     } else 10
                                 } else {
-                                    view.context?.let { ctx ->
+                                    context?.let { ctx ->
                                         val builder: AlertDialog.Builder =
                                             AlertDialog.Builder(ctx, R.style.AlertDialogCustom)
                                         builder.setMessage(d.plotText.asString(ctx).html())
@@ -926,21 +909,32 @@ class ResultFragmentTv : Fragment() {
                             R.drawable.profile_bg_red,
                             R.drawable.profile_bg_teal
                         ).random()
-                        //Change poster crop area to 20% from Top
-                        backgroundPoster.cropYCenterOffsetPct = 0.20F
 
                         backgroundPoster.loadImage(d.posterBackgroundImage) {
                             error { getImageFromDrawable(context ?: return@error null, error) }
                         }
+
+                        bindLogo(
+                            url = d.logoUrl,
+                            headers = d.posterHeaders,
+                            titleView = resultTitle,
+                            logoView = backgroundPosterWatermarkBadgeHolder
+                        )
+
                         comingSoon = d.comingSoon
                         resultTvComingSoon.isVisible = d.comingSoon
 
-                        UIHelper.populateChips(resultTag, d.tags)
-                        resultCastItems.isGone = d.actors.isNullOrEmpty()
-                        (resultCastItems.adapter as? ActorAdaptor)?.updateList(
-                            d.actors ?: emptyList()
+                        populateChips(resultTag, d.tags)
+                        val prefs =
+                            androidx.preference.PreferenceManager.getDefaultSharedPreferences(root.context)
+                        val showCast = prefs.getBoolean(
+                            root.context.getString(R.string.show_cast_in_details_key),
+                            true
                         )
 
+                        resultCastItems.isGone = !showCast || d.actors.isNullOrEmpty()
+                        (resultCastItems.adapter as? ActorAdaptor)?.submitList(if (showCast) d.actors else emptyList())
+
                         if (d.contentRatingText == null) {
                             // If there is no rating to display, we don't want an empty gap
                             resultMetaContentRating.width = 0
@@ -951,9 +945,7 @@ class ResultFragmentTv : Fragment() {
                         }
                     }
 
-                    is Resource.Loading -> {
-
-                    }
+                    is Resource.Loading -> {}
 
                     is Resource.Failure -> {
                         resultErrorText.text =
@@ -970,4 +962,4 @@ class ResultFragmentTv : Fragment() {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultTrailerPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultTrailerPlayer.kt
index 5253974e83e..3b1471e6ab2 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultTrailerPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultTrailerPlayer.kt
@@ -3,40 +3,76 @@ package com.lagradost.cloudstream3.ui.result
 import android.animation.ValueAnimator
 import android.content.Context
 import android.content.res.Configuration
+import android.os.Build
 import android.os.Bundle
-import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
+import androidx.core.view.ViewCompat
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import com.lagradost.cloudstream3.CommonActivity.screenHeight
 import com.lagradost.cloudstream3.CommonActivity.screenWidth
 import com.lagradost.cloudstream3.LoadResponse
 import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.databinding.FragmentResultSwipeBinding
 import com.lagradost.cloudstream3.ui.player.CSPlayerEvent
+import com.lagradost.cloudstream3.ui.player.CSPlayerLoading
 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
+import com.lagradost.cloudstream3.utils.UIHelper.fixSystemBarsPadding
 
-open class ResultTrailerPlayer : ResultFragmentPhone() {
+class ResultTrailerPlayer : ResultFragmentPhone() {
 
     override var lockRotation = false
     override var isFullScreenPlayer = false
     override var hasPipModeSupport = false
 
     companion object {
-        const val TAG = "RESULT_TRAILER"
+        const val TAG = "ResultTrailerPlayer"
     }
 
     private var playerWidthHeight: Pair<Int, Int>? = null
+    private var introVisible = true
 
-    override fun nextEpisode() {}
+    // Single-tap on empty player area: toggle controls.
+    override fun onSingleTap() {
+        if (introVisible) return
+        if (isShowing) uiReset() else showControls()
+    }
 
-    override fun prevEpisode() {}
+    private fun showControls() {
+        if (introVisible) return
+        isShowing = true
+        updateUIVisibility()
+        playerHostView?.scheduleAutoHide()
+    }
+
+    override fun isUIShowing(): Boolean = isShowing
 
-    override fun playerPositionChanged(position: Long, duration : Long) {}
+    override fun onAutoHideUI() {
+        if (player.getIsPlaying()) uiReset()
+    }
+
+    override fun onHidePlayerUI() = uiReset()
+
+    // When the hold-speedup gesture fires, hide controls so the video is unobstructed.
+    // The speedup button show/hide and speed change are handled by PlayerView.
+    override fun onHoldSpeedUp(show: Boolean) {
+        if (show && isShowing) uiReset()
+    }
+
+    override fun onGestureEnd(hadSwipe: Boolean, wasUiShowing: Boolean) {
+        if (!player.getIsPlaying() && hadSwipe && wasUiShowing && !isShowing) {
+            isShowing = true
+            showControls()
+        } else playerHostView?.scheduleAutoHide()
+    }
 
+    override fun nextEpisode() {}
+    override fun prevEpisode() {}
+    override fun playerPositionChanged(position: Long, duration: Long) {}
     override fun nextMirror() {}
 
     override fun onConfigurationChanged(newConfig: Configuration) {
@@ -46,18 +82,28 @@ open class ResultTrailerPlayer : ResultFragmentPhone() {
     }
 
     private fun fixPlayerSize() {
+        binding?.apply {
+            if (isFullScreenPlayer) {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                    ViewCompat.setOnApplyWindowInsetsListener(root, null)
+                    root.overlay.clear()
+                }
+                root.setPadding(0, 0, 0, 0)
+            } else {
+                fixSystemBarsPadding(root)
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                    ViewCompat.requestApplyInsets(root)
+                }
+            }
+        }
+
         playerWidthHeight?.let { (w, h) ->
-            if(w <= 0 || h <= 0) return@let
+            if (w <= 0 || h <= 0) return@let
 
             val orientation = context?.resources?.configuration?.orientation ?: return
 
-            val sw = if (orientation == Configuration.ORIENTATION_LANDSCAPE) {
-                screenWidth
-            } else {
-                screenHeight
-            }
+            val sw = if (orientation == Configuration.ORIENTATION_LANDSCAPE) screenWidth else screenHeight
 
-            //result_trailer_loading?.isVisible = false
             resultBinding?.resultSmallscreenHolder?.isVisible = !isFullScreenPlayer
             binding?.resultFullscreenHolder?.isVisible = isFullScreenPlayer
 
@@ -65,35 +111,30 @@ open class ResultTrailerPlayer : ResultFragmentPhone() {
 
             resultBinding?.fragmentTrailer?.playerBackground?.apply {
                 isVisible = true
-                layoutParams =
-                    FrameLayout.LayoutParams(
-                        FrameLayout.LayoutParams.MATCH_PARENT,
-                        if (isFullScreenPlayer) FrameLayout.LayoutParams.MATCH_PARENT else to
-                    )
+                layoutParams = FrameLayout.LayoutParams(
+                    FrameLayout.LayoutParams.MATCH_PARENT,
+                    if (isFullScreenPlayer) FrameLayout.LayoutParams.MATCH_PARENT else to
+                )
             }
 
             playerBinding?.playerIntroPlay?.apply {
-                layoutParams =
-                    FrameLayout.LayoutParams(
-                        FrameLayout.LayoutParams.MATCH_PARENT,
-                        resultBinding?.resultTopHolder?.measuredHeight
-                            ?: FrameLayout.LayoutParams.MATCH_PARENT
-                    )
+                layoutParams = FrameLayout.LayoutParams(
+                    FrameLayout.LayoutParams.MATCH_PARENT,
+                    resultBinding?.resultTopHolder?.measuredHeight ?: FrameLayout.LayoutParams.MATCH_PARENT
+                )
             }
 
             if (playerBinding?.playerIntroPlay?.isGone == true) {
                 resultBinding?.resultTopHolder?.apply {
-
                     val anim = ValueAnimator.ofInt(
                         measuredHeight,
                         if (isFullScreenPlayer) ViewGroup.LayoutParams.MATCH_PARENT else to
                     )
-                    anim.addUpdateListener { valueAnimator ->
-                        val `val` = valueAnimator.animatedValue as Int
-                        val layoutParams: ViewGroup.LayoutParams =
-                            layoutParams
-                        layoutParams.height = `val`
-                        setLayoutParams(layoutParams)
+                    anim.addUpdateListener { va ->
+                        val v = va.animatedValue as Int
+                        val lp: ViewGroup.LayoutParams = layoutParams
+                        lp.height = v
+                        layoutParams = lp
                     }
                     anim.duration = 200
                     anim.start()
@@ -102,9 +143,14 @@ open class ResultTrailerPlayer : ResultFragmentPhone() {
         }
     }
 
-    override fun playerDimensionsLoaded(width: Int, height : Int) {
+    override fun playerDimensionsLoaded(width: Int, height: Int) {
         playerWidthHeight = width to height
         fixPlayerSize()
+        // Apply autorotation when fullscreen (lockRotation = true).
+        // PlayerView already set isVerticalOrientation before this callback fires.
+        if (lockRotation) {
+            activity?.requestedOrientation = playerHostView?.dynamicOrientation() ?: return
+        }
     }
 
     override fun showMirrorsDialogue() {}
@@ -114,33 +160,39 @@ open class ResultTrailerPlayer : ResultFragmentPhone() {
         context: Context,
         loadResponse: LoadResponse?,
         dismissCallback: () -> Unit
-    ) {
-    }
+    ) {}
 
     override fun subtitlesChanged() {}
-
     override fun embeddedSubtitlesFetched(subtitles: List<SubtitleData>) {}
     override fun onTracksInfoChanged() {}
-
     override fun exitedPipMode() {}
+
+    override fun onSeekPreviewText(text: String?) {
+        playerBinding?.playerTimeText?.apply {
+            isVisible = text != null
+            if (text != null) this.text = text
+        }
+    }
+
     private fun updateFullscreen(fullscreen: Boolean) {
         isFullScreenPlayer = fullscreen
         lockRotation = fullscreen
+        playerHostView?.isFullScreen = fullscreen
 
-        playerBinding?.playerFullscreen?.setImageResource(if (fullscreen) R.drawable.baseline_fullscreen_exit_24 else R.drawable.baseline_fullscreen_24)
+        playerBinding?.playerFullscreen?.setImageResource(
+            if (fullscreen) R.drawable.baseline_fullscreen_exit_24 else R.drawable.baseline_fullscreen_24
+        )
         if (fullscreen) {
-            enterFullscreen()
+            playerHostView?.enterFullscreen()
             binding?.apply {
                 resultTopBar.isVisible = false
                 resultFullscreenHolder.isVisible = true
                 resultMainHolder.isVisible = false
             }
-
             resultBinding?.fragmentTrailer?.playerBackground?.let { view ->
                 (view.parent as ViewGroup?)?.removeView(view)
                 binding?.resultFullscreenHolder?.addView(view)
             }
-
         } else {
             binding?.apply {
                 resultTopBar.isVisible = true
@@ -151,36 +203,55 @@ open class ResultTrailerPlayer : ResultFragmentPhone() {
                     resultBinding?.resultSmallscreenHolder?.addView(view)
                 }
             }
-            exitFullscreen()
+            playerHostView?.exitFullscreen()
         }
         fixPlayerSize()
         uiReset()
 
         if (isFullScreenPlayer) {
-            activity?.attachBackPressedCallback("ResultTrailerPlayer") {
-                updateFullscreen(false)
-            }
-        } else activity?.detachBackPressedCallback("ResultTrailerPlayer")
+            activity?.attachBackPressedCallback("ResultTrailerPlayer") { updateFullscreen(false) }
+        } else {
+            activity?.detachBackPressedCallback("ResultTrailerPlayer")
+        }
     }
 
     override fun updateUIVisibility() {
         super.updateUIVisibility()
-        playerBinding?.playerGoBackHolder?.isVisible = false
+        playerBinding?.apply {
+            playerGoBackHolder.isVisible = false
+            val controlsVisible = isShowing && !introVisible
+            playerTopHolder.isVisible = controlsVisible
+            playerVideoHolder.isVisible = controlsVisible
+            shadowOverlay.isVisible = controlsVisible
+            playerPausePlayHolderHolder.isVisible =
+                controlsVisible && playerHostView?.currentPlayerStatus != CSPlayerLoading.IsBuffering
+        }
+        // Fade center controls in/out; also resets stale fillAfter alpha from seek animations.
+        playerHostView?.gestureHelper?.animateCenterControls(if (isShowing && !introVisible) 1f else 0f)
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        playerBinding?.playerFullscreen?.setOnClickListener {
-            updateFullscreen(!isFullScreenPlayer)
+    override fun playerStatusChanged() {
+        if (introVisible) {
+            playerBinding?.playerPausePlayHolderHolder?.isVisible = false
         }
+    }
+
+    override fun onBindingCreated(binding: FragmentResultSwipeBinding, savedInstanceState: Bundle?) {
+        super.onBindingCreated(binding, savedInstanceState)
+
+        playerHostView?.videoOutline = playerBinding?.videoOutline
+        playerHostView?.requestUpdateBrightnessOverlayOnNextLayout()
+
+        playerBinding?.playerFullscreen?.setOnClickListener { updateFullscreen(!isFullScreenPlayer) }
         updateFullscreen(isFullScreenPlayer)
         uiReset()
 
         playerBinding?.playerIntroPlay?.setOnClickListener {
             playerBinding?.playerIntroPlay?.isGone = true
+            introVisible = false
             player.handleEvent(CSPlayerEvent.Play, PlayerEventSource.UI)
-            updateUIVisibility()
             fixPlayerSize()
+            showControls()
         }
     }
-}
\ 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 8641c62be45..7dfe3cf5988 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
@@ -1,7 +1,8 @@
 package com.lagradost.cloudstream3.ui.result
 
 import android.app.Activity
-import android.content.*
+import android.content.Context
+import android.content.DialogInterface
 import android.util.Log
 import android.widget.Toast
 import androidx.annotation.MainThread
@@ -10,33 +11,67 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.lagradost.cloudstream3.*
+import com.lagradost.cloudstream3.APIHolder
 import com.lagradost.cloudstream3.APIHolder.apis
 import com.lagradost.cloudstream3.APIHolder.getApiFromNameNull
 import com.lagradost.cloudstream3.APIHolder.unixTime
 import com.lagradost.cloudstream3.APIHolder.unixTimeMS
-import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
+import com.lagradost.cloudstream3.ActorData
+import com.lagradost.cloudstream3.AnimeLoadResponse
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.context
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.setKey
 import com.lagradost.cloudstream3.CommonActivity.activity
 import com.lagradost.cloudstream3.CommonActivity.getCastSession
 import com.lagradost.cloudstream3.CommonActivity.showToast
+import com.lagradost.cloudstream3.DubStatus
+import com.lagradost.cloudstream3.EpisodeResponse
+import com.lagradost.cloudstream3.IDownloadableMinimum
+import com.lagradost.cloudstream3.LiveStreamLoadResponse
+import com.lagradost.cloudstream3.LoadResponse
 import com.lagradost.cloudstream3.LoadResponse.Companion.addTrailer
 import com.lagradost.cloudstream3.LoadResponse.Companion.getAniListId
+import com.lagradost.cloudstream3.LoadResponse.Companion.getKitsuId
 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
+import com.lagradost.cloudstream3.MovieLoadResponse
+import com.lagradost.cloudstream3.ProviderType
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.Score
+import com.lagradost.cloudstream3.SearchResponse
+import com.lagradost.cloudstream3.SeasonData
+import com.lagradost.cloudstream3.ShowStatus
+import com.lagradost.cloudstream3.SimklSyncServices
+import com.lagradost.cloudstream3.SubtitleFile
+import com.lagradost.cloudstream3.TorrentLoadResponse
+import com.lagradost.cloudstream3.TrackerType
+import com.lagradost.cloudstream3.TrailerData
+import com.lagradost.cloudstream3.TvSeriesLoadResponse
+import com.lagradost.cloudstream3.TvType
+import com.lagradost.cloudstream3.VPNStatus
 import com.lagradost.cloudstream3.actions.AlwaysAskAction
 import com.lagradost.cloudstream3.actions.VideoClickActionHolder
+import com.lagradost.cloudstream3.amap
+import com.lagradost.cloudstream3.isEpisodeBased
+import com.lagradost.cloudstream3.isLiveStream
 import com.lagradost.cloudstream3.metaproviders.SyncRedirector
-import com.lagradost.cloudstream3.mvvm.*
+import com.lagradost.cloudstream3.mvvm.Resource
+import com.lagradost.cloudstream3.mvvm.debugAssert
+import com.lagradost.cloudstream3.mvvm.debugException
+import com.lagradost.cloudstream3.mvvm.launchSafe
+import com.lagradost.cloudstream3.mvvm.logError
+import com.lagradost.cloudstream3.mvvm.safe
+import com.lagradost.cloudstream3.mvvm.safeApiCall
+import com.lagradost.cloudstream3.runAllAsync
+import com.lagradost.cloudstream3.sortUrls
 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.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_ALL
 import com.lagradost.cloudstream3.ui.player.LOADTYPE_CHROMECAST
 import com.lagradost.cloudstream3.ui.player.LOADTYPE_INAPP
@@ -44,8 +79,6 @@ 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.isConnectedToChromecast
 import com.lagradost.cloudstream3.utils.AppContextUtils.setDefaultFocus
@@ -55,7 +88,13 @@ 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.DOWNLOAD_HEADER_CACHE
+import com.lagradost.cloudstream3.utils.DataStore
+import com.lagradost.cloudstream3.utils.DataStore.editor
+import com.lagradost.cloudstream3.utils.DataStore.getFolderName
 import com.lagradost.cloudstream3.utils.DataStore.setKey
+import com.lagradost.cloudstream3.utils.DataStoreHelper
+import com.lagradost.cloudstream3.utils.DataStoreHelper.currentAccount
 import com.lagradost.cloudstream3.utils.DataStoreHelper.deleteBookmarkedData
 import com.lagradost.cloudstream3.utils.DataStoreHelper.getAllBookmarkedData
 import com.lagradost.cloudstream3.utils.DataStoreHelper.getAllFavorites
@@ -81,8 +120,30 @@ 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.Editor
+import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.ExtractorLinkType
+import com.lagradost.cloudstream3.utils.FillerEpisodeCheck
+import com.lagradost.cloudstream3.utils.INFER_TYPE
+import com.lagradost.cloudstream3.utils.Qualities
 import com.lagradost.cloudstream3.utils.UIHelper.navigate
-import kotlinx.coroutines.*
+import com.lagradost.cloudstream3.utils.UiText
+import com.lagradost.cloudstream3.utils.VIDEO_WATCH_STATE
+import com.lagradost.cloudstream3.utils.downloader.DownloadFileManagement.sanitizeFilename
+import com.lagradost.cloudstream3.utils.downloader.DownloadObjects
+import com.lagradost.cloudstream3.utils.downloader.DownloadQueueManager
+import com.lagradost.cloudstream3.utils.downloader.DownloadUtils.downloadSubtitle
+import com.lagradost.cloudstream3.utils.loadExtractor
+import com.lagradost.cloudstream3.utils.newExtractorLink
+import com.lagradost.cloudstream3.utils.txt
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.cancelChildren
+import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.isActive
+import kotlinx.coroutines.job
+import kotlinx.coroutines.launch
 import java.util.concurrent.TimeUnit
 
 /** This starts at 1 */
@@ -115,6 +176,7 @@ data class ResultData(
 
     val posterImage: String?,
     val posterBackgroundImage: String?,
+    val logoUrl: String?,
     val plotText: UiText,
     val apiName: UiText,
     val ratingText: UiText?,
@@ -240,6 +302,7 @@ fun LoadResponse.toResultData(repo: APIRepository): ResultData {
                 plot!!
             ),
         backgroundPosterUrl = backgroundPosterUrl,
+        logoUrl = logoUrl,
         title = name,
         typeText = txt(
             when (type) {
@@ -255,17 +318,18 @@ fun LoadResponse.toResultData(repo: APIRepository): ResultData {
                 TvType.Live -> R.string.live_singular
                 TvType.Others -> R.string.other_singular
                 TvType.NSFW -> R.string.nsfw_singular
-                TvType.Music -> R.string.music_singlar
+                TvType.Music -> R.string.music_singular
                 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
+                TvType.CustomMedia -> R.string.custom_media_singular
+                TvType.Audio -> R.string.audio_singular
+                TvType.Podcast -> R.string.podcast_singular
+                TvType.Video -> R.string.video_singular
             }
         ),
         yearText = txt(year?.toString()),
         apiName = txt(apiName),
-        ratingText = rating?.div(1000f)
-            ?.let { if (it <= 0.1f) null else txt(R.string.rating_format, it) },
+        ratingText = score?.toStringNull(0.1, 10, 1, false, '.')
+            ?.let { txt(R.string.rating_format, it) },
         contentRatingText = txt(contentRating),
         vpnText = txt(
             when (repo.vpnStatus) {
@@ -333,6 +397,7 @@ data class ResumeWatchingStatus(
 data class LinkLoadingResult(
     val links: List<ExtractorLink>,
     val subs: List<SubtitleData>,
+    val syncData: HashMap<String, String>
 )
 
 sealed class SelectPopup {
@@ -383,7 +448,7 @@ fun SelectPopup.getOptions(context: Context): List<String> {
 }
 
 data class ExtractedTrailerData(
-    var mirros: List<ExtractorLink>,
+    var mirros: List<Pair<ExtractorLink, String>>,//Pair of extracted trailer link and original trailer link
     var subtitles: List<SubtitleFile> = emptyList(),
 )
 
@@ -413,8 +478,8 @@ class ResultViewModel2 : ViewModel() {
     private var currentShowFillers: Boolean = false
     var currentRepo: APIRepository? = null
     private var currentId: Int? = null
-    private var fillers: Map<Int, Boolean> = emptyMap()
-    private var generator: IGenerator? = null
+    private var fillers: HashSet<Int> = hashSetOf()
+    private var generator: RepoLinkGenerator? = null
     private var preferDubStatus: DubStatus? = null
     private var preferStartEpisode: Int? = null
     private var preferStartSeason: Int? = null
@@ -518,6 +583,29 @@ class ResultViewModel2 : ViewModel() {
             return this?.firstOrNull { it.season == season }
         }
 
+        fun seasonToTxt(seasonData: SeasonData?, season: Int?): UiText? {
+            if (season == 0) {
+                return txt(R.string.no_season)
+            }
+
+            // If displaySeason is null then only show the name!
+            return if (seasonData?.name != null && seasonData.displaySeason == null) {
+                txt(seasonData.name)
+            } else {
+                val suffix = seasonData?.name?.let { " $it" } ?: ""
+                txt(
+                    R.string.season_format,
+                    txt(R.string.season),
+                    seasonData?.displaySeason ?: season,
+                    suffix
+                )
+            }
+        }
+
+        private fun List<SeasonData>?.getSeasonTxt(season: Int?): UiText? =
+            seasonToTxt(getSeason(season), season)
+
+
         private fun filterName(name: String?): String? {
             if (name == null) return null
             Regex("^[eE]pisode [0-9]*(.*)").find(name)?.groupValues?.get(1)?.let {
@@ -636,226 +724,6 @@ class ResultViewModel2 : ViewModel() {
                 index to list
             }.toMap()
         }
-
-        private fun downloadSubtitle(
-            context: Context?,
-            link: ExtractorSubtitleLink,
-            fileName: String,
-            folder: String
-        ) {
-            ioSafe {
-                VideoDownloadManager.downloadThing(
-                    context ?: return@ioSafe,
-                    link,
-                    "$fileName ${link.name}",
-                    folder,
-                    if (link.url.contains(".srt")) "srt" else "vtt",
-                    false,
-                    null, createNotificationCallback = {}
-                )
-            }
-        }
-
-        private fun getFolder(currentType: TvType, titleName: String): String {
-            return if (currentType.isEpisodeBased()) {
-                val sanitizedFileName = VideoDownloadManager.sanitizeFilename(titleName)
-                "${currentType.getFolderPrefix()}/$sanitizedFileName"
-            } else currentType.getFolderPrefix()
-        }
-
-        private fun downloadSubtitle(
-            context: Context?,
-            link: SubtitleData,
-            meta: VideoDownloadManager.DownloadEpisodeMetadata,
-        ) {
-            context?.let { ctx ->
-                val fileName = VideoDownloadManager.getFileName(ctx, meta)
-                val folder = getFolder(meta.type ?: return, meta.mainName)
-                downloadSubtitle(
-                    ctx,
-                    ExtractorSubtitleLink(link.name, link.url, ""),
-                    fileName,
-                    folder
-                )
-            }
-        }
-
-        fun startDownload(
-            context: Context?,
-            episode: ResultEpisode,
-            currentIsMovie: Boolean,
-            currentHeaderName: String,
-            currentType: TvType,
-            currentPoster: String?,
-            apiName: String,
-            parentId: Int,
-            url: String,
-            links: List<ExtractorLink>,
-            subs: List<SubtitleData>?
-        ) {
-            try {
-                if (context == null) return
-
-                val meta =
-                    getMeta(
-                        episode,
-                        currentHeaderName,
-                        apiName,
-                        currentPoster,
-                        currentIsMovie,
-                        currentType
-                    )
-
-                val folder = getFolder(currentType, currentHeaderName)
-
-                val src = "$DOWNLOAD_NAVIGATE_TO/$parentId" // url ?: return@let
-
-                // SET VISUAL KEYS
-                setKey(
-                    DOWNLOAD_HEADER_CACHE,
-                    parentId.toString(),
-                    VideoDownloadHelper.DownloadHeaderCached(
-                        apiName = apiName,
-                        url = url,
-                        type = currentType,
-                        name = currentHeaderName,
-                        poster = currentPoster,
-                        id = parentId,
-                        cacheTime = System.currentTimeMillis(),
-                    )
-                )
-
-                setKey(
-                    DataStore.getFolderName(
-                        DOWNLOAD_EPISODE_CACHE,
-                        parentId.toString()
-                    ), // 3 deep folder for faster acess
-                    episode.id.toString(),
-                    VideoDownloadHelper.DownloadEpisodeCached(
-                        name = episode.name,
-                        poster = episode.poster,
-                        episode = episode.episode,
-                        season = episode.season,
-                        id = episode.id,
-                        parentId = parentId,
-                        rating = episode.rating,
-                        description = episode.description,
-                        cacheTime = System.currentTimeMillis(),
-                    )
-                )
-
-                // DOWNLOAD VIDEO
-                VideoDownloadManager.downloadEpisodeUsingWorker(
-                    context,
-                    src,//url ?: return,
-                    folder,
-                    meta,
-                    links
-                )
-
-                // 1. Checks if the lang should be downloaded
-                // 2. Makes it into the download format
-                // 3. Downloads it as a .vtt file
-                val downloadList = SubtitlesFragment.getDownloadSubsLanguageISO639_1()
-                subs?.let { subsList ->
-                    subsList.filter {
-                        downloadList.contains(
-                            SubtitleHelper.fromLanguageToTwoLetters(
-                                it.name,
-                                true
-                            )
-                        )
-                    }
-                        .map { ExtractorSubtitleLink(it.name, it.url, "") }.take(3)
-                        .forEach { link ->
-                            val fileName = VideoDownloadManager.getFileName(context, meta)
-                            downloadSubtitle(context, link, fileName, folder)
-                        }
-                }
-            } catch (e: Exception) {
-                logError(e)
-            }
-        }
-
-        suspend fun downloadEpisode(
-            activity: Activity?,
-            episode: ResultEpisode,
-            currentIsMovie: Boolean,
-            currentHeaderName: String,
-            currentType: TvType,
-            currentPoster: String?,
-            apiName: String,
-            parentId: Int,
-            url: String,
-        ) {
-            ioSafe {
-                val generator = RepoLinkGenerator(listOf(episode))
-                val currentLinks = mutableSetOf<ExtractorLink>()
-                val currentSubs = mutableSetOf<SubtitleData>()
-                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 {
-                        showToast(
-                            R.string.no_links_found_toast,
-                            Toast.LENGTH_SHORT
-                        )
-                    }
-                    return@ioSafe
-                } else {
-                    main {
-                        showToast(
-                            R.string.download_started,
-                            Toast.LENGTH_SHORT
-                        )
-                    }
-                }
-
-                startDownload(
-                    activity,
-                    episode,
-                    currentIsMovie,
-                    currentHeaderName,
-                    currentType,
-                    currentPoster,
-                    apiName,
-                    parentId,
-                    url,
-                    sortUrls(currentLinks),
-                    sortSubs(currentSubs),
-                )
-            }
-        }
-
-        private fun getMeta(
-            episode: ResultEpisode,
-            titleName: String,
-            apiName: String,
-            currentPoster: String?,
-            currentIsMovie: Boolean,
-            tvType: TvType,
-        ): VideoDownloadManager.DownloadEpisodeMetadata {
-            return VideoDownloadManager.DownloadEpisodeMetadata(
-                episode.id,
-                VideoDownloadManager.sanitizeFilename(titleName),
-                apiName,
-                episode.poster ?: currentPoster,
-                episode.name,
-                if (currentIsMovie) null else episode.season,
-                if (currentIsMovie) null else episode.episode,
-                tvType,
-            )
-        }
     }
 
     private val _watchStatus: MutableLiveData<WatchType> = MutableLiveData(WatchType.NONE)
@@ -925,7 +793,7 @@ class ResultViewModel2 : ViewModel() {
                         response.syncData,
                         plot = response.plot,
                         tags = response.tags,
-                        rating = response.rating
+                        score = response.score
                     )
                 )
             }
@@ -1022,7 +890,7 @@ class ResultViewModel2 : ViewModel() {
                         response.year,
                         response.syncData,
                         plot = response.plot,
-                        rating = response.rating,
+                        score = response.score,
                         tags = response.tags
                     )
                 )
@@ -1034,6 +902,28 @@ class ResultViewModel2 : ViewModel() {
         }
     }
 
+    private fun getMeta(
+        episode: ResultEpisode,
+        titleName: String,
+        apiName: String,
+        currentPoster: String?,
+        currentIsMovie: Boolean,
+        tvType: TvType,
+    ): DownloadObjects.DownloadEpisodeMetadata {
+        return DownloadObjects.DownloadEpisodeMetadata(
+            episode.id,
+            episode.parentId,
+            sanitizeFilename(titleName),
+            apiName,
+            episode.poster ?: currentPoster,
+            episode.name,
+            if (currentIsMovie) null else episode.season,
+            if (currentIsMovie) null else episode.episode,
+            tvType,
+        )
+    }
+
+
     /**
      * Toggles the favorite status of an item.
      *
@@ -1093,7 +983,7 @@ class ResultViewModel2 : ViewModel() {
                         response.year,
                         response.syncData,
                         plot = response.plot,
-                        rating = response.rating,
+                        score = response.score,
                         tags = response.tags
                     )
                 )
@@ -1337,7 +1227,7 @@ class ResultViewModel2 : ViewModel() {
         // TODO Add skip loading here
         loadLinks(result, isVisible = true, sourceTypes, isCasting = isCasting) { links ->
             // Could not find a better way to do this
-            //val context = AcraApplication.context
+            //val context = CloudStreamApp.context
             postPopup(
                 text,
                 links.links.map { txt("${it.name} ${Qualities.getStringByInt(it.quality)}") }
@@ -1391,7 +1281,7 @@ class ResultViewModel2 : ViewModel() {
             updatePage()
             tempGenerator.generateLinks(
                 clearCache,
-                allowedTypes = sourceTypes,
+                sourceTypes = sourceTypes,
                 callback = { (link, _) ->
                     if (link != null) {
                         links += link
@@ -1402,9 +1292,10 @@ class ResultViewModel2 : ViewModel() {
                     subs += sub
                     updatePage()
                 },
-                isCasting = isCasting
+                isCasting = isCasting,
+                offset = 0
             )
-        } catch (e : CancellationException) {
+        } catch (_: CancellationException) {
             // Do nothing
         } catch (e: Exception) {
             logError(e)
@@ -1412,7 +1303,11 @@ class ResultViewModel2 : ViewModel() {
             _loadedLinks.postValue(null)
         }
 
-        return LinkLoadingResult(sortUrls(links), sortSubs(subs))
+        return LinkLoadingResult(
+            sortUrls(links),
+            sortSubs(subs),
+            HashMap(currentResponse?.syncData ?: emptyMap())
+        )
     }
 
     fun handleAction(click: EpisodeClickEvent) =
@@ -1424,6 +1319,40 @@ class ResultViewModel2 : ViewModel() {
         _episodeSynopsis.postValue(null)
     }
 
+    private fun markEpisodes(
+        editor: Editor,
+        episodeIds: Array<String>,
+        watchState: VideoWatchState
+    ) {
+        val watchStateString = DataStore.mapper.writeValueAsString(watchState)
+        episodeIds.forEach {
+            if (getVideoWatchState(it.toInt()) != watchState) {
+                editor.setKeyRaw(
+                    getFolderName("$currentAccount/$VIDEO_WATCH_STATE", it),
+                    watchStateString
+                )
+            }
+        }
+    }
+
+    private fun getEpisodesIdsBySeason(season: Int): HashMap<Int, Array<String>> {
+        val result = currentEpisodes.entries
+            .asSequence()
+            .filter { it.key.season <= season && it.key.dubStatus == preferDubStatus }
+            .flatMap { entry ->
+                entry.value.asSequence().map { entry.key.season to it.id.toString() }
+            }
+            .groupBy({ it.first }, { it.second })
+            .mapValues { (_, ids) -> ids.toTypedArray() }
+            .toMap(HashMap())
+
+        if (season != 0) {
+            result.remove(0)
+        }
+        return result
+    }
+
+
     private suspend fun handleEpisodeClickEvent(click: EpisodeClickEvent) {
         when (click.action) {
             ACTION_SHOW_OPTIONS -> {
@@ -1439,7 +1368,6 @@ class ResultViewModel2 : ViewModel() {
                 }
 
                 options.add(txt(R.string.episode_action_play_in_app) to ACTION_PLAY_EPISODE_IN_PLAYER)
-
                 options.addAll(
                     listOf(
                         txt(R.string.episode_action_auto_download) to ACTION_DOWNLOAD_EPISODE,
@@ -1461,9 +1389,14 @@ class ResultViewModel2 : ViewModel() {
                     val watchedText = if (isWatched) R.string.action_remove_from_watched
                     else R.string.action_mark_as_watched
 
+                    val markUpToText =
+                        if (isWatched) R.string.action_remove_mark_watched_up_to_this_episode
+                        else R.string.action_mark_watched_up_to_this_episode
+
                     options.add(txt(watchedText) to ACTION_MARK_AS_WATCHED)
-                }
 
+                    options.add(txt(markUpToText) to ACTION_MARK_WATCHED_UP_TO_THIS_EPISODE)
+                }
                 postPopup(
                     txt(
                         activity?.getNameFull(
@@ -1537,16 +1470,17 @@ class ResultViewModel2 : ViewModel() {
 
             ACTION_DOWNLOAD_EPISODE -> {
                 val response = currentResponse ?: return
-                downloadEpisode(
-                    activity,
-                    click.data,
-                    response.isMovie(),
-                    response.name,
-                    response.type,
-                    response.posterUrl,
-                    response.apiName,
-                    response.getId(),
-                    response.url
+                DownloadQueueManager.addToQueue(
+                    DownloadObjects.DownloadQueueItem(
+                        click.data,
+                        response.isMovie(),
+                        response.name,
+                        response.type,
+                        response.posterUrl,
+                        response.apiName,
+                        response.getId(),
+                        response.url,
+                    ).toWrapper()
                 )
             }
 
@@ -1557,9 +1491,8 @@ class ResultViewModel2 : ViewModel() {
                     LOADTYPE_INAPP_DOWNLOAD,
                     txt(R.string.episode_action_download_mirror)
                 ) { (result, index) ->
-                    ioSafe {
-                        startDownload(
-                            activity,
+                    DownloadQueueManager.addToQueue(
+                        DownloadObjects.DownloadQueueItem(
                             click.data,
                             response.isMovie(),
                             response.name,
@@ -1570,8 +1503,8 @@ class ResultViewModel2 : ViewModel() {
                             response.url,
                             listOf(result.links[index]),
                             result.subs,
-                        )
-                    }
+                        ).toWrapper()
+                    )
                     showToast(
                         R.string.download_started,
                         Toast.LENGTH_SHORT
@@ -1610,28 +1543,25 @@ class ResultViewModel2 : ViewModel() {
             }
 
             ACTION_PLAY_EPISODE_IN_PLAYER -> {
-                val data = currentResponse?.syncData?.toList() ?: emptyList()
-                val list =
-                    HashMap<String, String>().apply { putAll(data) }
-                generator?.also {
-                    it.getAll() // I know kinda shit to iterate all, but it is 100% sure to work
-                        ?.indexOfFirst { value -> value is ResultEpisode && value.id == click.data.id }
-                        ?.let { index ->
-                            if (index >= 0)
-                                it.goto(index)
-                        }
-                }
+                val list = HashMap<String, String>(currentResponse?.syncData ?: emptyMap())
+                val generator = generator ?: return
+
+                // I know kinda shit to iterate all, but it is 100% sure to work
+                val index = generator.videos.indexOfFirst { value -> value.id == click.data.id }
+
                 if (currentResponse?.type == TvType.CustomMedia) {
-                    generator?.generateLinks(
+                    generator.generateLinks(
+                        offset = index,
                         clearCache = true,
-                        LOADTYPE_ALL,
+                        isCasting = false,
+                        sourceTypes = LOADTYPE_ALL,
                         callback = {},
                         subtitleCallback = {})
                 } else {
                     activity?.navigate(
                         R.id.global_to_navigation_player,
                         GeneratorPlayer.newInstance(
-                            generator ?: return, list
+                            generator, index,list
                         )
                     )
                 }
@@ -1640,17 +1570,37 @@ class ResultViewModel2 : ViewModel() {
             ACTION_MARK_AS_WATCHED -> {
                 val isWatched =
                     getVideoWatchState(click.data.id) == VideoWatchState.Watched
-
                 if (isWatched) {
                     setVideoWatchState(click.data.id, VideoWatchState.None)
                 } else {
                     setVideoWatchState(click.data.id, VideoWatchState.Watched)
                 }
-
                 // Kinda dirty to reload all episodes :(
                 reloadEpisodes()
             }
 
+            ACTION_MARK_WATCHED_UP_TO_THIS_EPISODE -> ioSafe {
+                val editor = context?.let { it1 -> editor(it1, false) }
+
+                if (editor != null) {
+                    val (clickSeason, clickEpisode) = click.data.let {
+                        (it.season ?: 0) to it.episode
+                    }
+                    val watchState =
+                        if (getVideoWatchState(click.data.id) == VideoWatchState.Watched) VideoWatchState.None else VideoWatchState.Watched
+                    val seasons = getEpisodesIdsBySeason(clickSeason)
+
+                    seasons.keys.forEach { currentSeason ->
+                        var episodeIds = seasons[currentSeason] ?: emptyArray()
+                        if (currentSeason == clickSeason) episodeIds =
+                            episodeIds.sliceArray(0 until clickEpisode)
+                        markEpisodes(editor, episodeIds, watchState)
+                    }
+                    editor.apply()
+                    reloadEpisodes()
+                }
+            }
+
             else -> {
                 val action = VideoClickActionHolder.getActionById(click.action) ?: return
 
@@ -1660,13 +1610,14 @@ class ResultViewModel2 : ViewModel() {
                         // Show player selection dialog
                         val players = VideoClickActionHolder.getPlayers(ctx)
                         val options = mutableListOf<Pair<UiText, Int>>()
-                        
+
                         // Add internal player option
                         options.add(txt(R.string.episode_action_play_in_app) to ACTION_PLAY_EPISODE_IN_PLAYER)
-                        
+
                         // Add external player options 
                         options.addAll(players.filter { it !is AlwaysAskAction }.map { player ->
-                            player.name to (VideoClickActionHolder.uniqueIdToId(player.uniqueId()) ?: ACTION_PLAY_EPISODE_IN_PLAYER)
+                            player.name to (VideoClickActionHolder.uniqueIdToId(player.uniqueId())
+                                ?: ACTION_PLAY_EPISODE_IN_PLAYER)
                         })
 
                         postPopup(
@@ -1723,7 +1674,7 @@ class ResultViewModel2 : ViewModel() {
 
             if (meta != null) {
                 duration = duration ?: meta.duration
-                rating = rating ?: meta.publicScore
+                score = score ?: meta.publicScore
                 tags = tags ?: meta.genres
                 plot = if (plot.isNullOrBlank()) meta.synopsis else plot
                 posterUrl = posterUrl ?: meta.posterUrl ?: meta.backgroundPosterUrl
@@ -1760,7 +1711,7 @@ class ResultViewModel2 : ViewModel() {
                 {
                     if (this !is AnimeLoadResponse) return@runAllAsync
                     // already exist, no need to run getTracker
-                    if (this.getAniListId() != null && this.getMalId() != null) return@runAllAsync
+                    if (this.getAniListId() != null && this.getKitsuId() != null && this.getMalId() != null) return@runAllAsync
 
                     val res = APIHolder.getTracker(
                         listOfNotNull(
@@ -1778,9 +1729,12 @@ class ResultViewModel2 : ViewModel() {
                         this.year
                     )
 
+                    val kitsuId = AccountManager.kitsuApi.getAnimeIdByTitle(this.name)
+
                     val ids = arrayOf(
                         AccountManager.malApi.idPrefix to res?.malId?.toString(),
-                        AccountManager.aniListApi.idPrefix to res?.aniId
+                        AccountManager.aniListApi.idPrefix to res?.aniId,
+                        AccountManager.kitsuApi.idPrefix to kitsuId
                     )
 
                     if (ids.any { (id, new) ->
@@ -1802,6 +1756,7 @@ class ResultViewModel2 : ViewModel() {
                     // set posters, might fuck up due to headers idk
                     posterUrl = posterUrl ?: res?.image
                     backgroundPosterUrl = backgroundPosterUrl ?: res?.cover
+                    logoUrl = logoUrl
                 },
                 {
                     if (meta == null) return@runAllAsync
@@ -1876,11 +1831,10 @@ class ResultViewModel2 : ViewModel() {
     }
 
 
-    private suspend fun updateFillers(name: String) {
-        fillers =
-            ioWorkSafe {
-                FillerEpisodeCheck.getFillerEpisodes(name)
-            } ?: emptyMap()
+    private suspend fun updateFillers(data: LoadResponse) {
+        fillers = ioWorkSafe {
+            FillerEpisodeCheck.getFillerEpisodes(data)
+        } ?: hashSetOf()
     }
 
     fun changeDubStatus(status: DubStatus) {
@@ -1942,8 +1896,11 @@ class ResultViewModel2 : ViewModel() {
         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.RATING_HIGH_LOW -> episodes.sortedByDescending {
+                it.score?.toDouble() ?: 0.0
+            }
+
+            EpisodeSortType.RATING_LOW_HIGH -> episodes.sortedBy { it.score?.toDouble() ?: 0.0 }
             EpisodeSortType.DATE_NEWEST -> episodes.sortedByDescending { it.airDate }
             EpisodeSortType.DATE_OLDEST -> episodes.sortedBy { it.airDate }
         }
@@ -1961,6 +1918,7 @@ class ResultViewModel2 : ViewModel() {
         val text = txt(
             when (response.type) {
                 TvType.Torrent -> R.string.play_torrent_button
+                TvType.TvSeries -> R.string.play_full_series_button
                 else -> {
                     if (response.type.isLiveStream())
                         R.string.play_livestream_button
@@ -2022,7 +1980,7 @@ class ResultViewModel2 : ViewModel() {
         return when (type) {
             EpisodeSortType.NUMBER_ASC, EpisodeSortType.NUMBER_DESC -> true
             EpisodeSortType.RATING_HIGH_LOW, EpisodeSortType.RATING_LOW_HIGH ->
-                episodes.any { it.rating != null }
+                episodes.any { it.score != null }
 
             EpisodeSortType.DATE_NEWEST, EpisodeSortType.DATE_OLDEST ->
                 episodes.any { it.airDate != null }
@@ -2076,29 +2034,8 @@ class ResultViewModel2 : ViewModel() {
         )
 
         _selectedSeason.postValue(
-
             if (isMovie || currentSeasons.size <= 1) null else
-                when (indexer.season) {
-                    0 -> txt(R.string.no_season)
-                    else -> {
-                        val seasonNames = (currentResponse as? EpisodeResponse)?.seasonNames
-                        val seasonData = seasonNames.getSeason(indexer.season)
-
-                        // If displaySeason is null then only show the name!
-                        if (seasonData?.name != null && seasonData.displaySeason == null) {
-                            txt(seasonData.name)
-                        } else {
-                            val suffix = seasonData?.name?.let { " $it" } ?: ""
-                            txt(
-                                R.string.season_format,
-                                txt(R.string.season),
-                                seasonData?.displaySeason ?: indexer.season,
-                                suffix
-                            )
-                        }
-                    }
-                }
-
+                (currentResponse as? EpisodeResponse)?.seasonNames.getSeasonTxt(indexer.season)
         )
 
         _selectedRangeIndex.postValue(
@@ -2234,8 +2171,8 @@ class ResultViewModel2 : ViewModel() {
     ) {
         _episodes.postValue(Resource.Loading())
 
-        if (updateFillers && loadResponse is AnimeLoadResponse) {
-            updateFillers(loadResponse.name)
+        if (updateFillers) {
+            updateFillers(loadResponse)
         }
 
         val allEpisodes = when (loadResponse) {
@@ -2268,20 +2205,21 @@ class ResultViewModel2 : ViewModel() {
                                     filterName(i.name),
                                     i.posterUrl,
                                     episode,
-                                    seasonData?.season ?: i.season,
+                                    i.season,
                                     if (seasonData != null) seasonData.displaySeason else i.season,
                                     i.data,
                                     loadResponse.apiName,
                                     id,
                                     index,
-                                    i.rating,
+                                    i.score,
                                     i.description,
-                                    fillers.getOrDefault(episode, false),
+                                    fillers.contains(episode),
                                     loadResponse.type,
                                     mainId,
                                     totalIndex,
                                     airDate = i.date,
                                     runTime = i.runTime,
+                                    seasonData = seasonData,
                                 )
 
                             val season = eps.seasonIndex ?: 0
@@ -2324,13 +2262,13 @@ class ResultViewModel2 : ViewModel() {
                                 filterName(episode.name),
                                 episode.posterUrl,
                                 episodeIndex,
-                                seasonData?.season ?: episode.season,
+                                episode.season,
                                 if (seasonData != null) seasonData.displaySeason else episode.season,
                                 episode.data,
                                 loadResponse.apiName,
                                 id,
                                 index,
-                                episode.rating,
+                                episode.score,
                                 episode.description,
                                 null,
                                 loadResponse.type,
@@ -2338,6 +2276,7 @@ class ResultViewModel2 : ViewModel() {
                                 totalIndex,
                                 airDate = episode.date,
                                 runTime = episode.runTime,
+                                seasonData = seasonData,
                             )
 
                         val season = ep.seasonIndex ?: 0
@@ -2436,21 +2375,7 @@ class ResultViewModel2 : ViewModel() {
         _dubSubSelections.postValue(dubSelection.map { txt(it) to it })
         if (loadResponse is EpisodeResponse) {
             _seasonSelections.postValue(seasonsSelection.map { seasonNumber ->
-                val seasonData = loadResponse.seasonNames.getSeason(seasonNumber)
-                val fixedSeasonNumber = seasonData?.displaySeason ?: seasonNumber
-                val suffix = seasonData?.name?.let { " $it" } ?: ""
-                // If displaySeason is null then only show the name!
-                val name = if (seasonData?.name != null && seasonData.displaySeason == null) {
-                    txt(seasonData.name)
-                } else {
-                    txt(
-                        R.string.season_format,
-                        txt(R.string.season),
-                        fixedSeasonNumber,
-                        suffix
-                    )
-                }
-                name to seasonNumber
+                loadResponse.seasonNames.getSeasonTxt(seasonNumber) to seasonNumber
             })
         }
 
@@ -2528,25 +2453,34 @@ class ResultViewModel2 : ViewModel() {
             loadResponse.trailers.windowed(limit, limit, true).takeWhile { list ->
                 list.amap { trailerData ->
                     try {
-                        val links = arrayListOf<ExtractorLink>()
+                        val links = arrayListOf<Pair<ExtractorLink, String>>()
                         val subs = arrayListOf<SubtitleFile>()
                         if (!loadExtractor(
                                 trailerData.extractorUrl,
                                 trailerData.referer,
                                 { subs.add(it) },
-                                { links.add(it) }) && trailerData.raw
+                                {
+                                    links.add(
+                                        Pair(
+                                            it,
+                                            trailerData.extractorUrl
+                                        )
+                                    )
+                                }) && trailerData.raw
                         ) {
                             arrayListOf(
-                                newExtractorLink(
-                                    "",
-                                    "Trailer",
-                                    trailerData.extractorUrl,
-                                    type = INFER_TYPE
-                                ) {
-                                    this.referer = trailerData.referer ?: ""
-                                    this.quality = Qualities.Unknown.value
-                                    this.headers = trailerData.headers
-                                }
+                                Pair(
+                                    newExtractorLink(
+                                        "",
+                                        "Trailer",
+                                        trailerData.extractorUrl,
+                                        type = INFER_TYPE
+                                    ) {
+                                        this.referer = trailerData.referer ?: ""
+                                        this.quality = Qualities.Unknown.value
+                                        this.headers = trailerData.headers
+                                    }, trailerData.extractorUrl
+                                )
                             ) to arrayListOf()
                         } else {
                             links to subs
@@ -2620,7 +2554,7 @@ class ResultViewModel2 : ViewModel() {
         override var posterUrl: String?,
         override var year: Int? = null,
         override var plot: String? = null,
-        override var rating: Int? = null,
+        override var score: Score? = null,
         override var tags: List<String>? = null,
         override var duration: Int? = null,
         override var trailers: MutableList<TrailerData> = mutableListOf(),
@@ -2630,6 +2564,7 @@ class ResultViewModel2 : ViewModel() {
         override var syncData: MutableMap<String, String> = mutableMapOf(),
         override var posterHeaders: Map<String, String>? = null,
         override var backgroundPosterUrl: String? = null,
+        override var logoUrl: String? = null,
         override var contentRating: String? = null,
         override var uniqueUrl: String = url,
         val id: Int?,
@@ -2654,12 +2589,12 @@ class ResultViewModel2 : ViewModel() {
         ).apply {
             if (searchResponse is SyncAPI.LibraryItem) {
                 this.plot = searchResponse.plot
-                this.rating = searchResponse.personalRating?.times(100) ?: searchResponse.rating
+                this.score = searchResponse.personalRating ?: searchResponse.score
                 this.tags = searchResponse.tags
             }
             if (searchResponse is DataStoreHelper.BookmarkedData) {
                 this.plot = searchResponse.plot
-                this.rating = searchResponse.rating
+                this.score = searchResponse.score
                 this.tags = searchResponse.tags
             }
         }
@@ -2743,7 +2678,7 @@ class ResultViewModel2 : ViewModel() {
                     setKey(
                         DOWNLOAD_HEADER_CACHE,
                         mainId.toString(),
-                        VideoDownloadHelper.DownloadHeaderCached(
+                        DownloadObjects.DownloadHeaderCached(
                             apiName = apiName,
                             url = validUrl,
                             type = loadResponse.type,
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 ad5d89d18e5..4231819dd25 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
@@ -2,10 +2,11 @@ package com.lagradost.cloudstream3.ui.result
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
-import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView
-import com.google.android.material.button.MaterialButton
 import com.lagradost.cloudstream3.databinding.ResultSelectionBinding
+import com.lagradost.cloudstream3.ui.BaseDiffCallback
+import com.lagradost.cloudstream3.ui.NoStateAdapter
+import com.lagradost.cloudstream3.ui.ViewHolderState
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
 import com.lagradost.cloudstream3.utils.UiText
@@ -13,93 +14,56 @@ import com.lagradost.cloudstream3.utils.setText
 
 typealias SelectData = Pair<UiText?, Any>
 
-class SelectAdaptor(val callback: (Any) -> Unit) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
-    private val selection: MutableList<SelectData> = mutableListOf()
+class SelectAdaptor(val callback: (Any) -> Unit) :
+    NoStateAdapter<SelectData>(diffCallback = BaseDiffCallback(itemSame = { a, b ->
+        a.second == b.second
+    }, contentSame = { a, b ->
+        a == b
+    })) {
     private var selectedIndex: Int = -1
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-        return SelectViewHolder(
-            ResultSelectionBinding.inflate(LayoutInflater.from(parent.context), parent, false),
-
-                    //LayoutInflater.from(parent.context).inflate(R.layout.result_selection, parent, false),
+    override fun onCreateContent(parent: ViewGroup): ViewHolderState<Any> {
+        return ViewHolderState(
+            ResultSelectionBinding.inflate(
+                LayoutInflater.from(parent.context),
+                parent,
+                false
+            )
         )
     }
 
-    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-        when (holder) {
-            is SelectViewHolder -> {
-                holder.bind(selection[position], position == selectedIndex, callback)
+    override fun onBindContent(holder: ViewHolderState<Any>, item: SelectData, position: Int) {
+        when (val binding = holder.view) {
+            is ResultSelectionBinding -> {
+                binding.root.apply {
+                    if (isLayout(TV)) {
+                        isFocusable = true
+                        isFocusableInTouchMode = true
+                    }
+
+                    isSelected = position == selectedIndex
+                    setText(item.first)
+                    setOnClickListener {
+                        callback.invoke(item.second)
+                    }
+                }
             }
         }
     }
 
-    override fun onViewDetachedFromWindow(holder: RecyclerView.ViewHolder) {
-        if(holder.itemView.hasFocus()) {
+    override fun onViewDetachedFromWindow(holder: ViewHolderState<Any>) {
+        if (holder.itemView.hasFocus()) {
             holder.itemView.clearFocus()
         }
     }
 
-    override fun getItemCount(): Int {
-        return selection.size
-    }
-
     fun select(newIndex: Int, recyclerView: RecyclerView?) {
-        if(recyclerView == null) return
-        if(newIndex == selectedIndex) return
+        if (recyclerView == null) return
+        if (newIndex == selectedIndex) return
         val oldIndex = selectedIndex
         selectedIndex = newIndex
 
         notifyItemChanged(selectedIndex)
         notifyItemChanged(oldIndex)
     }
-
-    fun updateSelectionList(newList: List<SelectData>) {
-        val diffResult = DiffUtil.calculateDiff(
-            SelectDataCallback(this.selection, newList)
-        )
-
-        selection.clear()
-        selection.addAll(newList)
-
-        diffResult.dispatchUpdatesTo(this)
-    }
-
-
-    private class SelectViewHolder(
-        binding: ResultSelectionBinding,
-    ) :
-        RecyclerView.ViewHolder(binding.root) {
-        private val item: MaterialButton = binding.root
-
-        fun bind(
-            data: SelectData, isSelected: Boolean, callback: (Any) -> Unit
-        ) {
-            if (isLayout(TV)) {
-                item.isFocusable = true
-                item.isFocusableInTouchMode = true
-            }
-
-            item.isSelected = isSelected
-            item.setText(data.first)
-            item.setOnClickListener {
-                callback.invoke(data.second)
-            }
-        }
-    }
 }
-
-class SelectDataCallback(
-    private val oldList: List<SelectData>,
-    private val newList: List<SelectData>
-) :
-    DiffUtil.Callback() {
-    override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int) =
-        oldList[oldItemPosition].second == newList[newItemPosition].second
-
-    override fun getOldListSize() = oldList.size
-
-    override fun getNewListSize() = newList.size
-
-    override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int) =
-        oldList[oldItemPosition] == newList[newItemPosition]
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/SyncViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/SyncViewModel.kt
index c888e717bb5..6c5c64ff8bc 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/SyncViewModel.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/SyncViewModel.kt
@@ -4,11 +4,14 @@ import android.util.Log
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
+import com.lagradost.cloudstream3.Score
 import com.lagradost.cloudstream3.amap
 import com.lagradost.cloudstream3.mvvm.Resource
 import com.lagradost.cloudstream3.mvvm.logError
-import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.SyncApis
+import com.lagradost.cloudstream3.mvvm.throwAbleToResource
+import com.lagradost.cloudstream3.syncproviders.AccountManager
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.aniListApi
+import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.kitsuApi
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.malApi
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.simklApi
 import com.lagradost.cloudstream3.syncproviders.SyncAPI
@@ -31,7 +34,7 @@ class SyncViewModel : ViewModel() {
         const val TAG = "SYNCVM"
     }
 
-    private val repos = SyncApis
+    private val repos = AccountManager.syncApis
 
     private val _metaResponse: MutableLiveData<Resource<SyncAPI.SyncResult>?> =
         MutableLiveData(null)
@@ -65,7 +68,7 @@ class SyncViewModel : ViewModel() {
                 it.name,
                 it.idPrefix,
                 syncs.containsKey(it.idPrefix),
-                it.hasAccount(),
+                it.authUser() != null,
                 it.icon,
             )
         }
@@ -157,7 +160,7 @@ class SyncViewModel : ViewModel() {
         }
     }
 
-    fun setScore(score: Int) {
+    fun setScore(score: Score?) {
         Log.i(TAG, "setScore = $score")
         val user = userData.value
         if (user is Resource.Success) {
@@ -181,7 +184,7 @@ class SyncViewModel : ViewModel() {
         val user = userData.value
         if (user is Resource.Success) {
             syncs.forEach { (prefix, id) ->
-                repos.firstOrNull { it.idPrefix == prefix }?.score(id, user.value)
+                repos.firstOrNull { it.idPrefix == prefix }?.updateStatus(id, user.value)
             }
         }
         updateUserData()
@@ -203,17 +206,10 @@ class SyncViewModel : ViewModel() {
         ioSafe {
             syncs.amap { (prefix, id) ->
                 repos.firstOrNull { it.idPrefix == prefix }?.let { repo ->
-                    if (repo.hasAccount()) {
-                        val result = repo.getStatus(id)
-                        if (result is Resource.Success) {
-                            update(result.value)?.let { newData ->
-                                Log.i(TAG, "modifyData ${repo.name} => $newData")
-                                repo.score(id, newData)
-                            }
-                        } else if (result is Resource.Failure) {
-                            Log.e(TAG, "modifyData getStatus error ${result.errorString}")
-                        }
-                    }
+                    val result =
+                        update(repo.status(id).getOrNull() ?: return@let null) ?: return@let null
+                    Log.i(TAG, "modifyData ${repo.name} => $result")
+                    repo.updateStatus(id, result)
                 }
             }
         }
@@ -221,22 +217,17 @@ class SyncViewModel : ViewModel() {
     fun updateUserData() = ioSafe {
         Log.i(TAG, "updateUserData")
         _userDataResponse.postValue(Resource.Loading())
-        var lastError: Resource<SyncAPI.SyncStatus> = Resource.Failure(false, "No data")
-        syncs.forEach { (prefix, id) ->
-            repos.firstOrNull { it.idPrefix == prefix }?.let { repo ->
-                if (repo.hasAccount()) {
-                    val result = repo.getStatus(id)
-                    if (result is Resource.Success) {
-                        _userDataResponse.postValue(result)
-                        return@ioSafe
-                    } else if (result is Resource.Failure) {
-                        Log.e(TAG, "updateUserData error ${result.errorString}")
-                        lastError = result
-                    }
-                }
-            }
+
+        val status = syncs.firstNotNullOfOrNull { (prefix, id) ->
+            repos.firstOrNull { it.idPrefix == prefix }
+                ?.status(id)?.getOrNull()
+        }
+
+        if (status == null) {
+            _userDataResponse.postValue(Resource.Failure(false, "No data"))
+        } else {
+            _userDataResponse.postValue(Resource.Success(status))
         }
-        _userDataResponse.postValue(lastError)
     }
 
     private fun updateMetadata() = ioSafe {
@@ -261,19 +252,20 @@ class SyncViewModel : ViewModel() {
 
         current.forEach { (prefix, id) ->
             repos.firstOrNull { it.idPrefix == prefix }?.let { repo ->
-                if (!repo.requiresLogin || repo.hasAccount()) {
-                    Log.i(TAG, "updateMetadata loading ${repo.idPrefix}")
-                    val result = repo.getResult(id)
-                    if (result is Resource.Success) {
-                        _metaResponse.postValue(result)
-                        return@ioSafe
-                    } else if (result is Resource.Failure) {
-                        Log.e(
-                            TAG,
-                            "updateMetadata error $id at ${repo.idPrefix} ${result.errorString}"
-                        )
-                        lastError = result
-                    }
+                Log.i(TAG, "updateMetadata loading ${repo.idPrefix}")
+                val result = repo.load(id)
+                val resultValue = result.getOrNull()
+                val resultError = result.exceptionOrNull()
+                if (resultValue != null) {
+                    _metaResponse.postValue(Resource.Success(resultValue))
+                    return@ioSafe
+                } else if (resultError != null) {
+
+                    /*Log.e(
+                        TAG,
+                        "updateMetadata error $id at ${repo.idPrefix} ${result.errorString}"
+                    )*/
+                    lastError = throwAbleToResource(resultError)
                 }
             }
         }
@@ -285,6 +277,7 @@ class SyncViewModel : ViewModel() {
         // fix because of bad old data :pensive:
         val realName = when (syncName) {
             "MAL" -> malApi.idPrefix
+            "Kitsu" -> kitsuApi.idPrefix
             "Simkl" -> simklApi.idPrefix
             "AniList" -> aniListApi.idPrefix
             else -> syncName
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 f318401c092..7b63b6edec6 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchAdaptor.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchAdaptor.kt
@@ -4,15 +4,15 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
-import androidx.recyclerview.widget.DiffUtil
-import androidx.recyclerview.widget.RecyclerView
-import androidx.viewbinding.ViewBinding
 import com.lagradost.cloudstream3.SearchResponse
 import com.lagradost.cloudstream3.databinding.SearchResultGridBinding
 import com.lagradost.cloudstream3.databinding.SearchResultGridExpandedBinding
 import com.lagradost.cloudstream3.ui.AutofitRecyclerView
+import com.lagradost.cloudstream3.ui.BaseDiffCallback
+import com.lagradost.cloudstream3.ui.NoStateAdapter
+import com.lagradost.cloudstream3.ui.ViewHolderState
+import com.lagradost.cloudstream3.ui.newSharedPool
 import com.lagradost.cloudstream3.utils.UIHelper.isBottomLayout
-import com.lagradost.cloudstream3.utils.UIHelper.toPx
 import kotlin.math.roundToInt
 
 /** Click */
@@ -31,13 +31,28 @@ class SearchClickCallback(
 )
 
 class SearchAdapter(
-    private val cardList: MutableList<SearchResponse>,
     private val resView: AutofitRecyclerView,
+    private val isHorizontal:Boolean = false,
     private val clickCallback: (SearchClickCallback) -> Unit,
-) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+) : NoStateAdapter<SearchResponse>(diffCallback = BaseDiffCallback(itemSame = { a, b ->
+    if (a.id != null || b.id != null) {
+        a.id == b.id
+    } else {
+        a.name == b.name
+    }
+})) {
+    companion object {
+        val sharedPool =
+            newSharedPool { setMaxRecycledViews(CONTENT, 10) }
+    }
+
     var hasNext: Boolean = false
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+    private val coverRatio = if(isHorizontal) 1.8 else 0.68
+
+    private val coverHeight: Int get() = (resView.itemWidth / coverRatio).roundToInt()
+
+    override fun onCreateContent(parent: ViewGroup): ViewHolderState<Any> {
         val inflater = LayoutInflater.from(parent.context)
 
         val layout =
@@ -49,84 +64,36 @@ class SearchAdapter(
                 inflater,
                 parent,
                 false
-            ) //R.layout.search_result_grid_expanded else R.layout.search_result_grid
-
-
-
-        return CardViewHolder(
-            layout,
-            clickCallback,
-            resView
-        )
+            )
+        return ViewHolderState(layout)
     }
 
-    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-        when (holder) {
-            is CardViewHolder -> {
-                holder.bind(cardList[position], position)
+    override fun onClearView(holder: ViewHolderState<Any>) {
+        clearImage(
+            when (val binding = holder.view) {
+                is SearchResultGridExpandedBinding -> binding.imageView
+                is SearchResultGridBinding -> binding.imageView
+                else -> null
             }
-        }
-    }
-
-    override fun getItemCount(): Int {
-        return cardList.size
-    }
-
-    fun updateList(newList: List<SearchResponse>) {
-        val diffResult = DiffUtil.calculateDiff(
-            SearchResponseDiffCallback(this.cardList, newList)
         )
-
-        cardList.clear()
-        cardList.addAll(newList)
-
-        diffResult.dispatchUpdatesTo(this)
     }
 
-    class CardViewHolder(
-        val binding: ViewBinding,
-        private val clickCallback: (SearchClickCallback) -> Unit,
-        resView: AutofitRecyclerView
-    ) :
-        RecyclerView.ViewHolder(binding.root) {
-
-        private val compactView = false//itemView.context.getGridIsCompact()
-        private val coverHeight: Int =
-            if (compactView) 80.toPx else (resView.itemWidth / 0.68).roundToInt()
-
-        private val cardView = when(binding) {
+    override fun onBindContent(holder: ViewHolderState<Any>, item: SearchResponse, position: Int) {
+        val imageView = when (val binding = holder.view) {
             is SearchResultGridExpandedBinding -> binding.imageView
             is SearchResultGridBinding -> binding.imageView
             else -> null
         }
 
-        fun bind(card: SearchResponse, position: Int) {
-            if (!compactView) {
-                cardView?.apply {
-                    layoutParams = FrameLayout.LayoutParams(
-                        ViewGroup.LayoutParams.MATCH_PARENT,
-                        coverHeight
-                    )
-                }
+        if (imageView != null) {
+            val params = FrameLayout.LayoutParams(
+                ViewGroup.LayoutParams.MATCH_PARENT,
+                coverHeight
+            )
+            if (imageView.layoutParams.width != params.width || imageView.layoutParams.height != params.height) {
+                imageView.layoutParams = params
             }
-
-            SearchResultBuilder.bind(clickCallback, card, position, itemView)
         }
+        SearchResultBuilder.bind(clickCallback, item, position, holder.view.root)
     }
-}
-
-class SearchResponseDiffCallback(
-    private val oldList: List<SearchResponse>,
-    private val newList: List<SearchResponse>
-) :
-    DiffUtil.Callback() {
-    override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int) =
-        oldList[oldItemPosition].name == newList[newItemPosition].name
-
-    override fun getOldListSize() = oldList.size
-
-    override fun getNewListSize() = newList.size
-
-    override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int) =
-        oldList[oldItemPosition] == newList[newItemPosition]
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt
index 1922e4fae92..5f5b064b543 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
@@ -3,11 +3,9 @@ package com.lagradost.cloudstream3.ui.search
 import android.app.Activity
 import android.content.Intent
 import android.content.DialogInterface
-import android.content.res.Configuration
 import android.speech.RecognizerIntent
 import android.speech.SpeechRecognizer
 import android.os.Bundle
-import android.util.TypedValue
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -20,20 +18,20 @@ import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.widget.SearchView
 import androidx.core.view.isVisible
-import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.GridLayoutManager
-import androidx.recyclerview.widget.RecyclerView
+import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.activity.result.contract.ActivityResultContracts
+import androidx.core.view.doOnLayout
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.button.MaterialButton
 import com.lagradost.cloudstream3.APIHolder.getApiFromNameNull
-import com.lagradost.cloudstream3.AcraApplication.Companion.removeKey
-import com.lagradost.cloudstream3.AcraApplication.Companion.removeKeys
 import com.lagradost.cloudstream3.AllLanguagesName
 import com.lagradost.cloudstream3.AnimeSearchResponse
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.removeKey
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.removeKeys
 import com.lagradost.cloudstream3.CommonActivity.showToast
 import com.lagradost.cloudstream3.HomePageList
 import com.lagradost.cloudstream3.MainAPI
@@ -49,16 +47,21 @@ import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.mvvm.observe
 import com.lagradost.cloudstream3.ui.APIRepository
 import com.lagradost.cloudstream3.ui.BaseAdapter
+import com.lagradost.cloudstream3.ui.BaseFragment
 import com.lagradost.cloudstream3.ui.home.HomeFragment
 import com.lagradost.cloudstream3.ui.home.HomeFragment.Companion.bindChips
 import com.lagradost.cloudstream3.ui.home.HomeFragment.Companion.currentSpan
 import com.lagradost.cloudstream3.ui.home.HomeFragment.Companion.loadHomepageList
 import com.lagradost.cloudstream3.ui.home.HomeFragment.Companion.updateChips
+import com.lagradost.cloudstream3.ui.home.HomeViewModel
 import com.lagradost.cloudstream3.ui.home.ParentItemAdapter
 import com.lagradost.cloudstream3.ui.result.FOCUS_SELF
 import com.lagradost.cloudstream3.ui.result.setLinearListLayout
+import com.lagradost.cloudstream3.ui.setRecycledViewPool
 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.isLandscape
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
 import com.lagradost.cloudstream3.utils.AppContextUtils.filterProviderByPreferredMedia
 import com.lagradost.cloudstream3.utils.AppContextUtils.filterSearchResultByFilmQuality
@@ -67,18 +70,23 @@ import com.lagradost.cloudstream3.utils.AppContextUtils.getApiSettings
 import com.lagradost.cloudstream3.utils.AppContextUtils.ownHide
 import com.lagradost.cloudstream3.utils.AppContextUtils.ownShow
 import com.lagradost.cloudstream3.utils.AppContextUtils.setDefaultFocus
+import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import com.lagradost.cloudstream3.utils.Coroutines.main
 import com.lagradost.cloudstream3.utils.DataStoreHelper
 import com.lagradost.cloudstream3.utils.DataStoreHelper.currentAccount
 import com.lagradost.cloudstream3.utils.SubtitleHelper
+import com.lagradost.cloudstream3.utils.BackPressedCallbackHelper.attachBackPressedCallback
+import com.lagradost.cloudstream3.utils.BackPressedCallbackHelper.detachBackPressedCallback
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
-import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
+import com.lagradost.cloudstream3.utils.UIHelper.fixSystemBarsPadding
 import com.lagradost.cloudstream3.utils.UIHelper.getSpanCount
 import com.lagradost.cloudstream3.utils.UIHelper.hideKeyboard
 import java.util.Locale
 import java.util.concurrent.locks.ReentrantLock
 
-class SearchFragment : Fragment() {
+class SearchFragment : BaseFragment<FragmentSearchBinding>(
+    BaseFragment.BindingCreator.Bind(FragmentSearchBinding::bind)
+) {
     companion object {
         fun List<SearchResponse>.filterSearchResponse(): List<SearchResponse> {
             return this.filter { response ->
@@ -97,14 +105,13 @@ class SearchFragment : Fragment() {
 
         fun newInstance(query: String): Bundle {
             return Bundle().apply {
-                if(query.isNotBlank()) putString(SEARCH_QUERY, query)
+                if (query.isNotBlank()) putString(SEARCH_QUERY, query)
             }
         }
     }
 
     private val searchViewModel: SearchViewModel by activityViewModels()
     private var bottomSheetDialog: BottomSheetDialog? = null
-    var binding: FragmentSearchBinding? = null
 
     private val speechRecognizerLauncher =
         registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
@@ -118,6 +125,9 @@ class SearchFragment : Fragment() {
             }
         }
 
+    override fun pickLayout(): Int? =
+        if (isLayout(TV or EMULATOR)) R.layout.fragment_search_tv else R.layout.fragment_search
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -127,37 +137,13 @@ class SearchFragment : Fragment() {
             WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE
         )
         bottomSheetDialog?.ownShow()
-
-
-        binding = try {
-            val layout = if (isLayout(TV or EMULATOR)) R.layout.fragment_search_tv else R.layout.fragment_search
-            val root = inflater.inflate(layout, container, false)
-            FragmentSearchBinding.bind(root)
-        } catch (t : Throwable) {
-            FragmentSearchBinding.inflate(inflater)
-        }
-
-        return binding?.root
-    }
-
-    private fun fixGrid() {
-        activity?.getSpanCount()?.let {
-            currentSpan = it
-        }
-        binding?.searchAutofitResults?.spanCount = currentSpan
-        currentSpan = currentSpan
-        HomeFragment.configEvent.invoke(currentSpan)
-    }
-
-    override fun onConfigurationChanged(newConfig: Configuration) {
-        super.onConfigurationChanged(newConfig)
-        fixGrid()
+        return super.onCreateView(inflater, container, savedInstanceState)
     }
 
     override fun onDestroyView() {
         hideKeyboard()
         bottomSheetDialog?.ownHide()
-        binding = null
+        activity?.detachBackPressedCallback("SearchFragment")
         super.onDestroyView()
     }
 
@@ -182,7 +168,7 @@ class SearchFragment : Fragment() {
     fun search(query: String?) {
         if (query == null) return
         // don't resume state from prev search
-        (binding?.searchMasterRecycler?.adapter as? BaseAdapter<*,*>)?.clear()
+        (binding?.searchMasterRecycler?.adapter as? BaseAdapter<*, *>)?.clearState()
         context?.let { ctx ->
             val default = enumValues<TvType>().sorted().filter { it != TvType.NSFW }
                 .map { it.ordinal.toString() }.toSet()
@@ -231,42 +217,59 @@ class SearchFragment : Fragment() {
         }
     }
 
+    override fun fixLayout(view: View) {
+        fixSystemBarsPadding(
+            view,
+            padBottom = isLandscape(),
+            padLeft = isLayout(TV or EMULATOR)
+        )
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
+        // Fix grid
+        currentSpan = view.context.getSpanCount()
+        binding?.searchAutofitResults?.spanCount = currentSpan
+        HomeFragment.configEvent.invoke()
+    }
 
-        fixPaddingStatusbar(binding?.searchRoot)
-        fixGrid()
+    override fun onBindingCreated(
+        binding: FragmentSearchBinding,
+        savedInstanceState: Bundle?
+    ) {
         reloadRepos()
-
-        binding?.apply {
-            val adapter: RecyclerView.Adapter<RecyclerView.ViewHolder> =
+        binding.apply {
+            val adapter =
                 SearchAdapter(
-                    ArrayList(),
                     searchAutofitResults,
                 ) { callback ->
                     SearchHelper.handleSearchClickCallback(callback)
                 }
 
-            searchRoot.findViewById<TextView>(androidx.appcompat.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.setRecycledViewPool(SearchAdapter.sharedPool)
             searchAutofitResults.adapter = adapter
             searchLoadingBar.alpha = 0f
         }
 
-        binding?.voiceSearch?.setOnClickListener { searchView ->
+        binding.voiceSearch.setOnClickListener { searchView ->
             searchView?.context?.let { ctx ->
                 try {
                     if (!SpeechRecognizer.isRecognitionAvailable(ctx)) {
                         showToast(R.string.speech_recognition_unavailable)
                     } else {
                         val intent = Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH).apply {
-                            putExtra(RecognizerIntent.EXTRA_LANGUAGE_MODEL, RecognizerIntent.LANGUAGE_MODEL_FREE_FORM)
+                            putExtra(
+                                RecognizerIntent.EXTRA_LANGUAGE_MODEL,
+                                RecognizerIntent.LANGUAGE_MODEL_FREE_FORM
+                            )
                             putExtra(RecognizerIntent.EXTRA_LANGUAGE, Locale.getDefault())
-                            putExtra(RecognizerIntent.EXTRA_PROMPT, ctx.getString(R.string.begin_speaking))
+                            putExtra(
+                                RecognizerIntent.EXTRA_PROMPT,
+                                ctx.getString(R.string.begin_speaking)
+                            )
                         }
                         speechRecognizerLauncher.launch(intent)
                     }
-                } catch (_ : Throwable) {
+                } catch (_: Throwable) {
                     // launch may throw
                     showToast(R.string.speech_recognition_unavailable)
                 }
@@ -274,21 +277,11 @@ class SearchFragment : Fragment() {
         }
 
         val searchExitIcon =
-            binding?.mainSearch?.findViewById<ImageView>(androidx.appcompat.R.id.search_close_btn)
-        // val searchMagIcon =
-        //    binding?.mainSearch?.findViewById<ImageView>(androidx.appcompat.R.id.search_mag_icon)
-        // searchMagIcon.scaleX = 0.65f
-        // searchMagIcon.scaleY = 0.65f
-
-        // Set the color for the search exit icon to the correct theme text color
-        val searchExitIconColor = TypedValue()
-
-        activity?.theme?.resolveAttribute(android.R.attr.textColor, searchExitIconColor, true)
-        searchExitIcon?.setColorFilter(searchExitIconColor.data)
+            binding.mainSearch.findViewById<ImageView>(androidx.appcompat.R.id.search_close_btn)
 
         selectedApis = DataStoreHelper.searchPreferenceProviders.toMutableSet()
 
-        binding?.searchFilter?.setOnClickListener { searchView ->
+        binding.searchFilter.setOnClickListener { searchView ->
             searchView?.context?.let { ctx ->
                 val validAPIs = ctx.filterProviderByPreferredMedia(hasHomePageIsRequired = false)
                 var currentValidApis = listOf<MainAPI>()
@@ -300,11 +293,12 @@ class SearchFragment : Fragment() {
 
                 builder.behavior.state = BottomSheetBehavior.STATE_EXPANDED
 
-                val selectMainpageBinding: HomeSelectMainpageBinding = HomeSelectMainpageBinding.inflate(
-                    builder.layoutInflater,
-                    null,
-                    false
-                )
+                val selectMainpageBinding: HomeSelectMainpageBinding =
+                    HomeSelectMainpageBinding.inflate(
+                        builder.layoutInflater,
+                        null,
+                        false
+                    )
                 builder.setContentView(selectMainpageBinding.root)
                 builder.show()
                 builder.let { dialog ->
@@ -373,7 +367,10 @@ class SearchFragment : Fragment() {
                         if (selectedSearchTypes.toSet() != list.toSet()) {
                             selectedSearchTypes.clear()
                             selectedSearchTypes.addAll(list)
-                            updateChips(binding?.tvtypesChipsScroll?.tvtypesChips, selectedSearchTypes)
+                            updateChips(
+                                binding.tvtypesChipsScroll.tvtypesChips,
+                                selectedSearchTypes
+                            )
 
                         }
                     }
@@ -399,8 +396,8 @@ class SearchFragment : Fragment() {
                         selectedApis = currentSelectedApis
 
                         // run search when dialog is close
-                        if(previousSelectedApis != selectedApis.toSet() || previousSelectedSearchTypes != selectedSearchTypes.toSet()) {
-                            search(binding?.mainSearch?.query?.toString())
+                        if (previousSelectedApis != selectedApis.toSet() || previousSelectedSearchTypes != selectedSearchTypes.toSet()) {
+                            search(binding.mainSearch.query.toString())
                         }
                     }
                     updateList(selectedSearchTypes.toList())
@@ -410,19 +407,31 @@ class SearchFragment : Fragment() {
 
         val settingsManager = context?.let { PreferenceManager.getDefaultSharedPreferences(it) }
         val isAdvancedSearch = settingsManager?.getBoolean("advanced_search", true) ?: true
+        val isSearchSuggestionsEnabled = settingsManager?.getBoolean("search_suggestions_enabled", true) ?: true
 
         selectedSearchTypes = DataStoreHelper.searchPreferenceTags.toMutableList()
 
-        if (isLayout(TV)) {
-            binding?.searchFilter?.isFocusable = true
-            binding?.searchFilter?.isFocusableInTouchMode = true
+        if (!isLayout(PHONE)) {
+            binding.searchFilter.isFocusable = true
+            binding.searchFilter.isFocusableInTouchMode = true
+        }
+
+        // Hide suggestions when search view loses focus (phone only)
+        if (isLayout(PHONE)) {
+            binding.mainSearch.setOnQueryTextFocusChangeListener { _, hasFocus ->
+                if (!hasFocus) {
+                    searchViewModel.clearSuggestions()
+                }
+            }
         }
 
-        binding?.mainSearch?.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
+
+        binding.mainSearch.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
             override fun onQueryTextSubmit(query: String): Boolean {
                 search(query)
+                searchViewModel.clearSuggestions()
 
-                binding?.mainSearch?.let {
+                binding.mainSearch.let {
                     hideKeyboard(it)
                 }
 
@@ -435,76 +444,49 @@ class SearchFragment : Fragment() {
                 if (showHistory) {
                     searchViewModel.clearSearch()
                     searchViewModel.updateHistory()
+                    searchViewModel.clearSuggestions()
+                } else {
+                    // Fetch suggestions when user is typing (if enabled)
+                    if (isSearchSuggestionsEnabled) {
+                        searchViewModel.fetchSuggestions(newText)
+                    }
                 }
-                binding?.apply {
-                    searchHistoryHolder.isVisible = showHistory
+                binding.apply {
+                    searchHistoryRecycler.isVisible = showHistory
                     searchMasterRecycler.isVisible = !showHistory && isAdvancedSearch
                     searchAutofitResults.isVisible = !showHistory && !isAdvancedSearch
+                    // Hide suggestions when showing history or showing search results
+                    searchSuggestionsRecycler.isVisible = !showHistory && isSearchSuggestionsEnabled
                 }
 
                 return true
             }
         })
 
-        binding?.searchClearCallHistory?.setOnClickListener {
-            activity?.let { ctx ->
-                val builder: AlertDialog.Builder = AlertDialog.Builder(ctx)
-                val dialogClickListener =
-                    DialogInterface.OnClickListener { _, which ->
-                        when (which) {
-                            DialogInterface.BUTTON_POSITIVE -> {
-                                removeKeys("$currentAccount/$SEARCH_HISTORY_KEY")
-                                searchViewModel.updateHistory()
-                            }
-                            DialogInterface.BUTTON_NEGATIVE -> {
-                            }
-                        }
-                    }
-
-                try {
-                    builder.setTitle(R.string.clear_history).setMessage(
-                        ctx.getString(R.string.delete_message).format(
-                            ctx.getString(R.string.history)
-                        )
-                    )
-                        .setPositiveButton(R.string.sort_clear, dialogClickListener)
-                        .setNegativeButton(R.string.cancel, dialogClickListener)
-                        .show().setDefaultFocus()
-                } catch (e: Exception) {
-                    logError(e)
-                    // ye you somehow fucked up formatting did you?
-                }
-            }
-
-
-        }
-
-        observe(searchViewModel.currentHistory) { list ->
-            binding?.searchClearCallHistory?.isVisible = list.isNotEmpty()
-            (binding?.searchHistoryRecycler?.adapter as? SearchHistoryAdaptor?)?.updateList(list)
-        }
-
-        searchViewModel.updateHistory()
-
         observe(searchViewModel.searchResponse) {
             when (it) {
                 is Resource.Success -> {
                     it.value.let { data ->
-                        if (data.isNotEmpty()) {
-                            (binding?.searchAutofitResults?.adapter as? SearchAdapter)?.updateList(data)
+                        val list = data.list
+                        if (list.isNotEmpty()) {
+                            (binding.searchAutofitResults.adapter as? SearchAdapter)?.submitList(
+                                list
+                            )
                         }
                     }
                     searchExitIcon?.alpha = 1f
-                    binding?.searchLoadingBar?.alpha = 0f
+                    binding.searchLoadingBar.alpha = 0f
                 }
+
                 is Resource.Failure -> {
                     // Toast.makeText(activity, "Server error", Toast.LENGTH_LONG).show()
                     searchExitIcon?.alpha = 1f
-                    binding?.searchLoadingBar?.alpha = 0f
+                    binding.searchLoadingBar.alpha = 0f
                 }
+
                 is Resource.Loading -> {
                     searchExitIcon?.alpha = 0f
-                    binding?.searchLoadingBar?.alpha = 1f
+                    binding.searchLoadingBar.alpha = 1f
                 }
             }
         }
@@ -514,20 +496,33 @@ class SearchFragment : Fragment() {
             try {
                 // https://stackoverflow.com/questions/6866238/concurrent-modification-exception-adding-to-an-arraylist
                 listLock.lock()
-                (binding?.searchMasterRecycler?.adapter as ParentItemAdapter?)?.apply {
-                    val newItems = list.map { ongoing ->
-                        val dataList =
-                            if (ongoing.data is Resource.Success) ongoing.data.value else ArrayList()
+
+                val pinnedOrder = DataStoreHelper.pinnedProviders.reversedArray()
+
+                val sortedList = list.toList().sortedWith(compareBy { (providerName, _) ->
+                    val index = pinnedOrder.indexOf(providerName)
+                    if (index == -1) Int.MAX_VALUE else index
+                })
+
+                (binding.searchMasterRecycler.adapter as? ParentItemAdapter)?.apply {
+                    val newItems = sortedList.map { (providerName, providerData) ->
+                        val dataList = providerData.list
                         val dataListFiltered =
                             context?.filterSearchResultByFilmQuality(dataList) ?: dataList
-                        val ongoingList = HomePageList(
-                            ongoing.apiName,
+
+                        val homePageList = HomePageList(
+                            providerName,
                             dataListFiltered
                         )
-                        ongoingList
+
+                        HomeViewModel.ExpandableHomepageList(
+                            homePageList,
+                            providerData.currentPage,
+                            providerData.hasNext
+                        )
                     }
-                    updateList(newItems)
 
+                    submitList(newItems)
                     //notifyDataSetChanged()
                 }
             } catch (e: Exception) {
@@ -547,52 +542,123 @@ class SearchFragment : Fragment() {
         //main_search.onActionViewExpanded()*/
 
         val masterAdapter =
-            ParentItemAdapter(fragment = this, id = "masterAdapter".hashCode(), { callback ->
+            ParentItemAdapter(id = "masterAdapter".hashCode(), { callback ->
                 SearchHelper.handleSearchClickCallback(callback)
             }, { item ->
                 bottomSheetDialog = activity?.loadHomepageList(item, dismissCallback = {
                     bottomSheetDialog = null
-                })
+                }, expandCallback = { name -> searchViewModel.expandAndReturn(name) })
+            }, expandCallback = { name ->
+                ioSafe {
+                    searchViewModel.expandAndReturn(name)
+                }
             })
 
-        val historyAdapter = SearchHistoryAdaptor(mutableListOf()) { click ->
+        val historyAdapter = SearchHistoryAdaptor { click ->
             val searchItem = click.item
             when (click.clickAction) {
                 SEARCH_HISTORY_OPEN -> {
+                    if (searchItem == null) return@SearchHistoryAdaptor
                     searchViewModel.clearSearch()
                     if (searchItem.type.isNotEmpty())
-                        updateChips(binding?.tvtypesChipsScroll?.tvtypesChips, searchItem.type.toMutableList())
-                    binding?.mainSearch?.setQuery(searchItem.searchText, true)
+                        updateChips(
+                            binding.tvtypesChipsScroll.tvtypesChips,
+                            searchItem.type.toMutableList()
+                        )
+                    binding.mainSearch.setQuery(searchItem.searchText, true)
                 }
+
                 SEARCH_HISTORY_REMOVE -> {
+                    if (searchItem == null) return@SearchHistoryAdaptor
                     removeKey("$currentAccount/$SEARCH_HISTORY_KEY", searchItem.key)
                     searchViewModel.updateHistory()
                 }
+
+                SEARCH_HISTORY_CLEAR -> {
+                    // Show confirmation dialog (from footer button)
+                    activity?.let { ctx ->
+                        val builder: AlertDialog.Builder = AlertDialog.Builder(ctx)
+                        val dialogClickListener =
+                            DialogInterface.OnClickListener { _, which ->
+                                when (which) {
+                                    DialogInterface.BUTTON_POSITIVE -> {
+                                        removeKeys("$currentAccount/$SEARCH_HISTORY_KEY")
+                                        searchViewModel.updateHistory()
+                                    }
+
+                                    DialogInterface.BUTTON_NEGATIVE -> {
+                                    }
+                                }
+                            }
+
+                        try {
+                            builder.setTitle(R.string.clear_history).setMessage(
+                                ctx.getString(R.string.delete_message).format(
+                                    ctx.getString(R.string.history)
+                                )
+                            )
+                                .setPositiveButton(R.string.sort_clear, dialogClickListener)
+                                .setNegativeButton(R.string.cancel, dialogClickListener)
+                                .show().setDefaultFocus()
+                        } catch (e: Exception) {
+                            logError(e)
+                        }
+                    }
+                }
+
                 else -> {
                     // wth are you doing???
                 }
             }
         }
 
-        binding?.apply {
+        val suggestionAdapter = SearchSuggestionAdapter { callback ->
+            when (callback.clickAction) {
+                SEARCH_SUGGESTION_CLICK -> {
+                    // Search directly
+                    binding.mainSearch.setQuery(callback.suggestion, true)
+                    searchViewModel.clearSuggestions()
+                }
+                SEARCH_SUGGESTION_FILL -> {
+                    // Fill the search box without searching
+                    binding.mainSearch.setQuery(callback.suggestion, false)
+                }
+                SEARCH_SUGGESTION_CLEAR -> {
+                    // Clear suggestions (from footer button)
+                    searchViewModel.clearSuggestions()
+                }
+            }
+        }
+
+        binding.apply {
             searchHistoryRecycler.adapter = historyAdapter
             searchHistoryRecycler.setLinearListLayout(isHorizontal = false, nextRight = FOCUS_SELF)
             //searchHistoryRecycler.layoutManager = GridLayoutManager(context, 1)
 
+            // Setup suggestions RecyclerView
+            searchSuggestionsRecycler.adapter = suggestionAdapter
+            searchSuggestionsRecycler.layoutManager = LinearLayoutManager(context)
+
+            searchMasterRecycler.setRecycledViewPool(ParentItemAdapter.sharedPool)
             searchMasterRecycler.adapter = masterAdapter
             //searchMasterRecycler.setLinearListLayout(isHorizontal = false, nextRight = FOCUS_SELF)
 
             searchMasterRecycler.layoutManager = GridLayoutManager(context, 1)
 
             // Automatically search the specified query, this allows the app search to launch from intent
-            var sq = arguments?.getString(SEARCH_QUERY) ?: savedInstanceState?.getString(SEARCH_QUERY)
-            if(sq.isNullOrBlank()) {
+            var sq =
+                arguments?.getString(SEARCH_QUERY) ?: savedInstanceState?.getString(SEARCH_QUERY)
+            if (sq.isNullOrBlank()) {
                 sq = MainActivity.nextSearchQuery
             }
 
             sq?.let { query ->
                 if (query.isBlank()) return@let
-                mainSearch.setQuery(query, true)
+
+                // Queries are dropped if you are submitted before layout finishes
+                mainSearch.doOnLayout {
+                    mainSearch.setQuery(query, true)
+                }
                 // Clear the query as to not make it request the same query every time the page is opened
                 arguments?.remove(SEARCH_QUERY)
                 savedInstanceState?.remove(SEARCH_QUERY)
@@ -600,18 +666,37 @@ class SearchFragment : Fragment() {
             }
         }
 
+        observe(searchViewModel.currentHistory) { list ->
+            (binding.searchHistoryRecycler.adapter as? SearchHistoryAdaptor?)?.submitList(list)
+             // Scroll to top to show newest items (list is sorted by newest first)
+            if (list.isNotEmpty()) {
+                binding.searchHistoryRecycler.scrollToPosition(0)
+            }
+        }
 
-        // SubtitlesFragment.push(activity)
-        //searchViewModel.search("iron man")
-        //(activity as AppCompatActivity).loadResult("https://shiro.is/overlord-dubbed", "overlord-dubbed", "Shiro")
-/*
-        (activity as AppCompatActivity?)?.supportFragmentManager.beginTransaction()
-            .setCustomAnimations(R.anim.enter_anim,
-                R.anim.exit_anim,
-                R.anim.pop_enter,
-                R.anim.pop_exit)
-            .add(R.id.homeRoot, PlayerFragment.newInstance(PlayerData(0, null,0)))
-            .commit()*/
-    }
+        // Observe search suggestions
+        observe(searchViewModel.searchSuggestions) { suggestions ->
+            val hasSuggestions = suggestions.isNotEmpty()
+            binding.searchSuggestionsRecycler.isVisible = hasSuggestions
+            (binding.searchSuggestionsRecycler.adapter as? SearchSuggestionAdapter?)?.submitList(suggestions)
+
+            // On non-phone layouts, redirect focus and handle back button
+            if (!isLayout(PHONE)) {
+                if (hasSuggestions) {
+                    binding.tvtypesChipsScroll.tvtypesChips.root.nextFocusDownId = R.id.search_suggestions_recycler
+                    // Attach back button callback to clear suggestions
+                    activity?.attachBackPressedCallback("SearchFragment") {
+                        searchViewModel.clearSuggestions()
+                    }
+                } else {
+                    // Reset to default focus target (history)
+                    binding.tvtypesChipsScroll.tvtypesChips.root.nextFocusDownId = R.id.search_history_recycler
+                    // Detach back button callback when no suggestions
+                    activity?.detachBackPressedCallback("SearchFragment")
+                }
+            }
+        }
 
+        searchViewModel.updateHistory()
+    }
 }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchHelper.kt
index 01ec17b63f4..449a04bf81f 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchHelper.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchHelper.kt
@@ -11,7 +11,7 @@ import com.lagradost.cloudstream3.ui.download.DownloadClickEvent
 import com.lagradost.cloudstream3.ui.result.START_ACTION_LOAD_EP
 import com.lagradost.cloudstream3.utils.AppContextUtils.loadSearchResult
 import com.lagradost.cloudstream3.utils.DataStoreHelper
-import com.lagradost.cloudstream3.utils.VideoDownloadHelper
+import com.lagradost.cloudstream3.utils.downloader.DownloadObjects
 
 object SearchHelper {
     fun handleSearchClickCallback(callback: SearchClickCallback) {
@@ -31,14 +31,14 @@ object SearchHelper {
                             handleDownloadClick(
                                 DownloadClickEvent(
                                     DOWNLOAD_ACTION_PLAY_FILE,
-                                    VideoDownloadHelper.DownloadEpisodeCached(
+                                    DownloadObjects.DownloadEpisodeCached(
                                         name = card.name,
                                         poster = card.posterUrl,
                                         episode = card.episode ?: 0,
                                         season = card.season,
                                         id = id,
                                         parentId = card.parentId ?: return,
-                                        rating = null,
+                                        score = null,
                                         description = null,
                                         cacheTime = System.currentTimeMillis(),
                                     )
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 4ef5fa698b2..4868abb3d08 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
@@ -2,11 +2,17 @@ package com.lagradost.cloudstream3.ui.search
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
-import androidx.recyclerview.widget.DiffUtil
-import androidx.recyclerview.widget.RecyclerView
+import androidx.core.view.isGone
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.TvType
+import com.lagradost.cloudstream3.databinding.SearchHistoryFooterBinding
 import com.lagradost.cloudstream3.databinding.SearchHistoryItemBinding
+import com.lagradost.cloudstream3.ui.BaseDiffCallback
+import com.lagradost.cloudstream3.ui.NoStateAdapter
+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
 
 data class SearchHistoryItem(
     @JsonProperty("searchedAt") val searchedAt: Long,
@@ -16,84 +22,73 @@ data class SearchHistoryItem(
 )
 
 data class SearchHistoryCallback(
-    val item: SearchHistoryItem,
+    val item: SearchHistoryItem?,
     val clickAction: Int,
 )
 
 const val SEARCH_HISTORY_OPEN = 0
 const val SEARCH_HISTORY_REMOVE = 1
+const val SEARCH_HISTORY_CLEAR = 2
 
 class SearchHistoryAdaptor(
-    private val cardList: MutableList<SearchHistoryItem>,
     private val clickCallback: (SearchHistoryCallback) -> Unit,
-) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-        return CardViewHolder(
+) : NoStateAdapter<SearchHistoryItem>(diffCallback = BaseDiffCallback(itemSame = { a,b ->
+    a.searchedAt == b.searchedAt && a.searchText == b.searchText
+})) {
+    
+    // Add footer for all layouts
+    override val footers = 1
+    
+    override fun submitList(list: Collection<SearchHistoryItem>?, commitCallback: Runnable?) {
+        super.submitList(list, commitCallback)
+        // Notify footer to rebind when list changes to update visibility
+        if (footers > 0) {
+            notifyItemChanged(itemCount - 1)
+        }
+    }
+    
+    override fun onCreateContent(parent: ViewGroup): ViewHolderState<Any> {
+        return ViewHolderState(
             SearchHistoryItemBinding.inflate(LayoutInflater.from(parent.context), parent, false),
-            clickCallback,
         )
     }
 
-    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-        when (holder) {
-            is CardViewHolder -> {
-                holder.bind(cardList[position])
+    override fun onBindContent(
+        holder: ViewHolderState<Any>,
+        item: SearchHistoryItem,
+        position: Int
+    ) {
+        val binding = holder.view as? SearchHistoryItemBinding ?: return
+        binding.apply {
+            homeHistoryTitle.text = item.searchText
+
+            homeHistoryRemove.setOnClickListener {
+                clickCallback.invoke(SearchHistoryCallback(item, SEARCH_HISTORY_REMOVE))
+            }
+            homeHistoryTab.setOnClickListener {
+                clickCallback.invoke(SearchHistoryCallback(item, SEARCH_HISTORY_OPEN))
             }
         }
     }
-
-    override fun getItemCount(): Int {
-        return cardList.size
-    }
-
-    fun updateList(newList: List<SearchHistoryItem>) {
-        val diffResult = DiffUtil.calculateDiff(
-            SearchHistoryDiffCallback(this.cardList, newList)
+    
+    override fun onCreateFooter(parent: ViewGroup): ViewHolderState<Any> {
+        return ViewHolderState(
+            SearchHistoryFooterBinding.inflate(LayoutInflater.from(parent.context), parent, false)
         )
-
-        cardList.clear()
-        cardList.addAll(newList)
-
-        diffResult.dispatchUpdatesTo(this)
     }
-
-    class CardViewHolder(
-        val binding: SearchHistoryItemBinding,
-        private val clickCallback: (SearchHistoryCallback) -> Unit,
-    ) :
-        RecyclerView.ViewHolder(binding.root) {
-        //  private val removeButton: ImageView = itemView.home_history_remove
-        //  private val openButton: View = itemView.home_history_tab
-        // private val title: TextView = itemView.home_history_title
-
-        fun bind(card: SearchHistoryItem) {
-            binding.apply {
-                homeHistoryTitle.text = card.searchText
-
-                homeHistoryRemove.setOnClickListener {
-                    clickCallback.invoke(SearchHistoryCallback(card, SEARCH_HISTORY_REMOVE))
-                }
-                homeHistoryTab.setOnClickListener {
-                    clickCallback.invoke(SearchHistoryCallback(card, SEARCH_HISTORY_OPEN))
-                }
+    
+    override fun onBindFooter(holder: ViewHolderState<Any>) {
+        val binding = holder.view as? SearchHistoryFooterBinding ?: return
+        // Hide footer when list is empty
+        binding.searchClearCallHistory.apply {
+            isGone = immutableCurrentList.isEmpty()
+            if (isLayout(TV or EMULATOR)) {
+                isFocusable = true
+                isFocusableInTouchMode = true
+            }
+            setOnClickListener {
+                clickCallback.invoke(SearchHistoryCallback(null, SEARCH_HISTORY_CLEAR))
             }
         }
     }
 }
-
-class SearchHistoryDiffCallback(
-    private val oldList: List<SearchHistoryItem>,
-    private val newList: List<SearchHistoryItem>
-) :
-    DiffUtil.Callback() {
-    override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int) =
-        oldList[oldItemPosition].searchText == newList[newItemPosition].searchText
-
-    override fun getOldListSize() = oldList.size
-
-    override fun getNewListSize() = newList.size
-
-    override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int) =
-        oldList[oldItemPosition] == newList[newItemPosition]
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchResultBuilder.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchResultBuilder.kt
index a0e9113320d..fd99b8d4b06 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
@@ -2,6 +2,7 @@ package com.lagradost.cloudstream3.ui.search
 
 import android.annotation.SuppressLint
 import android.content.Context
+import android.content.res.ColorStateList
 import android.view.View
 import android.widget.ImageView
 import android.widget.ProgressBar
@@ -10,8 +11,6 @@ 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
@@ -23,11 +22,12 @@ import com.lagradost.cloudstream3.syncproviders.SyncAPI
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
 import com.lagradost.cloudstream3.utils.AppContextUtils.getNameFull
+import com.lagradost.cloudstream3.utils.AppContextUtils.getShortSeasonText
 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.createPaletteAsync
+import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute
 import com.lagradost.cloudstream3.utils.getImageFromDrawable
 
 object SearchResultBuilder {
@@ -50,7 +50,7 @@ object SearchResultBuilder {
         itemView: View,
         nextFocusUp: Int? = null,
         nextFocusDown: Int? = null,
-        colorCallback : ((Palette) -> Unit)? = null
+        colorCallback: ((Palette) -> Unit)? = null
     ) {
         val cardView: ImageView = itemView.findViewById(R.id.imageView)
         val cardText: TextView? = itemView.findViewById(R.id.imageText)
@@ -67,6 +67,7 @@ object SearchResultBuilder {
 
         val bar: ProgressBar? = itemView.findViewById(R.id.watchProgress)
         val playImg: ImageView? = itemView.findViewById(R.id.search_item_download_play)
+        val episodeText: TextView? = itemView.findViewById(R.id.episode_text)
 
         // Do logic
 
@@ -76,20 +77,27 @@ object SearchResultBuilder {
         textIsSub?.isVisible = false
         textFlag?.isVisible = false
         rating?.isVisible = false
+        episodeText?.isVisible = false
 
         val showSub = showCache[textIsDub?.context?.getString(R.string.show_sub_key)] ?: false
         val showDub = showCache[textIsDub?.context?.getString(R.string.show_dub_key)] ?: false
         val showTitle = showCache[cardText?.context?.getString(R.string.show_title_key)] ?: false
+        val showEpisodeText = showCache[cardText?.context?.getString(R.string.show_episode_text_key)] ?: false
         val showHd = showCache[textQuality?.context?.getString(R.string.show_hd_key)] ?: false
-
-        if(card is SyncAPI.LibraryItem) {
-            val showRating = (card.personalRating ?: 0) != 0
+        val showRatingView =
+            showCache[textQuality?.context?.getString(R.string.show_rating_key)] ?: false
+        if (card is SyncAPI.LibraryItem) {
+            val ratingText = card.personalRating?.toStringNull(0.1, 10, 1)
+            val showRating = !ratingText.isNullOrBlank()
+            rating?.isVisible = showRating
+            if (showRating) {
+                rating?.text = ratingText
+            }
+        } else if (showRatingView) {
+            val ratingText = card.score?.toStringNull(0.1, 10, 1)
+            val showRating = !ratingText.isNullOrBlank()
             rating?.isVisible = showRating
             if (showRating) {
-                // We want to show 8.5 but not 8.0 hence the replace
-                val ratingText = ((card.personalRating ?: 0).toDouble() / 10).toString()
-                    .replace(".0", "")
-
                 rating?.text = ratingText
             }
         }
@@ -124,19 +132,12 @@ object SearchResultBuilder {
         cardText?.text = card.name
         cardText?.isVisible = showTitle
         cardView.isVisible = true
-        cardView.loadImage(card.posterUrl, card.posterHeaders) {
-            error { getImageFromDrawable(itemView.context, R.drawable.default_cover) }
-            /*
-            createPaletteAsync is currently disabled as we use hardware acceleration on images
-            val posterUrl = card.posterUrl
-            if (posterUrl != null && colorCallback != null) {
-                this.listener(onSuccess = { _,success ->
-                    val bitmap = success.image.toBitmap()
-                    createPaletteAsync(posterUrl, bitmap, colorCallback)
-                })
-            }*/
-        }
-        
+        if (!card.posterUrl.isNullOrEmpty()) {
+            cardView.loadImage(card.posterUrl, card.posterHeaders) {
+                error { getImageFromDrawable(itemView.context, R.drawable.default_cover) }
+            }
+        } else cardView.loadImage(R.drawable.default_cover)
+
         fun click(view: View?) {
             clickCallback.invoke(
                 SearchClickCallback(
@@ -174,7 +175,7 @@ object SearchResultBuilder {
 
         bg.isFocusable = false
         bg.isFocusableInTouchMode = false
-        if(!isLayout(TV)) {
+        if (!isLayout(TV)) {
             bg.setOnClickListener {
                 click(it)
             }
@@ -184,7 +185,7 @@ object SearchResultBuilder {
             }
         }
         //
-       //
+        //
         //
 
         itemView.setOnClickListener {
@@ -218,9 +219,9 @@ object SearchResultBuilder {
         */
 
         if (isLayout(TV)) {
-           // bg.isFocusable = true
-           // bg.isFocusableInTouchMode = true
-           // bg.touchscreenBlocksFocus = false
+            // bg.isFocusable = true
+            // bg.isFocusableInTouchMode = true
+            // bg.touchscreenBlocksFocus = false
             itemView.isFocusableInTouchMode = true
             itemView.isFocusable = true
         }
@@ -249,6 +250,7 @@ object SearchResultBuilder {
                     }
                 }
             }
+
             is DataStoreHelper.ResumeWatchingResult -> {
                 val pos = card.watchPos?.fixVisual()
                 if (pos != null) {
@@ -256,14 +258,15 @@ object SearchResultBuilder {
                     bar?.progress = (pos.position / 1000).toInt()
                     bar?.visibility = View.VISIBLE
                 }
-
                 playImg?.visibility = View.VISIBLE
-
-                if (card.type?.isMovieType() == false) {
-                    cardText?.text =
-                        cardText?.context?.getNameFull(card.name, card.episode, card.season)
+                if (card.type?.isMovieType() == false && showEpisodeText) {
+                    episodeText?.context?.getShortSeasonText(card.episode, card.season)?.let {text->
+                        episodeText.text = text
+                        episodeText.isVisible = true
+                    }
                 }
             }
+
             is AnimeSearchResponse -> {
                 val dubStatus = card.dubStatus
                 if (!dubStatus.isNullOrEmpty()) {
@@ -299,5 +302,29 @@ object SearchResultBuilder {
                 }
             }
         }
+
+        // This is the logic for making the rounded corners more round on the top and bottom element
+        // a bit dirty to do memory allocation, but it makes it more extensible and is easier to reason about
+        // then a large if statement
+
+        // Requires that the ordering here is the same as in the xml
+        val boxes = arrayListOf<TextView>()
+        for (view in arrayOf(textIsDub, textIsSub, rating)) {
+            if (view?.isVisible == true) {
+                boxes.add(view)
+            }
+        }
+        if (boxes.size == 1) {
+            boxes[0].setBackgroundResource(R.drawable.bg_color_both)
+        } else if (boxes.size > 1) {
+            boxes[0].setBackgroundResource(R.drawable.bg_color_top)
+            for (i in 1 until boxes.size) {
+                boxes[i].setBackgroundResource(R.drawable.bg_color_center)
+            }
+            boxes[boxes.size - 1].setBackgroundResource(R.drawable.bg_color_bottom)
+        }
+        textIsDub?.apply {
+            backgroundTintList = ColorStateList.valueOf(context.colorFromAttribute(R.attr.textColor))
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchSuggestionAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchSuggestionAdapter.kt
new file mode 100644
index 00000000000..74d5e7b08a3
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchSuggestionAdapter.kt
@@ -0,0 +1,85 @@
+package com.lagradost.cloudstream3.ui.search
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.core.view.isGone
+import com.lagradost.cloudstream3.databinding.SearchSuggestionFooterBinding
+import com.lagradost.cloudstream3.databinding.SearchSuggestionItemBinding
+import com.lagradost.cloudstream3.ui.BaseDiffCallback
+import com.lagradost.cloudstream3.ui.NoStateAdapter
+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
+
+const val SEARCH_SUGGESTION_CLICK = 0
+const val SEARCH_SUGGESTION_FILL = 1
+const val SEARCH_SUGGESTION_CLEAR = 2
+
+data class SearchSuggestionCallback(
+    val suggestion: String,
+    val clickAction: Int,
+)
+
+class SearchSuggestionAdapter(
+    private val clickCallback: (SearchSuggestionCallback) -> Unit,
+) : NoStateAdapter<String>(diffCallback = BaseDiffCallback(itemSame = { a, b -> a == b })) {
+    
+    // Add footer for all layouts
+    override val footers = 1
+    
+    override fun submitList(list: Collection<String>?, commitCallback: Runnable?) {
+        super.submitList(list, commitCallback)
+        // Notify footer to rebind when list changes to update visibility
+        if (footers > 0) {
+            notifyItemChanged(itemCount - 1)
+        }
+    }
+    
+    override fun onCreateContent(parent: ViewGroup): ViewHolderState<Any> {
+        return ViewHolderState(
+            SearchSuggestionItemBinding.inflate(LayoutInflater.from(parent.context), parent, false),
+        )
+    }
+
+    override fun onBindContent(
+        holder: ViewHolderState<Any>,
+        item: String,
+        position: Int
+    ) {
+        val binding = holder.view as? SearchSuggestionItemBinding ?: return
+        binding.apply {
+            suggestionText.text = item
+            
+            // Click on the whole item to search
+            suggestionItem.setOnClickListener {
+                clickCallback.invoke(SearchSuggestionCallback(item, SEARCH_SUGGESTION_CLICK))
+            }
+            
+            // Click on the arrow to fill the search box without searching
+            suggestionFill.setOnClickListener {
+                clickCallback.invoke(SearchSuggestionCallback(item, SEARCH_SUGGESTION_FILL))
+            }
+        }
+    }
+    
+    override fun onCreateFooter(parent: ViewGroup): ViewHolderState<Any> {
+        return ViewHolderState(
+            SearchSuggestionFooterBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        )
+    }
+    
+    override fun onBindFooter(holder: ViewHolderState<Any>) {
+        val binding = holder.view as? SearchSuggestionFooterBinding ?: return
+        binding.clearSuggestionsButton.apply {
+            isGone = immutableCurrentList.isEmpty()
+            if (isLayout(TV or EMULATOR)) {
+                isFocusable = true
+                isFocusableInTouchMode = true
+            }
+            setOnClickListener {
+                clickCallback.invoke(SearchSuggestionCallback("", SEARCH_SUGGESTION_CLEAR))
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchSuggestionApi.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchSuggestionApi.kt
new file mode 100644
index 00000000000..8dbd7817898
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchSuggestionApi.kt
@@ -0,0 +1,74 @@
+package com.lagradost.cloudstream3.ui.search
+
+import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.mvvm.logError
+import com.lagradost.nicehttp.NiceResponse
+
+/**
+ * API for fetching search suggestions from external sources.
+ * Uses TheMovieDB API to provide movie/show/anime related suggestions.
+ */
+object SearchSuggestionApi {
+    private const val TMDB_API_URL = "https://api.themoviedb.org/3/search/multi"
+    private const val TMDB_API_KEY = "e6333b32409e02a4a6eba6fb7ff866bb"
+    
+    data class TmdbSearchResult(
+        @JsonProperty("results") val results: List<TmdbSearchItem>?
+    )
+    
+    data class TmdbSearchItem(
+        @JsonProperty("media_type") val mediaType: String?,
+        @JsonProperty("title") val title: String?,
+        @JsonProperty("name") val name: String?,
+        @JsonProperty("original_title") val originalTitle: String?,
+        @JsonProperty("original_name") val originalName: String?
+    )
+    
+    /**
+     * Fetches search suggestions from TheMovieDB multi search API.
+     * Returns suggestions for movies, TV series, and anime.
+     * 
+     * @param query The search query to get suggestions for
+     * @return List of suggestion strings, empty list on failure
+     */
+    suspend fun getSuggestions(query: String): List<String> {
+        if (query.isBlank() || query.length < 2) return emptyList()
+        
+        return try {
+            val response = app.get(
+                TMDB_API_URL,
+                params = mapOf(
+                    "api_key" to TMDB_API_KEY,
+                    "query" to query,
+                    "language" to "en-US"
+                ),
+                cacheTime = 60 * 24  // Cache for 1 day (cacheUnit default is Minutes)
+            )
+            
+            parseSuggestions(response)
+        } catch (e: Exception) {
+            logError(e)
+            emptyList()
+        }
+    }
+    
+    /**
+     * Parses the TMDB search response and extracts movie/TV show titles.
+     * Filters to only include movies, TV shows, and anime.
+     */
+    private fun parseSuggestions(response: NiceResponse): List<String> {
+        return try {
+            val parsed = response.parsed<TmdbSearchResult>()
+            parsed.results
+                ?.filter { it.mediaType == "movie" || it.mediaType == "tv" }
+                ?.mapNotNull { it.title ?: it.name }
+                ?.distinct()
+                ?.take(10)
+                ?: emptyList()
+        } catch (e: Exception) {
+            logError(e)
+            emptyList()
+        }
+    }
+}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchViewModel.kt
index 839b9d3f838..27db8d1ae5e 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchViewModel.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchViewModel.kt
@@ -5,46 +5,65 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.lagradost.cloudstream3.APIHolder.apis
-import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
-import com.lagradost.cloudstream3.AcraApplication.Companion.getKeys
-import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.getKey
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.getKeys
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.setKey
+import com.lagradost.cloudstream3.HomePageList
 import com.lagradost.cloudstream3.SearchResponse
 import com.lagradost.cloudstream3.amap
 import com.lagradost.cloudstream3.mvvm.Resource
+import com.lagradost.cloudstream3.mvvm.debugAssert
+import com.lagradost.cloudstream3.mvvm.debugWarning
 import com.lagradost.cloudstream3.mvvm.launchSafe
 import com.lagradost.cloudstream3.ui.APIRepository
+import com.lagradost.cloudstream3.ui.home.HomeViewModel
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import com.lagradost.cloudstream3.utils.DataStoreHelper.currentAccount
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 
-data class OnGoingSearch(
-    val apiName: String,
-    val data: Resource<List<SearchResponse>>
+
+data class ExpandableSearchList(
+    var list: List<SearchResponse>, var currentPage: Int, var hasNext: Boolean,
 )
 
 const val SEARCH_HISTORY_KEY = "search_history"
 
 class SearchViewModel : ViewModel() {
-    private val _searchResponse: MutableLiveData<Resource<List<SearchResponse>>> =
+    private val _searchResponse: MutableLiveData<Resource<ExpandableSearchList>> =
         MutableLiveData()
-    val searchResponse: LiveData<Resource<List<SearchResponse>>> get() = _searchResponse
+    val searchResponse: LiveData<Resource<ExpandableSearchList>> get() = _searchResponse
 
-    private val _currentSearch: MutableLiveData<List<OnGoingSearch>> = MutableLiveData()
-    val currentSearch: LiveData<List<OnGoingSearch>> get() = _currentSearch
+    private val _currentSearch: MutableLiveData<Map<String, ExpandableSearchList>> =
+        MutableLiveData()
+    val currentSearch: LiveData<Map<String, ExpandableSearchList>> get() = _currentSearch
 
     private val _currentHistory: MutableLiveData<List<SearchHistoryItem>> = MutableLiveData()
     val currentHistory: LiveData<List<SearchHistoryItem>> get() = _currentHistory
 
+    private val _searchSuggestions: MutableLiveData<List<String>> = MutableLiveData()
+    val searchSuggestions: LiveData<List<String>> get() = _searchSuggestions
+
+    private var suggestionJob: Job? = null
+
     private var repos = synchronized(apis) { apis.map { APIRepository(it) } }
 
     fun clearSearch() {
-        _searchResponse.postValue(Resource.Success(ArrayList()))
-        _currentSearch.postValue(emptyList())
+        _searchResponse.postValue(Resource.Success(ExpandableSearchList(emptyList(), 0, false)))
+        _currentSearch.postValue(emptyMap())
+        expandableSearches.clear()
     }
 
+    var lastQuery: String? = null
+
+    /** Save which providers can searched again and which search result page they are on.
+     * Maps provider name to search list.
+     * @see [HomeViewModel.expandable] */
+    private val expandableSearches: MutableMap<String, ExpandableSearchList> = mutableMapOf()
+
     private var currentSearchIndex = 0
     private var onGoingSearch: Job? = null
 
@@ -63,15 +82,119 @@ class SearchViewModel : ViewModel() {
         onGoingSearch = search(query, providersActive, ignoreSettings, isQuickSearch)
     }
 
-    fun updateHistory() = viewModelScope.launch {
-        ioSafe {
-            val items = getKeys("$currentAccount/$SEARCH_HISTORY_KEY")?.mapNotNull {
-                getKey<SearchHistoryItem>(it)
-            }?.sortedByDescending { it.searchedAt } ?: emptyList()
-            _currentHistory.postValue(items)
+    fun updateHistory() = ioSafe {
+        val items = getKeys("$currentAccount/$SEARCH_HISTORY_KEY")?.mapNotNull {
+            getKey<SearchHistoryItem>(it)
+        }?.sortedByDescending { it.searchedAt } ?: emptyList()
+        _currentHistory.postValue(items)
+    }
+
+    /**
+     * Fetches search suggestions with debouncing.
+     * Waits 300ms before making the API call to avoid too many requests.
+     * 
+     * @param query The search query to get suggestions for
+     */
+    fun fetchSuggestions(query: String) {
+        suggestionJob?.cancel()
+        
+        if (query.isBlank() || query.length < 2) {
+            _searchSuggestions.postValue(emptyList())
+            return
+        }
+        
+        suggestionJob = ioSafe {
+            delay(300) // Debounce
+            val suggestions = SearchSuggestionApi.getSuggestions(query)
+            _searchSuggestions.postValue(suggestions)
         }
     }
 
+    /**
+     * Clears the current search suggestions.
+     */
+    fun clearSuggestions() {
+        suggestionJob?.cancel()
+        _searchSuggestions.postValue(emptyList())
+    }
+
+    private val lock: MutableSet<String> = mutableSetOf()
+
+    // ExpandableHomepageList because the home adapter is reused in the search fragment
+    suspend fun expandAndReturn(name: String): HomeViewModel.ExpandableHomepageList? {
+        if (lock.contains(name)) return null
+        val query = lastQuery ?: return null
+        val repo = repos.find { it.name == name } ?: return null
+
+        lock += name
+
+        expandableSearches[name]?.let { current ->
+            debugAssert({ !current.hasNext }) {
+                "Expand called when not needed"
+            }
+
+            val nextPage = current.currentPage + 1
+            val next = repo.search(query, nextPage)
+            if (next is Resource.Success) {
+                val nextValue = next.value
+                expandableSearches[name]?.apply {
+                    this.hasNext = nextValue.hasNext
+                    this.currentPage = nextPage
+
+                    debugWarning({ nextValue.items.any { outer -> this.list.any { it.url == outer.url } } }) {
+                        "Expanded search contained an item that was previously already in the list.\nQuery = $query, ${nextValue.items} = ${this.list}"
+                    }
+
+                    // just to be sure we are not adding the same shit for some reason
+                    // Avoids weird behavior in the recyclerview by recreating the list
+                    this.list = (this.list + nextValue.items).distinctBy { it.url }
+                } ?: debugWarning {
+                    "Expanded an item not in search load named $name, current list is ${expandableSearches.keys}"
+                }
+            } else {
+                current.hasNext = false
+            }
+
+            _searchResponse.postValue(Resource.Success(bundleSearch(expandableSearches)))
+            _currentSearch.postValue(expandableSearches)
+        }
+
+        lock -= name
+
+        val item = expandableSearches[name] ?: return null
+        return HomeViewModel.ExpandableHomepageList(
+            HomePageList(name, item.list),
+            item.currentPage,
+            item.hasNext
+        )
+    }
+
+    private fun bundleSearch(lists: MutableMap<String, ExpandableSearchList>): ExpandableSearchList {
+        if (lists.size == 1) {
+            return lists.values.first()
+        }
+
+        val list = ArrayList<SearchResponse>()
+        val nestedList =
+            lists.map { it.value.list }
+
+        // I do it this way to move the relevant search results to the top
+        var index = 0
+        while (true) {
+            var added = 0
+            for (sublist in nestedList) {
+                if (sublist.size > index) {
+                    list.add(sublist[index])
+                    added++
+                }
+            }
+            if (added == 0) break
+            index++
+        }
+
+        return ExpandableSearchList(list, 1, false)
+    }
+
     private fun search(
         query: String,
         providersActive: Set<String>,
@@ -100,43 +223,30 @@ class SearchViewModel : ViewModel() {
             }
 
             _searchResponse.postValue(Resource.Loading())
+            _currentSearch.postValue(emptyMap())
+            expandableSearches.clear()
 
-
-            _currentSearch.postValue(ArrayList())
+            lastQuery = query
 
             withContext(Dispatchers.IO) { // This interrupts UI otherwise
-                val currentList = ArrayList<OnGoingSearch>()
-
                 repos.filter { a ->
                     (ignoreSettings || (providersActive.isEmpty() || providersActive.contains(a.name))) && (!isQuickSearch || a.hasQuickSearch)
                 }.amap { a -> // Parallel
-                    val search = if (isQuickSearch) a.quickSearch(query) else a.search(query)
+                    val search = if (isQuickSearch) a.quickSearch(query) else a.search(query, 1)
                     if (currentSearchIndex != currentIndex) return@amap
-                    currentList.add(OnGoingSearch(a.name, search))
-                    _currentSearch.postValue(currentList)
+                    if (search is Resource.Success) {
+                        val searchValue = search.value
+                        expandableSearches[a.name] =
+                            ExpandableSearchList(searchValue.items, 1, searchValue.hasNext)
+                    }
+
+                    _currentSearch.postValue(expandableSearches)
                 }
 
                 if (currentSearchIndex != currentIndex) return@withContext // this should prevent rewrite of existing data bug
 
-                _currentSearch.postValue(currentList)
-                val list = ArrayList<SearchResponse>()
-                val nestedList =
-                    currentList.map { it.data }
-                        .filterIsInstance<Resource.Success<List<SearchResponse>>>().map { it.value }
-
-                // I do it this way to move the relevant search results to the top
-                var index = 0
-                while (true) {
-                    var added = 0
-                    for (sublist in nestedList) {
-                        if (sublist.size > index) {
-                            list.add(sublist[index])
-                            added++
-                        }
-                    }
-                    if (added == 0) break
-                    index++
-                }
+                _currentSearch.postValue(expandableSearches)
+                val list = bundleSearch(expandableSearches)
 
                 _searchResponse.postValue(Resource.Success(list))
             }
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 71077e91f7c..938b870bb89 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
@@ -1,5 +1,6 @@
 package com.lagradost.cloudstream3.ui.search
 
+import com.lagradost.cloudstream3.Score
 import com.lagradost.cloudstream3.SearchQuality
 import com.lagradost.cloudstream3.SearchResponse
 import com.lagradost.cloudstream3.TvType
@@ -15,5 +16,6 @@ class SyncSearchViewModel {
         override var id: Int?,
         override var quality: SearchQuality? = null,
         override var posterHeaders: Map<String, String>? = null,
+        override var score: Score? = null,
     ) : SearchResponse
 }
\ No newline at end of file
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 ba53f96f1fb..be8b4180c2b 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,65 +1,56 @@
 package com.lagradost.cloudstream3.ui.settings
 
-import android.annotation.SuppressLint
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.view.isVisible
-import androidx.recyclerview.widget.RecyclerView
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.databinding.AccountSingleBinding
-import com.lagradost.cloudstream3.syncproviders.AuthAPI
+import com.lagradost.cloudstream3.syncproviders.AuthData
+import com.lagradost.cloudstream3.ui.BaseDiffCallback
+import com.lagradost.cloudstream3.ui.NoStateAdapter
+import com.lagradost.cloudstream3.ui.ViewHolderState
 import com.lagradost.cloudstream3.utils.ImageLoader.loadImage
 
-class AccountClickCallback(val action: Int, val view: View, val card: AuthAPI.LoginInfo)
+class AccountClickCallback(val action: Int, val view: View, val card: AuthData)
 
 class AccountAdapter(
-    private val cardList: List<AuthAPI.LoginInfo>,
     private val clickCallback: (AccountClickCallback) -> Unit
 ) :
-    RecyclerView.Adapter<RecyclerView.ViewHolder>() {
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-        return CardViewHolder(
-            AccountSingleBinding.inflate(LayoutInflater.from(parent.context), parent, false), //LayoutInflater.from(parent.context).inflate(layout, parent, false),
-
-            clickCallback
+    NoStateAdapter<AuthData>(
+        diffCallback = BaseDiffCallback(itemSame = { a, b ->
+            a.user.id == b.user.id
+        })
+    ) {
+
+    override fun onCreateContent(parent: ViewGroup): ViewHolderState<Any> {
+        return ViewHolderState(
+            AccountSingleBinding.inflate(
+                LayoutInflater.from(parent.context),
+                parent,
+                false
+            )
         )
     }
 
-    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-        when (holder) {
-            is CardViewHolder -> {
-                holder.bind(cardList[position])
-            }
-        }
-    }
-
-    override fun getItemCount(): Int {
-        return cardList.size
-    }
-
-    override fun getItemId(position: Int): Long {
-        return cardList[position].accountIndex.toLong()
+    override fun onClearView(holder: ViewHolderState<Any>) {
+        val binding = holder.view as? AccountSingleBinding ?: return
+        clearImage(binding.accountProfilePicture)
     }
 
-    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?.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))
-                }
+    override fun onBindContent(holder: ViewHolderState<Any>, item: AuthData, position: Int) {
+        val binding = holder.view as? AccountSingleBinding ?: return
+        binding.apply {
+            accountName.text = item.user.name
+                ?: "${binding.accountName.context.getString(R.string.account)} ${position + 1}"
+            accountProfilePicture.isVisible = true
+            accountProfilePicture.loadImage(
+                item.user.profilePicture,
+                headers = item.user.profilePictureHeaders
+            )
+
+            root.setOnClickListener {
+                clickCallback.invoke(AccountClickCallback(0, root, item))
             }
         }
     }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/Globals.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/Globals.kt
index aa513d87a64..93e469a4d64 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/Globals.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/Globals.kt
@@ -3,6 +3,7 @@ package com.lagradost.cloudstream3.ui.settings
 import android.app.UiModeManager
 import android.content.Context
 import android.content.res.Configuration
+import android.content.res.Resources
 import android.os.Build
 import androidx.preference.PreferenceManager
 import com.lagradost.cloudstream3.R
@@ -44,6 +45,11 @@ object Globals {
         layoutId = layoutIntCorrected()
     }
 
+    /** Returns true if the current orientation is landscape. */
+    fun isLandscape(): Boolean =
+        isLayout(TV or EMULATOR) ||
+            Resources.getSystem().configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
+
     /** Returns true if the layout is any of the flags,
      * so isLayout(TV or EMULATOR) is a valid statement for checking if the layout is in the emulator
      * or tv. Auto will become the "TV" or the "PHONE" layout.
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
index 7fcfefb7b0c..36599064683 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/LogcatAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/LogcatAdapter.kt
@@ -2,25 +2,30 @@ 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
+import com.lagradost.cloudstream3.ui.BaseDiffCallback
+import com.lagradost.cloudstream3.ui.NoStateAdapter
+import com.lagradost.cloudstream3.ui.ViewHolderState
 
-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)
+class LogcatAdapter() : NoStateAdapter<String>(
+    diffCallback = BaseDiffCallback(
+        itemSame = String::equals,
+        contentSame = String::equals
+    )
+) {
+    override fun onCreateContent(parent: ViewGroup): ViewHolderState<Any> {
+        return ViewHolderState(
+            ItemLogcatBinding.inflate(
+                LayoutInflater.from(parent.context),
+                parent,
+                false
+            )
+        )
     }
 
-    override fun onBindViewHolder(holder: LogViewHolder, position: Int) {
-        holder.binding.logText.text = logs[position]
+    override fun onBindContent(holder: ViewHolderState<Any>, item: String, position: Int) {
+        (holder.view as? ItemLogcatBinding)?.apply {
+            logText.text = item
+        }
     }
-
-    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 ebcc61b67a5..8d96a6b140e 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
@@ -1,5 +1,6 @@
 package com.lagradost.cloudstream3.ui.settings
 
+import android.annotation.SuppressLint
 import android.graphics.Bitmap
 import android.os.Bundle
 import android.os.CountDownTimer
@@ -13,31 +14,36 @@ import androidx.core.content.edit
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.fragment.app.FragmentActivity
-import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.PreferenceManager
 import androidx.preference.SwitchPreference
 import androidx.recyclerview.widget.RecyclerView
-import com.lagradost.cloudstream3.AcraApplication.Companion.openBrowser
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.openBrowser
 import com.lagradost.cloudstream3.CommonActivity.onDialogDismissedEvent
 import com.lagradost.cloudstream3.CommonActivity.showToast
+import com.lagradost.cloudstream3.ErrorLoadingException
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.databinding.AccountManagmentBinding
 import com.lagradost.cloudstream3.databinding.AccountSwitchBinding
 import com.lagradost.cloudstream3.databinding.AddAccountInputBinding
 import com.lagradost.cloudstream3.databinding.DeviceAuthBinding
 import com.lagradost.cloudstream3.mvvm.logError
-import com.lagradost.cloudstream3.syncproviders.AccountManager
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.aniListApi
+import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.animeSkipApi
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.malApi
+import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.kitsuApi
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.openSubtitlesApi
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.simklApi
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.subDlApi
-import com.lagradost.cloudstream3.syncproviders.AuthAPI
-import com.lagradost.cloudstream3.syncproviders.InAppAuthAPI
-import com.lagradost.cloudstream3.syncproviders.OAuth2API
+import com.lagradost.cloudstream3.syncproviders.AuthLoginResponse
+import com.lagradost.cloudstream3.syncproviders.AuthRepo
+import com.lagradost.cloudstream3.syncproviders.AuthUser
+import com.lagradost.cloudstream3.syncproviders.PlainAuthRepo
+import com.lagradost.cloudstream3.syncproviders.SubtitleRepo
+import com.lagradost.cloudstream3.syncproviders.SyncRepo
+import com.lagradost.cloudstream3.ui.BasePreferenceFragmentCompat
 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.PHONE
 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
@@ -63,13 +69,15 @@ import com.lagradost.cloudstream3.utils.setText
 import com.lagradost.cloudstream3.utils.txt
 import qrcode.QRCode
 
-class SettingsAccount : PreferenceFragmentCompat(), BiometricCallback {
+class SettingsAccount : BasePreferenceFragmentCompat(), BiometricCallback {
     companion object {
         /** Used by nginx plugin too */
+        @SuppressLint("StringFormatInvalid")
         fun showLoginInfo(
             activity: FragmentActivity?,
-            api: AccountManager,
-            info: AuthAPI.LoginInfo
+            api: AuthRepo,
+            info: AuthUser?,
+            index: Int,
         ) {
             if (activity == null) return
             val binding: AccountManagmentBinding =
@@ -79,17 +87,25 @@ class SettingsAccount : PreferenceFragmentCompat(), BiometricCallback {
                     .setView(binding.root)
             val dialog = builder.show()
 
-            binding.accountMainProfilePictureHolder.isVisible = !info.profilePicture.isNullOrEmpty()
-            binding.accountMainProfilePicture.loadImage(info.profilePicture)
-
+            binding.accountMainProfilePictureHolder.isVisible =
+                !info?.profilePicture.isNullOrEmpty()
+            binding.accountMainProfilePicture.loadImage(info?.profilePicture)
 
+            binding.accountLogout.isVisible = info != null
             binding.accountLogout.setOnClickListener {
-                api.logOut()
+                if (info != null) {
+                    ioSafe { api.logout(info) }
+                }
                 dialog.dismissSafe(activity)
             }
 
-            (info.name ?: activity.getString(R.string.no_data)).let {
-                dialog.findViewById<TextView>(R.id.account_name)?.text = it
+            dialog.findViewById<TextView>(R.id.account_name)?.text = if (info != null) {
+                info.name ?: "%s %d".format(
+                    activity.getString(R.string.account),
+                    index + 1
+                )
+            } else {
+                activity.getString(R.string.no_account)
             }
 
             binding.accountSite.text = api.name
@@ -103,8 +119,8 @@ class SettingsAccount : PreferenceFragmentCompat(), BiometricCallback {
             }
         }
 
-        private fun showAccountSwitch(activity: FragmentActivity, api: AccountManager) {
-            val accounts = api.getAccounts() ?: return
+        private fun showAccountSwitch(activity: FragmentActivity, api: AuthRepo) {
+            val accounts = api.accounts
             val binding: AccountSwitchBinding =
                 AccountSwitchBinding.inflate(activity.layoutInflater, null, false)
 
@@ -118,248 +134,272 @@ class SettingsAccount : PreferenceFragmentCompat(), BiometricCallback {
                 dialog?.dismissSafe(activity)
             }
 
-            val ogIndex = api.accountIndex
-
-            val items = ArrayList<AuthAPI.LoginInfo>()
-
-            for (index in accounts) {
-                api.accountIndex = index
-                val accountInfo = api.loginInfo()
-                if (accountInfo != null) {
-                    items.add(accountInfo)
-                }
+            binding.accountNone.setOnClickListener {
+                api.accountId = -1
+                dialog?.dismissSafe(activity)
             }
-            api.accountIndex = ogIndex
-            val adapter = AccountAdapter(items) {
+
+            val adapter = AccountAdapter {
                 dialog?.dismissSafe(activity)
-                api.changeAccount(it.card.accountIndex)
+                api.accountId = it.card.user.id
+            }.apply {
+                submitList(accounts.toList())
             }
             val list = dialog.findViewById<RecyclerView>(R.id.account_list)
             list?.adapter = adapter
         }
 
+
         @UiThread
-        fun addAccount(activity: FragmentActivity?, api: AccountManager) {
-            try {
-                when (api) {
-                    is OAuth2API -> {
-                        if (isLayout(PHONE) || !api.supportDeviceAuth) {
-                            api.authenticate(activity)
-                        } else if (api.supportDeviceAuth && activity != null) {
-
-                            val binding: DeviceAuthBinding =
-                                DeviceAuthBinding.inflate(activity.layoutInflater, null, false)
-
-                            val builder =
-                                AlertDialog.Builder(activity)
-                                    .setView(binding.root)
-
-                            builder.apply {
-                                setNegativeButton(R.string.cancel) { _, _ -> }
-                                setPositiveButton(R.string.auth_locally) { _, _ ->
-                                    api.authenticate(activity)
-                                }
-                            }
+        fun showPin(activity: FragmentActivity, api: AuthRepo) {
+            val binding: DeviceAuthBinding =
+                DeviceAuthBinding.inflate(activity.layoutInflater, null, false)
 
-                            val dialog = builder.create()
+            val builder =
+                AlertDialog.Builder(activity)
+                    .setView(binding.root)
 
-                            ioSafe {
-                                try {
-                                    val pinCodeData = api.getDevicePin()
-                                    if (pinCodeData == null) {
-                                        showToast(R.string.device_pin_error_message)
-                                        api.authenticate(activity)
-                                        return@ioSafe
-                                    }
-
-                                    /*val logoBytes = ContextCompat.getDrawable(
-                                        activity,
-                                        R.drawable.cloud_2_solid
-                                    )?.toBitmapOrNull()?.let { bitmap ->
-                                        val csLogo = ByteArrayOutputStream()
-                                        bitmap.compress(Bitmap.CompressFormat.PNG, 100, csLogo)
-                                        csLogo.toByteArray()
-                                    }*/
-
-                                    val qrCodeImage = QRCode.ofRoundedSquares()
-                                        .withColor(activity.colorFromAttribute(R.attr.textColor))
-                                        .withBackgroundColor(activity.colorFromAttribute(R.attr.primaryBlackBackground))
-                                        //.withLogo(logoBytes, 200.toPx, 200.toPx) //For later if logo needed anytime
-                                        .build(pinCodeData.verificationUrl)
-                                        .render().nativeImage() as Bitmap
-
-                                    activity.runOnUiThread {
-                                        dialog.show()
-                                        binding.apply {
-                                            devicePinCode.setText(txt(pinCodeData.userCode))
-                                            deviceAuthMessage.setText(
-                                                txt(
-                                                    R.string.device_pin_url_message,
-                                                    pinCodeData.verificationUrl
-                                                )
-                                            )
-                                            deviceAuthQrcode.loadImage(qrCodeImage)
-                                        }
-
-                                        val expirationMillis =
-                                            pinCodeData.expiresIn.times(1000).toLong()
-
-                                        object : CountDownTimer(expirationMillis, 1000) {
-
-                                            override fun onTick(millisUntilFinished: Long) {
-                                                val secondsUntilFinished =
-                                                    millisUntilFinished.div(1000).toInt()
-
-                                                binding.deviceAuthValidationCounter.setText(
-                                                    txt(
-                                                        R.string.device_pin_counter_text,
-                                                        secondsUntilFinished.div(60),
-                                                        secondsUntilFinished.rem(60)
-                                                    )
-                                                )
-
-                                                ioSafe {
-                                                    if (secondsUntilFinished.rem(pinCodeData.interval) == 0 && api.handleDeviceAuth(pinCodeData)) {
-                                                        showToast(
-                                                            txt(
-                                                                R.string.authenticated_user,
-                                                                api.name
-                                                            )
-                                                        )
-                                                        dialog.dismissSafe(activity)
-                                                        cancel()
-                                                    }
-                                                }
-                                            }
-
-                                            override fun onFinish() {
-                                                showToast(R.string.device_pin_expired_message)
-                                                dialog.dismissSafe(activity)
-                                            }
-
-                                        }.start()
-                                    }
-                                } catch (e: Exception) {
-                                    logError(e)
-                                }
-                            }
-                        }
+            builder.apply {
+                setNegativeButton(R.string.cancel) { _, _ -> }
+                if (api.hasOAuth2) {
+                    setPositiveButton(R.string.auth_locally) { _, _ ->
+                        api.openOAuth2PageWithToast()
                     }
+                }
+            }
 
-                    is InAppAuthAPI -> {
-                        if (activity == null) return
-                        val binding: AddAccountInputBinding =
-                            AddAccountInputBinding.inflate(activity.layoutInflater, null, false)
-                        val builder =
-                            AlertDialog.Builder(activity, R.style.AlertDialogCustom)
-                                .setView(binding.root)
-                        val dialog = builder.show()
-
-                        val visibilityMap = listOf(
-                            binding.loginEmailInput to api.requiresEmail,
-                            binding.loginPasswordInput to api.requiresPassword,
-                            binding.loginServerInput to api.requiresServer,
-                            binding.loginUsernameInput to api.requiresUsername
-                        )
+            val dialog = builder.create()
 
-                        if (isLayout(TV or EMULATOR)) {
-                            visibilityMap.forEach { (input, isVisible) ->
-                                input.isVisible = isVisible
-
-                                // Band-aid for weird FireTV behavior causing crashes because keyboard covers the screen
-                                input.setOnEditorActionListener { textView, actionId, _ ->
-                                    if (actionId == EditorInfo.IME_ACTION_NEXT) {
-                                        val view = textView.focusSearch(FOCUS_DOWN)
-                                        return@setOnEditorActionListener view?.requestFocus(
-                                            FOCUS_DOWN
-                                        ) == true
-                                    }
-                                    return@setOnEditorActionListener true
-                                }
-                            }
-                        } else {
-                            visibilityMap.forEach { (input, isVisible) ->
-                                input.isVisible = isVisible
-                            }
-                        }
-
-                        binding.loginEmailInput.isVisible = api.requiresEmail
-                        binding.loginPasswordInput.isVisible = api.requiresPassword
-                        binding.loginServerInput.isVisible = api.requiresServer
-                        binding.loginUsernameInput.isVisible = api.requiresUsername
-                        binding.createAccount.isGone = api.createAccountUrl.isNullOrBlank()
-                        binding.createAccount.setOnClickListener {
-                            openBrowser(
-                                api.createAccountUrl ?: return@setOnClickListener,
-                                activity
+            ioSafe {
+                val pinCodeData = try {
+                    api.pinRequest()
+                } catch (e: ErrorLoadingException) {
+                    if (e.message != null) {
+                        showToast(e.message)
+                        null
+                    } else {
+                        throw e
+                    }
+                } catch (t: Throwable) {
+                    logError(t)
+                    null
+                }
+                if (pinCodeData == null) {
+                    if (api.hasOAuth2) {
+                        showToast(R.string.device_pin_error_message)
+                        api.openOAuth2PageWithToast()
+                    } else {
+                        showToast(
+                            txt(
+                                R.string.authenticated_user_fail,
+                                api.name
                             )
-                            dialog.dismissSafe()
-                        }
-
-                        val displayedItems = listOf(
-                            binding.loginUsernameInput,
-                            binding.loginEmailInput,
-                            binding.loginServerInput,
-                            binding.loginPasswordInput
-                        ).filter { it.isVisible }
-
-                        displayedItems.foldRight(displayedItems.firstOrNull()) { item, previous ->
-                            item.id.let { previous?.nextFocusDownId = it }
-                            previous?.id?.let { item.nextFocusUpId = it }
-                            item
-                        }
+                        )
+                    }
+                    return@ioSafe
+                }
 
-                        displayedItems.firstOrNull()?.let {
-                            binding.createAccount.nextFocusDownId = it.id
-                            it.nextFocusUpId = binding.createAccount.id
-                        }
-                        binding.applyBtt.id.let {
-                            displayedItems.lastOrNull()?.nextFocusDownId = it
-                        }
+                /*val logoBytes = ContextCompat.getDrawable(
+                    activity,
+                    R.drawable.cloud_2_solid
+                )?.toBitmapOrNull()?.let { bitmap ->
+                    val csLogo = ByteArrayOutputStream()
+                    bitmap.compress(Bitmap.CompressFormat.PNG, 100, csLogo)
+                    csLogo.toByteArray()
+                }*/
+
+                val qrCodeImage = QRCode.ofRoundedSquares()
+                    .withColor(activity.colorFromAttribute(R.attr.textColor))
+                    .withBackgroundColor(activity.colorFromAttribute(R.attr.primaryBlackBackground))
+                    //.withLogo(logoBytes, 200.toPx, 200.toPx) //For later if logo needed anytime
+                    .build(pinCodeData.verificationUrl)
+                    .render().nativeImage() as Bitmap
+
+                activity.runOnUiThread {
+                    dialog.show()
+                    binding.apply {
+                        devicePinCode.setText(txt(pinCodeData.userCode))
+                        deviceAuthMessage.setText(
+                            txt(
+                                R.string.device_pin_url_message,
+                                pinCodeData.verificationUrl
+                            )
+                        )
+                        deviceAuthQrcode.loadImage(qrCodeImage)
+                    }
 
-                        binding.text1.text = api.name
+                    val expirationMillis =
+                        pinCodeData.expiresIn.times(1000).toLong()
 
-                        if (api.storesPasswordInPlainText) {
-                            api.getLatestLoginData()?.let { data ->
-                                binding.loginEmailInput.setText(data.email ?: "")
-                                binding.loginServerInput.setText(data.server ?: "")
-                                binding.loginUsernameInput.setText(data.username ?: "")
-                                binding.loginPasswordInput.setText(data.password ?: "")
-                            }
-                        }
+                    object : CountDownTimer(expirationMillis, 1000) {
+                        override fun onTick(millisUntilFinished: Long) {
+                            val secondsUntilFinished =
+                                millisUntilFinished.div(1000).toInt()
 
-                        binding.applyBtt.setOnClickListener {
-                            val loginData = InAppAuthAPI.LoginData(
-                                username = if (api.requiresUsername) binding.loginUsernameInput.text?.toString() else null,
-                                password = if (api.requiresPassword) binding.loginPasswordInput.text?.toString() else null,
-                                email = if (api.requiresEmail) binding.loginEmailInput.text?.toString() else null,
-                                server = if (api.requiresServer) binding.loginServerInput.text?.toString() else null,
+                            binding.deviceAuthValidationCounter.setText(
+                                txt(
+                                    R.string.device_pin_counter_text,
+                                    secondsUntilFinished.div(60),
+                                    secondsUntilFinished.rem(60)
+                                )
                             )
+
                             ioSafe {
-                                try {
+                                if (secondsUntilFinished.rem(pinCodeData.interval) == 0 && api.login(
+                                        pinCodeData
+                                    )
+                                ) {
                                     showToast(
                                         txt(
-                                            if (api.login(loginData)) R.string.authenticated_user else R.string.authenticated_user_fail,
+                                            R.string.authenticated_user,
                                             api.name
                                         )
                                     )
-                                } catch (e: Exception) {
-                                    logError(e)
+                                    dialog.dismissSafe(activity)
+                                    cancel()
                                 }
                             }
-                            dialog.dismissSafe(activity)
                         }
-                        binding.cancelBtt.setOnClickListener {
+
+                        override fun onFinish() {
+                            showToast(R.string.device_pin_expired_message)
                             dialog.dismissSafe(activity)
                         }
+                    }.start()
+                }
+            }
+        }
+
+
+        fun showAppLogin(activity: FragmentActivity, api: AuthRepo) {
+
+            val binding: AddAccountInputBinding =
+                AddAccountInputBinding.inflate(activity.layoutInflater, null, false)
+            val builder =
+                AlertDialog.Builder(activity, R.style.AlertDialogCustom)
+                    .setView(binding.root)
+            val dialog = builder.show()
+            val req =
+                api.inAppLoginRequirement ?: throw ErrorLoadingException("Missing LoginRequirement")
+            val visibilityMap = listOf(
+                binding.loginEmailInput to req.email,
+                binding.loginPasswordInput to req.password,
+                binding.loginServerInput to req.server,
+                binding.loginUsernameInput to req.username
+            )
+
+            if (isLayout(TV or EMULATOR)) {
+                visibilityMap.forEach { (input, isVisible) ->
+                    input.isVisible = isVisible
+
+                    // Band-aid for weird FireTV behavior causing crashes because keyboard covers the screen
+                    input.setOnEditorActionListener { textView, actionId, _ ->
+                        if (actionId == EditorInfo.IME_ACTION_NEXT) {
+                            val view = textView.focusSearch(FOCUS_DOWN)
+                            return@setOnEditorActionListener view?.requestFocus(
+                                FOCUS_DOWN
+                            ) == true
+                        }
+                        return@setOnEditorActionListener true
                     }
+                }
+            } else {
+                visibilityMap.forEach { (input, isVisible) ->
+                    input.isVisible = isVisible
+                }
+            }
+
+            binding.createAccount.isGone = api.createAccountUrl.isNullOrBlank()
+            binding.createAccount.setOnClickListener {
+                openBrowser(
+                    api.createAccountUrl ?: return@setOnClickListener,
+                    activity
+                )
+                dialog.dismissSafe()
+            }
+
+            val displayedItems = listOf(
+                binding.loginUsernameInput,
+                binding.loginEmailInput,
+                binding.loginServerInput,
+                binding.loginPasswordInput
+            ).filter { it.isVisible }
+
+            displayedItems.foldRight(displayedItems.firstOrNull()) { item, previous ->
+                item.id.let { previous?.nextFocusDownId = it }
+                previous?.id?.let { item.nextFocusUpId = it }
+                item
+            }
+
+            displayedItems.firstOrNull()?.let {
+                binding.createAccount.nextFocusDownId = it.id
+                it.nextFocusUpId = binding.createAccount.id
+            }
+            binding.applyBtt.id.let {
+                displayedItems.lastOrNull()?.nextFocusDownId = it
+            }
 
-                    else -> {
-                        throw NotImplementedError("You are trying to add an account that has an unknown login method")
+            binding.text1.text = api.name
+
+            binding.applyBtt.setOnClickListener {
+                val loginData = AuthLoginResponse(
+                    username = if (req.username) binding.loginUsernameInput.text?.toString() else null,
+                    password = if (req.password) binding.loginPasswordInput.text?.toString() else null,
+                    email = if (req.email) binding.loginEmailInput.text?.toString() else null,
+                    server = if (req.server) binding.loginServerInput.text?.toString() else null,
+                )
+                ioSafe {
+                    try {
+                        if (api.login(loginData)) {
+                            showToast(
+                                txt(
+                                    R.string.authenticated_user,
+                                    api.name
+                                )
+                            )
+                            dialog.dismissSafe(activity)
+                        } else {
+                            showToast(
+                                txt(
+                                    R.string.authenticated_user_fail,
+                                    api.name
+                                )
+                            )
+                        }
+                    } catch (t: Throwable) {
+                        if (t is ErrorLoadingException && t.message != null) {
+                            showToast(t.message)
+                            return@ioSafe
+                        }
+                        showToast(
+                            txt(
+                                R.string.authenticated_user_fail,
+                                api.name
+                            )
+                        )
                     }
                 }
-            } catch (e: Exception) {
-                logError(e)
+            }
+            binding.cancelBtt.setOnClickListener {
+                dialog.dismissSafe(activity)
+            }
+        }
+
+        @UiThread
+        fun addAccount(activity: FragmentActivity, api: AuthRepo) {
+            try {
+                if (api.hasPin && !isLayout(PHONE)) {
+                    showPin(activity, api)
+                } else if (api.hasOAuth2) {
+                    api.openOAuth2PageWithToast()
+                } else if (api.hasInApp) {
+                    showAppLogin(activity, api)
+                } else {
+                    throw NotImplementedError("The api ${api.name} has no login")
+                }
+            } catch (t: Throwable) {
+                showToast(txt(R.string.authenticated_user_fail, api.name))
+                logError(t)
             }
         }
     }
@@ -378,7 +418,7 @@ class SettingsAccount : PreferenceFragmentCompat(), BiometricCallback {
     }
 
     override fun onAuthenticationSuccess() {
-        if (isAuthEnabled(context?: return)) {
+        if (isAuthEnabled(context ?: return)) {
             updateAuthPreference(true)
             BackupUtils.backup(activity)
             activity?.showBottomDialogText(
@@ -409,10 +449,10 @@ class SettingsAccount : PreferenceFragmentCompat(), BiometricCallback {
 
             if (deviceHasPasswordPinLock(ctx)) {
                 startBiometricAuthentication(
-                    activity?: return@setOnPreferenceClickListener false,
+                    activity ?: return@setOnPreferenceClickListener false,
                     R.string.biometric_authentication_title,
                     false
-                    )
+                )
                 promptInfo?.let {
                     authCallback = this
                     biometricPrompt?.authenticate(it)
@@ -424,20 +464,24 @@ class SettingsAccount : PreferenceFragmentCompat(), BiometricCallback {
 
         val syncApis =
             listOf(
-                R.string.mal_key to malApi,
-                R.string.anilist_key to aniListApi,
-                R.string.simkl_key to simklApi,
-                R.string.opensubtitles_key to openSubtitlesApi,
-                R.string.subdl_key to subDlApi,
+                R.string.mal_key to SyncRepo(malApi),
+                R.string.kitsu_key to SyncRepo(kitsuApi),
+                R.string.anilist_key to SyncRepo(aniListApi),
+                R.string.simkl_key to SyncRepo(simklApi),
+                R.string.opensubtitles_key to SubtitleRepo(openSubtitlesApi),
+                R.string.subdl_key to SubtitleRepo(subDlApi),
+                R.string.animeskip_key to PlainAuthRepo(animeSkipApi),
             )
 
         for ((key, api) in syncApis) {
             getPref(key)?.apply {
                 title = api.name
                 setOnPreferenceClickListener {
-                    val info = api.loginInfo()
-                    if (info != null) {
-                        showLoginInfo(activity, api, info)
+                    val activity = activity ?: return@setOnPreferenceClickListener false
+                    val info = api.authUser()
+                    val index = api.accounts.indexOfFirst { account -> account.user.id == info?.id }
+                    if (api.accounts.isNotEmpty()) {
+                        showLoginInfo(activity, api, info, index)
                     } else {
                         addAccount(activity, api)
                     }
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 f256a31e79e..e41109b5982 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
@@ -2,9 +2,7 @@ package com.lagradost.cloudstream3.ui.settings
 
 import android.os.Bundle
 import android.util.Log
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import android.widget.ImageView
 import androidx.annotation.StringRes
 import androidx.core.view.children
@@ -18,17 +16,21 @@ import com.lagradost.cloudstream3.BuildConfig
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.databinding.MainSettingsBinding
 import com.lagradost.cloudstream3.mvvm.logError
+import com.lagradost.cloudstream3.mvvm.safe
 import com.lagradost.cloudstream3.syncproviders.AccountManager
-import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.accountManagers
+import com.lagradost.cloudstream3.syncproviders.AuthRepo
+import com.lagradost.cloudstream3.ui.BaseFragment
 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.isLandscape
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
 import com.lagradost.cloudstream3.utils.DataStoreHelper
+import com.lagradost.cloudstream3.utils.GitInfo.currentCommitHash
 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.fixSystemBarsPadding
 import com.lagradost.cloudstream3.utils.UIHelper.navigate
 import com.lagradost.cloudstream3.utils.UIHelper.toPx
 import com.lagradost.cloudstream3.utils.getImageFromDrawable
@@ -40,7 +42,9 @@ import java.util.Date
 import java.util.Locale
 import java.util.TimeZone
 
-class SettingsFragment : Fragment() {
+class SettingsFragment : BaseFragment<MainSettingsBinding>(
+    BaseFragment.BindingCreator.Inflate(MainSettingsBinding::inflate)
+) {
     companion object {
         fun PreferenceFragmentCompat?.getPref(id: Int): Preference? {
             if (this == null) return null
@@ -122,7 +126,6 @@ class SettingsFragment : Fragment() {
                     }
                 }
             }
-            UIHelper.fixPaddingStatusbar(settingsToolbar)
         }
 
         fun Fragment?.setUpToolbar(@StringRes title: Int) {
@@ -135,11 +138,20 @@ class SettingsFragment : Fragment() {
                     setNavigationIcon(R.drawable.ic_baseline_arrow_back_24)
                     children.firstOrNull { it is ImageView }?.tag = getString(R.string.tv_no_focus_tag)
                     setNavigationOnClickListener {
-                        activity?.onBackPressedDispatcher?.onBackPressed()
+                        safe { activity?.onBackPressedDispatcher?.onBackPressed() }
                     }
                 }
             }
-            UIHelper.fixPaddingStatusbar(settingsToolbar)
+        }
+
+        fun Fragment.setSystemBarsPadding() {
+            view?.let {
+                fixSystemBarsPadding(
+                    it,
+                    padLeft = isLayout(TV or EMULATOR),
+                    padBottom = isLandscape()
+                )
+            }
         }
 
         fun getFolderSize(dir: File): Long {
@@ -157,24 +169,15 @@ class SettingsFragment : Fragment() {
         }
     }
 
-    override fun onDestroyView() {
-        binding = null
-        super.onDestroyView()
+    override fun fixLayout(view: View) {
+        fixSystemBarsPadding(
+            view,
+            padBottom = isLandscape(),
+            padLeft = isLayout(TV or EMULATOR)
+        )
     }
 
-    var binding: MainSettingsBinding? = null
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?,
-    ): View {
-        val localBinding = MainSettingsBinding.inflate(inflater, container, false)
-        binding = localBinding
-        return localBinding.root
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    override fun onBindingCreated(binding: MainSettingsBinding) {
         fun navigate(id: Int) {
             activity?.navigate(id, Bundle())
         }
@@ -183,26 +186,25 @@ class SettingsFragment : Fragment() {
         showToast(activity,"${VideoDownloadManager.downloadStatusEvent.size} :
         ${VideoDownloadManager.downloadProgressEvent.size}") **/
 
-        fun hasProfilePictureFromAccountManagers(accountManagers: List<AccountManager>): Boolean {
+        fun hasProfilePictureFromAccountManagers(accountManagers: Array<AuthRepo>): Boolean {
             for (syncApi in accountManagers) {
-                val login = syncApi.loginInfo()
+                val login = syncApi.authUser()
                 val pic = login?.profilePicture ?: continue
 
-                binding?.settingsProfilePic?.let { imageView ->
+                binding.settingsProfilePic.let { imageView ->
                     imageView.loadImage(pic) {
                         // Fallback to random error drawable
                         error { getImageFromDrawable(context ?: return@error null, errorProfilePic) }
                     }
                 }
-                binding?.settingsProfileText?.text = login.name
+                binding.settingsProfileText.text = login.name
                 return true // sync profile exists
-
             }
             return false // not syncing
         }
 
         // display local account information if not syncing
-        if (!hasProfilePictureFromAccountManagers(accountManagers)) {
+        if (!hasProfilePictureFromAccountManagers(AccountManager.allApis)) {
             val activity = activity ?: return
             val currentAccount = try {
                 DataStoreHelper.accounts.firstOrNull {
@@ -214,11 +216,11 @@ class SettingsFragment : Fragment() {
                 null
             }
 
-            binding?.settingsProfilePic?.loadImage(currentAccount?.image)
-            binding?.settingsProfileText?.text = currentAccount?.name
+            binding.settingsProfilePic.loadImage(currentAccount?.image)
+            binding.settingsProfileText.text = currentAccount?.name
         }
 
-        binding?.apply {
+        binding.apply {
             listOf(
                 settingsGeneral to R.id.action_navigation_global_to_navigation_settings_general,
                 settingsPlayer to R.id.action_navigation_global_to_navigation_settings_player,
@@ -245,16 +247,18 @@ class SettingsFragment : Fragment() {
             }
         }
 
-        val appVersion = getString(R.string.app_version)
-        val commitInfo = getString(R.string.commit_hash)
+        val appVersion = BuildConfig.VERSION_NAME
+        val commitHash = activity?.currentCommitHash() ?: ""
         val buildTimestamp = SimpleDateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.LONG,
             Locale.getDefault()
         ).apply { timeZone = TimeZone.getTimeZone("UTC")
         }.format(Date(BuildConfig.BUILD_DATE)).replace("UTC", "")
 
-        binding?.buildDate?.text = buildTimestamp
-        binding?.appVersionInfo?.setOnLongClickListener {
-            clipboardHelper(txt(R.string.extension_version), "$appVersion $commitInfo $buildTimestamp")
+        binding.appVersion.text = appVersion
+        binding.buildDate.text = buildTimestamp
+        binding.commitHash.text = commitHash
+        binding.appVersionInfo.setOnLongClickListener {
+            clipboardHelper(txt(R.string.extension_version), "$appVersion $commitHash $buildTimestamp")
             true
         }
     }
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 e82481ffa68..dbf2ff1dc53 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
@@ -2,18 +2,19 @@ package com.lagradost.cloudstream3.ui.settings
 
 import android.content.Context
 import android.net.Uri
-import android.os.Build
 import android.os.Bundle
 import android.view.View
 import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
-import androidx.preference.PreferenceFragmentCompat
+import androidx.core.content.edit
+import androidx.core.os.ConfigurationCompat
+import androidx.fragment.app.Fragment
 import androidx.preference.PreferenceManager
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.APIHolder.allProviders
-import com.lagradost.cloudstream3.AcraApplication
-import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
-import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
+import com.lagradost.cloudstream3.CloudStreamApp
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.getKey
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.setKey
 import com.lagradost.cloudstream3.CommonActivity
 import com.lagradost.cloudstream3.CommonActivity.showToast
 import com.lagradost.cloudstream3.MainActivity
@@ -24,6 +25,7 @@ import com.lagradost.cloudstream3.databinding.AddSiteInputBinding
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.mvvm.safe
 import com.lagradost.cloudstream3.network.initClient
+import com.lagradost.cloudstream3.ui.BasePreferenceFragmentCompat
 import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
 import com.lagradost.cloudstream3.ui.settings.Globals.beneneCount
@@ -43,90 +45,99 @@ 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.cloudstream3.utils.downloader.DownloadFileManagement
+import com.lagradost.cloudstream3.utils.downloader.DownloadFileManagement.getBasePath
+import com.lagradost.cloudstream3.utils.downloader.DownloadQueueManager
+import java.util.Locale
 
 // Change local language settings in the app.
 fun getCurrentLocale(context: Context): String {
-    val res = context.resources
-    val conf = res.configuration
-
-    return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-        conf?.locales?.get(0)?.toString() ?: "en"
-    } else {
-        @Suppress("DEPRECATION")
-        conf?.locale?.toString() ?: "en"
-    }
+    val conf = context.resources.configuration
+    return ConfigurationCompat.getLocales(conf).get(0)?.toLanguageTag() ?: "en"
 }
 
-// idk, if you find a way of automating this it would be great
-// https://www.iemoji.com/view/emoji/1794/flags/antarctica
-// Emoji Character Encoding Data --> C/C++/Java Src
-// https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes leave blank for auto
+/**
+ * List of app supported languages.
+ * Language code shall be a IETF BCP 47 conformant tag
+ *
+ * See locales on:
+ * https://github.com/unicode-org/cldr-json/blob/main/cldr-json/cldr-core/availableLocales.json
+ * https://www.iana.org/assignments/language-subtag-registry/language-subtag-registry
+ * https://android.googlesource.com/platform/frameworks/base/+/android-16.0.0_r2/core/res/res/values/locale_config.xml
+ * https://iso639-3.sil.org/code_tables/639/data/all
+*/
 val appLanguages = arrayListOf(
     /* begin language list */
-    Triple("", "Afrikaans", "af"),
-    Triple("", "عربي شامي", "ajp"),
-    Triple("", "አማርኛ", "am"),
-    Triple("", "العربية", "ar"),
-    Triple("", "اللهجة النجدية", "ars"),
-    Triple("", "অসমীয়া", "as"),
-    Triple("", "azərbaycan dili", "az"),
-    Triple("", "български", "bg"),
-    Triple("", "বাংলা", "bn"),
-    Triple("\uD83C\uDDE7\uD83C\uDDF7", "português brasileiro", "bp"),
-    Triple("", "čeština", "cs"),
-    Triple("", "Deutsch", "de"),
-    Triple("", "Ελληνικά", "el"),
-    Triple("", "English", "en"),
-    Triple("", "Esperanto", "eo"),
-    Triple("", "español", "es"),
-    Triple("", "فارسی", "fa"),
-    Triple("", "fil", "fil"),
-    Triple("", "français", "fr"),
-    Triple("", "galego", "gl"),
-    Triple("", "हिन्दी", "hi"),
-    Triple("", "hrvatski", "hr"),
-    Triple("", "magyar", "hu"),
-    Triple("\uD83C\uDDEE\uD83C\uDDE9", "Bahasa Indonesia", "in"),
-    Triple("", "italiano", "it"),
-    Triple("\uD83C\uDDEE\uD83C\uDDF1", "עברית", "iw"),
-    Triple("", "日本語 (にほんご)", "ja"),
-    Triple("", "ಕನ್ನಡ", "kn"),
-    Triple("", "한국어", "ko"),
-    Triple("", "lietuvių kalba", "lt"),
-    Triple("", "latviešu valoda", "lv"),
-    Triple("", "македонски", "mk"),
-    Triple("", "മലയാളം", "ml"),
-    Triple("", "bahasa Melayu", "ms"),
-    Triple("", "Malti", "mt"),
-    Triple("", "ဗမာစာ", "my"),
-    Triple("", "नेपाली", "ne"),
-    Triple("", "Nederlands", "nl"),
-    Triple("", "norsk nynorsk", "nn"),
-    Triple("", "norsk bokmål", "no"),
-    Triple("", "ଓଡ଼ିଆ", "or"),
-    Triple("", "polski", "pl"),
-    Triple("\uD83C\uDDF5\uD83C\uDDF9", "português", "pt"),
-    Triple("\uD83E\uDD8D", "mmmm... monke", "qt"),
-    Triple("", "română", "ro"),
-    Triple("", "русский", "ru"),
-    Triple("", "slovenčina", "sk"),
-    Triple("", "Soomaaliga", "so"),
-    Triple("", "svenska", "sv"),
-    Triple("", "தமிழ்", "ta"),
-    Triple("", "ትግርኛ", "ti"),
-    Triple("", "Tagalog", "tl"),
-    Triple("", "Türkçe", "tr"),
-    Triple("", "українська", "uk"),
-    Triple("", "اردو", "ur"),
-    Triple("", "Tiếng Việt", "vi"),
-    Triple("", "中文", "zh"),
-    Triple("\uD83C\uDDF9\uD83C\uDDFC", "正體中文(臺灣)", "zh-rTW"),
+    Pair("Afrikaans", "af"),
+    Pair("Azərbaycan dili", "az"),
+    Pair("Bahasa Indonesia", "in"),
+    Pair("Bahasa Melayu", "ms"),
+    Pair("Deutsch", "de"),
+    Pair("English", "en"),
+    Pair("Español", "es"),
+    Pair("Esperanto", "eo"),
+    Pair("Français", "fr"),
+    Pair("Galego", "gl"),
+    Pair("hrvatski", "hr"),
+    Pair("Italiano", "it"),
+    Pair("Latviešu valoda", "lv"),
+    Pair("Lietuvių kalba", "lt"),
+    Pair("Magyar", "hu"),
+    Pair("Malti", "mt"),
+    Pair("mmmm... monke", "qt"),
+    Pair("Nederlands", "nl"),
+    Pair("Norsk bokmål", "no"),
+    Pair("Norsk nynorsk", "nn"),
+    Pair("Polski", "pl"),
+    Pair("Português", "pt"),
+    Pair("Português (Brasil)", "pt-BR"),
+    Pair("Română", "ro"),
+    Pair("Slovenčina", "sk"),
+    Pair("Soomaaliga", "so"),
+    Pair("Svenska", "sv"),
+    Pair("Tagalog", "tl"),
+    Pair("Tiếng Việt", "vi"),
+    Pair("Türkçe", "tr"),
+    Pair("Wikang Filipino", "fil"),
+    Pair("Čeština", "cs"),
+    Pair("Ελληνικά", "el"),
+    Pair("български", "bg"),
+    Pair("македонски", "mk"),
+    Pair("русский", "ru"),
+    Pair("українська", "uk"),
+    Pair("עברית", "iw"),
+    Pair("اردو", "ur"),
+    Pair("العربية", "ar"),
+    Pair("اللهجة النجدية", "ars"),
+    Pair("عربي شامي", "apc"),
+    Pair("فارسی", "fa"),
+    Pair("کوردیی ناوەندی", "ckb"),
+    Pair("नेपाली", "ne"),
+    Pair("हिन्दी", "hi"),
+    Pair("অসমীয়া", "as"),
+    Pair("বাংলা", "bn"),
+    Pair("ଓଡ଼ିଆ", "or"),
+    Pair("தமிழ்", "ta"),
+    Pair("ಕನ್ನಡ", "kn"),
+    Pair("മലയാളം", "ml"),
+    Pair("ဗမာစာ", "my"),
+    Pair("ትግርኛ", "ti"),
+    Pair("አማርኛ", "am"),
+    Pair("中文", "zh"),
+    Pair("日本語 (にほんご)", "ja"),
+    Pair("正體中文(臺灣)", "zh-TW"),
+    Pair("한국어", "ko"),
 /* end language list */
-).sortedBy { it.second.lowercase() } //ye, we go alphabetical, so ppl don't put their lang on top
+).sortedBy { it.first.lowercase(Locale.ROOT) } // ye, we go alphabetical, so ppl don't put their lang on top
+
+fun Pair<String, String>.nameNextToFlagEmoji(): String {
+    // fallback to [A][A] -> [?] question mak flag
+    val flag = SubtitleHelper.getFlagFromIso(this.second) ?: "\ud83c\udde6\ud83c\udde6"
 
-class SettingsGeneral : PreferenceFragmentCompat() {
+    return "$flag\u00a0${this.first}" // \u00a0 non-breaking space
+}
+
+class SettingsGeneral : BasePreferenceFragmentCompat() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         setUpToolbar(R.string.category_general)
@@ -145,16 +156,23 @@ class SettingsGeneral : PreferenceFragmentCompat() {
         val lang: String,
     )
 
-    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()
+    companion object {
+        fun Fragment.pickDownloadPath(uri: Uri?, path: String?) {
+            if (uri == null) return
+
+            val context = context ?: CloudStreamApp.context ?: return
+            val visual = path ?: uri.toString()
+            PreferenceManager.getDefaultSharedPreferences(context).edit {
+                putString(getString(R.string.download_path_key), uri.toString())
+                putString(context.getString(R.string.download_path_key_visual), visual)
+            }
         }
     }
 
+    private val pathPicker = getChooseFolderLauncher { uri, path ->
+        pickDownloadPath(uri, path)
+    }
+
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         hideKeyboard()
         setPreferencesFromResource(R.xml.settings_general, rootKey)
@@ -166,22 +184,20 @@ class SettingsGeneral : PreferenceFragmentCompat() {
         }
 
         getPref(R.string.locale_key)?.setOnPreferenceClickListener { pref ->
-            val tempLangs = appLanguages.toMutableList()
             val current = getCurrentLocale(pref.context)
-            val languageCodes = tempLangs.map { (_, _, iso) -> iso }
-            val languageNames = tempLangs.map { (emoji, name, iso) ->
-                val flag = emoji.ifBlank { SubtitleHelper.getFlagFromIso(iso) ?: "ERROR" }
-                "$flag $name"
-            }
-            val index = languageCodes.indexOf(current)
+            val languageTagsIETF = appLanguages.map { it.second }
+            val languageNames = appLanguages.map { it.nameNextToFlagEmoji() }
+            val currentIndex = languageTagsIETF.indexOf(current)
 
             activity?.showDialog(
-                languageNames, index, getString(R.string.app_language), true, { }
-            ) { languageIndex ->
+                languageNames, currentIndex, getString(R.string.app_language), true, { }
+            ) { selectedLangIndex ->
                 try {
-                    val code = languageCodes[languageIndex]
-                    CommonActivity.setLocale(activity, code)
-                    settingsManager.edit().putString(getString(R.string.locale_key), code).apply()
+                    val langTagIETF = languageTagsIETF[selectedLangIndex]
+                    CommonActivity.setLocale(activity, langTagIETF)
+                    settingsManager.edit {
+                        putString(getString(R.string.locale_key), langTagIETF)
+                    }
                     activity?.recreate()
                 } catch (e: Exception) {
                     logError(e)
@@ -227,7 +243,7 @@ class SettingsGeneral : PreferenceFragmentCompat() {
                     val url = binding.siteUrlInput.text?.toString()
                     val lang = binding.siteLangInput.text?.toString()
                     val realLang = if (lang.isNullOrBlank()) provider.lang else lang
-                    if (url.isNullOrBlank() || name.isNullOrBlank() || realLang.length != 2) {
+                    if (url.isNullOrBlank() || name.isNullOrBlank()) {
                         showToast(R.string.error_invalid_data, Toast.LENGTH_SHORT)
                         return@setOnClickListener
                     }
@@ -312,8 +328,8 @@ class SettingsGeneral : PreferenceFragmentCompat() {
                 getString(R.string.dns_pref),
                 true,
                 {}) {
-                settingsManager.edit().putInt(getString(R.string.dns_pref), prefValues[it]).apply()
-                (context ?: AcraApplication.context)?.let { ctx -> app.initClient(ctx) }
+                settingsManager.edit { putInt(getString(R.string.dns_pref), prefValues[it]) }
+                (context ?: CloudStreamApp.context)?.let { ctx -> app.initClient(ctx) }
             }
             return@setOnPreferenceClickListener true
         }
@@ -321,7 +337,7 @@ class SettingsGeneral : PreferenceFragmentCompat() {
         fun getDownloadDirs(): List<String> {
             return safe {
                 context?.let { ctx ->
-                    val defaultDir = VideoDownloadManager.getDefaultDir(ctx)?.filePath()
+                    val defaultDir = DownloadFileManagement.getDefaultDir(ctx)?.filePath()
 
                     val first = listOf(defaultDir)
                     (try {
@@ -337,18 +353,24 @@ class SettingsGeneral : PreferenceFragmentCompat() {
             } ?: emptyList()
         }
 
-        settingsManager.edit().putBoolean(getString(R.string.jsdelivr_proxy_key), getKey(getString(R.string.jsdelivr_proxy_key), false) ?: false).apply()
+        settingsManager.edit { putBoolean(getString(R.string.jsdelivr_proxy_key), getKey(getString(R.string.jsdelivr_proxy_key), false) ?: false) }
         getPref(R.string.jsdelivr_proxy_key)?.setOnPreferenceChangeListener { _, newValue ->
             setKey(getString(R.string.jsdelivr_proxy_key), newValue)
             return@setOnPreferenceChangeListener true
         }
 
+        getPref(R.string.download_parallel_key)?.setOnPreferenceChangeListener { _, _ ->
+            // Notify that the queue logic has been changed
+            DownloadQueueManager.forceRefreshQueue()
+            return@setOnPreferenceChangeListener true
+        }
+
         getPref(R.string.download_path_key)?.setOnPreferenceClickListener {
             val dirs = getDownloadDirs()
 
             val currentDir =
                 settingsManager.getString(getString(R.string.download_path_key_visual), null)
-                    ?: context?.let { ctx -> VideoDownloadManager.getDefaultDir(ctx)?.filePath() }
+                    ?: context?.let { ctx -> DownloadFileManagement.getDefaultDir(ctx)?.filePath() }
 
             activity?.showBottomDialog(
                 dirs + listOf(getString(R.string.custom)),
@@ -367,10 +389,10 @@ class SettingsGeneral : PreferenceFragmentCompat() {
                     // Sets both visual and actual paths.
                     // key = used path
                     // visual = visual path
-                    settingsManager.edit()
-                        .putString(getString(R.string.download_path_key), dirs[it])
-                        .putString(getString(R.string.download_path_key_visual), dirs[it])
-                        .apply()
+                    settingsManager.edit {
+                        putString(getString(R.string.download_path_key), dirs[it])
+                        putString(getString(R.string.download_path_key_visual), dirs[it])
+                    }
                 }
             }
             return@setOnPreferenceClickListener true
@@ -393,10 +415,12 @@ class SettingsGeneral : PreferenceFragmentCompat() {
                         if (beneneCount%20 == 0) {
                             activity?.navigate(R.id.action_navigation_settings_general_to_easterEggMonkeFragment)
                         }
-                        settingsManager.edit().putInt(
-                            getString(R.string.benene_count),
-                            beneneCount
-                        ).apply()
+                        settingsManager.edit {
+                            putInt(
+                                getString(R.string.benene_count),
+                                beneneCount
+                            )
+                        }
                         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 5c6acdd9b85..0a0fb33c8aa 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
@@ -3,11 +3,13 @@ package com.lagradost.cloudstream3.ui.settings
 import android.os.Bundle
 import android.text.format.Formatter.formatShortFileSize
 import android.view.View
-import androidx.preference.PreferenceFragmentCompat
+import androidx.core.content.edit
 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.BasePreferenceFragmentCompat
+import com.lagradost.cloudstream3.ui.player.source_priority.QualityProfileDialog
 import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
 import com.lagradost.cloudstream3.ui.settings.Globals.PHONE
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
@@ -20,18 +22,21 @@ import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setTool
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setUpToolbar
 import com.lagradost.cloudstream3.ui.subtitles.ChromecastSubtitlesFragment
 import com.lagradost.cloudstream3.ui.subtitles.SubtitlesFragment
+import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import com.lagradost.cloudstream3.utils.Qualities
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialog
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showDialog
+import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showMultiDialog
 import com.lagradost.cloudstream3.utils.UIHelper.hideKeyboard
 
-class SettingsPlayer : PreferenceFragmentCompat() {
+class SettingsPlayer : BasePreferenceFragmentCompat() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         setUpToolbar(R.string.category_player)
         setPaddingBottom()
         setToolBarScrollFlags()
     }
+
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         hideKeyboard()
         setPreferencesFromResource(R.xml.settings_player, rootKey)
@@ -47,7 +52,7 @@ class SettingsPlayer : PreferenceFragmentCompat() {
             ),
             TV or EMULATOR
         )
-        
+
         getPref(R.string.preview_seekbar_key)?.hideOn(TV)
         getPref(R.string.pref_category_android_tv_key)?.hideOn(PHONE)
 
@@ -63,10 +68,11 @@ class SettingsPlayer : PreferenceFragmentCompat() {
                 prefValues.indexOf(currentPrefSize),
                 getString(R.string.video_buffer_length_settings),
                 true,
-                {}) {
-                settingsManager.edit()
-                    .putInt(getString(R.string.video_buffer_length_key), prefValues[it])
-                    .apply()
+                {}
+            ) {
+                settingsManager.edit {
+                    putInt(getString(R.string.video_buffer_length_key), prefValues[it])
+                }
             }
             return@setOnPreferenceClickListener true
         }
@@ -81,10 +87,11 @@ class SettingsPlayer : PreferenceFragmentCompat() {
                 prefValues.indexOf(current),
                 getString(R.string.limit_title),
                 true,
-                {}) {
-                settingsManager.edit()
-                    .putInt(getString(R.string.prefer_limit_title_key), prefValues[it])
-                    .apply()
+                {}
+            ) {
+                settingsManager.edit {
+                    putInt(getString(R.string.prefer_limit_title_key), prefValues[it])
+                }
             }
             return@setOnPreferenceClickListener true
         }
@@ -99,30 +106,48 @@ class SettingsPlayer : PreferenceFragmentCompat() {
                 prefValues.indexOf(current),
                 getString(R.string.software_decoding),
                 true,
-                {}) {
-                settingsManager.edit()
-                    .putInt(getString(R.string.software_decoding_key), prefValues[it])
-                    .apply()
+                {}
+            ) {
+                settingsManager.edit {
+                    putInt(getString(R.string.software_decoding_key), prefValues[it])
+                }
             }
             return@setOnPreferenceClickListener true
         }
 
-        getPref(R.string.prefer_limit_title_rez_key)?.setOnPreferenceClickListener {
-            val prefNames = resources.getStringArray(R.array.limit_title_rez_pref_names)
-            val prefValues = resources.getIntArray(R.array.limit_title_rez_pref_values)
-            val current = settingsManager.getInt(getString(R.string.prefer_limit_title_rez_key), 3)
+        getPref(R.string.prefer_limit_show_player_info)?.setOnPreferenceClickListener {
+            val ctx = context ?: return@setOnPreferenceClickListener false
 
-            activity?.showBottomDialog(
+            val prefNames = resources.getStringArray(R.array.title_info_pref_names)
+            val keys = resources.getStringArray(R.array.title_info_pref_values)
+
+            // Player defaults
+            val playerDefaults = mapOf(
+                ctx.getString(R.string.show_name_key) to true,
+                ctx.getString(R.string.show_resolution_key) to true,
+                ctx.getString(R.string.show_media_info_key) to false
+            )
+
+            val selectedIndices = keys.map { key ->
+                settingsManager.getBoolean(key, playerDefaults[key] ?: false)
+            }.mapIndexedNotNull { index, enabled ->
+                if (enabled) index else null
+            }
+
+            activity?.showMultiDialog(
                 prefNames.toList(),
-                prefValues.indexOf(current),
+                selectedIndices,
                 getString(R.string.limit_title_rez),
-                true,
-                {}) {
-                settingsManager.edit()
-                    .putInt(getString(R.string.prefer_limit_title_rez_key), prefValues[it])
-                    .apply()
+                {}
+            ) { selected ->
+                settingsManager.edit {
+                    for ((index, key) in keys.withIndex()) {
+                        putBoolean(key, selected.contains(index))
+                    }
+                }
             }
-            return@setOnPreferenceClickListener true
+
+            true
         }
 
         getPref(R.string.hide_player_control_names_key)?.hideOn(TV)
@@ -144,9 +169,11 @@ class SettingsPlayer : PreferenceFragmentCompat() {
                 prefValues.indexOf(currentQuality),
                 getString(R.string.watch_quality_pref),
                 true,
-                {}) {
-                settingsManager.edit().putInt(getString(R.string.quality_pref_key), prefValues[it])
-                    .apply()
+                {}
+            ) {
+                settingsManager.edit {
+                    putInt(getString(R.string.quality_pref_key), prefValues[it])
+                }
             }
             return@setOnPreferenceClickListener true
         }
@@ -168,9 +195,11 @@ class SettingsPlayer : PreferenceFragmentCompat() {
                 prefValues.indexOf(currentQuality),
                 getString(R.string.watch_quality_pref_data),
                 true,
-                {}) {
-                settingsManager.edit().putInt(getString(R.string.quality_pref_mobile_data_key), prefValues[it])
-                    .apply()
+                {}
+            ) {
+                settingsManager.edit {
+                    putInt(getString(R.string.quality_pref_mobile_data_key), prefValues[it])
+                }
             }
             return@setOnPreferenceClickListener true
         }
@@ -185,15 +214,19 @@ class SettingsPlayer : PreferenceFragmentCompat() {
                 add("")
                 addAll(players.map { it.uniqueId() })
             }
-            val current = settingsManager.getString(getString(R.string.player_default_key), "") ?: ""
+            val current =
+                settingsManager.getString(getString(R.string.player_default_key), "") ?: ""
 
             activity?.showBottomDialog(
                 prefNames.toList(),
                 prefValues.indexOf(current),
                 getString(R.string.player_pref),
                 true,
-                {}) {
-                settingsManager.edit().putString(getString(R.string.player_default_key), prefValues[it]).apply()
+                {}
+            ) {
+                settingsManager.edit {
+                    putString(getString(R.string.player_default_key), prefValues[it])
+                }
             }
             return@setOnPreferenceClickListener true
         }
@@ -208,6 +241,21 @@ class SettingsPlayer : PreferenceFragmentCompat() {
             return@setOnPreferenceClickListener true
         }
 
+        getPref(R.string.player_source_priority_key)?.setOnPreferenceClickListener {
+            ioSafe {
+                val defaultSources = QualityProfileDialog.getAllDefaultSources()
+                val activity = activity ?: return@ioSafe
+                activity.runOnUiThread {
+                    QualityProfileDialog(
+                        activity,
+                        R.style.DialogFullscreenPlayer,
+                        defaultSources,
+                    ).show()
+                }
+            }
+            return@setOnPreferenceClickListener true
+        }
+
         getPref(R.string.video_buffer_disk_key)?.setOnPreferenceClickListener {
             val prefNames = resources.getStringArray(R.array.video_buffer_size_names)
             val prefValues = resources.getIntArray(R.array.video_buffer_size_values)
@@ -220,10 +268,11 @@ class SettingsPlayer : PreferenceFragmentCompat() {
                 prefValues.indexOf(currentPrefSize),
                 getString(R.string.video_buffer_disk_settings),
                 true,
-                {}) {
-                settingsManager.edit()
-                    .putInt(getString(R.string.video_buffer_disk_key), prefValues[it])
-                    .apply()
+                {}
+            ) {
+                settingsManager.edit {
+                    putInt(getString(R.string.video_buffer_disk_key), prefValues[it])
+                }
             }
             return@setOnPreferenceClickListener true
         }
@@ -239,10 +288,11 @@ class SettingsPlayer : PreferenceFragmentCompat() {
                 prefValues.indexOf(currentPrefSize),
                 getString(R.string.video_buffer_size_settings),
                 true,
-                {}) {
-                settingsManager.edit()
-                    .putInt(getString(R.string.video_buffer_size_key), prefValues[it])
-                    .apply()
+                {}
+            ) {
+                settingsManager.edit {
+                    putInt(getString(R.string.video_buffer_size_key), prefValues[it])
+                }
             }
             return@setOnPreferenceClickListener true
         }
@@ -250,20 +300,20 @@ class SettingsPlayer : PreferenceFragmentCompat() {
         getPref(R.string.video_buffer_clear_key)?.let { pref ->
             val cacheDir = context?.cacheDir ?: return@let
 
-            fun updateSummery() {
+            fun updateSummary() {
                 try {
-                    pref.summary = formatShortFileSize(view?.context, getFolderSize(cacheDir))
+                    pref.summary = formatShortFileSize(pref.context, getFolderSize(cacheDir))
                 } catch (e: Exception) {
                     logError(e)
                 }
             }
 
-            updateSummery()
+            updateSummary()
 
             pref.setOnPreferenceClickListener {
                 try {
                     cacheDir.deleteRecursively()
-                    updateSummery()
+                    updateSummary()
                 } catch (e: Exception) {
                     logError(e)
                 }
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 cb7d25fd7d5..076f17a0aaf 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
@@ -2,12 +2,13 @@ package com.lagradost.cloudstream3.ui.settings
 
 import android.os.Bundle
 import android.view.View
-import androidx.navigation.NavOptions
+import androidx.core.content.edit
 import androidx.navigation.fragment.findNavController
-import androidx.preference.PreferenceFragmentCompat
+import androidx.navigation.NavOptions
 import androidx.preference.PreferenceManager
 import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.ui.APIRepository
+import com.lagradost.cloudstream3.ui.BasePreferenceFragmentCompat
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.getPref
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setPaddingBottom
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setToolBarScrollFlags
@@ -16,10 +17,10 @@ import com.lagradost.cloudstream3.utils.AppContextUtils.getApiDubstatusSettings
 import com.lagradost.cloudstream3.utils.AppContextUtils.getApiProviderLangSettings
 import com.lagradost.cloudstream3.utils.DataStoreHelper
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showMultiDialog
-import com.lagradost.cloudstream3.utils.SubtitleHelper
+import com.lagradost.cloudstream3.utils.SubtitleHelper.getNameNextToFlagEmoji
 import com.lagradost.cloudstream3.utils.UIHelper.hideKeyboard
 
-class SettingsProviders : PreferenceFragmentCompat() {
+class SettingsProviders : BasePreferenceFragmentCompat() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         setUpToolbar(R.string.category_providers)
@@ -46,13 +47,15 @@ class SettingsProviders : PreferenceFragmentCompat() {
                     names,
                     currentList,
                     getString(R.string.display_subbed_dubbed_settings),
-                    {}) { selectedList ->
+                    {}
+                ) { selectedList ->
                     APIRepository.dubStatusActive = selectedList.map { dublist[it] }.toHashSet()
-
-                    settingsManager.edit().putStringSet(
-                        this.getString(R.string.display_sub_key),
-                        selectedList.map { names[it] }.toMutableSet()
-                    ).apply()
+                    settingsManager.edit {
+                        putStringSet(
+                            getString(R.string.display_sub_key),
+                            selectedList.map { names[it] }.toMutableSet()
+                        )
+                    }
                 }
             }
 
@@ -91,50 +94,46 @@ class SettingsProviders : PreferenceFragmentCompat() {
                 names,
                 currentList,
                 getString(R.string.preferred_media_settings),
-                {}) { selectedList ->
-                settingsManager.edit().putStringSet(
-                    this.getString(R.string.prefer_media_type_key),
-                    selectedList.map { it.toString() }.toMutableSet()
-                ).apply()
+                {}
+            ) { selectedList ->
+                settingsManager.edit {
+                    putStringSet(
+                        getString(R.string.prefer_media_type_key),
+                        selectedList.map { it.toString() }.toMutableSet()
+                    )
+                }
                 DataStoreHelper.currentHomePage = null
-                //(context ?: AcraApplication.context)?.let { ctx -> app.initClient(ctx) }
+                //(context ?: CloudStreamApp.context)?.let { ctx -> app.initClient(ctx) }
             }
 
             return@setOnPreferenceClickListener true
         }
 
         getPref(R.string.provider_lang_key)?.setOnPreferenceClickListener {
-            activity?.getApiProviderLangSettings()?.let { current ->
-                val languages = synchronized(APIHolder.apis) {
-                    APIHolder.apis.map { it.lang }.toSet()
-                        .sortedBy { SubtitleHelper.fromTwoLettersToLanguage(it) } + AllLanguagesName
+            activity?.getApiProviderLangSettings()?.let { currentLangTags ->
+                val languagesTagName = synchronized(APIHolder.apis) {
+                    listOf( Pair(AllLanguagesName, getString(R.string.all_languages_preference)) ) +
+                    APIHolder.apis.map { Pair(it.lang, getNameNextToFlagEmoji(it.lang) ?: it.lang) }
+                        .toSet().sortedBy { it.second.substringAfter("\u00a0").lowercase() } // name ignoring flag emoji
                 }
 
-                val currentList = current.map {
-                    languages.indexOf(it)
-                }
-
-                val names = languages.map {
-                    if (it == AllLanguagesName) {
-                        Pair(it, getString(R.string.all_languages_preference))
-                    } else {
-                        val emoji = SubtitleHelper.getFlagFromIso(it)
-                        val name = SubtitleHelper.fromTwoLettersToLanguage(it)
-                        val fullName = "$emoji $name"
-                        Pair(it, fullName)
-                    }
+                val currentIndexList = currentLangTags.map { langTag ->
+                    languagesTagName.indexOfFirst { lang -> lang.first == langTag }
                 }
 
                 activity?.showMultiDialog(
-                    names.map { it.second },
-                    currentList,
+                    languagesTagName.map { it.second },
+                    currentIndexList,
                     getString(R.string.provider_lang_settings),
-                    {}) { selectedList ->
-                    settingsManager.edit().putStringSet(
-                        this.getString(R.string.provider_lang_key),
-                        selectedList.map { names[it].first }.toMutableSet()
-                    ).apply()
-                    //APIRepository.providersActive = it.context.getApiSettings()
+                    {}
+                ) { selectedList ->
+                    settingsManager.edit {
+                        putStringSet(
+                            getString(R.string.provider_lang_key),
+                            selectedList.map { languagesTagName[it].first }.toSet()
+                        )
+                    }
+                    // APIRepository.providersActive = it.context.getApiSettings()
                 }
             }
 
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 6446ae75d93..f4c522bf981 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
@@ -3,18 +3,22 @@ package com.lagradost.cloudstream3.ui.settings
 import android.os.Build
 import android.os.Bundle
 import android.view.View
-import androidx.preference.PreferenceFragmentCompat
+import androidx.core.content.edit
 import androidx.preference.PreferenceManager
 import androidx.preference.SeekBarPreference
-import com.lagradost.cloudstream3.AcraApplication.Companion.getActivity
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.getActivity
 import com.lagradost.cloudstream3.MainActivity
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.SearchQuality
 import com.lagradost.cloudstream3.mvvm.logError
+import com.lagradost.cloudstream3.ui.BasePreferenceFragmentCompat
+import com.lagradost.cloudstream3.ui.clear
+import com.lagradost.cloudstream3.ui.home.HomeChildItemAdapter
+import com.lagradost.cloudstream3.ui.home.ParentItemAdapter
+import com.lagradost.cloudstream3.ui.search.SearchAdapter
 import com.lagradost.cloudstream3.ui.search.SearchResultBuilder
 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.updateTv
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.getPref
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.hideOn
@@ -27,7 +31,7 @@ import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showMultiDialog
 import com.lagradost.cloudstream3.utils.UIHelper.hideKeyboard
 import com.lagradost.cloudstream3.utils.UIHelper.toPx
 
-class SettingsUI : PreferenceFragmentCompat() {
+class SettingsUI : BasePreferenceFragmentCompat() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         setUpToolbar(R.string.category_ui)
@@ -40,14 +44,27 @@ class SettingsUI : PreferenceFragmentCompat() {
         setPreferencesFromResource(R.xml.settings_ui, rootKey)
         val settingsManager = PreferenceManager.getDefaultSharedPreferences(requireContext())
 
-        getPref(R.string.random_button_key)?.hideOn(EMULATOR or TV)
-
-        (getPref(R.string.overscan_key)?.hideOn(PHONE or EMULATOR) as? SeekBarPreference)?.setOnPreferenceChangeListener { perf, newValue ->
+        (getPref(R.string.overscan_key)?.hideOn(PHONE or EMULATOR) as? SeekBarPreference)?.setOnPreferenceChangeListener { pref, newValue ->
             val padding = (newValue as? Int)?.toPx ?: return@setOnPreferenceChangeListener true
-            (perf.context.getActivity() as? MainActivity)?.binding?.homeRoot?.setPadding(padding, padding, padding, padding)
+            (pref.context.getActivity() as? MainActivity)?.binding?.homeRoot?.setPadding(padding, padding, padding, padding)
             return@setOnPreferenceChangeListener true
         }
 
+        getPref(R.string.bottom_title_key)?.setOnPreferenceChangeListener { _, _ ->
+            HomeChildItemAdapter.sharedPool.clear()
+            ParentItemAdapter.sharedPool.clear()
+            SearchAdapter.sharedPool.clear()
+            true
+        }
+
+        getPref(R.string.poster_size_key)?.setOnPreferenceChangeListener { _, newValue ->
+            HomeChildItemAdapter.sharedPool.clear()
+            ParentItemAdapter.sharedPool.clear()
+            SearchAdapter.sharedPool.clear()
+            context?.let { HomeChildItemAdapter.updatePosterSize(it, newValue as? Int) }
+            true
+        }
+
         getPref(R.string.poster_ui_key)?.setOnPreferenceClickListener {
             val prefNames = resources.getStringArray(R.array.poster_ui_options)
             val keys = resources.getStringArray(R.array.poster_ui_options_values)
@@ -63,12 +80,13 @@ class SettingsUI : PreferenceFragmentCompat() {
                 prefNames.toList(),
                 prefValues,
                 getString(R.string.poster_ui_settings),
-                {}) { list ->
-                val edit = settingsManager.edit()
-                for ((i, key) in keys.withIndex()) {
-                    edit.putBoolean(key, list.contains(i))
+                {}
+            ) { list ->
+                settingsManager.edit {
+                    for ((i, key) in keys.withIndex()) {
+                        putBoolean(key, list.contains(i))
+                    }
                 }
-                edit.apply()
                 SearchResultBuilder.updateCache(it.context)
             }
 
@@ -90,9 +108,9 @@ class SettingsUI : PreferenceFragmentCompat() {
                 dismissCallback = {},
                 callback = {
                     try {
-                        settingsManager.edit()
-                            .putInt(getString(R.string.app_layout_key), prefValues[it])
-                            .apply()
+                        settingsManager.edit {
+                            putInt(getString(R.string.app_layout_key), prefValues[it])
+                        }
                         context?.updateTv()
                         activity?.recreate()
                     } catch (e: Exception) {
@@ -132,11 +150,12 @@ class SettingsUI : PreferenceFragmentCompat() {
                 prefValues.indexOf(currentLayout),
                 getString(R.string.app_theme_settings),
                 true,
-                {}) {
+                {}
+            ) {
                 try {
-                    settingsManager.edit()
-                        .putString(getString(R.string.app_theme_key), prefValues[it])
-                        .apply()
+                    settingsManager.edit {
+                        putString(getString(R.string.app_theme_key), prefValues[it])
+                    }
                     activity?.recreate()
                 } catch (e: Exception) {
                     logError(e)
@@ -169,11 +188,12 @@ class SettingsUI : PreferenceFragmentCompat() {
                 prefValues.indexOf(currentLayout),
                 getString(R.string.primary_color_settings),
                 true,
-                {}) {
+                {}
+            ) {
                 try {
-                    settingsManager.edit()
-                        .putString(getString(R.string.primary_color_key), prefValues[it])
-                        .apply()
+                    settingsManager.edit {
+                        putString(getString(R.string.primary_color_key), prefValues[it])
+                    }
                     activity?.recreate()
                 } catch (e: Exception) {
                     logError(e)
@@ -195,11 +215,14 @@ class SettingsUI : PreferenceFragmentCompat() {
                 names,
                 currentList,
                 getString(R.string.pref_filter_search_quality),
-                {}) { selectedList ->
-                settingsManager.edit().putStringSet(
-                    this.getString(R.string.pref_filter_search_quality_key),
-                    selectedList.map { it.toString() }.toMutableSet()
-                ).apply()
+                {}
+            ) { selectedList ->
+                settingsManager.edit {
+                    putStringSet(
+                        getString(R.string.pref_filter_search_quality_key),
+                        selectedList.map { it.toString() }.toMutableSet()
+                    )
+                }
             }
 
             return@setOnPreferenceClickListener true
@@ -217,9 +240,9 @@ class SettingsUI : PreferenceFragmentCompat() {
                 showApply = true,
                 dismissCallback = {},
                 callback = { selectedOption ->
-                    settingsManager.edit()
-                        .putInt(getString(R.string.confirm_exit_key), prefValues[selectedOption])
-                        .apply()
+                    settingsManager.edit {
+                        putInt(getString(R.string.confirm_exit_key), prefValues[selectedOption])
+                    }
                 }
             )
             return@setOnPreferenceClickListener true
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 bacca67ec2a..c04215594e1 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
@@ -5,12 +5,13 @@ import android.os.Bundle
 import android.view.View
 import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
+import androidx.core.content.edit
 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.BuildConfig
+import com.lagradost.cloudstream3.CloudStreamApp
 import com.lagradost.cloudstream3.CommonActivity.showToast
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.app
@@ -20,8 +21,8 @@ import com.lagradost.cloudstream3.mvvm.safe
 import com.lagradost.cloudstream3.network.initClient
 import com.lagradost.cloudstream3.plugins.PluginManager
 import com.lagradost.cloudstream3.services.BackupWorkManager
+import com.lagradost.cloudstream3.ui.BasePreferenceFragmentCompat
 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
@@ -31,13 +32,14 @@ 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
-import com.lagradost.cloudstream3.utils.InAppUpdater.Companion.runAutoUpdate
+import com.lagradost.cloudstream3.utils.InAppUpdater.installPreReleaseIfNeeded
+import com.lagradost.cloudstream3.utils.InAppUpdater.runAutoUpdate
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialog
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showDialog
 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 com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager
 import com.lagradost.cloudstream3.utils.txt
 import java.io.BufferedReader
 import java.io.InputStreamReader
@@ -47,7 +49,7 @@ import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale
 
-class SettingsUpdates : PreferenceFragmentCompat() {
+class SettingsUpdates : BasePreferenceFragmentCompat() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         setUpToolbar(R.string.category_updates)
@@ -56,16 +58,17 @@ class SettingsUpdates : PreferenceFragmentCompat() {
     }
 
     private val pathPicker = getChooseFolderLauncher { uri, path ->
-        val context = context ?: AcraApplication.context ?: return@getChooseFolderLauncher
+        if(uri == null) return@getChooseFolderLauncher
+
+        val context = context ?: CloudStreamApp.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()
+            PreferenceManager.getDefaultSharedPreferences(context).edit {
+                putString(getString(R.string.backup_path_key), uri.toString())
+                putString(getString(R.string.backup_dir_key), it)
+            }
         }
     }
 
-    @Suppress("DEPRECATION_ERROR")
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         hideKeyboard()
         setPreferencesFromResource(R.xml.settings_updates, rootKey)
@@ -86,11 +89,13 @@ class SettingsUpdates : PreferenceFragmentCompat() {
                 prefValues.indexOf(current),
                 getString(R.string.backup_frequency),
                 true,
-                {}) { index ->
-                settingsManager.edit()
-                    .putInt(getString(R.string.automatic_backup_key), prefValues[index]).apply()
+                {}
+            ) { index ->
+                settingsManager.edit {
+                    putInt(getString(R.string.automatic_backup_key), prefValues[index])
+                }
                 BackupWorkManager.enqueuePeriodicWork(
-                    context ?: AcraApplication.context,
+                    context ?: CloudStreamApp.context,
                     prefValues[index].toLong()
                 )
             }
@@ -117,7 +122,8 @@ class SettingsUpdates : PreferenceFragmentCompat() {
                 dirs.indexOf(currentDir),
                 getString(R.string.backup_path_title),
                 true,
-                {}) {
+                {}
+            ) {
                 // Last = custom
                 if (it == dirs.size) {
                     try {
@@ -129,10 +135,10 @@ class SettingsUpdates : PreferenceFragmentCompat() {
                     // 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()
+                    settingsManager.edit {
+                        putString(getString(R.string.backup_path_key), dirs[it])
+                        putString(getString(R.string.backup_dir_key), dirs[it])
+                    }
                 }
             }
             return@setOnPreferenceClickListener true
@@ -157,7 +163,7 @@ class SettingsUpdates : PreferenceFragmentCompat() {
                 logError(e) // kinda ironic
             }
 
-            val adapter = LogcatAdapter(logList)
+            val adapter = LogcatAdapter().apply { submitList(logList) }
             binding.logcatRecyclerView.layoutManager = LinearLayoutManager(pref.context)
             binding.logcatRecyclerView.adapter = adapter
 
@@ -201,19 +207,21 @@ class SettingsUpdates : PreferenceFragmentCompat() {
             val prefNames = resources.getStringArray(R.array.apk_installer_pref)
             val prefValues = resources.getIntArray(R.array.apk_installer_values)
 
+            // Use legacy installer as default until we make the new installer completely reliable
             val currentInstaller =
-                settingsManager.getInt(getString(R.string.apk_installer_key), 0)
+                settingsManager.getInt(getString(R.string.apk_installer_key), 1)
 
             activity?.showBottomDialog(
                 prefNames.toList(),
                 prefValues.indexOf(currentInstaller),
                 getString(R.string.apk_installer_settings),
                 true,
-                {}) { num ->
+                {}
+            ) { num ->
                 try {
-                    settingsManager.edit()
-                        .putInt(getString(R.string.apk_installer_key), prefValues[num])
-                        .apply()
+                    settingsManager.edit {
+                        putInt(getString(R.string.apk_installer_key), prefValues[num])
+                    }
                 } catch (e: Exception) {
                     logError(e)
                 }
@@ -221,18 +229,29 @@ class SettingsUpdates : PreferenceFragmentCompat() {
             return@setOnPreferenceClickListener true
         }
 
-        getPref(R.string.manual_check_update_key)?.setOnPreferenceClickListener {
-            ioSafe {
-                if (activity?.runAutoUpdate(false) == false) {
-                    activity?.runOnUiThread {
-                        showToast(
-                            R.string.no_update_found,
-                            Toast.LENGTH_SHORT
-                        )
+        getPref(R.string.manual_check_update_key)?.let { pref ->
+            pref.summary = BuildConfig.VERSION_NAME
+            pref.setOnPreferenceClickListener {
+                ioSafe {
+                    if (activity?.runAutoUpdate(false) == false) {
+                        activity?.runOnUiThread {
+                            showToast(
+                                R.string.no_update_found,
+                                Toast.LENGTH_SHORT
+                            )
+                        }
                     }
                 }
+                return@setOnPreferenceClickListener true
+            }
+        }
+        
+        getPref(R.string.install_prerelease_key)?.let { pref ->
+            pref.isVisible = BuildConfig.FLAVOR == "stable"
+            pref.setOnPreferenceClickListener {
+                activity?.installPreReleaseIfNeeded()
+                return@setOnPreferenceClickListener true
             }
-            return@setOnPreferenceClickListener true
         }
 
         getPref(R.string.auto_download_plugins_key)?.setOnPreferenceClickListener {
@@ -247,10 +266,12 @@ 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[num]).apply()
-                (context ?: AcraApplication.context)?.let { ctx -> app.initClient(ctx) }
+                {}
+            ) { num ->
+                settingsManager.edit {
+                    putInt(getString(R.string.auto_download_plugins_key), prefValues[num])
+                }
+                (context ?: CloudStreamApp.context)?.let { ctx -> app.initClient(ctx) }
             }
             return@setOnPreferenceClickListener true
         }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/ExtensionsFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/ExtensionsFragment.kt
index bd1e219d046..af0d3dfe756 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
@@ -4,10 +4,8 @@ import android.content.ClipboardManager
 import android.content.Context
 import android.content.DialogInterface
 import android.os.Build
-import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import android.widget.LinearLayout
 import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
@@ -15,7 +13,6 @@ import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.core.view.marginBottom
 import androidx.core.view.marginTop
-import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.navigation.fragment.findNavController
 import com.lagradost.cloudstream3.CommonActivity.showToast
@@ -26,11 +23,12 @@ import com.lagradost.cloudstream3.databinding.FragmentExtensionsBinding
 import com.lagradost.cloudstream3.mvvm.observe
 import com.lagradost.cloudstream3.mvvm.observeNullable
 import com.lagradost.cloudstream3.plugins.RepositoryManager
+import com.lagradost.cloudstream3.ui.BaseFragment
 import com.lagradost.cloudstream3.ui.result.FOCUS_SELF
 import com.lagradost.cloudstream3.ui.result.setLinearListLayout
-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.setSystemBarsPadding
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setToolBarScrollFlags
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setUpToolbar
 import com.lagradost.cloudstream3.utils.AppContextUtils.addRepositoryDialog
@@ -38,23 +36,13 @@ import com.lagradost.cloudstream3.utils.AppContextUtils.setDefaultFocus
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import com.lagradost.cloudstream3.utils.Coroutines.main
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
+import com.lagradost.cloudstream3.utils.setText
 
-class ExtensionsFragment : Fragment() {
-    var binding: FragmentExtensionsBinding? = null
-    override fun onDestroyView() {
-        binding = null
-        super.onDestroyView()
-    }
+class ExtensionsFragment : BaseFragment<FragmentExtensionsBinding>(
+    BaseFragment.BindingCreator.Inflate(FragmentExtensionsBinding::inflate)
+) {
 
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?,
-    ): View {
-        val localBinding = FragmentExtensionsBinding.inflate(inflater, container, false)
-        binding = localBinding
-        return localBinding.root//inflater.inflate(R.layout.fragment_extensions, container, false)
-    }
+    private val extensionViewModel: ExtensionsViewModel by activityViewModels()
 
     private fun View.setLayoutWidth(weight: Int) {
         val param = LinearLayout.LayoutParams(
@@ -65,8 +53,6 @@ class ExtensionsFragment : Fragment() {
         this.layoutParams = param
     }
 
-    private val extensionViewModel: ExtensionsViewModel by activityViewModels()
-
     override fun onResume() {
         super.onResume()
         afterRepositoryLoadedEvent += ::reloadRepositories
@@ -82,24 +68,25 @@ class ExtensionsFragment : Fragment() {
         extensionViewModel.loadRepositories()
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        //context?.fixPaddingStatusbar(extensions_root)
+    override fun fixLayout(view: View) {
+        setSystemBarsPadding()
+    }
 
+    override fun onBindingCreated(binding: FragmentExtensionsBinding) {
         setUpToolbar(R.string.extensions)
         setToolBarScrollFlags()
 
-        binding?.repoRecyclerView?.apply {
+        binding.repoRecyclerView.apply {
             setLinearListLayout(
                 isHorizontal = false,
-                nextUp = R.id.settings_toolbar, //FOCUS_SELF, // back has no id so we cant :pensive:
+                nextUp = R.id.settings_toolbar, // FOCUS_SELF, // back has no id so we cant :pensive:
                 nextDown = R.id.plugin_storage_appbar,
                 nextRight = FOCUS_SELF,
                 nextLeft = R.id.nav_rail_view
             )
 
             if (!isLayout(TV))
-                binding?.addRepoButton?.let { button ->
+                binding.addRepoButton.let { button ->
                     button.post {
                         setPadding(
                             paddingLeft,
@@ -113,10 +100,10 @@ class ExtensionsFragment : Fragment() {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
                 setOnScrollChangeListener { _, _, scrollY, _, oldScrollY ->
                     val dy = scrollY - oldScrollY
-                    if (dy > 0) { //check for scroll down
-                        binding?.addRepoButton?.shrink() // hide
+                    if (dy > 0) { // check for scroll down
+                        binding.addRepoButton.shrink() // hide
                     } else if (dy < -5) {
-                        binding?.addRepoButton?.extend() // show
+                        binding.addRepoButton.extend() // show
                     }
                 }
             }
@@ -132,13 +119,14 @@ class ExtensionsFragment : Fragment() {
             }, { repo ->
                 // Prompt user before deleting repo
                 main {
-                    val builder = AlertDialog.Builder(context ?: view.context)
+                    val uiContext = context ?: binding.root.context
+                    val builder = AlertDialog.Builder(uiContext)
                     val dialogClickListener =
                         DialogInterface.OnClickListener { _, which ->
                             when (which) {
                                 DialogInterface.BUTTON_POSITIVE -> {
                                     ioSafe {
-                                        RepositoryManager.removeRepository(view.context, repo)
+                                        RepositoryManager.removeRepository(uiContext.applicationContext, repo)
                                         extensionViewModel.loadStats()
                                         extensionViewModel.loadRepositories()
                                     }
@@ -149,9 +137,7 @@ class ExtensionsFragment : Fragment() {
                         }
 
                     builder.setTitle(R.string.delete_repository)
-                        .setMessage(
-                            context?.getString(R.string.delete_repository_plugins)
-                        )
+                        .setMessage(uiContext.getString(R.string.delete_repository_plugins))
                         .setPositiveButton(R.string.delete, dialogClickListener)
                         .setNegativeButton(R.string.cancel, dialogClickListener)
                         .show().setDefaultFocus()
@@ -160,37 +146,15 @@ class ExtensionsFragment : Fragment() {
         }
 
         observe(extensionViewModel.repositories) {
-            binding?.repoRecyclerView?.isVisible = it.isNotEmpty()
-            binding?.blankRepoScreen?.isVisible = it.isEmpty()
-            (binding?.repoRecyclerView?.adapter as? RepoAdapter)?.updateList(it)
+            binding.repoRecyclerView.isVisible = it.isNotEmpty()
+            binding.blankRepoScreen.isVisible = it.isEmpty()
+            (binding.repoRecyclerView.adapter as? RepoAdapter)?.submitList(it.toList())
         }
 
-        /*binding?.repoRecyclerView?.apply {
-            context?.let { ctx ->
-                layoutManager = LinearRecycleViewLayoutManager(ctx, nextFocusUpId, nextFocusDownId)
-            }
-        }*/
-
-//        list_repositories?.setOnClickListener {
-//            // Open webview on tv if browser fails
-//            val isTv = isTvSettings()
-//            openBrowser(PUBLIC_REPOSITORIES_LIST, isTv, this)
-//
-//            // Set clipboard on TV because the browser might not exist or work properly
-//            if (isTv) {
-//                val serviceClipboard =
-//                    (activity?.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager?)
-//                        ?: return@setOnClickListener
-//                val clip = ClipData.newPlainText("Repository url", PUBLIC_REPOSITORIES_LIST)
-//                serviceClipboard.setPrimaryClip(clip)
-//            }
-//        }
-
         observeNullable(extensionViewModel.pluginStats) { value ->
-            binding?.apply {
+            binding.apply {
                 if (value == null) {
                     pluginStorageAppbar.isVisible = false
-
                     return@observeNullable
                 }
 
@@ -210,7 +174,7 @@ class ExtensionsFragment : Fragment() {
             }
         }
 
-        binding?.pluginStorageAppbar?.setOnClickListener {
+        binding.pluginStorageAppbar.setOnClickListener {
             findNavController().navigate(
                 R.id.navigation_settings_extensions_to_navigation_settings_plugins,
                 PluginsFragment.newInstance(
@@ -230,24 +194,24 @@ class ExtensionsFragment : Fragment() {
 
             val dialog = builder.create()
             dialog.show()
-            (activity?.getSystemService(Context.CLIPBOARD_SERVICE) as? ClipboardManager?)?.primaryClip?.getItemAt(
+            (activity?.getSystemService(Context.CLIPBOARD_SERVICE) as? ClipboardManager)?.primaryClip?.getItemAt(
                 0
-            )?.text?.toString()?.let { copy ->
-                binding.repoUrlInput.setText(copy)
+            )?.text?.toString()?.let { copiedText ->
+                if (copiedText.contains(RepoAdapter.SHAREABLE_REPO_SEPARATOR)) {
+                    // text is of format <repository name> : <repository url>
+                    val (name, url) = copiedText.split(RepoAdapter.SHAREABLE_REPO_SEPARATOR, limit = 2)
+                    binding.repoUrlInput.setText(url.trim())
+                    binding.repoNameInput.setText(name.trim())
+                } else {
+                    binding.repoUrlInput.setText(copiedText)
+                }
             }
 
-//            dialog.list_repositories?.setOnClickListener {
-//                // Open webview on tv if browser fails
-//                openBrowser(PUBLIC_REPOSITORIES_LIST, isTvSettings(), this)
-//                dialog.dismissSafe()
-//            }
-
-//            dialog.text2?.text = provider.name
             binding.applyBtt.setOnClickListener secondListener@{
                 val name = binding.repoNameInput.text?.toString()
+                val urlInput = binding.repoUrlInput.text?.toString()
                 ioSafe {
-                    val url = binding.repoUrlInput.text?.toString()
-                        ?.let { it1 -> RepositoryManager.parseRepoUrl(it1) }
+                    val url = urlInput?.let { it1 -> RepositoryManager.parseRepoUrl(it1) }
                     if (url.isNullOrBlank()) {
                         main {
                             showToast(R.string.error_invalid_data, Toast.LENGTH_SHORT)
@@ -263,8 +227,7 @@ class ExtensionsFragment : Fragment() {
 
                         val fixedName = if (!name.isNullOrBlank()) name
                         else repository.name
-
-                        val newRepo = RepositoryData(fixedName, url)
+                        val newRepo = RepositoryData(repository.iconUrl,fixedName, url)
                         RepositoryManager.addRepository(newRepo)
                         extensionViewModel.loadStats()
                         extensionViewModel.loadRepositories()
@@ -288,7 +251,7 @@ class ExtensionsFragment : Fragment() {
         }
 
         val isTv = isLayout(TV)
-        binding?.apply {
+        binding.apply {
             addRepoButton.isGone = isTv
             addRepoButtonImageviewHolder.isVisible = isTv
 
@@ -301,4 +264,4 @@ class ExtensionsFragment : Fragment() {
         }
         reloadRepositories()
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/ExtensionsViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/ExtensionsViewModel.kt
index ebe9fc88865..482251b7831 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
@@ -4,7 +4,7 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import com.fasterxml.jackson.annotation.JsonProperty
-import com.lagradost.cloudstream3.AcraApplication.Companion.getKey
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.getKey
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.amap
 import com.lagradost.cloudstream3.mvvm.debugAssert
@@ -17,9 +17,12 @@ import com.lagradost.cloudstream3.utils.txt
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 
 data class RepositoryData(
+    @JsonProperty("iconUrl") val iconUrl: String?,
     @JsonProperty("name") val name: String,
     @JsonProperty("url") val url: String
-)
+){
+    constructor(name: String,url: String):this(null,name,url)
+}
 
 const val REPOSITORIES_KEY = "REPOSITORIES_KEY"
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginAdapter.kt
index 15228b260d6..d0f9ff565da 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
@@ -8,29 +8,26 @@ import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
-import androidx.recyclerview.widget.DiffUtil
-import androidx.recyclerview.widget.RecyclerView
-import com.lagradost.cloudstream3.AcraApplication.Companion.getActivity
+import androidx.viewbinding.ViewBinding
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.getActivity
 import com.lagradost.cloudstream3.PROVIDER_STATUS_DOWN
 import com.lagradost.cloudstream3.R
 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.utils.setText
-import com.lagradost.cloudstream3.utils.txt
+import com.lagradost.cloudstream3.ui.BaseDiffCallback
+import com.lagradost.cloudstream3.ui.NoStateAdapter
+import com.lagradost.cloudstream3.ui.ViewHolderState
+import com.lagradost.cloudstream3.ui.newSharedPool
 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.SubtitleHelper.getNameNextToFlagEmoji
 import com.lagradost.cloudstream3.utils.UIHelper.toPx
 import com.lagradost.cloudstream3.utils.getImageFromDrawable
-import org.junit.Assert
-import org.junit.Test
+import com.lagradost.cloudstream3.utils.setText
+import com.lagradost.cloudstream3.utils.txt
 import java.text.DecimalFormat
 import kotlin.math.floor
 import kotlin.math.log10
@@ -41,60 +38,171 @@ data class PluginViewData(
     val isDownloaded: Boolean,
 )
 
+class RepositoryViewHolderState(view: ViewBinding) : ViewHolderState<Any>(view) {
+    // Store how many times this has called recycled, this is used to correctly sync text in jobs
+    var recycleCount = 0
+}
+
 class PluginAdapter(
     val iconClickCallback: (Plugin) -> Unit
-) :
-    RecyclerView.Adapter<RecyclerView.ViewHolder>() {
-    private val plugins: MutableList<PluginViewData> = mutableListOf()
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-        val layout = if(isLayout(TV)) R.layout.repository_item_tv else R.layout.repository_item
+) : NoStateAdapter<PluginViewData>(diffCallback = BaseDiffCallback(itemSame = { a, b ->
+    a.plugin.second.internalName == b.plugin.second.internalName && a.plugin.first == b.plugin.first
+})) {
+    override fun onCreateContent(parent: ViewGroup): ViewHolderState<Any> {
+        val layout = if (isLayout(TV)) R.layout.repository_item_tv else R.layout.repository_item
         val inflated = LayoutInflater.from(parent.context).inflate(layout, parent, false)
 
-        return PluginViewHolder(
+        return RepositoryViewHolderState(
             RepositoryItemBinding.bind(inflated) // may crash
         )
     }
 
-    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-        when (holder) {
-            is PluginViewHolder -> {
-                holder.bind(plugins[position])
+    override fun onClearView(holder: ViewHolderState<Any>) {
+        if (holder is RepositoryViewHolderState) {
+            holder.recycleCount += 1
+        }
+        when (val binding = holder.view) {
+            is RepositoryItemBinding -> {
+                clearImage(binding.entryIcon)
             }
         }
     }
 
-    override fun getItemCount(): Int {
-        return plugins.size
-    }
+    @SuppressLint("SetTextI18n")
+    override fun onBindContent(holder: ViewHolderState<Any>, item: PluginViewData, position: Int) {
+        val binding = holder.view as? RepositoryItemBinding ?: return
+        val itemView = holder.itemView
+
+        val metadata = item.plugin.second
+        val disabled = metadata.status == PROVIDER_STATUS_DOWN
+        val name = metadata.name.removeSuffix("Provider")
+        val alpha = if (disabled) 0.6f else 1f
+        val isLocal = !item.plugin.second.url.startsWith("http")
+        binding.mainText.alpha = alpha
+        binding.subText.alpha = alpha
+
+        val drawableInt = if (item.isDownloaded)
+            R.drawable.ic_baseline_delete_outline_24
+        else R.drawable.netflix_download
+
+        binding.nsfwMarker.isVisible = metadata.tvTypes?.contains(TvType.NSFW.name) ?: false
+        binding.actionButton.setImageResource(drawableInt)
+
+        binding.actionButton.setOnClickListener {
+            iconClickCallback.invoke(item.plugin)
+        }
+        itemView.setOnClickListener {
+            if (isLocal) return@setOnClickListener
+
+            val sheet = PluginDetailsFragment(item)
+            val activity = itemView.context.getActivity() as AppCompatActivity
+            sheet.show(activity.supportFragmentManager, "PluginDetails")
+        }
+        //if (itemView.context?.isTrueTvSettings() == false) {
+        //    val siteUrl = metadata.repositoryUrl
+        //    if (siteUrl != null && siteUrl.isNotBlank() && siteUrl != "NONE") {
+        //        itemView.setOnClickListener {
+        //            openBrowser(siteUrl)
+        //        }
+        //    }
+        //}
+
+        if (item.isDownloaded) {
+            // On local plugins page the filepath is provided instead of url.
+            val plugin =
+                (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 {
+                    try {
+                        plugin.openSettings?.invoke(itemView.context)
+                    } catch (e: Throwable) {
+                        Log.e(
+                            "PluginAdapter",
+                            "Failed to open $name settings: ${
+                                Log.getStackTraceString(e)
+                            }"
+                        )
+                    }
+                }
+            } else {
+                binding.actionSettings.isVisible = false
+            }
+        } else {
+            binding.actionSettings.isVisible = false
+        }
 
-    fun updateList(newList: List<PluginViewData>) {
-        val diffResult = DiffUtil.calculateDiff(
-            PluginDiffCallback(this.plugins, newList)
+        val url = metadata.iconUrl?.replace(
+            "%size%",
+            "$iconSize"
+        )?.replace(
+            "%exact_size%",
+            "$iconSizeExact"
         )
 
-        plugins.clear()
-        plugins.addAll(newList)
+        if (url.isNullOrBlank()) {
+            binding.entryIcon.loadImage(R.drawable.ic_baseline_extension_24)
+        } else {
+            binding.entryIcon.loadImage(
+                url
+            ) { error(getImageFromDrawable(itemView.context, R.drawable.ic_baseline_extension_24)) }
+        }
+
+        binding.extVersion.isVisible = true
+        binding.extVersion.text = "v${metadata.version}"
 
-        diffResult.dispatchUpdatesTo(this)
-    }
+        if (metadata.language.isNullOrBlank()) {
+            binding.langIcon.isVisible = false
+        } else {
+            binding.langIcon.isVisible = true
+            binding.langIcon.text = getNameNextToFlagEmoji(metadata.language) ?: metadata.language
+        }
 
-    /*
-    private var storedPlugins: Array<PluginData> = reloadStoredPlugins()
+        //val oldRecycleCount = (holder as? RepositoryViewHolderState)?.recycleCount
 
-    private fun reloadStoredPlugins(): Array<PluginData> {
-        return PluginManager.getPluginsOnline().also { storedPlugins = it }
-    }*/
+        binding.extVotes.isVisible = false
 
-    // Clear coil image because setImageResource doesn't override
-    override fun onViewRecycled(holder: RecyclerView.ViewHolder) {
-        if (holder is PluginViewHolder) {
-            holder.binding.entryIcon.loadImage(R.drawable.ic_github_logo)
+        // Disable this for now as the vote api is down, this will also significantly improve the lag
+        // from doing all these network requests
+        /*if (!isLocal) {
+            ioSafe {
+                metadata.getVotes().main { votes ->
+                    val currentRecycleCount = (holder as? RepositoryViewHolderState)?.recycleCount
+
+                    // Only set the text if the view is correctly rendered
+                    if (currentRecycleCount == oldRecycleCount) {
+                        binding.extVotes.setText(txt(R.string.extension_rating, prettyCount(votes)))
+                        binding.extVotes.isVisible = true
+                    }
+                }
+            }
+        }*/
+
+        if (metadata.fileSize != null) {
+            binding.extFilesize.isVisible = true
+            binding.extFilesize.text = formatShortFileSize(itemView.context, metadata.fileSize)
+        } else {
+            binding.extFilesize.isVisible = false
         }
-        super.onViewRecycled(holder)
+
+        binding.mainText.setText(
+            if (disabled) txt(
+                R.string.single_plugin_disabled,
+                name
+            ) else txt(name)
+        )
+
+        binding.subText.isGone = metadata.description.isNullOrBlank()
+        binding.subText.text = metadata.description.html()
     }
 
     companion object {
+        // A high count as we can render in the entire list as the same time
+        val sharedPool =
+            newSharedPool { setMaxRecycledViews(CONTENT, 15) }
+
         private tailrec fun findClosestBase2(target: Int, current: Int = 16, max: Int = 512): Int {
             if (current >= max) return max
             if (current >= target) return current
@@ -103,14 +211,14 @@ class PluginAdapter(
 
         // 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
+        /*@Test
         fun testFindClosestBase2() {
             Assert.assertEquals(16, findClosestBase2(0))
             Assert.assertEquals(256, findClosestBase2(170))
             Assert.assertEquals(256, findClosestBase2(256))
             Assert.assertEquals(512, findClosestBase2(257))
             Assert.assertEquals(512, findClosestBase2(700))
-        }
+        }*/
 
         private val iconSizeExact = 32.toPx
         private val iconSize by lazy {
@@ -131,136 +239,4 @@ class PluginAdapter(
             }
         }
     }
-
-    inner class PluginViewHolder(val binding: RepositoryItemBinding) :
-        RecyclerView.ViewHolder(binding.root) {
-
-        @SuppressLint("SetTextI18n")
-        fun bind(
-            data: PluginViewData,
-        ) {
-            val metadata = data.plugin.second
-            val disabled = metadata.status == PROVIDER_STATUS_DOWN
-            val name = metadata.name.removeSuffix("Provider")
-            val alpha = if (disabled) 0.6f else 1f
-            val isLocal = !data.plugin.second.url.startsWith("http")
-            binding.mainText.alpha = alpha
-            binding.subText.alpha = alpha
-
-            val drawableInt = if (data.isDownloaded)
-                R.drawable.ic_baseline_delete_outline_24
-            else R.drawable.netflix_download
-
-            binding.nsfwMarker.isVisible = metadata.tvTypes?.contains(TvType.NSFW.name) ?: false
-            binding.actionButton.setImageResource(drawableInt)
-
-            binding.actionButton.setOnClickListener {
-                iconClickCallback.invoke(data.plugin)
-            }
-            itemView.setOnClickListener {
-                if (isLocal) return@setOnClickListener
-
-                val sheet = PluginDetailsFragment(data)
-                val activity = itemView.context.getActivity() as AppCompatActivity
-                sheet.show(activity.supportFragmentManager, "PluginDetails")
-            }
-            //if (itemView.context?.isTrueTvSettings() == false) {
-            //    val siteUrl = metadata.repositoryUrl
-            //    if (siteUrl != null && siteUrl.isNotBlank() && siteUrl != "NONE") {
-            //        itemView.setOnClickListener {
-            //            openBrowser(siteUrl)
-            //        }
-            //    }
-            //}
-
-            if (data.isDownloaded) {
-                // On local plugins page the filepath is provided instead of url.
-                val plugin =
-                    (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 {
-                        try {
-                            plugin.openSettings!!.invoke(itemView.context)
-                        } catch (e: Throwable) {
-                            Log.e(
-                                "PluginAdapter",
-                                "Failed to open $name settings: ${
-                                    Log.getStackTraceString(e)
-                                }"
-                            )
-                        }
-                    }
-                } else {
-                    binding.actionSettings.isVisible = false
-                }
-            } else {
-                binding.actionSettings.isVisible = false
-            }
-
-            binding.entryIcon.loadImage(
-                    metadata.iconUrl?.replace(
-                        "%size%",
-                        "$iconSize"
-                    )?.replace(
-                        "%exact_size%",
-                        "$iconSizeExact"
-                    )
-                ) { error(getImageFromDrawable(itemView.context, R.drawable.ic_baseline_extension_24)) }
-
-            binding.extVersion.isVisible = true
-            binding.extVersion.text = "v${metadata.version}"
-
-            if (metadata.language.isNullOrBlank()) {
-                binding.langIcon.isVisible = false
-            } else {
-                binding.langIcon.isVisible = true
-                binding.langIcon.text =
-                    "${getFlagFromIso(metadata.language)} ${fromTwoLettersToLanguage(metadata.language)}"
-            }
-
-            binding.extVotes.isVisible = false
-            if (!isLocal) {
-                ioSafe {
-                    metadata.getVotes().main {
-                        binding.extVotes.setText(txt(R.string.extension_rating, prettyCount(it)))
-                        binding.extVotes.isVisible = true
-                    }
-                }
-            }
-
-
-            if (metadata.fileSize != null) {
-                binding.extFilesize.isVisible = true
-                binding.extFilesize.text = formatShortFileSize(itemView.context, metadata.fileSize)
-            } else {
-                binding.extFilesize.isVisible = false
-            }
-            binding.mainText.setText(
-                if (disabled) txt(
-                    R.string.single_plugin_disabled,
-                    name
-                ) else txt(name)
-            )
-            binding.subText.isGone = metadata.description.isNullOrBlank()
-            binding.subText.text = metadata.description.html()
-        }
-    }
-}
-
-class PluginDiffCallback(
-    private val oldList: List<PluginViewData>,
-    private val newList: List<PluginViewData>
-) :
-    DiffUtil.Callback() {
-    override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int) =
-        oldList[oldItemPosition].plugin.second.internalName == newList[newItemPosition].plugin.second.internalName && oldList[oldItemPosition].plugin.first == newList[newItemPosition].plugin.first
-
-    override fun getOldListSize() = oldList.size
-
-    override fun getNewListSize() = newList.size
-
-    override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int) =
-        oldList[oldItemPosition] == newList[newItemPosition]
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginDetailsFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginDetailsFragment.kt
index 80be3cf4b22..0dcbece6cc3 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
@@ -1,33 +1,36 @@
 package com.lagradost.cloudstream3.ui.settings.extensions
 
 import android.content.res.ColorStateList
-import android.os.Bundle
 import android.text.format.Formatter.formatFileSize
 import android.util.Log
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import androidx.core.view.isVisible
-import com.google.android.material.bottomsheet.BottomSheetDialogFragment
-import com.lagradost.cloudstream3.AcraApplication.Companion.openBrowser
-import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.openBrowser
 import com.lagradost.cloudstream3.databinding.FragmentPluginDetailsBinding
 import com.lagradost.cloudstream3.plugins.PluginManager
 import com.lagradost.cloudstream3.plugins.VotingApi.canVote
 import com.lagradost.cloudstream3.plugins.VotingApi.getVotes
 import com.lagradost.cloudstream3.plugins.VotingApi.hasVoted
 import com.lagradost.cloudstream3.plugins.VotingApi.vote
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.ui.BaseBottomSheetDialogFragment
+import com.lagradost.cloudstream3.ui.BaseFragment
+import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
+import com.lagradost.cloudstream3.ui.settings.Globals.TV
+import com.lagradost.cloudstream3.ui.settings.Globals.isLandscape
+import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import com.lagradost.cloudstream3.utils.Coroutines.main
+import com.lagradost.cloudstream3.utils.getImageFromDrawable
 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.SubtitleHelper.getNameNextToFlagEmoji
 import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute
+import com.lagradost.cloudstream3.utils.UIHelper.fixSystemBarsPadding
 import com.lagradost.cloudstream3.utils.UIHelper.toPx
-import com.lagradost.cloudstream3.utils.getImageFromDrawable
 
-
-class PluginDetailsFragment(val data: PluginViewData) : BottomSheetDialogFragment() {
+class PluginDetailsFragment(val data: PluginViewData) : BaseBottomSheetDialogFragment<FragmentPluginDetailsBinding>(
+    BaseFragment.BindingCreator.Inflate(FragmentPluginDetailsBinding::inflate)
+) {
 
     companion object {
         private tailrec fun findClosestBase2(target: Int, current: Int = 16, max: Int = 512): Int {
@@ -42,26 +45,17 @@ class PluginDetailsFragment(val data: PluginViewData) : BottomSheetDialogFragmen
         }
     }
 
-    override fun onDestroyView() {
-        binding = null
-        super.onDestroyView()
-    }
-
-    var binding: FragmentPluginDetailsBinding? = null
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        val localBinding = FragmentPluginDetailsBinding.inflate(inflater, container, false)
-        binding = localBinding
-        return localBinding.root
-        //return inflater.inflate(R.layout.fragment_plugin_details, container, false)
+    override fun fixLayout(view: View) {
+        fixSystemBarsPadding(
+            view,
+            padBottom = isLandscape(),
+            padLeft = isLayout(TV or EMULATOR)
+        )
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
+    override fun onBindingCreated(binding: FragmentPluginDetailsBinding) {
         val metadata = data.plugin.second
-        binding?.apply {
+        binding.apply {
             pluginIcon.loadImage(metadata.iconUrl?.replace("%size%", "$iconSize")
                 ?.replace("%exact_size%", "$iconSizeExact")) {
                 error { getImageFromDrawable(context ?: return@error null , R.drawable.ic_baseline_extension_24) }
@@ -85,9 +79,9 @@ class PluginDetailsFragment(val data: PluginViewData) : BottomSheetDialogFragmen
                     ", "
                 )
             pluginLang.text = if (metadata.language == null)
-                getString(R.string.no_data)
-            else
-                "${getFlagFromIso(metadata.language)} ${fromTwoLettersToLanguage(metadata.language)}"
+                    getString(R.string.no_data)
+                else
+                    getNameNextToFlagEmoji(metadata.language) ?: metadata.language
 
             githubBtn.setOnClickListener {
                 if (metadata.repositoryUrl != null) {
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 4878049b4cf..534ffa62a43 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
@@ -1,70 +1,62 @@
 package com.lagradost.cloudstream3.ui.settings.extensions
 
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import androidx.appcompat.widget.SearchView
 import androidx.core.view.isVisible
-import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import com.lagradost.cloudstream3.AllLanguagesName
 import com.lagradost.cloudstream3.BuildConfig
-import com.lagradost.cloudstream3.R
-import com.lagradost.cloudstream3.TvType
 import com.lagradost.cloudstream3.databinding.FragmentPluginsBinding
 import com.lagradost.cloudstream3.mvvm.observe
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.TvType
+import com.lagradost.cloudstream3.ui.BaseFragment
 import com.lagradost.cloudstream3.ui.home.HomeFragment.Companion.bindChips
 import com.lagradost.cloudstream3.ui.result.FOCUS_SELF
 import com.lagradost.cloudstream3.ui.result.setLinearListLayout
+import com.lagradost.cloudstream3.ui.setRecycledViewPool
 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.ui.settings.SettingsFragment.Companion.setSystemBarsPadding
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setToolBarScrollFlags
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setUpToolbar
-import com.lagradost.cloudstream3.ui.settings.appLanguages
 import com.lagradost.cloudstream3.utils.AppContextUtils.getApiProviderLangSettings
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showMultiDialog
-import com.lagradost.cloudstream3.utils.SubtitleHelper
+import com.lagradost.cloudstream3.utils.SubtitleHelper.getNameNextToFlagEmoji
 import com.lagradost.cloudstream3.utils.UIHelper.toPx
 
 const val PLUGINS_BUNDLE_NAME = "name"
 const val PLUGINS_BUNDLE_URL = "url"
 const val PLUGINS_BUNDLE_LOCAL = "isLocal"
 
-class PluginsFragment : Fragment() {
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?,
-    ): View {
-        val localBinding = FragmentPluginsBinding.inflate(inflater, container, false)
-        binding = localBinding
-        return localBinding.root//inflater.inflate(R.layout.fragment_plugins, container, false)
-    }
+class PluginsFragment : BaseFragment<FragmentPluginsBinding>(
+    BaseFragment.BindingCreator.Inflate(FragmentPluginsBinding::inflate)
+) {
+
+    private val pluginViewModel: PluginsViewModel by activityViewModels()
 
     override fun onDestroyView() {
-        binding = null
+        pluginViewModel.clear() // clear for the next observe
         super.onDestroyView()
     }
 
-    private val pluginViewModel: PluginsViewModel by activityViewModels()
-    var binding: FragmentPluginsBinding? = null
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
+    override fun fixLayout(view: View) {
+        setSystemBarsPadding()
+    }
 
+    override fun onBindingCreated(binding: FragmentPluginsBinding) {
         // Since the ViewModel is getting reused the tvTypes must be cleared between uses
         pluginViewModel.tvTypes.clear()
-        pluginViewModel.languages = listOf()
-        pluginViewModel.search(null)
+        pluginViewModel.selectedLanguages = listOf()
+        pluginViewModel.clear()
 
         // Filter by language set on preferred media
         activity?.let {
             val providerLangs = it.getApiProviderLangSettings().toList()
             if (!providerLangs.contains(AllLanguagesName)) {
-                pluginViewModel.languages = mutableListOf("none") + providerLangs
-                //Log.i("DevDebug", "providerLang => ${pluginViewModel.languages.toJson()}")
+                pluginViewModel.selectedLanguages = mutableListOf("none") + providerLangs
             }
         }
 
@@ -72,16 +64,16 @@ class PluginsFragment : Fragment() {
         val url = arguments?.getString(PLUGINS_BUNDLE_URL)
         val isLocal = arguments?.getBoolean(PLUGINS_BUNDLE_LOCAL) == true
         // download all extensions button
-        val downloadAllButton = binding?.settingsToolbar?.menu?.findItem(R.id.download_all)
+        val downloadAllButton = binding.settingsToolbar.menu?.findItem(R.id.download_all)
 
         if (url == null || name == null) {
-            activity?.onBackPressedDispatcher?.onBackPressed()
+            dispatchBackPressed()
             return
         }
 
         setToolBarScrollFlags()
         setUpToolbar(name)
-        binding?.settingsToolbar?.apply {
+        binding.settingsToolbar.apply {
             setOnMenuItemClickListener { menuItem ->
                 when (menuItem?.itemId) {
                     R.id.download_all -> {
@@ -89,24 +81,35 @@ class PluginsFragment : Fragment() {
                     }
 
                     R.id.lang_filter -> {
-                        val tempLangs = appLanguages.toMutableList()
-                        val languageCodes =
-                            mutableListOf("none") + tempLangs.map { (_, _, iso) -> iso }
-                        val languageNames =
-                            mutableListOf(getString(R.string.no_data)) + tempLangs.map { (emoji, name, iso) ->
-                                val flag =
-                                    emoji.ifBlank { SubtitleHelper.getFlagFromIso(iso) ?: "ERROR" }
-                                "$flag $name"
+                        val languagesTagName = pluginViewModel.pluginLanguages
+                            .map { langTag ->
+                                Pair(
+                                    langTag,
+                                    getNameNextToFlagEmoji(langTag) ?: langTag
+                                )
                             }
-                        val selectedList =
-                            pluginViewModel.languages.map { languageCodes.indexOf(it) }
+                            .sortedBy {
+                                it.second.substringAfter("\u00a0").lowercase()
+                            } // name ignoring flag emoji
+                            .toMutableList()
+
+                        // Move "none" to 1st position as it's special code to indicate unknown/missing language
+                        if (languagesTagName.remove(Pair("none", "none"))) {
+                            languagesTagName.add(0, Pair("none", getString(R.string.no_data)))
+                        }
+
+                        val currentIndexList = pluginViewModel.selectedLanguages.map { langTag ->
+                            languagesTagName.indexOfFirst { lang -> lang.first == langTag }
+                        }
 
                         activity?.showMultiDialog(
-                            languageNames,
-                            selectedList,
+                            languagesTagName.map { it.second },
+                            currentIndexList,
                             getString(R.string.provider_lang_settings),
-                            {}) { newList ->
-                            pluginViewModel.languages = newList.map { languageCodes[it] }
+                            {}
+                        ) { selectedList ->
+                            pluginViewModel.selectedLanguages =
+                                selectedList.map { languagesTagName[it].first }
                             pluginViewModel.updateFilteredPlugins()
                         }
                     }
@@ -124,7 +127,7 @@ class PluginsFragment : Fragment() {
                 if (searchView?.isIconified == false) {
                     searchView.isIconified = true
                 } else {
-                    activity?.onBackPressedDispatcher?.onBackPressed()
+                    dispatchBackPressed()
                 }
             }
             searchView?.setOnQueryTextFocusChangeListener { _, hasFocus ->
@@ -149,46 +152,46 @@ class PluginsFragment : Fragment() {
 
         // Because onActionViewCollapsed doesn't wanna work we need this workaround :(
 
-        binding?.pluginRecyclerView?.setLinearListLayout(
-            isHorizontal = false,
-            nextDown = FOCUS_SELF,
-            nextRight = FOCUS_SELF,
-        )
-
-        binding?.pluginRecyclerView?.adapter =
-            PluginAdapter {
-                pluginViewModel.handlePluginAction(activity, url, it, isLocal)
-            }
+        binding.pluginRecyclerView.apply {
+            setLinearListLayout(
+                isHorizontal = false,
+                nextDown = FOCUS_SELF,
+                nextRight = FOCUS_SELF,
+            )
+            setRecycledViewPool(PluginAdapter.sharedPool)
+            adapter =
+                PluginAdapter {
+                    pluginViewModel.handlePluginAction(activity, url, it, isLocal)
+                }
+        }
 
         if (isLayout(TV or EMULATOR)) {
             // Scrolling down does not reveal the whole RecyclerView on TV, add to bypass that.
-            binding?.pluginRecyclerView?.setPadding(0, 0, 0, 200.toPx)
+            binding.pluginRecyclerView.setPadding(0, 0, 0, 200.toPx)
         }
 
         observe(pluginViewModel.filteredPlugins) { (scrollToTop, list) ->
-            (binding?.pluginRecyclerView?.adapter as? PluginAdapter)?.updateList(list)
-
-            if (scrollToTop)
-                binding?.pluginRecyclerView?.scrollToPosition(0)
+            (binding.pluginRecyclerView.adapter as? PluginAdapter)?.submitList(list)
+            if (scrollToTop) {
+                binding.pluginRecyclerView.scrollToPosition(0)
+            }
         }
 
         if (isLocal) {
             // No download button and no categories on local
             downloadAllButton?.isVisible = false
-            binding?.settingsToolbar?.menu?.findItem(R.id.lang_filter)?.isVisible = false
+            binding.settingsToolbar.menu?.findItem(R.id.lang_filter)?.isVisible = false
             pluginViewModel.updatePluginListLocal()
 
-            binding?.tvtypesChipsScroll?.root?.isVisible = false
+            binding.tvtypesChipsScroll.root.isVisible = false
         } else {
             pluginViewModel.updatePluginList(context, url)
-            binding?.tvtypesChipsScroll?.root?.isVisible = true
+            binding.tvtypesChipsScroll.root.isVisible = true
             // not needed for users but may be useful for devs
             downloadAllButton?.isVisible = BuildConfig.DEBUG
 
-
-
             bindChips(
-                binding?.tvtypesChipsScroll?.tvtypesChips,
+                binding.tvtypesChipsScroll.tvtypesChips,
                 emptyList(),
                 TvType.entries.toList(),
                 callback = { list ->
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 a6f9148985c..dfc61eba54c 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
@@ -26,6 +26,7 @@ import com.lagradost.cloudstream3.utils.Coroutines.runOnMainThread
 import me.xdrop.fuzzywuzzy.FuzzySearch
 import java.io.File
 
+// String => repository url
 typealias Plugin = Pair<String, SitePlugin>
 /**
  * The boolean signifies if the plugin list should be scrolled to the top, used for searching.
@@ -36,13 +37,28 @@ class PluginsViewModel : ViewModel() {
 
     /** plugins is an unaltered list of plugins */
     private var plugins: List<PluginViewData> = emptyList()
+        set(value) {
+            // Also set all the plugin languages for easier filtering
+            value.map { pluginViewData ->
+                val language = pluginViewData.plugin.second.language?.lowercase()
+                pluginLanguages.add(
+                    when {
+                        language.isNullOrBlank() -> "none"
+                        else -> language.lowercase()
+                    }
+                )
+                // not sorting as most likely this is a language tag instead of name
+            }
+            field = value
+        }
+    var pluginLanguages = mutableSetOf<String>() // set to avoid duplicates
 
     /** filteredPlugins is a subset of plugins following the current search query and tv type selection */
     private var _filteredPlugins = MutableLiveData<PluginViewDataUpdate>()
     var filteredPlugins: LiveData<PluginViewDataUpdate> = _filteredPlugins
 
     val tvTypes = mutableListOf<String>()
-    var languages = listOf<String>()
+    var selectedLanguages = listOf<String>()
     private var currentQuery: String? = null
 
     companion object {
@@ -112,6 +128,7 @@ class PluginsViewModel : ViewModel() {
                     PluginManager.downloadPlugin(
                         activity,
                         metadata.url,
+                        metadata.fileHash,
                         metadata.internalName,
                         repo,
                         metadata.status != PROVIDER_STATUS_DOWN
@@ -163,6 +180,7 @@ class PluginsViewModel : ViewModel() {
             PluginManager.downloadPlugin(
                 activity,
                 metadata.url,
+                metadata.fileHash,
                 metadata.internalName,
                 repo,
                 isEnabled
@@ -213,12 +231,12 @@ class PluginsViewModel : ViewModel() {
     }
 
     private fun List<PluginViewData>.filterLang(): List<PluginViewData> {
-        if (languages.isEmpty()) return this
+        if (selectedLanguages.isEmpty()) return this // do not filter
         return this.filter {
             if (it.plugin.second.language == null) {
-                return@filter languages.contains("none")
+                return@filter selectedLanguages.contains("none")
             }
-            languages.contains(it.plugin.second.language)
+            selectedLanguages.contains(it.plugin.second.language?.lowercase())
         }
     }
 
@@ -227,7 +245,12 @@ class PluginsViewModel : ViewModel() {
             // Return list to base state if no query
             this.sortedBy { it.plugin.second.name }
         } else {
-            this.sortedBy { -FuzzySearch.partialRatio(it.plugin.second.name.lowercase(), query.lowercase()) }
+            this.sortedBy {
+                -FuzzySearch.partialRatio(
+                    it.plugin.second.name.lowercase(),
+                    query.lowercase()
+                )
+            }
         }
     }
 
@@ -237,6 +260,13 @@ class PluginsViewModel : ViewModel() {
         )
     }
 
+    fun clear() {
+        currentQuery = null
+        _filteredPlugins.postValue(
+            false to emptyList()
+        )
+    }
+
     fun updatePluginList(context: Context?, repositoryUrl: String) = viewModelScope.launchSafe {
         if (context == null) return@launchSafe
         Log.i(TAG, "updatePluginList = $repositoryUrl")
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 9d633314413..0f9bf5f58c9 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
@@ -2,17 +2,19 @@ package com.lagradost.cloudstream3.ui.settings.extensions
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
-import androidx.recyclerview.widget.DiffUtil
-import androidx.recyclerview.widget.RecyclerView
-import androidx.viewbinding.ViewBinding
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.databinding.RepositoryItemBinding
 import com.lagradost.cloudstream3.databinding.RepositoryItemTvBinding
 import com.lagradost.cloudstream3.plugins.RepositoryManager.PREBUILT_REPOSITORIES
-import com.lagradost.cloudstream3.utils.txt
+import com.lagradost.cloudstream3.ui.BaseDiffCallback
+import com.lagradost.cloudstream3.ui.NoStateAdapter
+import com.lagradost.cloudstream3.ui.ViewHolderState
 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.clipboardHelper
+import com.lagradost.cloudstream3.utils.getImageFromDrawable
+import com.lagradost.cloudstream3.utils.txt
 
 class RepoAdapter(
     val isSetup: Boolean,
@@ -20,10 +22,11 @@ class RepoAdapter(
     val imageClickCallback: RepoAdapter.(RepositoryData) -> Unit,
     /** In setup mode the trash icons will be replaced with download icons */
 ) :
-    RecyclerView.Adapter<RecyclerView.ViewHolder>() {
-    private val repositories: MutableList<RepositoryData> = mutableListOf()
+    NoStateAdapter<RepositoryData>(diffCallback = BaseDiffCallback(itemSame = { a, b ->
+        a.url == b.url
+    })) {
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+    override fun onCreateContent(parent: ViewGroup): ViewHolderState<Any> {
         val layout = if (isLayout(TV)) RepositoryItemTvBinding.inflate(
             LayoutInflater.from(parent.context),
             parent,
@@ -32,109 +35,97 @@ class RepoAdapter(
             LayoutInflater.from(parent.context),
             parent,
             false
-        )  //R.layout.repository_item_tv else R.layout.repository_item
-        return RepoViewHolder(
-            layout
         )
+        return ViewHolderState(layout)
     }
 
-    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-        when (holder) {
-            is RepoViewHolder -> {
-                holder.bind(repositories[position])
-            }
+    override fun onClearView(holder: ViewHolderState<Any>) {
+        when (val binding = holder.view) {
+            is RepositoryItemBinding -> clearImage(binding.entryIcon)
+            is RepositoryItemTvBinding -> clearImage(binding.entryIcon)
         }
     }
 
-    override fun getItemCount(): Int {
-        return repositories.size
-    }
-
-    fun updateList(newList: Array<RepositoryData>) {
-        val diffResult = DiffUtil.calculateDiff(
-            RepoDiffCallback(this.repositories, newList)
-        )
-
-        repositories.clear()
-        repositories.addAll(newList)
-
-        diffResult.dispatchUpdatesTo(this)
-    }
-
-    inner class RepoViewHolder(
-        val binding: ViewBinding
-    ) :
-        RecyclerView.ViewHolder(binding.root) {
-        fun bind(
-            repositoryData: RepositoryData
-        ) {
-            val isPrebuilt = PREBUILT_REPOSITORIES.contains(repositoryData)
-            val drawable =
-                if (isSetup) R.drawable.netflix_download else R.drawable.ic_baseline_delete_outline_24
-            when (binding) {
-                is RepositoryItemTvBinding -> {
-                    binding.apply {
-                        // Only shows icon if on setup or if it isn't a prebuilt repo.
-                        // No delete buttons on prebuilt repos.
-                        if (!isPrebuilt || isSetup) {
-                            actionButton.setImageResource(drawable)
-                        }
+    override fun onBindContent(holder: ViewHolderState<Any>, item: RepositoryData, position: Int) {
+        val isPrebuilt = PREBUILT_REPOSITORIES.contains(item)
+        val drawable =
+            if (isSetup) R.drawable.netflix_download else R.drawable.ic_baseline_delete_outline_24
+        when (val binding = holder.view) {
+            is RepositoryItemTvBinding -> {
+                binding.apply {
+                    // Only shows icon if on setup or if it isn't a prebuilt repo.
+                    // No delete buttons on prebuilt repos.
+                    if (!isPrebuilt || isSetup) {
+                        actionButton.setImageResource(drawable)
+                    }
 
-                        actionButton.setOnClickListener {
-                            imageClickCallback(repositoryData)
-                        }
+                    actionButton.setOnClickListener {
+                        imageClickCallback(item)
+                    }
 
-                        repositoryItemRoot.setOnClickListener {
-                            clickCallback(repositoryData)
+                    repositoryItemRoot.setOnClickListener {
+                        clickCallback(item)
+                    }
+                    mainText.text = item.name
+                    subText.text = item.url
+                    if (!item.iconUrl.isNullOrEmpty()) {
+                        entryIcon.loadImage(item.iconUrl) {
+                            error(
+                                getImageFromDrawable(
+                                    binding.root.context,
+                                    R.drawable.ic_github_logo
+                                )
+                            )
                         }
-                        mainText.text = repositoryData.name
-                        subText.text = repositoryData.url
+                    } else {
+                        entryIcon.loadImage(R.drawable.ic_github_logo)
                     }
                 }
+            }
 
-                is RepositoryItemBinding -> {
-                    binding.apply {
-                        // Only shows icon if on setup or if it isn't a prebuilt repo.
-                        // No delete buttons on prebuilt repos.
-                        if (!isPrebuilt || isSetup) {
-                            actionButton.setImageResource(drawable)
-                        }
+            is RepositoryItemBinding -> {
+                binding.apply {
+                    // Only shows icon if on setup or if it isn't a prebuilt repo.
+                    // No delete buttons on prebuilt repos.
+                    if (!isPrebuilt || isSetup) {
+                        actionButton.setImageResource(drawable)
+                    }
 
-                        actionButton.setOnClickListener {
-                            imageClickCallback(repositoryData)
-                        }
+                    actionButton.setOnClickListener {
+                        imageClickCallback(item)
+                    }
 
-                        repositoryItemRoot.setOnClickListener {
-                            clickCallback(repositoryData)
-                        }
+                    repositoryItemRoot.setOnClickListener {
+                        clickCallback(item)
+                    }
 
-                        repositoryItemRoot.setOnLongClickListener {
-                            val shareableRepoData = "${repositoryData.name} : \n ${repositoryData.url}"
-                            clipboardHelper(txt(R.string.repo_copy_label), shareableRepoData)
-                            true
-                        }
+                    repositoryItemRoot.setOnLongClickListener {
+                        val shareableRepoData =
+                            "${item.name}$SHAREABLE_REPO_SEPARATOR\n ${item.url}"
+                        clipboardHelper(txt(R.string.repo_copy_label), shareableRepoData)
+                        true
+                    }
 
-                        mainText.text = repositoryData.name
-                        subText.text = repositoryData.url
+                    mainText.text = item.name
+                    subText.text = item.url
+                    if (!item.iconUrl.isNullOrEmpty()) {
+                        entryIcon.loadImage(item.iconUrl) {
+                            error(
+                                getImageFromDrawable(
+                                    binding.root.context,
+                                    R.drawable.ic_github_logo
+                                )
+                            )
+                        }
+                    } else {
+                        entryIcon.loadImage(R.drawable.ic_github_logo)
                     }
                 }
             }
         }
     }
-}
-
-class RepoDiffCallback(
-    private val oldList: List<RepositoryData>,
-    private val newList: Array<RepositoryData>
-) :
-    DiffUtil.Callback() {
-    override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int) =
-        oldList[oldItemPosition].url == newList[newItemPosition].url
 
-    override fun getOldListSize() = oldList.size
-
-    override fun getNewListSize() = newList.size
-
-    override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int) =
-        oldList[oldItemPosition] == newList[newItemPosition]
+    companion object {
+        const val SHAREABLE_REPO_SEPARATOR = " : "
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestFragment.kt
index 921ac0674b7..4ec005a094d 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestFragment.kt
@@ -1,41 +1,35 @@
 package com.lagradost.cloudstream3.ui.settings.testing
 
-import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
-import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.databinding.FragmentTestingBinding
 import com.lagradost.cloudstream3.mvvm.safe
 import com.lagradost.cloudstream3.mvvm.observe
 import com.lagradost.cloudstream3.mvvm.observeNullable
+import com.lagradost.cloudstream3.ui.BaseFragment
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
+import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setSystemBarsPadding
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setToolBarScrollFlags
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setUpToolbar
 
-
-class TestFragment : Fragment() {
+class TestFragment : BaseFragment<FragmentTestingBinding>(
+    BaseFragment.BindingCreator.Inflate(FragmentTestingBinding::inflate)
+) {
 
     private val testViewModel: TestViewModel by activityViewModels()
-    var binding: FragmentTestingBinding? = null
 
-    override fun onDestroyView() {
-        binding = null
-        super.onDestroyView()
+    override fun fixLayout(view: View) {
+        setSystemBarsPadding()
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    override fun onBindingCreated(binding: FragmentTestingBinding) {
         setUpToolbar(R.string.category_provider_test)
         setToolBarScrollFlags()
-        super.onViewCreated(view, savedInstanceState)
 
-        binding?.apply {
-            providerTestRecyclerView.adapter = TestResultAdapter(
-                mutableListOf()
-            )
+        binding.apply {
+            providerTestRecyclerView.adapter = TestResultAdapter()
 
             testViewModel.init()
             if (testViewModel.isRunningTest) {
@@ -46,10 +40,10 @@ class TestFragment : Fragment() {
                 providerTest.setProgress(passed, failed, total)
             }
 
-            observeNullable(testViewModel.providerResults) {
+            observe(testViewModel.providerResults) {
                 safe {
                     val newItems = it.sortedBy { api -> api.first.name }
-                    (providerTestRecyclerView.adapter as? TestResultAdapter)?.updateList(
+                    (providerTestRecyclerView.adapter as? TestResultAdapter)?.submitList(
                         newItems
                     )
                 }
@@ -96,13 +90,4 @@ class TestFragment : Fragment() {
             }
         }
     }
-
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        val localBinding = FragmentTestingBinding.inflate(inflater, container, false)
-        binding = localBinding
-        return localBinding.root//inflater.inflate(R.layout.fragment_testing, container, false)
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestResultAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestResultAdapter.kt
index bad58a0e74e..c53ff1fcf8a 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestResultAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestResultAdapter.kt
@@ -7,7 +7,6 @@ import android.widget.ImageView
 import android.widget.TextView
 import android.widget.Toast
 import androidx.core.content.ContextCompat
-import androidx.recyclerview.widget.RecyclerView
 import com.lagradost.cloudstream3.CommonActivity.showToast
 import com.lagradost.cloudstream3.MainAPI
 import com.lagradost.cloudstream3.R
@@ -15,103 +14,117 @@ import com.lagradost.cloudstream3.databinding.ProviderTestItemBinding
 import com.lagradost.cloudstream3.mvvm.getAllMessages
 import com.lagradost.cloudstream3.mvvm.getStackTracePretty
 import com.lagradost.cloudstream3.plugins.PluginManager
-import com.lagradost.cloudstream3.utils.AppContextUtils
+import com.lagradost.cloudstream3.ui.BaseDiffCallback
+import com.lagradost.cloudstream3.ui.NoStateAdapter
+import com.lagradost.cloudstream3.ui.ViewHolderState
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import com.lagradost.cloudstream3.utils.Coroutines.runOnMainThread
 import com.lagradost.cloudstream3.utils.SubtitleHelper.getFlagFromIso
 import com.lagradost.cloudstream3.utils.TestingUtils
 import java.io.File
 
-class TestResultAdapter(override val items: MutableList<Pair<MainAPI, TestingUtils.TestResultProvider>>) :
-    AppContextUtils.DiffAdapter<Pair<MainAPI, TestingUtils.TestResultProvider>>(items) {
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-        return ProviderTestViewHolder(
-            ProviderTestItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-            //LayoutInflater.from(parent.context)
-            //    .inflate(R.layout.provider_test_item, parent, false),
-        )
+class TestResultAdapter() :
+    NoStateAdapter<Pair<MainAPI, TestingUtils.TestResultProvider>>(
+        diffCallback = BaseDiffCallback(
+            itemSame = { a, b ->
+                a.first.name == b.first.name && a.first.mainUrl == b.first.mainUrl
+            },
+            contentSame = { a, b ->
+                a == b
+            })
+    ) {
+    companion object {
+        private fun String.lastLine(): String? {
+            return this.lines().lastOrNull { it.isNotBlank() }
+        }
     }
 
-    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-        when (holder) {
-            is ProviderTestViewHolder -> {
-                val item = items[position]
-                holder.bind(item.first, item.second)
-            }
-        }
+    override fun onClearView(holder: ViewHolderState<Any>) {
+        val binding = holder.view as? ProviderTestItemBinding ?: return
+        clearImage(binding.actionButton)
     }
 
-    inner class ProviderTestViewHolder(binding: ProviderTestItemBinding) :
-        RecyclerView.ViewHolder(binding.root) {
-        private val languageText: TextView = binding.langIcon
-        private val providerTitle: TextView = binding.mainText
-        private val statusText: TextView = binding.passedFailedMarker
-        private val failDescription: TextView = binding.failDescription
-        private val logButton: ImageView = binding.actionButton
+    override fun onCreateContent(parent: ViewGroup): ViewHolderState<Any> {
+        return ViewHolderState(
+            ProviderTestItemBinding.inflate(
+                LayoutInflater.from(parent.context),
+                parent,
+                false
+            )
+        )
+    }
 
-        private fun String.lastLine(): String? {
-            return this.lines().lastOrNull { it.isNotBlank() }
-        }
+    override fun onBindContent(
+        holder: ViewHolderState<Any>,
+        item: Pair<MainAPI, TestingUtils.TestResultProvider>,
+        position: Int
+    ) {
+        val binding = holder.view as? ProviderTestItemBinding ?: return
+        val (api, result) = item
 
-        fun bind(api: MainAPI, result: TestingUtils.TestResultProvider) {
-            languageText.text = getFlagFromIso(api.lang)
-            providerTitle.text = api.name
+        val itemView = holder.itemView
 
-            val (resultText, resultColor) = if (result.success) {
-                if (result.log.any { it.level == TestingUtils.Logger.LogLevel.Warning }) {
-                    R.string.test_warning to R.color.colorTestWarning
-                } else {
-                    R.string.test_passed to R.color.colorTestPass
-                }
+        val languageText: TextView = binding.langIcon
+        val providerTitle: TextView = binding.mainText
+        val statusText: TextView = binding.passedFailedMarker
+        val failDescription: TextView = binding.failDescription
+        val logButton: ImageView = binding.actionButton
+
+        languageText.text = getFlagFromIso(api.lang)
+        providerTitle.text = api.name
+
+        val (resultText, resultColor) = if (result.success) {
+            if (result.log.any { it.level == TestingUtils.Logger.LogLevel.Warning }) {
+                R.string.test_warning to R.color.colorTestWarning
             } else {
-                R.string.test_failed to R.color.colorTestFail
+                R.string.test_passed to R.color.colorTestPass
             }
+        } else {
+            R.string.test_failed to R.color.colorTestFail
+        }
 
-            statusText.setText(resultText)
-            statusText.setTextColor(ContextCompat.getColor(itemView.context, resultColor))
-
-            val stackTrace = result.exception?.getStackTracePretty(false)?.ifBlank { null }
-            val messages = result.exception?.getAllMessages()?.ifBlank { null }
-            val resultLog = result.log.joinToString("\n")
-            val fullLog =
-                resultLog +
-                        (messages?.let { "\n\nError: $it" } ?: "") +
-                        (stackTrace?.let { "\n\n$it" } ?: "")
-
-            failDescription.text = messages?.lastLine() ?: resultLog.lastLine()
-
-            logButton.setOnClickListener {
-                val builder: AlertDialog.Builder =
-                    AlertDialog.Builder(it.context, R.style.AlertDialogCustom)
-                builder.setMessage(fullLog)
-                    .setTitle(R.string.test_log)
-                    // Ok button just closes the dialog
-                    .setPositiveButton(R.string.ok) { _, _ -> }
-
-                api.sourcePlugin?.let { path ->
-                    val pluginFile = File(path)
-                    // Cannot delete a deleted plugin
-                    if (!pluginFile.exists()) return@let
-
-                    builder.setNegativeButton(R.string.delete_plugin) { _, _ ->
-                        ioSafe {
-                            val success = PluginManager.deletePlugin(pluginFile)
-
-                            runOnMainThread {
-                                if (success) {
-                                    showToast(R.string.plugin_deleted, Toast.LENGTH_SHORT)
-                                } else {
-                                    showToast(R.string.error, Toast.LENGTH_SHORT)
-                                }
+        statusText.setText(resultText)
+        statusText.setTextColor(ContextCompat.getColor(itemView.context, resultColor))
+
+        val stackTrace = result.exception?.getStackTracePretty(false)?.ifBlank { null }
+        val messages = result.exception?.getAllMessages()?.ifBlank { null }
+        val resultLog = result.log.joinToString("\n")
+        val fullLog =
+            resultLog +
+                    (messages?.let { "\n\nError: $it" } ?: "") +
+                    (stackTrace?.let { "\n\n$it" } ?: "")
+
+        failDescription.text = messages?.lastLine() ?: resultLog.lastLine()
+
+        logButton.setOnClickListener {
+            val builder: AlertDialog.Builder =
+                AlertDialog.Builder(it.context, R.style.AlertDialogCustom)
+            builder.setMessage(fullLog)
+                .setTitle(R.string.test_log)
+                // Ok button just closes the dialog
+                .setPositiveButton(R.string.ok) { _, _ -> }
+
+            api.sourcePlugin?.let { path ->
+                val pluginFile = File(path)
+                // Cannot delete a deleted plugin
+                if (!pluginFile.exists()) return@let
+
+                builder.setNegativeButton(R.string.delete_plugin) { _, _ ->
+                    ioSafe {
+                        val success = PluginManager.deletePlugin(pluginFile)
+
+                        runOnMainThread {
+                            if (success) {
+                                showToast(R.string.plugin_deleted, Toast.LENGTH_SHORT)
+                            } else {
+                                showToast(R.string.error, Toast.LENGTH_SHORT)
                             }
                         }
                     }
                 }
-
-                builder.show()
             }
+
+            builder.show()
         }
     }
-
-
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestView.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestView.kt
index eea495a267e..65ed47a545a 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestView.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestView.kt
@@ -9,6 +9,7 @@ import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
 import androidx.cardview.widget.CardView
 import androidx.core.content.ContextCompat
+import androidx.core.content.withStyledAttributes
 import androidx.core.view.isVisible
 import androidx.core.widget.ContentLoadingProgressBar
 import com.google.android.material.button.MaterialButton
@@ -59,10 +60,9 @@ class TestView @JvmOverloads constructor(
         playPauseButton = findViewById(R.id.tests_play_pause)
 
         attrs?.let {
-            val typedArray = context.obtainStyledAttributes(it, R.styleable.TestView)
-            val headerText = typedArray.getString(R.styleable.TestView_header_text)
-            mainSectionHeader?.text = headerText
-            typedArray.recycle()
+            context.withStyledAttributes(it, R.styleable.TestView) {
+                mainSectionHeader?.text = getString(R.styleable.TestView_header_text)
+            }
         }
 
         playPauseButton?.setOnClickListener {
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
index 9e126b7a6a5..dfc93117481 100644
--- 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
@@ -4,14 +4,17 @@ 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.cloudstream3.CloudStreamApp
 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
+        if(uri == null) {
+            dirSelected(null, null)
+            return@registerForActivityResult
+        }
+        val context = context ?: CloudStreamApp.context ?: return@registerForActivityResult
         // RW perms for the path
         val flags = Intent.FLAG_GRANT_READ_URI_PERMISSION or
                 Intent.FLAG_GRANT_WRITE_URI_PERMISSION
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentExtensions.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentExtensions.kt
index 0dccd5cc42b..501ee0eef7b 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentExtensions.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentExtensions.kt
@@ -1,11 +1,8 @@
 package com.lagradost.cloudstream3.ui.setup
 
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import androidx.core.view.isVisible
-import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.findNavController
 import com.lagradost.cloudstream3.APIHolder.apis
 import com.lagradost.cloudstream3.MainActivity.Companion.afterRepositoryLoadedEvent
@@ -14,13 +11,15 @@ import com.lagradost.cloudstream3.databinding.FragmentSetupExtensionsBinding
 import com.lagradost.cloudstream3.mvvm.safe
 import com.lagradost.cloudstream3.plugins.RepositoryManager
 import com.lagradost.cloudstream3.plugins.RepositoryManager.PREBUILT_REPOSITORIES
+import com.lagradost.cloudstream3.ui.BaseFragment
 import com.lagradost.cloudstream3.ui.settings.extensions.PluginsViewModel
 import com.lagradost.cloudstream3.ui.settings.extensions.RepoAdapter
 import com.lagradost.cloudstream3.utils.Coroutines.main
-import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
+import com.lagradost.cloudstream3.utils.UIHelper.fixSystemBarsPadding
 
-
-class SetupFragmentExtensions : Fragment() {
+class SetupFragmentExtensions : BaseFragment<FragmentSetupExtensionsBinding>(
+    BaseFragment.BindingCreator.Inflate(FragmentSetupExtensionsBinding::inflate)
+) {
     companion object {
         const val SETUP_EXTENSION_BUNDLE_IS_SETUP = "isSetup"
 
@@ -34,24 +33,6 @@ class SetupFragmentExtensions : Fragment() {
         }
     }
 
-    var binding: FragmentSetupExtensionsBinding? = null
-
-    override fun onDestroyView() {
-        binding = null
-        super.onDestroyView()
-    }
-
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        val localBinding = FragmentSetupExtensionsBinding.inflate(inflater, container, false)
-        binding = localBinding
-        return localBinding.root
-        //return inflater.inflate(R.layout.fragment_setup_extensions, container, false)
-    }
-
-
     override fun onResume() {
         super.onResume()
         afterRepositoryLoadedEvent += ::setRepositories
@@ -62,18 +43,21 @@ class SetupFragmentExtensions : Fragment() {
         afterRepositoryLoadedEvent -= ::setRepositories
     }
 
+    override fun fixLayout(view: View) {
+        fixSystemBarsPadding(view)
+    }
+
     private fun setRepositories(success: Boolean = true) {
         main {
             val repositories = RepositoryManager.getRepositories() + PREBUILT_REPOSITORIES
             val hasRepos = repositories.isNotEmpty()
             binding?.repoRecyclerView?.isVisible = hasRepos
             binding?.blankRepoScreen?.isVisible = !hasRepos
-//            view_public_repositories_button?.isVisible = hasRepos
 
             if (hasRepos) {
                 binding?.repoRecyclerView?.adapter = RepoAdapter(true, {}, {
                     PluginsViewModel.downloadAll(activity, it.url, null)
-                }).apply { updateList(repositories) }
+                }).apply { submitList(repositories.toList()) }
             }
 //            else {
 //                list_repositories?.setOnClickListener {
@@ -84,19 +68,12 @@ class SetupFragmentExtensions : Fragment() {
         }
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        fixPaddingStatusbar(binding?.setupRoot)
+    override fun onBindingCreated(binding: FragmentSetupExtensionsBinding) {
         val isSetup = arguments?.getBoolean(SETUP_EXTENSION_BUNDLE_IS_SETUP) ?: false
 
-//        view_public_repositories_button?.setOnClickListener {
-//            openBrowser(PUBLIC_REPOSITORIES_LIST, isTvSettings(), this)
-//        }
-
         safe {
-           // val ctx = context ?: return@safe
             setRepositories()
-            binding?.apply {
+            binding.apply {
                 if (!isSetup) {
                     nextBtt.setText(R.string.setup_done)
                 }
@@ -123,6 +100,4 @@ class SetupFragmentExtensions : Fragment() {
             }
         }
     }
-
-
-}
\ 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 f57d4f159bd..e96a662c370 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
@@ -1,61 +1,45 @@
 package com.lagradost.cloudstream3.ui.setup
 
-import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import android.widget.AbsListView
 import android.widget.ArrayAdapter
 import androidx.core.content.ContextCompat
-import androidx.fragment.app.Fragment
+import androidx.core.content.edit
 import androidx.navigation.fragment.findNavController
 import androidx.preference.PreferenceManager
 import com.lagradost.cloudstream3.BuildConfig
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.setKey
 import com.lagradost.cloudstream3.CommonActivity
-import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.databinding.FragmentSetupLanguageBinding
 import com.lagradost.cloudstream3.mvvm.safe
 import com.lagradost.cloudstream3.plugins.PluginManager
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.ui.BaseFragment
 import com.lagradost.cloudstream3.ui.settings.appLanguages
 import com.lagradost.cloudstream3.ui.settings.getCurrentLocale
-import com.lagradost.cloudstream3.utils.SubtitleHelper
-import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
+import com.lagradost.cloudstream3.ui.settings.nameNextToFlagEmoji
+import com.lagradost.cloudstream3.utils.UIHelper.fixSystemBarsPadding
 
 const val HAS_DONE_SETUP_KEY = "HAS_DONE_SETUP"
 
-class SetupFragmentLanguage : Fragment() {
-    var binding: FragmentSetupLanguageBinding? = null
+class SetupFragmentLanguage : BaseFragment<FragmentSetupLanguageBinding>(
+    BaseFragment.BindingCreator.Inflate(FragmentSetupLanguageBinding::inflate)
+) {
 
-    override fun onDestroyView() {
-        binding = null
-        super.onDestroyView()
+    override fun fixLayout(view: View) {
+        fixSystemBarsPadding(view)
     }
 
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        val localBinding = FragmentSetupLanguageBinding.inflate(inflater, container, false)
-        binding = localBinding
-        return localBinding.root
-        //return inflater.inflate(R.layout.fragment_setup_language, container, false)
-    }
-
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
+    override fun onBindingCreated(binding: FragmentSetupLanguageBinding) {
         // We don't want a crash for all users
         safe {
-            fixPaddingStatusbar(binding?.setupRoot)
-
             val ctx = context ?: return@safe
             val settingsManager = PreferenceManager.getDefaultSharedPreferences(ctx)
 
             val arrayAdapter =
                 ArrayAdapter<String>(ctx, R.layout.sort_bottom_single_choice)
 
-            binding?.apply {
+            binding.apply {
                 // Icons may crash on some weird android versions?
                 safe {
                     val drawable = when {
@@ -67,24 +51,21 @@ class SetupFragmentLanguage : Fragment() {
                 }
 
                 val current = getCurrentLocale(ctx)
-                val languageCodes = appLanguages.map { it.third }
-                val languageNames = appLanguages.map { (emoji, name, iso) ->
-                    val flag = emoji.ifBlank { SubtitleHelper.getFlagFromIso(iso) ?: "ERROR" }
-                    "$flag $name"
-                }
-                val index = languageCodes.indexOf(current)
+                val languageTagsIETF = appLanguages.map { it.second }
+                val languageNames = appLanguages.map { it.nameNextToFlagEmoji() }
+                val currentIndex = languageTagsIETF.indexOf(current)
 
                 arrayAdapter.addAll(languageNames)
                 listview1.adapter = arrayAdapter
                 listview1.choiceMode = AbsListView.CHOICE_MODE_SINGLE
-                listview1.setItemChecked(index, true)
+                listview1.setItemChecked(currentIndex, true)
 
-                listview1.setOnItemClickListener { _, _, position, _ ->
-                    val code = languageCodes[position]
-                    CommonActivity.setLocale(activity, code)
-                    settingsManager.edit().putString(getString(R.string.locale_key), code)
-                        .apply()
-                    activity?.recreate()
+                listview1.setOnItemClickListener { _, _, selectedLangIndex, _ ->
+                    val langTagIETF = languageTagsIETF[selectedLangIndex]
+                    CommonActivity.setLocale(activity, langTagIETF)
+                    settingsManager.edit {
+                        putString(getString(R.string.locale_key), langTagIETF)
+                    }
                 }
 
                 nextBtt.setOnClickListener {
@@ -103,10 +84,10 @@ class SetupFragmentLanguage : Fragment() {
                 }
 
                 skipBtt.setOnClickListener {
+                    setKey(HAS_DONE_SETUP_KEY, true)
                     findNavController().navigate(R.id.navigation_home)
                 }
             }
-
         }
     }
-}
\ 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 85eabefa4b3..4a8e784a145 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
@@ -1,45 +1,27 @@
 package com.lagradost.cloudstream3.ui.setup
 
-import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import android.widget.AbsListView
 import android.widget.ArrayAdapter
-import androidx.fragment.app.Fragment
+import androidx.core.content.edit
 import androidx.navigation.fragment.findNavController
 import androidx.preference.PreferenceManager
-import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.setKey
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.databinding.FragmentSetupLayoutBinding
 import com.lagradost.cloudstream3.mvvm.safe
-import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
-import org.acra.ACRA
+import com.lagradost.cloudstream3.ui.BaseFragment
+import com.lagradost.cloudstream3.utils.UIHelper.fixSystemBarsPadding
 
+class SetupFragmentLayout : BaseFragment<FragmentSetupLayoutBinding>(
+    BaseFragment.BindingCreator.Inflate(FragmentSetupLayoutBinding::inflate)
+) {
 
-class SetupFragmentLayout : Fragment() {
-
-    var binding: FragmentSetupLayoutBinding? = null
-
-    override fun onDestroyView() {
-        binding = null
-        super.onDestroyView()
+    override fun fixLayout(view: View) {
+        fixSystemBarsPadding(view)
     }
 
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        val localBinding = FragmentSetupLayoutBinding.inflate(inflater, container, false)
-        binding = localBinding
-        return localBinding.root
-        //return inflater.inflate(R.layout.fragment_setup_layout, container, false)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        fixPaddingStatusbar(binding?.setupRoot)
-
+    override fun onBindingCreated(binding: FragmentSetupLayoutBinding) {
         safe {
             val ctx = context ?: return@safe
 
@@ -55,7 +37,7 @@ class SetupFragmentLayout : Fragment() {
                 ArrayAdapter<String>(ctx, R.layout.sort_bottom_single_choice)
 
             arrayAdapter.addAll(prefNames.toList())
-            binding?.apply {
+            binding.apply {
                 listview1.adapter = arrayAdapter
                 listview1.choiceMode = AbsListView.CHOICE_MODE_SINGLE
                 listview1.setItemChecked(
@@ -63,28 +45,11 @@ class SetupFragmentLayout : Fragment() {
                 )
 
                 listview1.setOnItemClickListener { _, _, position, _ ->
-                    settingsManager.edit()
-                        .putInt(getString(R.string.app_layout_key), prefValues[position])
-                        .apply()
+                    settingsManager.edit {
+                        putInt(getString(R.string.app_layout_key), prefValues[position])
+                    }
                     activity?.recreate()
                 }
-                /*acraSwitch.setOnCheckedChangeListener { _, enableCrashReporting ->
-                    // Use same pref as in settings
-                    settingsManager.edit().putBoolean(ACRA.PREF_DISABLE_ACRA, !enableCrashReporting)
-                        .apply()
-                    val text =
-                        if (enableCrashReporting) R.string.bug_report_settings_off else R.string.bug_report_settings_on
-                    crashReportingText.text = getText(text)
-                }
-
-                val enableCrashReporting = !settingsManager.getBoolean(ACRA.PREF_DISABLE_ACRA, true)
-
-                acraSwitch.isChecked = enableCrashReporting
-                crashReportingText.text =
-                    getText(
-                        if (enableCrashReporting) R.string.bug_report_settings_off else R.string.bug_report_settings_on
-                    )*/
-
 
                 nextBtt.setOnClickListener {
                     setKey(HAS_DONE_SETUP_KEY, true)
@@ -97,4 +62,4 @@ class SetupFragmentLayout : Fragment() {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentMedia.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentMedia.kt
index 9db967dcb5c..8da121daa98 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
@@ -1,47 +1,30 @@
 package com.lagradost.cloudstream3.ui.setup
 
-import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import android.widget.AbsListView
 import android.widget.ArrayAdapter
+import androidx.core.content.edit
 import androidx.core.util.forEach
-import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.findNavController
 import androidx.preference.PreferenceManager
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.TvType
 import com.lagradost.cloudstream3.databinding.FragmentSetupMediaBinding
 import com.lagradost.cloudstream3.mvvm.safe
+import com.lagradost.cloudstream3.ui.BaseFragment
 import com.lagradost.cloudstream3.utils.DataStoreHelper
-import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
+import com.lagradost.cloudstream3.utils.UIHelper.fixSystemBarsPadding
 
+class SetupFragmentMedia : BaseFragment<FragmentSetupMediaBinding>(
+    BaseFragment.BindingCreator.Inflate(FragmentSetupMediaBinding::inflate)
+) {
 
-class SetupFragmentMedia : Fragment() {
-    var binding: FragmentSetupMediaBinding? = null
-
-    override fun onDestroyView() {
-        binding = null
-        super.onDestroyView()
-    }
-
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        val localBinding = FragmentSetupMediaBinding.inflate(inflater, container, false)
-        binding = localBinding
-        return localBinding.root
-        //return inflater.inflate(R.layout.fragment_setup_media, container, false)
+    override fun fixLayout(view: View) {
+        fixSystemBarsPadding(view)
     }
 
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
+    override fun onBindingCreated(binding: FragmentSetupMediaBinding) {
         safe {
-            fixPaddingStatusbar(binding?.setupRoot)
-
             val ctx = context ?: return@safe
             val settingsManager = PreferenceManager.getDefaultSharedPreferences(ctx)
 
@@ -52,7 +35,7 @@ class SetupFragmentMedia : Fragment() {
             val selected = mutableListOf<Int>()
 
             arrayAdapter.addAll(names)
-            binding?.apply {
+            binding.apply {
                 listview1.let {
                     it.adapter = arrayAdapter
                     it.choiceMode = AbsListView.CHOICE_MODE_MULTIPLE
@@ -71,9 +54,9 @@ class SetupFragmentMedia : Fragment() {
                             val itemVal = TvType.valueOf(item)
                             itemVal.ordinal.toString()
                         }.toSet()
-                        settingsManager.edit()
-                            .putStringSet(getString(R.string.prefer_media_type_key), prefValues)
-                            .apply()
+                        settingsManager.edit {
+                            putStringSet(getString(R.string.prefer_media_type_key), prefValues)
+                        }
 
                         // Regenerate set homepage
                         DataStoreHelper.currentHomePage = null
@@ -90,4 +73,4 @@ class SetupFragmentMedia : Fragment() {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentProviderLanguage.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentProviderLanguage.kt
index 353e735e905..3c4a09adea8 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentProviderLanguage.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentProviderLanguage.kt
@@ -1,47 +1,31 @@
 package com.lagradost.cloudstream3.ui.setup
 
-import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import android.widget.AbsListView
 import android.widget.ArrayAdapter
+import androidx.core.content.edit
 import androidx.core.util.forEach
-import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.findNavController
 import androidx.preference.PreferenceManager
-import com.lagradost.cloudstream3.APIHolder
 import com.lagradost.cloudstream3.AllLanguagesName
-import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.APIHolder
 import com.lagradost.cloudstream3.databinding.FragmentSetupProviderLanguagesBinding
 import com.lagradost.cloudstream3.mvvm.safe
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.ui.BaseFragment
 import com.lagradost.cloudstream3.utils.AppContextUtils.getApiProviderLangSettings
-import com.lagradost.cloudstream3.utils.SubtitleHelper
-import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
+import com.lagradost.cloudstream3.utils.SubtitleHelper.getNameNextToFlagEmoji
+import com.lagradost.cloudstream3.utils.UIHelper.fixSystemBarsPadding
 
-class SetupFragmentProviderLanguage : Fragment() {
-    var binding: FragmentSetupProviderLanguagesBinding? = null
+class SetupFragmentProviderLanguage : BaseFragment<FragmentSetupProviderLanguagesBinding>(
+    BaseFragment.BindingCreator.Inflate(FragmentSetupProviderLanguagesBinding::inflate)
+) {
 
-    override fun onDestroyView() {
-        binding = null
-        super.onDestroyView()
+    override fun fixLayout(view: View) {
+        fixSystemBarsPadding(view)
     }
 
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        val localBinding = FragmentSetupProviderLanguagesBinding.inflate(inflater, container, false)
-        binding = localBinding
-        return localBinding.root
-        //return inflater.inflate(R.layout.fragment_setup_provider_languages, container, false)
-    }
-
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        fixPaddingStatusbar(binding?.setupRoot)
-
+    override fun onBindingCreated(binding: FragmentSetupProviderLanguagesBinding) {
         safe {
             val ctx = context ?: return@safe
 
@@ -50,51 +34,47 @@ class SetupFragmentProviderLanguage : Fragment() {
             val arrayAdapter =
                 ArrayAdapter<String>(ctx, R.layout.sort_bottom_single_choice)
 
-            val current = ctx.getApiProviderLangSettings()
-            val langs = synchronized(APIHolder.apis) { APIHolder.apis.map { it.lang }.toSet()
-                .sortedBy { SubtitleHelper.fromTwoLettersToLanguage(it) } + AllLanguagesName}
+            val currentLangTags = ctx.getApiProviderLangSettings()
+
+            val languagesTagName = synchronized(APIHolder.apis) {
+                listOf( Pair(AllLanguagesName, getString(R.string.all_languages_preference)) ) +
+                APIHolder.apis.map { Pair(it.lang, getNameNextToFlagEmoji(it.lang) ?: it.lang) }
+                    .toSet().sortedBy { it.second.substringAfter("\u00a0").lowercase() } // name ignoring flag emoji
+            }
 
-            val currentList =
-                current.map { langs.indexOf(it) }.filter { it != -1 } // TODO LOOK INTO
+            val currentIndexList = currentLangTags.map { langTag ->
+                languagesTagName.indexOfFirst { lang -> lang.first == langTag }
+            }.filter { it > -1 }
 
-            val languageNames = langs.map {
-                if (it == AllLanguagesName) {
-                    getString(R.string.all_languages_preference)
-                } else {
-                    val emoji = SubtitleHelper.getFlagFromIso(it)
-                    val name = SubtitleHelper.fromTwoLettersToLanguage(it)
-                    "$emoji $name"
+            arrayAdapter.addAll(languagesTagName.map { it.second })
+            binding.apply {
+                listview1.adapter = arrayAdapter
+                listview1.choiceMode = AbsListView.CHOICE_MODE_MULTIPLE
+                currentIndexList.forEach {
+                    listview1.setItemChecked(it, true)
                 }
-            }
 
-            arrayAdapter.addAll(languageNames)
-            binding?.apply {
-            listview1.adapter = arrayAdapter
-            listview1.choiceMode = AbsListView.CHOICE_MODE_MULTIPLE
-            currentList.forEach {
-                listview1.setItemChecked(it, true)
-            }
+                listview1.setOnItemClickListener { _, _, _, _ ->
+                    val selectedLanguages = mutableSetOf<String>()
+                    listview1.checkedItemPositions?.forEach { key, value ->
+                        if (value) selectedLanguages.add(languagesTagName[key].first)
+                    }
+                    settingsManager.edit {
+                        putStringSet(
+                            ctx.getString(R.string.provider_lang_key),
+                            selectedLanguages.toSet()
+                        )
+                    }
+                }
 
-            listview1.setOnItemClickListener { _, _, _, _ ->
-                val currentLanguages = mutableListOf<String>()
-                listview1.checkedItemPositions?.forEach { key, value ->
-                    if (value) currentLanguages.add(langs[key])
+                nextBtt.setOnClickListener {
+                    findNavController().navigate(R.id.navigation_setup_provider_languages_to_navigation_setup_media)
                 }
-                settingsManager.edit().putStringSet(
-                    ctx.getString(R.string.provider_lang_key),
-                    currentLanguages.toSet()
-                ).apply()
-            }
 
-            nextBtt.setOnClickListener {
-                findNavController().navigate(R.id.navigation_setup_provider_languages_to_navigation_setup_media)
+                prevBtt.setOnClickListener {
+                    findNavController().popBackStack()
+                }
             }
-
-            prevBtt.setOnClickListener {
-                findNavController().popBackStack()
-            } }
         }
     }
-
-
-}
\ No newline at end of file
+}
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 c76a218e547..f9b1cb1fe88 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
@@ -7,13 +7,12 @@ import android.graphics.Color
 import android.os.Bundle
 import android.util.DisplayMetrics
 import android.util.TypedValue
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import android.widget.TextView
 import android.widget.Toast
-import androidx.fragment.app.Fragment
+import androidx.annotation.OptIn
 import androidx.media3.common.text.Cue
+import androidx.media3.common.util.UnstableApi
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.google.android.gms.cast.TextTrackStyle.EDGE_TYPE_DEPRESSED
 import com.google.android.gms.cast.TextTrackStyle.EDGE_TYPE_DROP_SHADOW
@@ -21,19 +20,21 @@ 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.CloudStreamApp.Companion.getKey
 import com.lagradost.cloudstream3.CommonActivity.onColorSelectedEvent
 import com.lagradost.cloudstream3.CommonActivity.onDialogDismissedEvent
 import com.lagradost.cloudstream3.CommonActivity.showToast
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.databinding.ChromecastSubtitleSettingsBinding
+import com.lagradost.cloudstream3.ui.BaseFragment
 import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
+import com.lagradost.cloudstream3.ui.settings.Globals.isLandscape
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
 import com.lagradost.cloudstream3.utils.DataStore.setKey
 import com.lagradost.cloudstream3.utils.Event
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showDialog
-import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
+import com.lagradost.cloudstream3.utils.UIHelper.fixSystemBarsPadding
 import com.lagradost.cloudstream3.utils.UIHelper.hideSystemUI
 import com.lagradost.cloudstream3.utils.UIHelper.navigate
 import com.lagradost.cloudstream3.utils.UIHelper.popCurrentPage
@@ -50,8 +51,10 @@ data class SaveChromeCaptionStyle(
     @JsonProperty("fontScale") var fontScale: Float = 1.05f,
     @JsonProperty("windowColor") var windowColor: Int = Color.TRANSPARENT,
 )
-@androidx.annotation.OptIn(androidx.media3.common.util.UnstableApi::class)
-class ChromecastSubtitlesFragment : Fragment() {
+
+class ChromecastSubtitlesFragment : BaseFragment<ChromecastSubtitleSettingsBinding>(
+    BaseFragment.BindingCreator.Inflate(ChromecastSubtitleSettingsBinding::inflate)
+) {
     companion object {
         val applyStyleEvent = Event<SaveChromeCaptionStyle>()
 
@@ -142,23 +145,6 @@ class ChromecastSubtitlesFragment : Fragment() {
         //subtitle_text?.setStyle(fromSaveToStyle(state))
     }
 
-    var binding : ChromecastSubtitleSettingsBinding? = null
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?,
-    ): View {
-        val localBinding = ChromecastSubtitleSettingsBinding.inflate(inflater, container, false)
-        binding = localBinding
-        return localBinding.root//inflater.inflate(R.layout.chromecast_subtitle_settings, container, false)
-    }
-
-    override fun onDestroyView() {
-        binding = null
-        super.onDestroyView()
-    }
-
     private lateinit var state: SaveChromeCaptionStyle
     private var hide: Boolean = true
 
@@ -167,26 +153,29 @@ class ChromecastSubtitlesFragment : Fragment() {
         onColorSelectedEvent -= ::onColorSelected
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
+    override fun fixLayout(view: View) {
+        fixSystemBarsPadding(
+            view,
+            padBottom = isLandscape(),
+            padLeft = isLayout(TV or EMULATOR)
+        )
+    }
+
+    override fun onBindingCreated(binding: ChromecastSubtitleSettingsBinding) {
         hide = arguments?.getBoolean("hide") ?: true
         onColorSelectedEvent += ::onColorSelected
         onDialogDismissedEvent += ::onDialogDismissed
 
-        fixPaddingStatusbar(binding?.subsRoot)
-
         state = getCurrentSavedStyle()
         updateState()
 
         val isTvSettings = isLayout(TV or EMULATOR)
-
         fun View.setFocusableInTv() {
             this.isFocusableInTouchMode = isTvSettings
         }
 
         fun View.setup(id: Int) {
             setFocusableInTv()
-
             this.setOnClickListener {
                 activity?.let {
                     ColorPickerDialog.newBuilder()
@@ -204,20 +193,19 @@ class ChromecastSubtitlesFragment : Fragment() {
             }
         }
 
-        binding?.apply {
+        binding.apply {
             subsTextColor.setup(0)
             subsOutlineColor.setup(1)
             subsBackgroundColor.setup(2)
         }
 
-
         val dismissCallback = {
             if (hide)
                 activity?.hideSystemUI()
         }
 
-        binding?.subsEdgeType?.setFocusableInTv()
-        binding?.subsEdgeType?.setOnClickListener { textView ->
+        binding.subsEdgeType.setFocusableInTv()
+        binding.subsEdgeType.setOnClickListener { textView ->
             val edgeTypes = listOf(
                 Pair(
                     EDGE_TYPE_NONE,
@@ -254,15 +242,15 @@ class ChromecastSubtitlesFragment : Fragment() {
             }
         }
 
-        binding?.subsEdgeType?.setOnLongClickListener {
+        binding.subsEdgeType.setOnLongClickListener {
             state.edgeType = defaultState.edgeType
             updateState()
             showToast(R.string.subs_default_reset_toast, Toast.LENGTH_SHORT)
             return@setOnLongClickListener true
         }
 
-        binding?.subsFontSize?.setFocusableInTv()
-        binding?.subsFontSize?.setOnClickListener { textView ->
+        binding.subsFontSize.setFocusableInTv()
+        binding.subsFontSize.setOnClickListener { textView ->
             val fontSizes = listOf(
                 Pair(0.75f, "75%"),
                 Pair(0.80f, "80%"),
@@ -295,17 +283,15 @@ class ChromecastSubtitlesFragment : Fragment() {
             }
         }
 
-        binding?.subsFontSize?.setOnLongClickListener { _ ->
+        binding.subsFontSize.setOnLongClickListener { _ ->
             state.fontScale = defaultState.fontScale
             //textView.context.updateState() // font size not changed
             showToast(R.string.subs_default_reset_toast, Toast.LENGTH_SHORT)
             return@setOnLongClickListener true
         }
 
-
-
-        binding?.subsFont?.setFocusableInTv()
-        binding?.subsFont?.setOnClickListener { textView ->
+        binding.subsFont.setFocusableInTv()
+        binding.subsFont.setOnClickListener { textView ->
             val fontTypes = listOf(
                 null to textView.context.getString(R.string.normal),
                 "Droid Sans" to "Droid Sans",
@@ -329,24 +315,30 @@ class ChromecastSubtitlesFragment : Fragment() {
                 updateState()
             }
         }
-        binding?.subsFont?.setOnLongClickListener { _ ->
+        binding.subsFont.setOnLongClickListener { _ ->
             state.fontFamily = defaultState.fontFamily
             updateState()
             showToast(activity, R.string.subs_default_reset_toast, Toast.LENGTH_SHORT)
             return@setOnLongClickListener true
         }
 
-        binding?.cancelBtt?.setOnClickListener {
+        binding.cancelBtt.setOnClickListener {
             activity?.popCurrentPage()
         }
 
-        binding?.applyBtt?.setOnClickListener {
+        binding.applyBtt.setOnClickListener {
             it.context.saveStyle(state)
             applyStyleEvent.invoke(state)
             //it.context.fromSaveToStyle(state)
             activity?.popCurrentPage()
         }
-        binding?.subtitleText?.apply {
+
+        setSubtitleCues(binding)
+    }
+
+    @OptIn(UnstableApi::class)
+    private fun setSubtitleCues(binding: ChromecastSubtitleSettingsBinding) {
+        binding.subtitleText.apply {
             setCues(
                 listOf(
                     Cue.Builder()
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 28c2cdc486f..5f716cca3f1 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
@@ -12,16 +12,14 @@ import android.text.SpannableString
 import android.text.style.StyleSpan
 import android.util.DisplayMetrics
 import android.util.TypedValue
-import android.view.LayoutInflater
 import android.view.View
-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.edit
 import androidx.core.content.res.ResourcesCompat
-import androidx.fragment.app.DialogFragment
 import androidx.media3.common.text.Cue
 import androidx.media3.common.util.UnstableApi
 import androidx.media3.ui.CaptionStyleCompat
@@ -29,23 +27,29 @@ 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
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.getKey
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.setKey
 import com.lagradost.cloudstream3.CommonActivity.onColorSelectedEvent
 import com.lagradost.cloudstream3.CommonActivity.onDialogDismissedEvent
 import com.lagradost.cloudstream3.CommonActivity.showToast
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.databinding.SubtitleSettingsBinding
+import com.lagradost.cloudstream3.ui.BaseDialogFragment
+import com.lagradost.cloudstream3.ui.BaseFragment
+import com.lagradost.cloudstream3.ui.player.CustomDecoder
+import com.lagradost.cloudstream3.ui.player.CustomDecoder.Companion.setSubtitleAlignment
 import com.lagradost.cloudstream3.ui.player.OutlineSpan
 import com.lagradost.cloudstream3.ui.player.RoundedBackgroundColorSpan
+import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
+import com.lagradost.cloudstream3.ui.settings.Globals.isLandscape
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
 import com.lagradost.cloudstream3.utils.DataStore.setKey
 import com.lagradost.cloudstream3.utils.Event
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showDialog
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showMultiDialog
-import com.lagradost.cloudstream3.utils.SubtitleHelper
-import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
+import com.lagradost.cloudstream3.utils.SubtitleHelper.languages
+import com.lagradost.cloudstream3.utils.UIHelper.fixSystemBarsPadding
 import com.lagradost.cloudstream3.utils.UIHelper.hideSystemUI
 import com.lagradost.cloudstream3.utils.UIHelper.navigate
 import com.lagradost.cloudstream3.utils.UIHelper.popCurrentPage
@@ -56,10 +60,11 @@ 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 @OptIn(UnstableApi::class) constructor(
+data class SaveCaptionStyle(
     @JsonProperty("foregroundColor") var foregroundColor: Int,
     @JsonProperty("backgroundColor") var backgroundColor: Int,
     @JsonProperty("windowColor") var windowColor: Int,
+    @OptIn(UnstableApi::class)
     @JsonProperty("edgeType") var edgeType: @CaptionStyleCompat.EdgeType Int,
     @JsonProperty("edgeColor") var edgeColor: Int,
     @FontRes
@@ -81,28 +86,40 @@ data class SaveCaptionStyle @OptIn(UnstableApi::class) constructor(
     @JsonProperty("italic") var italic: Boolean = false,
     /** in px, background radius, aka how round the background (backgroundColor) on each row is **/
     @JsonProperty("backgroundRadius") var backgroundRadius: Float? = null,
+    /** The SSA_ALIGNMENT */
+    @JsonProperty("alignment") var alignment: Int? = null,
 )
 
 const val DEF_SUBS_ELEVATION = 20
 
-@OptIn(androidx.media3.common.util.UnstableApi::class)
-class SubtitlesFragment : DialogFragment() {
+@OptIn(UnstableApi::class)
+class SubtitlesFragment : BaseDialogFragment<SubtitleSettingsBinding>(
+    BaseFragment.BindingCreator.Inflate(SubtitleSettingsBinding::inflate)
+) {
     companion object {
         val applyStyleEvent = Event<SaveCaptionStyle>()
         private val captionRegex = Regex("""(-\s?|)[\[({][\S\s]*?[])}]\s*""")
 
-        fun setSubtitleViewStyle(view: SubtitleView?, data: SaveCaptionStyle) {
+        fun setSubtitleViewStyle(
+            view: SubtitleView?,
+            data: SaveCaptionStyle,
+            applyElevation: Boolean
+        ) {
             if (view == null) return
             val ctx = view.context ?: return
             val style = ctx.fromSaveToStyle(data)
             view.setStyle(style)
-            view.setPadding(
-                view.paddingLeft, data.elevation.toPx, view.paddingRight, view.paddingBottom
-            )
+
+            if (applyElevation) {
+                view.setPadding(
+                    view.paddingLeft, data.elevation.toPx, view.paddingRight, view.paddingBottom
+                )
+            }
 
             // we default to 25sp, this is needed as RoundedBackgroundColorSpan breaks on override sizes
             val size = data.fixedTextSize ?: 25.0f
             view.setFixedTextSize(TypedValue.COMPLEX_UNIT_SP, size)
+            view.setBottomPaddingFraction(0.0f)
             /*if (size != null) {
                 view.setFixedTextSize(TypedValue.COMPLEX_UNIT_SP, size)
             } else {
@@ -191,7 +208,8 @@ class SubtitlesFragment : DialogFragment() {
                 }
             }
 
-            return this
+            // 6. set alignment
+            return this.setSubtitleAlignment(style.alignment)
         }
 
         private fun Context.fromSaveToStyle(data: SaveCaptionStyle): CaptionStyleCompat {
@@ -275,11 +293,11 @@ class SubtitlesFragment : DialogFragment() {
             return TypedValue.applyDimension(unit, size, metrics).toInt()
         }
 
-        fun getDownloadSubsLanguageISO639_1(): List<String> {
+        fun getDownloadSubsLanguageTagIETF(): List<String> {
             return getKey(SUBTITLE_DOWNLOAD_KEY) ?: listOf("en")
         }
 
-        fun getAutoSelectLanguageISO639_1(): String {
+        fun getAutoSelectLanguageTagIETF(): String {
             return getKey(SUBTITLE_AUTO_SELECT_KEY) ?: "en"
         }
     }
@@ -311,7 +329,7 @@ class SubtitlesFragment : DialogFragment() {
     private fun Context.updateState() {
         val text = getString(R.string.subtitles_example_text)
         val fixedText = SpannableString.valueOf(if (state.upperCase) text.uppercase() else text)
-        setSubtitleViewStyle(binding?.subtitleText, state)
+        setSubtitleViewStyle(binding?.subtitleText, state, false)
 
         binding?.subtitleText?.setCues(
             listOf(
@@ -336,23 +354,6 @@ class SubtitlesFragment : DialogFragment() {
         return if (color == Color.TRANSPARENT) Color.BLACK else color
     }
 
-    override fun onDestroyView() {
-        binding = null
-        super.onDestroyView()
-    }
-
-    var binding: SubtitleSettingsBinding? = null
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        val localBinding = SubtitleSettingsBinding.inflate(inflater, container, false)
-        binding = localBinding
-        return localBinding.root
-        //return inflater.inflate(R.layout.subtitle_settings, container, false)
-    }
-
     private lateinit var state: SaveCaptionStyle
     private var hide: Boolean = true
 
@@ -363,30 +364,35 @@ class SubtitlesFragment : DialogFragment() {
 
     override fun onStart() {
         super.onStart()
-        dialog?.window?.setWindowAnimations(R.style.DialogFullscreen)
+        dialog?.window?.setWindowAnimations(R.style.DialogFullscreenPlayer)
     }
 
     override fun getTheme(): Int {
-        return R.style.DialogFullscreen
+        return R.style.DialogFullscreenPlayer
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
+    var systemBarsAddPadding = isLayout(TV or EMULATOR)
+    override fun fixLayout(view: View) {
+        fixSystemBarsPadding(
+            view,
+            padBottom = systemBarsAddPadding || isLandscape(),
+            padLeft = systemBarsAddPadding
+        )
+    }
+
+    override fun onBindingCreated(binding: SubtitleSettingsBinding) {
         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(
+        binding.subsImportText.text = getString(R.string.subs_import_text).format(
             context?.getExternalFilesDir(null)?.absolutePath.toString() + "/Fonts"
         )
 
-        fixPaddingStatusbar(binding?.subsRoot)
-
         state = getCurrentSavedStyle()
         context?.updateState()
 
         val isTvTrueSettings = isLayout(TV)
-
         fun View.setFocusableInTv() {
             this.isFocusableInTouchMode = isTvTrueSettings
         }
@@ -410,7 +416,7 @@ class SubtitlesFragment : DialogFragment() {
                 return@setOnLongClickListener true
             }
         }
-        binding?.apply {
+        binding.apply {
             subsTextColor.setup(0)
             subsOutlineColor.setup(1)
             subsBackgroundColor.setup(2)
@@ -426,7 +432,7 @@ class SubtitlesFragment : DialogFragment() {
                 // tbh this should not be a dialog if it has so many values
                 val elevationTypes = listOf(
                     0 to textView.context.getString(R.string.none)
-                ) + (1..30).map { x ->
+                ) + (1..40).map { x ->
                     val i = x * 10
                     i to "${i}dp"
                 }
@@ -482,6 +488,33 @@ class SubtitlesFragment : DialogFragment() {
                 return@setOnLongClickListener true
             }
 
+            subsSubtitleAlignment.setFocusableInTv()
+            subsSubtitleAlignment.setOnClickListener { textView ->
+                val alignmentTypes = listOf(
+                    null to R.string.automatic,
+                    CustomDecoder.SSA_ALIGNMENT_BOTTOM_LEFT to R.string.bottom_left,
+                    CustomDecoder.SSA_ALIGNMENT_BOTTOM_CENTER to R.string.bottom_center,
+                    CustomDecoder.SSA_ALIGNMENT_BOTTOM_RIGHT to R.string.bottom_right,
+                    CustomDecoder.SSA_ALIGNMENT_MIDDLE_LEFT to R.string.middle_left,
+                    CustomDecoder.SSA_ALIGNMENT_MIDDLE_CENTER to R.string.middle_center,
+                    CustomDecoder.SSA_ALIGNMENT_MIDDLE_RIGHT to R.string.middle_right,
+                    CustomDecoder.SSA_ALIGNMENT_TOP_LEFT to R.string.top_left,
+                    CustomDecoder.SSA_ALIGNMENT_TOP_CENTER to R.string.top_center,
+                    CustomDecoder.SSA_ALIGNMENT_TOP_RIGHT to R.string.top_right,
+                )
+
+                activity?.showDialog(
+                    alignmentTypes.map { textView.context.getString(it.second) },
+                    alignmentTypes.map { it.first }.indexOf(state.alignment),
+                    (textView as TextView).text.toString(),
+                    false,
+                    dismissCallback
+                ) { index ->
+                    state.alignment = alignmentTypes.map { it.first }[index]
+                    textView.context.updateState()
+                }
+            }
+
             subsEdgeType.setFocusableInTv()
             subsEdgeType.setOnClickListener { textView ->
                 val edgeTypes = listOf(
@@ -605,10 +638,9 @@ class SubtitlesFragment : DialogFragment() {
 
             subtitlesFilterSubLang.setOnCheckedChangeListener { _, b ->
                 context?.let { ctx ->
-                    PreferenceManager.getDefaultSharedPreferences(ctx)
-                        .edit()
-                        .putBoolean(getString(R.string.filter_sub_lang_key), b)
-                        .apply()
+                    PreferenceManager.getDefaultSharedPreferences(ctx).edit {
+                        putBoolean(getString(R.string.filter_sub_lang_key), b)
+                    }
                 }
             }
 
@@ -670,28 +702,29 @@ class SubtitlesFragment : DialogFragment() {
 
             subsAutoSelectLanguage.setFocusableInTv()
             subsAutoSelectLanguage.setOnClickListener { textView ->
-                val langMap = arrayListOf(
-                    SubtitleHelper.Language639(
-                        textView.context.getString(R.string.none),
-                        textView.context.getString(R.string.none),
-                        "",
-                        "",
-                        "",
-                        "",
-                        ""
-                    ),
-                )
-                langMap.addAll(SubtitleHelper.languages)
+                val languagesTagName =
+                    listOf(
+                        Pair(
+                            textView.context.getString(R.string.none),
+                            textView.context.getString(R.string.none)
+                        )
+                    ) +
+                            languages
+                                .map { Pair(it.IETF_tag, it.nameNextToFlagEmoji()) }
+                                .sortedBy {
+                                    it.second.substringAfter("\u00a0").lowercase()
+                                } // name ignoring flag emoji
+
+                val (langTagsIETF, langNames) = languagesTagName.unzip()
 
-                val lang639_1 = langMap.map { it.ISO_639_1 }
                 activity?.showDialog(
-                    langMap.map { it.languageName },
-                    lang639_1.indexOf(getAutoSelectLanguageISO639_1()),
+                    langNames,
+                    langTagsIETF.indexOf(getAutoSelectLanguageTagIETF()),
                     (textView as TextView).text.toString(),
                     true,
                     dismissCallback
                 ) { index ->
-                    setKey(SUBTITLE_AUTO_SELECT_KEY, lang639_1[index])
+                    setKey(SUBTITLE_AUTO_SELECT_KEY, langTagsIETF[index])
                 }
             }
 
@@ -703,18 +736,26 @@ class SubtitlesFragment : DialogFragment() {
 
             subsDownloadLanguages.setFocusableInTv()
             subsDownloadLanguages.setOnClickListener { textView ->
-                val langMap = SubtitleHelper.languages
-                val lang639_1 = langMap.map { it.ISO_639_1 }
-                val keys = getDownloadSubsLanguageISO639_1()
-                val keyMap = keys.map { lang639_1.indexOf(it) }.filter { it >= 0 }
+                val languagesTagName =
+                    languages
+                        .map { Pair(it.IETF_tag, it.nameNextToFlagEmoji()) }
+                        .sortedBy {
+                            it.second.substringAfter("\u00a0").lowercase()
+                        } // name ignoring flag emoji
+
+                val (langTagsIETF, langNames) = languagesTagName.unzip()
+
+                val selectedLanguages = getDownloadSubsLanguageTagIETF()
+                    .map { langTagsIETF.indexOf(it) }
+                    .filter { it >= 0 }
 
                 activity?.showMultiDialog(
-                    langMap.map { it.languageName },
-                    keyMap,
+                    langNames,
+                    selectedLanguages,
                     (textView as TextView).text.toString(),
                     dismissCallback
                 ) { indexList ->
-                    setKey(SUBTITLE_DOWNLOAD_KEY, indexList.map { lang639_1[it] }.toList())
+                    setKey(SUBTITLE_DOWNLOAD_KEY, indexList.map { langTagsIETF[it] }.toList())
                 }
             }
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/AniSkip.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/AniSkip.kt
deleted file mode 100644
index 820a01f9f40..00000000000
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/AniSkip.kt
+++ /dev/null
@@ -1,139 +0,0 @@
-package com.lagradost.cloudstream3.utils
-
-import android.util.Log
-import androidx.annotation.StringRes
-import com.fasterxml.jackson.databind.annotation.JsonSerialize
-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 java.lang.Long.min
-
-object EpisodeSkip {
-    private const val TAG = "EpisodeSkip"
-
-    enum class SkipType(@StringRes name: Int) {
-        Opening(R.string.skip_type_op),
-        Ending(R.string.skip_type_ed),
-        Recap(R.string.skip_type_recap),
-        MixedOpening(R.string.skip_type_mixed_op),
-        MixedEnding(R.string.skip_type_mixed_ed),
-        Credits(R.string.skip_type_creddits),
-        Intro(R.string.skip_type_creddits),
-    }
-
-    data class SkipStamp(
-        val type: SkipType,
-        val skipToNextEpisode: Boolean,
-        val startMs: Long,
-        val endMs: Long,
-    ) {
-        val uiText = if (skipToNextEpisode) txt(R.string.next_episode) else txt(
-            R.string.skip_type_format,
-            txt(type.name)
-        )
-    }
-
-    private val cachedStamps = HashMap<Int, List<SkipStamp>>()
-
-    private fun shouldSkipToNextEpisode(endMs: Long, episodeDurationMs: Long): Boolean {
-        return episodeDurationMs - endMs < 20_000L // some might have outro that we don't care about tbh
-    }
-
-    suspend fun getStamps(
-        data: LoadResponse,
-        episode: ResultEpisode,
-        episodeDurationMs: Long,
-        hasNextEpisode: Boolean,
-    ): List<SkipStamp> {
-        cachedStamps[episode.id]?.let { list ->
-            return list
-        }
-
-        val out = mutableListOf<SkipStamp>()
-        Log.i(TAG, "Requesting SkipStamp from ${data.syncData}")
-
-        if (data is AnimeLoadResponse && (data.type == TvType.Anime || data.type == TvType.OVA)) {
-            data.getMalId()?.toIntOrNull()?.let { malId ->
-                val (resultLength, stamps) = AniSkip.getResult(
-                    malId,
-                    episode.episode,
-                    episodeDurationMs
-                ) ?: return@let null
-                // because it also returns an expected episode length we use that just in case it is mismatched with like 2s next episode will still work
-                val dur = min(episodeDurationMs, resultLength)
-                stamps.mapNotNull { stamp ->
-                    val skipType = when (stamp.skipType) {
-                        "op" -> SkipType.Opening
-                        "ed" -> SkipType.Ending
-                        "recap" -> SkipType.Recap
-                        "mixed-ed" -> SkipType.MixedEnding
-                        "mixed-op" -> SkipType.MixedOpening
-                        else -> null
-                    } ?: return@mapNotNull null
-                    val end = (stamp.interval.endTime * 1000.0).toLong()
-                    val start = (stamp.interval.startTime * 1000.0).toLong()
-                    SkipStamp(
-                        type = skipType,
-                        skipToNextEpisode = hasNextEpisode && shouldSkipToNextEpisode(
-                            end,
-                            dur
-                        ),
-                        startMs = start,
-                        endMs = end
-                    )
-                }.let { list ->
-                    out.addAll(list)
-                }
-            }
-        }
-        if (out.isNotEmpty())
-            cachedStamps[episode.id] = out
-        return out
-    }
-}
-
-// taken from https://github.com/saikou-app/saikou/blob/3803f8a7a59b826ca193664d46af3a22bbc989f7/app/src/main/java/ani/saikou/others/AniSkip.kt
-// the following is GPLv3 code https://github.com/saikou-app/saikou/blob/main/LICENSE.md
-object AniSkip {
-    private const val TAG = "AniSkip"
-    suspend fun getResult(
-        malId: Int,
-        episodeNumber: Int,
-        episodeLength: Long
-    ): Pair<Long, List<Stamp>>? {
-        return try {
-            val url =
-                "https://api.aniskip.com/v2/skip-times/$malId/$episodeNumber?types[]=ed&types[]=mixed-ed&types[]=mixed-op&types[]=op&types[]=recap&episodeLength=${episodeLength / 1000L}"
-            Log.i(TAG, "Requesting $url")
-
-            val a = app.get(url)
-            val res = a.parsed<AniSkipResponse>()
-            Log.i(TAG, "Found ${res.found} with ${res.results?.size} results")
-            if (res.found && !res.results.isNullOrEmpty()) (res.results[0].episodeLength * 1000).toLong() to res.results else null
-        } catch (t: Throwable) {
-            Log.i(TAG, "error = ${t.message}")
-            logError(t)
-            null
-        }
-    }
-
-    data class AniSkipResponse(
-        @JsonSerialize val found: Boolean,
-        @JsonSerialize val results: List<Stamp>?,
-        @JsonSerialize val message: String?,
-        @JsonSerialize val statusCode: Int
-    )
-
-    data class Stamp(
-        @JsonSerialize val interval: AniSkipInterval,
-        @JsonSerialize val skipType: String,
-        @JsonSerialize val skipId: String,
-        @JsonSerialize val episodeLength: Double
-    )
-
-    data class AniSkipInterval(
-        @JsonSerialize val startTime: Double,
-        @JsonSerialize val endTime: Double
-    )
-}
\ No newline at end of file
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 28b194531ce..1377ccd08ad 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,6 @@ import android.app.Activity
 import android.app.Activity.RESULT_CANCELED
 import android.app.NotificationChannel
 import android.app.NotificationManager
-import android.content.ContentValues
 import android.content.Context
 import android.content.DialogInterface
 import android.content.Intent
@@ -19,13 +18,9 @@ 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.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
 import android.view.View
@@ -37,6 +32,7 @@ import androidx.activity.result.contract.ActivityResultContracts
 import androidx.annotation.RequiresApi
 import androidx.annotation.WorkerThread
 import androidx.appcompat.app.AlertDialog
+import androidx.core.net.toUri
 import androidx.core.text.HtmlCompat
 import androidx.core.text.toSpanned
 import androidx.core.widget.ContentLoadingProgressBar
@@ -44,7 +40,6 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import androidx.navigation.fragment.findNavController
 import androidx.preference.PreferenceManager
-import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.tvprovider.media.tv.PreviewChannelHelper
@@ -59,8 +54,8 @@ 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.APIHolder.apis
-import com.lagradost.cloudstream3.AcraApplication.Companion.getActivity
 import com.lagradost.cloudstream3.AllLanguagesName
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.getActivity
 import com.lagradost.cloudstream3.CommonActivity.activity
 import com.lagradost.cloudstream3.CommonActivity.showToast
 import com.lagradost.cloudstream3.DubStatus
@@ -90,25 +85,18 @@ import com.lagradost.cloudstream3.utils.DataStoreHelper.getLastWatched
 import com.lagradost.cloudstream3.utils.FillerEpisodeCheck.toClassDir
 import com.lagradost.cloudstream3.utils.JsUnpacker.Companion.load
 import com.lagradost.cloudstream3.utils.UIHelper.navigate
+import com.lagradost.cloudstream3.utils.downloader.DownloadObjects
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import okhttp3.Cache
 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) {
-        for (i in 0..maxViewTypeId)
-            recycledViewPool.setMaxRecycledViews(i, maxPoolSize)
-    }
 
+object AppContextUtils {
     fun RecyclerView.isRecyclerScrollable(): Boolean {
         val layoutManager =
             this.layoutManager as? LinearLayoutManager?
@@ -159,12 +147,12 @@ object AppContextUtils {
             text.toSpanned()
         }
     }
-
+    /** Get channel ID by name */
     @SuppressLint("RestrictedApi")
     private fun buildWatchNextProgramUri(
         context: Context,
         card: DataStoreHelper.ResumeWatchingResult,
-        resumeWatching: VideoDownloadHelper.ResumeWatching?
+        resumeWatching: DownloadObjects.ResumeWatching?
     ): WatchNextProgram {
         val isSeries = card.type?.isMovieType() == false
         val title = if (isSeries) {
@@ -182,10 +170,10 @@ object AppContextUtils {
             )
             .setWatchNextType(TvContractCompat.WatchNextPrograms.WATCH_NEXT_TYPE_CONTINUE)
             .setTitle(title)
-            .setPosterArtUri(Uri.parse(card.posterUrl))
-            .setIntentUri(Uri.parse(card.id?.let {
+            .setPosterArtUri(card.posterUrl?.toUri())
+            .setIntentUri((card.id?.let {
                 "$APP_STRING_RESUME_WATCHING://$it"
-            } ?: card.url))
+            } ?: card.url).toUri())
             .setInternalProviderId(card.url)
             .setLastEngagementTimeUtcMillis(
                 resumeWatching?.updateTime ?: System.currentTimeMillis()
@@ -331,7 +319,7 @@ object AppContextUtils {
         val context = this
         continueWatchingLock.withLock {
             // A way to get all last watched timestamps
-            val timeStampHashMap = HashMap<Int, VideoDownloadHelper.ResumeWatching>()
+            val timeStampHashMap = HashMap<Int, DownloadObjects.ResumeWatching>()
             getAllResumeStateIds()?.forEach { id ->
                 val lastWatched = getLastWatched(id) ?: return@forEach
                 timeStampHashMap[lastWatched.parentId] = lastWatched
@@ -376,25 +364,6 @@ object AppContextUtils {
         }
     }
 
-    @SuppressLint("Range")
-    fun getVideoContentUri(context: Context, videoFilePath: String): Uri? {
-        val cursor = context.contentResolver.query(
-            MediaStore.Video.Media.EXTERNAL_CONTENT_URI, arrayOf(MediaStore.Video.Media._ID),
-            MediaStore.Video.Media.DATA + "=? ", arrayOf(videoFilePath), null
-        )
-        return if (cursor != null && cursor.moveToFirst()) {
-            val id = cursor.getInt(cursor.getColumnIndex(MediaStore.MediaColumns._ID))
-            cursor.close()
-            Uri.withAppendedPath(MediaStore.Video.Media.EXTERNAL_CONTENT_URI, "" + id)
-        } else {
-            val values = ContentValues()
-            values.put(MediaStore.Video.Media.DATA, videoFilePath)
-            context.contentResolver.insert(
-                MediaStore.Video.Media.EXTERNAL_CONTENT_URI, values
-            )
-        }
-    }
-
     fun sortSubs(subs: Set<SubtitleData>): List<SubtitleData> {
         return subs.sortedBy { it.name }
     }
@@ -480,6 +449,14 @@ object AppContextUtils {
         return settingsManager.getBoolean(this.getString(R.string.show_trailers_key), true)
     }
 
+    fun Context.shouldShowPlayerMetadata(): Boolean {
+        val prefs = PreferenceManager.getDefaultSharedPreferences(this)
+        return prefs.getBoolean(
+            getString(R.string.show_player_metadata_key),
+            true
+        )
+    }
+
     fun Context.filterProviderByPreferredMedia(hasHomePageIsRequired: Boolean = true): List<MainAPI> {
         // We are getting the weirdest crash ever done:
         // java.lang.ClassCastException: com.lagradost.cloudstream3.TvType cannot be cast to com.lagradost.cloudstream3.TvType
@@ -562,6 +539,7 @@ object AppContextUtils {
             val repo = RepositoryManager.parseRepository(url) ?: return@ioSafe
             RepositoryManager.addRepository(
                 RepositoryData(
+                    repo.iconUrl ?: "",
                     repo.name,
                     url
                 )
@@ -577,45 +555,6 @@ object AppContextUtils {
         }
     }
 
-    abstract class DiffAdapter<T>(
-        open val items: MutableList<T>,
-        val comparison: (first: T, second: T) -> Boolean = { first, second ->
-            first.hashCode() == second.hashCode()
-        }
-    ) :
-        RecyclerView.Adapter<RecyclerView.ViewHolder>() {
-        override fun getItemCount(): Int {
-            return items.size
-        }
-
-        fun updateList(newList: List<T>) {
-            val diffResult = DiffUtil.calculateDiff(
-                GenericDiffCallback(this.items, newList)
-            )
-
-            items.clear()
-            items.addAll(newList)
-
-            diffResult.dispatchUpdatesTo(this)
-        }
-
-        inner class GenericDiffCallback(
-            private val oldList: List<T>,
-            private val newList: List<T>
-        ) :
-            DiffUtil.Callback() {
-            override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int) =
-                comparison(oldList[oldItemPosition], newList[newItemPosition])
-
-            override fun getOldListSize() = oldList.size
-
-            override fun getNewListSize() = newList.size
-
-            override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int) =
-                oldList[oldItemPosition] == newList[newItemPosition]
-        }
-    }
-
     fun Activity.addRepositoryDialog(
         repositoryName: String,
         repositoryURL: String,
@@ -672,7 +611,7 @@ object AppContextUtils {
     ) = (this.getActivity() ?: activity)?.runOnUiThread {
         try {
             val intent = Intent(Intent.ACTION_VIEW)
-            intent.data = Uri.parse(url)
+            intent.data = url.toUri()
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK)
 
             // activityResultRegistry is used to fall back to webview if a browser is missing
@@ -756,6 +695,18 @@ object AppContextUtils {
         return ""
     }
 
+    fun Context.getShortSeasonText(episode: Int?, season: Int?): String? {
+        val rEpisode = if (episode == 0) null else episode
+        val rSeason = if (season == 0) null else season
+        val seasonNameShort = getString(R.string.season_short)
+        val episodeNameShort = getString(R.string.episode_short)
+        return if (rEpisode != null && rSeason != null) {
+            "$seasonNameShort${rSeason}:$episodeNameShort${rEpisode}"
+        } else if (rEpisode != null) {
+            "$episodeNameShort$rEpisode"
+        }else null
+    }
+
     fun Activity?.loadCache() {
         try {
             cacheClass("android.net.NetworkCapabilities".load())
@@ -911,100 +862,6 @@ object AppContextUtils {
         }
     }
 
-    // Copied from https://github.com/videolan/vlc-android/blob/master/application/vlc-android/src/org/videolan/vlc/util/FileUtils.kt
-    @SuppressLint("Range")
-    fun Context.getUri(data: Uri?): Uri? {
-        var uri = data
-        val ctx = this
-        if (data != null && data.scheme == "content") {
-            // Mail-based apps - download the stream to a temporary file and play it
-            if ("com.fsck.k9.attachmentprovider" == data.host || "gmail-ls" == data.host) {
-                var inputStream: InputStream? = null
-                var os: OutputStream? = null
-                var cursor: Cursor? = null
-                try {
-                    cursor = ctx.contentResolver.query(
-                        data,
-                        arrayOf(MediaStore.MediaColumns.DISPLAY_NAME), null, null, null
-                    )
-                    if (cursor != null && cursor.moveToFirst()) {
-                        val filename =
-                            cursor.getString(cursor.getColumnIndex(MediaStore.MediaColumns.DISPLAY_NAME))
-                                .replace("/", "")
-                        inputStream = ctx.contentResolver.openInputStream(data)
-                        if (inputStream == null) return data
-                        os =
-                            FileOutputStream(Environment.getExternalStorageDirectory().path + "/Download/" + filename)
-                        val buffer = ByteArray(1024)
-                        var bytesRead = inputStream.read(buffer)
-                        while (bytesRead >= 0) {
-                            os.write(buffer, 0, bytesRead)
-                            bytesRead = inputStream.read(buffer)
-                        }
-                        uri =
-                            Uri.fromFile(File(Environment.getExternalStorageDirectory().path + "/Download/" + filename))
-                    }
-                } catch (e: Exception) {
-                    return null
-                } finally {
-                    inputStream?.close()
-                    os?.close()
-                    cursor?.close()
-                }
-            } else if (data.authority == "media") {
-                uri = this.contentResolver.query(
-                    data,
-                    arrayOf(MediaStore.Video.Media.DATA), null, null, null
-                )?.use {
-                    val columnIndex = it.getColumnIndexOrThrow(MediaStore.Video.Media.DATA)
-                    if (it.moveToFirst()) Uri.fromFile(File(it.getString(columnIndex)))
-                        ?: data else data
-                }
-                //uri = MediaUtils.getContentMediaUri(data)
-                /*} else if (data.authority == ctx.getString(R.string.tv_provider_authority)) {
-                    println("TV AUTHORITY")
-                    //val medialibrary = Medialibrary.getInstance()
-                    //val media = medialibrary.getMedia(data.lastPathSegment!!.toLong())
-                    uri = null//media.uri*/
-            } else {
-                val inputPFD: ParcelFileDescriptor?
-                try {
-                    inputPFD = ctx.contentResolver.openFileDescriptor(data, "r")
-                    if (inputPFD == null) return data
-                    uri = Uri.parse("fd://" + inputPFD.fd)
-                    //                    Cursor returnCursor =
-                    //                            getContentResolver().query(data, null, null, null, null);
-                    //                    if (returnCursor != null) {
-                    //                        if (returnCursor.getCount() > 0) {
-                    //                            int nameIndex = returnCursor.getColumnIndex(OpenableColumns.DISPLAY_NAME);
-                    //                            if (nameIndex > -1) {
-                    //                                returnCursor.moveToFirst();
-                    //                                title = returnCursor.getString(nameIndex);
-                    //                            }
-                    //                        }
-                    //                        returnCursor.close();
-                    //                    }
-                } catch (e: FileNotFoundException) {
-                    Log.e("TAG", "${e.message} for $data", e)
-                    return null
-                } catch (e: IllegalArgumentException) {
-                    Log.e("TAG", "${e.message} for $data", e)
-                    return null
-                } catch (e: IllegalStateException) {
-                    Log.e("TAG", "${e.message} for $data", e)
-                    return null
-                } catch (e: NullPointerException) {
-                    Log.e("TAG", "${e.message} for $data", e)
-                    return null
-                } catch (e: SecurityException) {
-                    Log.e("TAG", "${e.message} for $data", e)
-                    return null
-                }
-            }// Media or MMS URI
-        }
-        return uri
-    }
-
     fun Context.isUsingMobileData(): Boolean {
         val connectionManager = getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
         return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/BackPressedCallbackHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/BackPressedCallbackHelper.kt
index 9f77597b084..10736e13e5f 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/BackPressedCallbackHelper.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/BackPressedCallbackHelper.kt
@@ -2,31 +2,61 @@ package com.lagradost.cloudstream3.utils
 
 import androidx.activity.ComponentActivity
 import androidx.activity.OnBackPressedCallback
+import java.lang.ref.WeakReference
 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() }
+    private val backPressedCallbacks =
+        WeakHashMap<ComponentActivity, MutableMap<String, OnBackPressedCallback>>()
+
+    class CallbackHelper(
+        private val activityRef: WeakReference<ComponentActivity>,
+        private val callback: OnBackPressedCallback
+    ) {
+        fun runDefault() {
+            val activity = activityRef.get() ?: return
+            val wasEnabled = callback.isEnabled
+            callback.isEnabled = false
+            try {
+                activity.onBackPressedDispatcher.onBackPressed()
+            } finally {
+                callback.isEnabled = wasEnabled
+            }
+        }
+    }
 
+    fun ComponentActivity.attachBackPressedCallback(
+        id: String,
+        callback: CallbackHelper.() -> Unit
+    ) {
+        val callbackMap = backPressedCallbacks.getOrPut(this) { mutableMapOf() }
         if (callbackMap.containsKey(id)) return
 
+        // We use WeakReference to protect against potential leaks.
+        val activityRef = WeakReference(this)
         val newCallback = object : OnBackPressedCallback(true) {
             override fun handleOnBackPressed() {
-                callback.invoke()
+                CallbackHelper(activityRef, this).callback()
             }
         }
-        callbackMap[id] = newCallback
 
+        callbackMap[id] = newCallback
         onBackPressedDispatcher.addCallback(this, newCallback)
     }
 
+    fun ComponentActivity.disableBackPressedCallback(id : String) {
+        backPressedCallbacks[this]?.get(id)?.isEnabled = false
+    }
+
+    fun ComponentActivity.enableBackPressedCallback(id : String) {
+        backPressedCallbacks[this]?.get(id)?.isEnabled = true
+    }
+
     fun ComponentActivity.detachBackPressedCallback(id: String) {
         val callbackMap = backPressedCallbacks[this] ?: return
-
         callbackMap[id]?.let { callback ->
-            callback.isEnabled = false
+            callback.remove()
             callbackMap.remove(id)
         }
 
@@ -34,4 +64,4 @@ object BackPressedCallbackHelper {
             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 9bc00a99203..88cb7481c9a 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/BackupUtils.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/BackupUtils.kt
@@ -1,6 +1,5 @@
 package com.lagradost.cloudstream3.utils
 
-import android.annotation.SuppressLint
 import android.content.Context
 import android.net.Uri
 import android.widget.Toast
@@ -12,23 +11,16 @@ 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
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.getActivity
 import com.lagradost.cloudstream3.CommonActivity.showToast
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.plugins.PLUGINS_KEY
 import com.lagradost.cloudstream3.plugins.PLUGINS_KEY_LOCAL
+import com.lagradost.cloudstream3.syncproviders.AccountManager
 import com.lagradost.cloudstream3.syncproviders.providers.AniListApi.Companion.ANILIST_CACHED_LIST
-import com.lagradost.cloudstream3.syncproviders.providers.AniListApi.Companion.ANILIST_TOKEN_KEY
-import com.lagradost.cloudstream3.syncproviders.providers.AniListApi.Companion.ANILIST_UNIXTIME_KEY
-import com.lagradost.cloudstream3.syncproviders.providers.AniListApi.Companion.ANILIST_USER_KEY
 import com.lagradost.cloudstream3.syncproviders.providers.MALApi.Companion.MAL_CACHED_LIST
-import com.lagradost.cloudstream3.syncproviders.providers.MALApi.Companion.MAL_REFRESH_TOKEN_KEY
-import com.lagradost.cloudstream3.syncproviders.providers.MALApi.Companion.MAL_TOKEN_KEY
-import com.lagradost.cloudstream3.syncproviders.providers.MALApi.Companion.MAL_UNIXTIME_KEY
-import com.lagradost.cloudstream3.syncproviders.providers.MALApi.Companion.MAL_USER_KEY
-import com.lagradost.cloudstream3.syncproviders.providers.OpenSubtitlesApi.Companion.OPEN_SUBTITLES_USER_KEY
-import com.lagradost.cloudstream3.syncproviders.providers.SubDlApi.Companion.SUBDL_SUBTITLES_USER_KEY
+import com.lagradost.cloudstream3.syncproviders.providers.KitsuApi.Companion.KITSU_CACHED_LIST
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import com.lagradost.cloudstream3.utils.Coroutines.main
 import com.lagradost.cloudstream3.utils.DataStore.getDefaultSharedPrefs
@@ -36,19 +28,22 @@ 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.cloudstream3.utils.downloader.VideoDownloadManager.setupStream
+import com.lagradost.cloudstream3.utils.downloader.DownloadObjects
+import com.lagradost.cloudstream3.utils.downloader.DownloadQueueManager.QUEUE_KEY
+import com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager.KEY_DOWNLOAD_INFO
+import com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager.KEY_RESUME_IN_QUEUE
+import com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager.KEY_RESUME_PACKAGES
 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
 import java.text.SimpleDateFormat
 import java.util.Date
+import java.util.Locale
 
 object BackupUtils {
 
@@ -56,24 +51,18 @@ object BackupUtils {
      * No sensitive or breaking data in the backup
      * */
     private val nonTransferableKeys = listOf(
-        // When sharing backup we do not want to transfer what is essentially the password
-        ANILIST_TOKEN_KEY,
         ANILIST_CACHED_LIST,
-        ANILIST_UNIXTIME_KEY,
-        ANILIST_USER_KEY,
-        MAL_TOKEN_KEY,
-        MAL_REFRESH_TOKEN_KEY,
         MAL_CACHED_LIST,
-        MAL_UNIXTIME_KEY,
-        MAL_USER_KEY,
+        KITSU_CACHED_LIST,
 
         // The plugins themselves are not backed up
         PLUGINS_KEY,
         PLUGINS_KEY_LOCAL,
 
-        OPEN_SUBTITLES_USER_KEY,
-        SUBDL_SUBTITLES_USER_KEY,
+        AccountManager.ACCOUNT_TOKEN,
+        AccountManager.ACCOUNT_IDS,
 
+        // TODO proper getter for string res keys to ensure that they are updated
         "biometric_key", // can lock down users if backup is shared on a incompatible device
         "nginx_user", // Nginx user key
 
@@ -81,7 +70,44 @@ object BackupUtils {
         "download_path_key",
         "download_path_key_visual",
         "backup_path_key",
-        "backup_dir_path_key"
+        "backup_dir_path_key",
+
+        // When sharing backup we do not want to transfer what is essentially the password
+        // Note that this is deprecated, and can be removed after all tokens have expired
+        "anilist_token",
+        "anilist_user",
+        "mal_user",
+        "mal_token",
+        "mal_refresh_token",
+        "mal_unixtime",
+        "open_subtitles_user",
+        "subdl_user",
+        "simkl_token",
+
+
+        // Downloads can not be restored from backups.
+        // The download path URI can not be transferred.
+        // In the future we may potentially write metadata to files in the download directory
+        // and make it possible to restore download folders using that metadata.
+        DOWNLOAD_EPISODE_CACHE_BACKUP,
+        DOWNLOAD_EPISODE_CACHE,
+        
+        // Download headers are unintuitively used in the resume watching system.
+        // We can therefore not prune download headers in backups.
+        //DOWNLOAD_HEADER_CACHE_BACKUP,
+        //DOWNLOAD_HEADER_CACHE,
+        
+
+        // This may overwrite valid local data with invalid data
+        KEY_DOWNLOAD_INFO,
+
+        // Prevent backups from automatically starting downloads
+        KEY_RESUME_IN_QUEUE,
+        KEY_RESUME_PACKAGES,
+        QUEUE_KEY,
+
+        // Prevent automatic plugin download after restoring backup
+        "auto_download_plugins_key2"
     )
 
     /** false if key should not be contained in backup */
@@ -162,9 +188,13 @@ object BackupUtils {
             context.restoreMap(backupFile.datastore.long)
             context.restoreMap(backupFile.datastore.stringSet)
         }
+
+        // Make sure the library is fresh
+        for(api in AccountManager.syncApis) {
+            api.requireLibraryRefresh = true
+        }
     }
 
-    @SuppressLint("SimpleDateFormat")
     fun backup(context: Context?) = ioSafe {
         if (context == null) return@ioSafe
 
@@ -177,7 +207,7 @@ object BackupUtils {
                 return@ioSafe
             }
 
-            val date = SimpleDateFormat("yyyy_MM_dd_HH_mm").format(Date(currentTimeMillis()))
+            val date = SimpleDateFormat("yyyy_MM_dd_HH_mm", Locale.getDefault()).format(Date(currentTimeMillis()))
             val displayName = "CS3_Backup_${date}"
             val backupFile = getBackup(context)
             val stream = setupBackupStream(context, displayName)
@@ -207,7 +237,7 @@ object BackupUtils {
     }
 
     @Throws(IOException::class)
-    private fun setupBackupStream(context: Context, name: String, ext: String = "txt"): StreamData {
+    private fun setupBackupStream(context: Context, name: String, ext: String = "txt"): DownloadObjects.StreamData {
         return setupStream(
             baseFile = getCurrentBackupDir(context).first ?: getDefaultBackupDir(context)
             ?: throw IOException("Bad config"),
@@ -289,7 +319,7 @@ object BackupUtils {
     }
 
     /**
-     * Copy of [VideoDownloadManager.basePathToFile], [VideoDownloadManager.getDefaultDir] and [VideoDownloadManager.getBasePath]
+     * Copy of [com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager.basePathToFile], [com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager.getDefaultDir] and [com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager.getBasePath]
      * modded for backup specific paths
      * */
 
@@ -299,7 +329,8 @@ object BackupUtils {
 
     fun getCurrentBackupDir(context: Context): Pair<SafeFile?, String?> {
         val settingsManager = PreferenceManager.getDefaultSharedPreferences(context)
-        val basePathSetting = settingsManager.getString(context.getString(R.string.backup_path_key), null)
+        val basePathSetting =
+            settingsManager.getString(context.getString(R.string.backup_path_key), null)
         return baseBackupPathToFile(context, basePathSetting) to basePathSetting
     }
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/BiometricAuthenticator.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/BiometricAuthenticator.kt
index 1d9cf5f46ee..bce8f09dced 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/BiometricAuthenticator.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/BiometricAuthenticator.kt
@@ -1,5 +1,6 @@
 package com.lagradost.cloudstream3.utils
 
+import android.annotation.SuppressLint
 import android.app.Activity
 import android.app.KeyguardManager
 import android.content.Context
@@ -100,31 +101,51 @@ object BiometricAuthenticator {
     }
 
     private fun isBiometricHardWareAvailable(): Boolean {
-        // authentication occurs only when this is true and device is truly capable
+        // Authentication occurs only when this is true and device is truly capable.
         var result = false
+        when {
+            Build.VERSION.SDK_INT >= Build.VERSION_CODES.BAKLAVA -> {
+                @SuppressLint("RestrictedApi")
+                when (biometricManager?.canAuthenticate(
+                    DEVICE_CREDENTIAL or BIOMETRIC_STRONG or BIOMETRIC_WEAK
+                )) {
+                    BiometricManager.BIOMETRIC_SUCCESS -> result = true
+                    BiometricManager.BIOMETRIC_ERROR_NO_HARDWARE -> result = false
+                    BiometricManager.BIOMETRIC_ERROR_HW_UNAVAILABLE -> result = false
+                    BiometricManager.BIOMETRIC_ERROR_NONE_ENROLLED -> result = false
+                    BiometricManager.BIOMETRIC_ERROR_NOT_ENABLED_FOR_APPS -> result = false
+                    BiometricManager.BIOMETRIC_ERROR_SECURITY_UPDATE_REQUIRED -> result = true
+                    BiometricManager.BIOMETRIC_ERROR_UNSUPPORTED -> result = true
+                    BiometricManager.BIOMETRIC_STATUS_UNKNOWN -> result = false
+                }
+            }
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-            when (biometricManager?.canAuthenticate(
-                DEVICE_CREDENTIAL or BIOMETRIC_STRONG or BIOMETRIC_WEAK
-            )) {
-                BiometricManager.BIOMETRIC_SUCCESS -> result = true
-                BiometricManager.BIOMETRIC_ERROR_NO_HARDWARE -> result = false
-                BiometricManager.BIOMETRIC_ERROR_HW_UNAVAILABLE -> result = false
-                BiometricManager.BIOMETRIC_ERROR_NONE_ENROLLED -> result = false
-                BiometricManager.BIOMETRIC_ERROR_SECURITY_UPDATE_REQUIRED -> result = true
-                BiometricManager.BIOMETRIC_ERROR_UNSUPPORTED -> result = true
-                BiometricManager.BIOMETRIC_STATUS_UNKNOWN -> result = false
+            Build.VERSION.SDK_INT >= Build.VERSION_CODES.R -> {
+                @Suppress("SwitchIntDef")
+                when (biometricManager?.canAuthenticate(
+                    DEVICE_CREDENTIAL or BIOMETRIC_STRONG or BIOMETRIC_WEAK
+                )) {
+                    BiometricManager.BIOMETRIC_SUCCESS -> result = true
+                    BiometricManager.BIOMETRIC_ERROR_NO_HARDWARE -> result = false
+                    BiometricManager.BIOMETRIC_ERROR_HW_UNAVAILABLE -> result = false
+                    BiometricManager.BIOMETRIC_ERROR_NONE_ENROLLED -> result = false
+                    BiometricManager.BIOMETRIC_ERROR_SECURITY_UPDATE_REQUIRED -> result = true
+                    BiometricManager.BIOMETRIC_ERROR_UNSUPPORTED -> result = true
+                    BiometricManager.BIOMETRIC_STATUS_UNKNOWN -> result = false
+                }
             }
-        } else {
-            @Suppress("DEPRECATION")
-            when (biometricManager?.canAuthenticate()) {
-                BiometricManager.BIOMETRIC_SUCCESS -> result = true
-                BiometricManager.BIOMETRIC_ERROR_NO_HARDWARE -> result = false
-                BiometricManager.BIOMETRIC_ERROR_HW_UNAVAILABLE -> result = false
-                BiometricManager.BIOMETRIC_ERROR_NONE_ENROLLED -> result = false
-                BiometricManager.BIOMETRIC_ERROR_SECURITY_UPDATE_REQUIRED -> result = true
-                BiometricManager.BIOMETRIC_ERROR_UNSUPPORTED -> result = true
-                BiometricManager.BIOMETRIC_STATUS_UNKNOWN -> result = false
+
+            else -> {
+                @Suppress("DEPRECATION", "SwitchIntDef")
+                when (biometricManager?.canAuthenticate()) {
+                    BiometricManager.BIOMETRIC_SUCCESS -> result = true
+                    BiometricManager.BIOMETRIC_ERROR_NO_HARDWARE -> result = false
+                    BiometricManager.BIOMETRIC_ERROR_HW_UNAVAILABLE -> result = false
+                    BiometricManager.BIOMETRIC_ERROR_NONE_ENROLLED -> result = false
+                    BiometricManager.BIOMETRIC_ERROR_SECURITY_UPDATE_REQUIRED -> result = true
+                    BiometricManager.BIOMETRIC_ERROR_UNSUPPORTED -> result = true
+                    BiometricManager.BIOMETRIC_STATUS_UNKNOWN -> result = false
+                }
             }
         }
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/CastHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/CastHelper.kt
index d83731658b7..b48c8d40a69 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/CastHelper.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/CastHelper.kt
@@ -1,6 +1,6 @@
 package com.lagradost.cloudstream3.utils
 
-import android.net.Uri
+import androidx.core.net.toUri
 import androidx.media3.common.MimeTypes
 import com.google.android.gms.cast.*
 import com.google.android.gms.cast.framework.CastSession
@@ -41,7 +41,7 @@ object CastHelper {
 
         val srcPoster = epData.poster ?: holder.poster
         if (srcPoster != null) {
-            movieMetadata.addImage(WebImage(Uri.parse(srcPoster)))
+            movieMetadata.addImage(WebImage(srcPoster.toUri()))
         }
 
         var subIndex = 0
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/ConsistentLiveData.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/ConsistentLiveData.kt
new file mode 100644
index 00000000000..def41d7a07a
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/ConsistentLiveData.kt
@@ -0,0 +1,47 @@
+package com.lagradost.cloudstream3.utils
+
+import androidx.annotation.MainThread
+import androidx.lifecycle.LiveData
+import com.lagradost.cloudstream3.mvvm.Resource
+
+/**
+ * This is an atomic LiveData where you can do .value instantly after doing .postValue.
+ *
+ * The default behavior is a footgun that will cause race conditions, 
+ * as we do not really care if it is posted as we only want the latest data (even in the binding).
+ *
+ * Fuck all that is LiveData, because we want this value to be accessible everywhere instantly.
+ * */
+open class ConsistentLiveData<T>(initValue : T? = null) : LiveData<T>(initValue) {
+    @Volatile private var internalValue : T? = initValue
+
+    override fun getValue(): T? {
+        return internalValue
+    }
+
+    /** If someone want the old behavior then good for them */
+    val postedValue : T? get() = super.getValue()
+
+    public override fun postValue(value : T?) {
+        super.postValue(value)
+        internalValue = value
+    }
+
+    @MainThread
+    public override fun setValue(value: T?) {
+        super.setValue(value)
+        internalValue = value
+    }
+}
+
+/** Atomic resource livedata, to make it easier to work with resources without local copies */
+class ResourceLiveData<T>(initValue : Resource<T>? = null) : ConsistentLiveData<Resource<T>>(initValue) {
+    var success
+        get() = when(val output = this.value) {
+            is Resource.Success<T> -> {
+                output.value
+            }
+            else -> null
+        }
+        set(value) = this.postValue(value?.let { Resource.Success<T>(it) } )
+}
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 b5192aae287..0a1db85fadb 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/DataStore.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/DataStore.kt
@@ -6,21 +6,24 @@ import androidx.preference.PreferenceManager
 import com.fasterxml.jackson.databind.DeserializationFeature
 import com.fasterxml.jackson.databind.json.JsonMapper
 import com.fasterxml.jackson.module.kotlin.kotlinModule
-import com.lagradost.cloudstream3.AcraApplication.Companion.getKeyClass
-import com.lagradost.cloudstream3.AcraApplication.Companion.removeKey
-import com.lagradost.cloudstream3.AcraApplication.Companion.setKeyClass
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.getKeyClass
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.removeKey
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.setKeyClass
 import com.lagradost.cloudstream3.mvvm.logError
 import kotlin.reflect.KClass
 import kotlin.reflect.KProperty
+import androidx.core.content.edit
 
+/** Used to display metadata about downloads and resume watching */
 const val DOWNLOAD_HEADER_CACHE = "download_header_cache"
+const val DOWNLOAD_HEADER_CACHE_BACKUP = "BACKUP_download_header_cache"
 
 //const val WATCH_HEADER_CACHE = "watch_header_cache"
 const val DOWNLOAD_EPISODE_CACHE = "download_episode_cache"
+const val DOWNLOAD_EPISODE_CACHE_BACKUP = "BACKUP_download_episode_cache"
 const val VIDEO_PLAYER_BRIGHTNESS = "video_player_alpha_key"
 const val USER_SELECTED_HOMEPAGE_API = "home_api_used"
 const val USER_PROVIDER_API = "user_custom_sites"
-
 const val PREFERENCES_NAME = "rebuild_preference"
 
 // TODO degelgate by value for get & set
@@ -29,6 +32,7 @@ class PreferenceDelegate<T : Any>(
     val key: String, val default: T //, private val klass: KClass<T>
 ) {
     private val klass: KClass<out T> = default::class
+
     // simple cache to make it not get the key every time it is accessed, however this requires
     // that ONLY this changes the key
     private var cache: T? = null
@@ -52,10 +56,10 @@ class PreferenceDelegate<T : Any>(
 
 /** When inserting many keys use this function, this is because apply for every key is very expensive on memory */
 data class Editor(
-    val editor : SharedPreferences.Editor
+    val editor: SharedPreferences.Editor
 ) {
     /** Always remember to call apply after */
-    fun<T> setKeyRaw(path: String, value: T) {
+    fun <T> setKeyRaw(path: String, value: T) {
         @Suppress("UNCHECKED_CAST")
         if (isStringSet(value)) {
             editor.putStringSet(path, value as Set<String>)
@@ -70,7 +74,7 @@ data class Editor(
         }
     }
 
-    private fun isStringSet(value: Any?) : Boolean {
+    private fun isStringSet(value: Any?): Boolean {
         if (value is Set<*>) {
             return value.filterIsInstance<String>().size == value.size
         }
@@ -95,13 +99,15 @@ object DataStore {
         return getPreferences(this)
     }
 
+
     fun getFolderName(folder: String, path: String): String {
         return "${folder}/${path}"
     }
 
-    fun editor(context : Context, isEditingAppSettings: Boolean = false) : Editor {
+    fun editor(context: Context, isEditingAppSettings: Boolean = false): Editor {
         val editor: SharedPreferences.Editor =
-            if (isEditingAppSettings) context.getDefaultSharedPrefs().edit() else context.getSharedPrefs().edit()
+            if (isEditingAppSettings) context.getDefaultSharedPrefs()
+                .edit() else context.getSharedPrefs().edit()
         return Editor(editor)
     }
 
@@ -110,7 +116,9 @@ object DataStore {
     }
 
     fun Context.getKeys(folder: String): List<String> {
-        return this.getSharedPrefs().all.keys.filter { it.startsWith(folder) }
+        // Ensure that the folder ends with "/" to prevent matching with other folders
+        val fixedFolder = folder.trimEnd('/') + "/"
+        return this.getSharedPrefs().all.keys.filter { it.startsWith(fixedFolder) }
     }
 
     fun Context.removeKey(folder: String, path: String) {
@@ -130,9 +138,9 @@ object DataStore {
         try {
             val prefs = getSharedPrefs()
             if (prefs.contains(path)) {
-                val editor: SharedPreferences.Editor = prefs.edit()
-                editor.remove(path)
-                editor.apply()
+                prefs.edit {
+                    remove(path)
+                }
             }
         } catch (e: Exception) {
             logError(e)
@@ -141,17 +149,24 @@ object DataStore {
 
     fun Context.removeKeys(folder: String): Int {
         val keys = getKeys("$folder/")
-        keys.forEach { value ->
-            removeKey(value)
+        try {
+            getSharedPrefs().edit {
+                keys.forEach { value ->
+                    remove(value)
+                }
+            }
+            return keys.size
+        } catch (e: Exception) {
+            logError(e)
+            return 0
         }
-        return keys.size
     }
 
     fun <T> Context.setKey(path: String, value: T) {
         try {
-            val editor: SharedPreferences.Editor = getSharedPrefs().edit()
-            editor.putString(path, mapper.writeValueAsString(value))
-            editor.apply()
+            getSharedPrefs().edit {
+                putString(path, mapper.writeValueAsString(value))
+            }
         } catch (e: Exception) {
             logError(e)
         }
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 650502dcaba..19caead21ee 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/DataStoreHelper.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/DataStoreHelper.kt
@@ -3,18 +3,20 @@ package com.lagradost.cloudstream3.utils
 import android.content.Context
 import com.fasterxml.jackson.annotation.JsonProperty
 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
-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.CloudStreamApp.Companion.context
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.getKey
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.getKeyClass
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.getKeys
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.removeKey
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.removeKeys
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.setKey
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.setKeyClass
 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.Score
 import com.lagradost.cloudstream3.SearchQuality
 import com.lagradost.cloudstream3.SearchResponse
 import com.lagradost.cloudstream3.TvType
@@ -22,9 +24,13 @@ 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.player.ExtractorUri
+import com.lagradost.cloudstream3.ui.player.NEXT_WATCH_EPISODE_PERCENTAGE
 import com.lagradost.cloudstream3.ui.result.EpisodeSortType
+import com.lagradost.cloudstream3.ui.result.ResultEpisode
 import com.lagradost.cloudstream3.ui.result.VideoWatchState
 import com.lagradost.cloudstream3.utils.AppContextUtils.filterProviderByPreferredMedia
+import com.lagradost.cloudstream3.utils.downloader.DownloadObjects
 import java.util.Calendar
 import java.util.Date
 import java.util.GregorianCalendar
@@ -44,7 +50,7 @@ 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"
-
+const val USER_PINNED_PROVIDERS = "user_pinned_providers" //key for pinned user set
 
 class UserPreferenceDelegate<T : Any>(
     private val key: String, private val default: T //, private val klass: KClass<T>
@@ -52,7 +58,7 @@ class UserPreferenceDelegate<T : Any>(
     private val klass: KClass<out T> = default::class
     private val realKey get() = "${DataStoreHelper.currentAccount}/$key"
     operator fun getValue(self: Any?, property: KProperty<*>) =
-        AcraApplication.getKeyClass(realKey, klass.java) ?: default
+        getKeyClass(realKey, klass.java) ?: default
 
     operator fun setValue(
         self: Any?,
@@ -62,7 +68,7 @@ class UserPreferenceDelegate<T : Any>(
         if (t == null) {
             removeKey(realKey)
         } else {
-            AcraApplication.setKeyClass(realKey, t)
+            setKeyClass(realKey, t)
         }
     }
 }
@@ -79,50 +85,64 @@ object DataStoreHelper {
         R.drawable.profile_bg_teal
     )
 
-    private var searchPreferenceProvidersStrings : List<String> by UserPreferenceDelegate(
+    private var searchPreferenceProvidersStrings: List<String> by UserPreferenceDelegate(
         /** java moment right here, as listOf()::class.java != List(0) { "" }::class.java */
         "search_pref_providers", List(0) { "" }
     )
 
-    private fun serializeTv(data : List<TvType>) : List<String> = data.map { it.name }
+    private fun serializeTv(data: List<TvType>): List<String> = data.map { it.name }
 
-    private fun deserializeTv(data : List<String>) : List<TvType> {
+    private fun deserializeTv(data: List<String>): List<TvType> {
         return data.mapNotNull { listName ->
             TvType.values().firstOrNull { it.name == listName }
         }
     }
 
-    var searchPreferenceProviders : List<String>
+    var searchPreferenceProviders: List<String>
         get() {
             val ret = searchPreferenceProvidersStrings
             return ret.ifEmpty {
                 context?.filterProviderByPreferredMedia()?.map { it.name } ?: emptyList()
             }
-        } set(value) {
+        }
+        set(value) {
             searchPreferenceProvidersStrings = value
         }
 
-    private var searchPreferenceTagsStrings : List<String> by UserPreferenceDelegate("search_pref_tags", listOf(TvType.Movie, TvType.TvSeries).map { it.name })
-    var searchPreferenceTags : List<TvType>
+    private var searchPreferenceTagsStrings: List<String> by UserPreferenceDelegate(
+        "search_pref_tags",
+        listOf(TvType.Movie, TvType.TvSeries).map { it.name })
+    var searchPreferenceTags: List<TvType>
         get() = deserializeTv(searchPreferenceTagsStrings)
         set(value) {
             searchPreferenceTagsStrings = serializeTv(value)
         }
 
 
-    private var homePreferenceStrings : List<String> by UserPreferenceDelegate("home_pref_homepage", listOf(TvType.Movie, TvType.TvSeries).map { it.name })
-    var homePreference : List<TvType>
+    private var homePreferenceStrings: List<String> by UserPreferenceDelegate(
+        "home_pref_homepage",
+        listOf(TvType.Movie, TvType.TvSeries).map { it.name })
+    var homePreference: List<TvType>
         get() = deserializeTv(homePreferenceStrings)
         set(value) {
             homePreferenceStrings = serializeTv(value)
         }
 
-    var homeBookmarkedList : IntArray by UserPreferenceDelegate("home_bookmarked_last_list", IntArray(0))
-    var playBackSpeed : Float by UserPreferenceDelegate("playback_speed", 1.0f)
-    var resizeMode : Int by UserPreferenceDelegate("resize_mode", 0)
-    var librarySortingMode : Int by UserPreferenceDelegate("library_sorting_mode", ListSorting.AlphabeticalA.ordinal)
-    private var _resultsSortingMode : Int by UserPreferenceDelegate("results_sorting_mode", EpisodeSortType.NUMBER_ASC.ordinal)
-    var resultsSortingMode : EpisodeSortType
+    var homeBookmarkedList: IntArray by UserPreferenceDelegate(
+        "home_bookmarked_last_list",
+        IntArray(0)
+    )
+    var playBackSpeed: Float by UserPreferenceDelegate("playback_speed", 1.0f)
+    var resizeMode: Int by UserPreferenceDelegate("resize_mode", 0)
+    var librarySortingMode: Int by UserPreferenceDelegate(
+        "library_sorting_mode",
+        ListSorting.AlphabeticalA.ordinal
+    )
+    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
@@ -140,7 +160,10 @@ object DataStoreHelper {
         @JsonProperty("lockPin")
         val lockPin: String? = null,
     ) {
-        val image get() = customImage?.let { UiImage.Image(it) } ?: profileImages.getOrNull(defaultImageIndex)?.let { UiImage.Drawable(it) } ?: UiImage.Drawable(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"
@@ -167,6 +190,7 @@ object DataStoreHelper {
         val homepage = currentHomePage
 
         selectedKeyIndex = account.keyIndex
+        AccountManager.updateAccountIds()
         showToast(context?.getString(R.string.logged_account, account.name) ?: account.name)
         MainActivity.bookmarksUpdatedEvent(true)
         MainActivity.reloadLibraryEvent(true)
@@ -222,7 +246,8 @@ object DataStoreHelper {
         return this
     }
 
-    fun Int.toYear() : Date = GregorianCalendar.getInstance().also { it.set(Calendar.YEAR, this) }.time
+    fun Int.toYear(): Date =
+        GregorianCalendar.getInstance().also { it.set(Calendar.YEAR, this) }.time
 
     /**
      * Used to display notifications on new episodes and posters in library.
@@ -239,10 +264,24 @@ object DataStoreHelper {
         @JsonProperty("syncData") open val syncData: Map<String, String>?,
         @JsonProperty("quality") override var quality: SearchQuality?,
         @JsonProperty("posterHeaders") override var posterHeaders: Map<String, String>?,
-        @JsonProperty("plot") open val plot : String? = null,
-        @JsonProperty("rating") open val rating : Int? = null,
-        @JsonProperty("tags") open val tags : List<String>? = null,
-    ) : SearchResponse
+        @JsonProperty("plot") open val plot: String? = null,
+        @JsonProperty("score") override var score: Score? = null,
+        @JsonProperty("tags") open val tags: List<String>? = null,
+    ) : SearchResponse {
+        @JsonProperty("rating", access = JsonProperty.Access.WRITE_ONLY)
+        @Deprecated(
+            "`rating` is the old scoring system, use score instead",
+            replaceWith = ReplaceWith("score"),
+            level = DeprecationLevel.ERROR
+        )
+        var rating: Int? = null
+            set(value) {
+                if (value != null) {
+                    @Suppress("DEPRECATION_ERROR")
+                    score = Score.fromOld(value)
+                }
+            }
+    }
 
     data class SubscribedData(
         @JsonProperty("subscribedTime") val subscribedTime: Long,
@@ -259,9 +298,24 @@ object DataStoreHelper {
         override var quality: SearchQuality? = null,
         override var posterHeaders: Map<String, String>? = null,
         override val plot: String? = null,
-        override val rating: Int? = null,
+        override var score: Score? = null,
         override val tags: List<String>? = null,
-    ) : LibrarySearchResponse(id, latestUpdatedTime, name, url, apiName, type, posterUrl, year, syncData, quality, posterHeaders, plot,rating,tags) {
+    ) : LibrarySearchResponse(
+        id,
+        latestUpdatedTime,
+        name,
+        url,
+        apiName,
+        type,
+        posterUrl,
+        year,
+        syncData,
+        quality,
+        posterHeaders,
+        plot,
+        score,
+        tags
+    ) {
         fun toLibraryItem(): SyncAPI.LibraryItem? {
             return SyncAPI.LibraryItem(
                 name,
@@ -271,7 +325,16 @@ object DataStoreHelper {
                 null,
                 null,
                 latestUpdatedTime,
-                apiName, type, posterUrl, posterHeaders, quality, year?.toYear(), this.id, plot = this.plot, rating = this.rating, tags = this.tags
+                apiName,
+                type,
+                posterUrl,
+                posterHeaders,
+                quality,
+                year?.toYear(),
+                this.id,
+                plot = this.plot,
+                score = this.score,
+                tags = this.tags
             )
         }
     }
@@ -290,9 +353,22 @@ object DataStoreHelper {
         override var quality: SearchQuality? = null,
         override var posterHeaders: Map<String, String>? = null,
         override val plot: String? = null,
-        override val rating: Int? = null,
+        override var score: Score? = null,
         override val tags: List<String>? = null,
-    ) : LibrarySearchResponse(id, latestUpdatedTime, name, url, apiName, type, posterUrl, year, syncData, quality, posterHeaders, plot) {
+    ) : LibrarySearchResponse(
+        id,
+        latestUpdatedTime,
+        name,
+        url,
+        apiName,
+        type,
+        posterUrl,
+        year,
+        syncData,
+        quality,
+        posterHeaders,
+        plot
+    ) {
         fun toLibraryItem(id: String): SyncAPI.LibraryItem {
             return SyncAPI.LibraryItem(
                 name,
@@ -302,7 +378,16 @@ object DataStoreHelper {
                 null,
                 null,
                 latestUpdatedTime,
-                apiName, type, posterUrl, posterHeaders, quality, year?.toYear(), this.id, plot = this.plot, rating = this.rating, tags = this.tags
+                apiName,
+                type,
+                posterUrl,
+                posterHeaders,
+                quality,
+                year?.toYear(),
+                this.id,
+                plot = this.plot,
+                score = this.score,
+                tags = this.tags
             )
         }
     }
@@ -321,9 +406,22 @@ object DataStoreHelper {
         override var quality: SearchQuality? = null,
         override var posterHeaders: Map<String, String>? = null,
         override val plot: String? = null,
-        override val rating: Int? = null,
+        override var score: Score? = null,
         override val tags: List<String>? = null,
-    ) : LibrarySearchResponse(id, latestUpdatedTime, name, url, apiName, type, posterUrl, year, syncData, quality, posterHeaders,plot) {
+    ) : LibrarySearchResponse(
+        id,
+        latestUpdatedTime,
+        name,
+        url,
+        apiName,
+        type,
+        posterUrl,
+        year,
+        syncData,
+        quality,
+        posterHeaders,
+        plot
+    ) {
         fun toLibraryItem(): SyncAPI.LibraryItem? {
             return SyncAPI.LibraryItem(
                 name,
@@ -333,7 +431,16 @@ object DataStoreHelper {
                 null,
                 null,
                 latestUpdatedTime,
-                apiName, type, posterUrl, posterHeaders, quality, year?.toYear(), this.id, plot = this.plot, rating = this.rating, tags = this.tags
+                apiName,
+                type,
+                posterUrl,
+                posterHeaders,
+                quality,
+                year?.toYear(),
+                this.id,
+                plot = this.plot,
+                score = this.score,
+                tags = this.tags
             )
         }
     }
@@ -352,6 +459,7 @@ object DataStoreHelper {
         @JsonProperty("isFromDownload") val isFromDownload: Boolean,
         @JsonProperty("quality") override var quality: SearchQuality? = null,
         @JsonProperty("posterHeaders") override var posterHeaders: Map<String, String>? = null,
+        @JsonProperty("score") override var score: Score? = null,
     ) : SearchResponse
 
     /**
@@ -422,7 +530,7 @@ object DataStoreHelper {
         setKey(
             "$currentAccount/$RESULT_RESUME_WATCHING",
             parentId.toString(),
-            VideoDownloadHelper.ResumeWatching(
+            DownloadObjects.ResumeWatching(
                 parentId,
                 episodeId,
                 episode,
@@ -443,7 +551,7 @@ object DataStoreHelper {
         removeKey("$currentAccount/$RESULT_RESUME_WATCHING", parentId.toString())
     }
 
-    fun getLastWatched(id: Int?): VideoDownloadHelper.ResumeWatching? {
+    fun getLastWatched(id: Int?): DownloadObjects.ResumeWatching? {
         if (id == null) return null
         return getKey(
             "$currentAccount/$RESULT_RESUME_WATCHING",
@@ -451,7 +559,7 @@ object DataStoreHelper {
         )
     }
 
-    private fun getLastWatchedOld(id: Int?): VideoDownloadHelper.ResumeWatching? {
+    private fun getLastWatchedOld(id: Int?): DownloadObjects.ResumeWatching? {
         if (id == null) return null
         return getKey(
             "$currentAccount/$RESULT_RESUME_WATCHING_OLD",
@@ -540,6 +648,62 @@ object DataStoreHelper {
         setKey("$currentAccount/$VIDEO_POS_DUR", id.toString(), PosDur(pos, dur))
     }
 
+    /** Sets the position, duration, and resume data of an episode/movie,
+     *
+     * if nextEpisode is not specified it will not be able to set the next episode as resumable if progress > NEXT_WATCH_EPISODE_PERCENTAGE
+     * */
+    fun setViewPosAndResume(id: Int?, position: Long, duration: Long, currentEpisode: Any?, nextEpisode: Any?) {
+        setViewPos(id, position, duration)
+        if (id != null) {
+            when (val meta = currentEpisode) {
+                is ResultEpisode -> {
+                    if (meta.videoWatchState == VideoWatchState.Watched) {
+                        setVideoWatchState(id, VideoWatchState.None)
+                    }
+                }
+            }
+        }
+
+        val percentage = position * 100L / duration
+        val nextEp = percentage >= NEXT_WATCH_EPISODE_PERCENTAGE
+        val resumeMeta = if (nextEp) nextEpisode else currentEpisode
+        if (resumeMeta == null && nextEp) {
+            // remove last watched as it is the last episode and you have watched too much
+            when (val newMeta = currentEpisode) {
+                is ResultEpisode -> {
+                    removeLastWatched(newMeta.parentId)
+                }
+
+                is ExtractorUri -> {
+                    removeLastWatched(newMeta.parentId)
+                }
+            }
+        } else {
+            // save resume
+            when (resumeMeta) {
+                is ResultEpisode -> {
+                    setLastWatched(
+                        resumeMeta.parentId,
+                        resumeMeta.id,
+                        resumeMeta.episode,
+                        resumeMeta.season,
+                        isFromDownload = false
+                    )
+                }
+
+                is ExtractorUri -> {
+                    setLastWatched(
+                        resumeMeta.parentId,
+                        resumeMeta.id,
+                        resumeMeta.episode,
+                        resumeMeta.season,
+                        isFromDownload = true
+                    )
+                }
+            }
+        }
+    }
+
     fun getViewPos(id: Int?): PosDur? {
         if (id == null) return null
         return getKey("$currentAccount/$VIDEO_POS_DUR", id.toString(), null)
@@ -562,7 +726,7 @@ object DataStoreHelper {
     }
 
     fun getDub(id: Int): DubStatus? {
-        return DubStatus.values()
+        return DubStatus.entries
             .getOrNull(getKey("$currentAccount/$RESULT_DUB", id.toString(), -1) ?: -1)
     }
 
@@ -614,4 +778,9 @@ object DataStoreHelper {
             getKey("${idPrefix}_sync", id.toString())
         }
     }
+
+    var pinnedProviders: Array<String>
+        get() = getKey(USER_PINNED_PROVIDERS) ?: emptyArray<String>()
+        set(value) = setKey(USER_PINNED_PROVIDERS, value)
+
 }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/DownloadFileWorkManager.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/DownloadFileWorkManager.kt
deleted file mode 100644
index 4eeb4e5da43..00000000000
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/DownloadFileWorkManager.kt
+++ /dev/null
@@ -1,104 +0,0 @@
-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.main
-import com.lagradost.cloudstream3.utils.DataStore.getKey
-import com.lagradost.cloudstream3.utils.VideoDownloadManager.WORK_KEY_INFO
-import com.lagradost.cloudstream3.utils.VideoDownloadManager.WORK_KEY_PACKAGE
-import com.lagradost.cloudstream3.utils.VideoDownloadManager.downloadCheck
-import com.lagradost.cloudstream3.utils.VideoDownloadManager.downloadEpisode
-import com.lagradost.cloudstream3.utils.VideoDownloadManager.downloadFromResume
-import com.lagradost.cloudstream3.utils.VideoDownloadManager.downloadStatusEvent
-import com.lagradost.cloudstream3.utils.VideoDownloadManager.getDownloadResumePackage
-import kotlinx.coroutines.delay
-
-const val DOWNLOAD_CHECK = "DownloadCheck"
-
-class DownloadFileWorkManager(val context: Context, private val workerParams: WorkerParameters) :
-    CoroutineWorker(context, workerParams) {
-
-    override suspend fun doWork(): Result {
-        val key = workerParams.inputData.getString("key")
-        try {
-            if (key == DOWNLOAD_CHECK) {
-                downloadCheck(applicationContext, ::handleNotification)
-            } else if (key != null) {
-                val info =
-                    applicationContext.getKey<VideoDownloadManager.DownloadInfo>(WORK_KEY_INFO, key)
-                val pkg =
-                    applicationContext.getKey<VideoDownloadManager.DownloadResumePackage>(
-                        WORK_KEY_PACKAGE,
-                        key
-                    )
-
-                if (info != null) {
-                    getDownloadResumePackage(applicationContext, info.ep.id)?.let { dpkg ->
-                        downloadFromResume(applicationContext, dpkg, ::handleNotification)
-                    } ?: run {
-                        downloadEpisode(
-                            applicationContext,
-                            info.source,
-                            info.folder,
-                            info.ep,
-                            info.links,
-                            ::handleNotification
-                        )
-                    }
-                } else if (pkg != null) {
-                    downloadFromResume(applicationContext, pkg, ::handleNotification)
-                }
-                removeKeys(key)
-            }
-            return Result.success()
-        } catch (e: Exception) {
-            logError(e)
-            if (key != null) {
-                removeKeys(key)
-            }
-            return Result.failure()
-        }
-    }
-
-    private fun removeKeys(key: String) {
-        removeKey(WORK_KEY_INFO, key)
-        removeKey(WORK_KEY_PACKAGE, key)
-    }
-
-    private suspend fun awaitDownload(id: Int) {
-        var isDone = false
-        val listener = { (localId, localType): Pair<Int, VideoDownloadManager.DownloadType> ->
-            if (id == localId) {
-                when (localType) {
-                    VideoDownloadManager.DownloadType.IsDone, VideoDownloadManager.DownloadType.IsFailed, VideoDownloadManager.DownloadType.IsStopped -> {
-                        isDone = true
-                    }
-
-                    else -> Unit
-                }
-            }
-        }
-        downloadStatusEvent += listener
-        while (!isDone) {
-            println("AWAITING $id")
-            delay(1000)
-        }
-        downloadStatusEvent -= listener
-    }
-
-    private fun handleNotification(id: Int, notification: Notification) {
-        main {
-            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/Event.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/Event.kt
index a0dfe734e54..f66da4e5ff3 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/Event.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/Event.kt
@@ -24,3 +24,28 @@ class Event<T> {
         }
     }
 }
+
+class EmptyEvent {
+    private val observers = mutableSetOf<Runnable>()
+
+    val size: Int get() = observers.size
+
+    operator fun plusAssign(observer: Runnable) {
+        synchronized(observers) {
+            observers.add(observer)
+        }
+    }
+
+    operator fun minusAssign(observer: Runnable) {
+        synchronized(observers) {
+            observers.remove(observer)
+        }
+    }
+
+    operator fun invoke() {
+        synchronized(observers) {
+            for (observer in observers)
+                observer.run()
+        }
+    }
+}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/FillerEpisodeCheck.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/FillerEpisodeCheck.kt
index 14d1b055654..8456094d1e9 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/FillerEpisodeCheck.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/FillerEpisodeCheck.kt
@@ -1,112 +1,166 @@
 package com.lagradost.cloudstream3.utils
 
-import com.lagradost.cloudstream3.app
+import androidx.annotation.WorkerThread
+import com.fasterxml.jackson.annotation.JsonProperty
+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.getKitsuId
+import com.lagradost.cloudstream3.LoadResponse.Companion.getMalId
+import com.lagradost.cloudstream3.LoadResponse.Companion.getTMDbId
+import com.lagradost.cloudstream3.TvType
+import com.lagradost.cloudstream3.ui.result.getId
 import com.lagradost.cloudstream3.utils.Coroutines.main
-import org.jsoup.Jsoup
 import java.lang.Thread.sleep
 import java.util.*
 import kotlin.concurrent.thread
+import com.lagradost.cloudstream3.utils.AppUtils.parseJson
+import java.io.InputStream
+import kotlin.let
 
 object FillerEpisodeCheck {
-    private const val MAIN_URL = "https://www.animefillerlist.com"
+    fun String?.toClassDir(): String {
+        val q = this ?: "null"
+        val z = (6..10).random().calc()
+        return q + "cache" + z
+    }
 
-    var list: HashMap<String, String>? = null
-    var cache: HashMap<String, HashMap<Int, Boolean>> = hashMapOf()
+    data class Show(
+        @JsonProperty("slug")
+        val slug: String,
+        @JsonProperty("title")
+        val title: String,
+        @JsonProperty("filler")
+        val filler: ArrayList<Int>,
+        @JsonProperty("mixedCanon")
+        val mixedCanon: ArrayList<Int>,
+        @JsonProperty("mangaCanon")
+        val mangaCanon: ArrayList<Int>,
+        @JsonProperty("animeCanon")
+        val animeCanon: ArrayList<Int>,
+    )
 
-    private fun fixName(name: String): String {
-        return name.lowercase(Locale.ROOT)/*.replace(" ", "")*/.replace("-", " ")
-            .replace("[^a-zA-Z0-9 ]".toRegex(), "")
-    }
+    data class MappingRoot(
+        @JsonProperty("type")
+        val type: String?,
+        @JsonProperty("anidb_id")
+        val anidbId: Long?,
+        @JsonProperty("anilist_id")
+        val anilistId: Long?,
+        @JsonProperty("animecountdown_id")
+        val animecountdownId: Long?,
+        @JsonProperty("animenewsnetwork_id")
+        val animenewsnetworkId: Long?,
+        @JsonProperty("anime-planet_id")
+        val animePlanetId: String?,
+        @JsonProperty("anisearch_id")
+        val anisearchId: Long?,
+        @JsonProperty("imdb_id")
+        val imdbId: String?,
+        @JsonProperty("kitsu_id")
+        val kitsuId: Long?,
+        @JsonProperty("livechart_id")
+        val livechartId: Long?,
+        @JsonProperty("mal_id")
+        val malId: Long?,
+        @JsonProperty("simkl_id")
+        val simklId: Long?,
+        @JsonProperty("themoviedb_id")
+        val themoviedbId: Long?,
+        @JsonProperty("tvdb_id")
+        val tvdbId: Long?,
+        @JsonProperty("season")
+        val season: Season?,
+    )
 
-    private suspend fun getFillerList(): Boolean {
-        if (list != null) return true
-        try {
-            val result = app.get("$MAIN_URL/shows").text
-            val documented = Jsoup.parse(result)
-            val localHTMLList = documented.select("div#ShowList > div.Group > ul > li > a")
-            val localList = HashMap<String, String>()
-            for (i in localHTMLList) {
-                val name = i.text()
-
-                if (name.lowercase(Locale.ROOT).contains("manga only")) continue
-
-                val href = i.attr("href")
-                if (name.isNullOrEmpty() || href.isNullOrEmpty()) {
-                    continue
-                }
+    data class Season(
+        @JsonProperty("tvdb")
+        val tvdb: Long?,
+        @JsonProperty("tmdb")
+        val tmdb: Long?,
+    )
 
-                val values = "(.*) \\((.*)\\)".toRegex().matchEntire(name)?.groups
-                if (values != null) {
-                    for (index in 1 until values.size) {
-                        val localName = values[index]?.value ?: continue
-                        localList[fixName(localName)] = href
-                    }
-                } else {
-                    localList[fixName(name)] = href
-                }
-            }
-            if (localList.size > 0) {
-                list = localList
-                return true
-            }
-        } catch (e: Exception) {
-            e.printStackTrace()
+    data class CombinedMedia(
+        @JsonProperty("mapping")
+        val mapping: MappingRoot?,
+        @JsonProperty("show")
+        val show: Show
+    )
+
+    data class Database(
+        val mal: HashMap<Long, CombinedMedia> = hashMapOf(),
+        val anilist: HashMap<Long, CombinedMedia> = hashMapOf(),
+        val kitsu: HashMap<Long, CombinedMedia> = hashMapOf(),
+        val tmdb: HashMap<Long, CombinedMedia> = hashMapOf(),
+        val imdb: HashMap<String, CombinedMedia> = hashMapOf(),
+        val name: HashMap<String, CombinedMedia> = hashMapOf(),
+    )
+
+    private var database: Database? = null
+
+    private val strip = Regex("[ :\\-.!]")
+
+    /** Makes names more uniform to make partial matches more still give a result */
+    fun stripName(name: String): String =
+        name.replace(strip, "").lowercase()
+
+
+    @Synchronized
+    @Throws
+    @WorkerThread
+    fun loadJson(): Database {
+        database?.let {
+            return it
         }
-        return false
-    }
+        
+        /** The entire "database" is stored as a json file we can parse */
+        val stream: InputStream = com.lagradost.AnimeDB.getDatabaseStream()!!
+        val text = stream.reader().readText()
 
-    fun String?.toClassDir(): String {
-        val q = this ?: "null"
-        val z = (6..10).random().calc()
-        return q + "cache" + z
+        val allMedia = parseJson<Array<CombinedMedia>>(text)
+        val pending = Database()
+        for (media in allMedia) {
+            val lowercase = stripName(media.show.title)
+            pending.name[lowercase] = media
+            val map = media.mapping ?: continue
+
+            map.imdbId?.let { id -> pending.imdb[id] = media }
+            map.malId?.let { id -> pending.mal[id] = media }
+            map.anilistId?.let { id -> pending.anilist[id] = media }
+            map.kitsuId?.let { id -> pending.kitsu[id] = media }
+            map.season?.tmdb?.let { id -> pending.tmdb[id] = media }
+        }
+        database = pending
+        return pending
     }
 
-    suspend fun getFillerEpisodes(query: String): HashMap<Int, Boolean>? {
-        try {
-            cache[query]?.let {
-                return it
-            }
-            if (!getFillerList()) return null
-            val localList = list ?: return null
-
-            // Strips these from the name
-            val blackList = listOf(
-                "TV Dubbed",
-                "(Dub)",
-                "Subbed",
-                "(TV)",
-                "(Uncensored)",
-                "(Censored)",
-                "(\\d+)" // year
-            )
-            val blackListRegex =
-                Regex(
-                    """ (${
-                        blackList.joinToString(separator = "|").replace("(", "\\(")
-                            .replace(")", "\\)")
-                    })"""
-                )
-
-            val realQuery =
-                fixName(query.replace(blackListRegex, "")).replace("shippuuden", "shippuden")
-            if (!localList.containsKey(realQuery)) return null
-            val href = localList[realQuery]?.replace(MAIN_URL, "") ?: return null // JUST IN CASE
-            val result = app.get("$MAIN_URL$href").text
-            val documented = Jsoup.parse(result) ?: return null
-            val hashMap = HashMap<Int, Boolean>()
-            documented.select("table.EpisodeList > tbody > tr").forEach {
-                val type = it.selectFirst("td.Type > span")?.text() == "Filler"
-                val episodeNumber = it.selectFirst("td.Number")?.text()?.toIntOrNull()
-                if (episodeNumber != null) {
-                    hashMap[episodeNumber] = type
-                }
-            }
-            cache[query] = hashMap
-            return hashMap
-        } catch (e: Exception) {
-            e.printStackTrace()
+    val loadCache: HashMap<Int, HashSet<Int>?> = hashMapOf()
+
+    @Synchronized
+    @Throws
+    @WorkerThread
+    fun getFillerEpisodes(data: LoadResponse): HashSet<Int>? {
+        /** Only for anime */
+        if (data.type != TvType.Anime) {
             return null
         }
+        /** Try to hit the cache for this entry, to avoid recreating the hashset */
+        loadCache[data.getId()]?.let { cachedResponse ->
+            return cachedResponse
+        }
+        val db = loadJson()
+
+        val media =
+            db.mal[data.getMalId()?.toLongOrNull()]
+                ?: db.anilist[data.getAniListId()?.toLongOrNull()]
+                ?: db.kitsu[data.getKitsuId()?.toLongOrNull()]
+                ?: db.imdb[data.getImdbId()]
+                ?: db.tmdb[data.getTMDbId()?.toLongOrNull()]
+                ?: db.name[stripName(data.name)]
+
+        return media?.show?.filler?.toHashSet().also { response ->
+            loadCache[data.getId()] = response
+        }
     }
 
     private fun Int.calc(): Int {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/GitInfo.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/GitInfo.kt
new file mode 100644
index 00000000000..58ff44bb257
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/GitInfo.kt
@@ -0,0 +1,20 @@
+package com.lagradost.cloudstream3.utils
+
+import android.content.Context
+
+/**
+ * Simple helper to get the short commit hash from assets.
+ * The hash is generated at build and stored as an asset
+ * that can be accessed at runtime for Gradle
+ * configuration cache support.
+ */
+object GitInfo {
+    fun Context.currentCommitHash(): String = try {
+        assets.open("git-hash.txt")
+            .bufferedReader()
+            .readText()
+            .trim()
+    } catch (_: Exception) {
+        ""
+    }
+}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/ImageModuleCoil.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/ImageModuleCoil.kt
index a75d1b43748..9d5c75289c8 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/ImageModuleCoil.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/ImageModuleCoil.kt
@@ -12,6 +12,7 @@ import coil3.ImageLoader
 import coil3.PlatformContext
 import coil3.SingletonImageLoader
 import coil3.disk.DiskCache
+import coil3.dispose
 import coil3.load
 import coil3.memory.MemoryCache
 import coil3.network.NetworkHeaders
@@ -85,10 +86,16 @@ object ImageLoader {
         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)
+        this.dispose()
 
         if(imageData == null) return // Just in case
 
+        // setImageResource is better than coil3 on resources due to attr
+        if(imageData is Int) {
+            this.setImageResource(imageData)
+            return
+        }
+
         // Use Coil's built-in load method but with our custom module & a decent USER-AGENT always
         // which can be overridden by extensions.
         this.load(imageData, SingletonImageLoader.get(context)) {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/ImageUtil.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/ImageUtil.kt
index 1f90b920d0c..6ed4d4afaff 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/ImageUtil.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/ImageUtil.kt
@@ -7,9 +7,9 @@ import android.graphics.drawable.BitmapDrawable
 import android.graphics.drawable.Drawable
 import androidx.annotation.DrawableRes
 import androidx.core.content.ContextCompat
+import androidx.core.graphics.createBitmap
 import coil3.Image
 import coil3.asImage
-import coil3.request.ImageRequest
 
 /// Type safe any image, because THIS IS NOT PYTHON
 sealed class UiImage {
@@ -30,11 +30,7 @@ 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 bitmap = createBitmap(drawable.intrinsicWidth, drawable.intrinsicHeight)
             val canvas = Canvas(bitmap)
             drawable.setBounds(0, 0, canvas.width, canvas.height)
             drawable.draw(canvas)
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 8bce8f63964..8bcd1b88e70 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/InAppUpdater.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/InAppUpdater.kt
@@ -3,392 +3,365 @@ package com.lagradost.cloudstream3.utils
 import android.app.Activity
 import android.content.Context
 import android.content.Intent
+import android.content.pm.PackageManager.NameNotFoundException
 import android.net.Uri
 import android.util.Log
 import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat
 import androidx.core.content.FileProvider
+import androidx.core.content.edit
 import androidx.preference.PreferenceManager
 import com.fasterxml.jackson.annotation.JsonProperty
-import com.lagradost.cloudstream3.*
+import com.lagradost.cloudstream3.BuildConfig
 import com.lagradost.cloudstream3.CommonActivity.showToast
+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.mvvm.safe
+import com.lagradost.cloudstream3.services.PackageInstallerService
+import com.lagradost.cloudstream3.utils.AppContextUtils.setDefaultFocus
 import com.lagradost.cloudstream3.utils.AppUtils.parseJson
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
+import com.lagradost.cloudstream3.utils.GitInfo.currentCommitHash
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import okio.BufferedSink
 import okio.buffer
 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.File
 import java.io.IOException
 import java.io.InputStreamReader
 
+object InAppUpdater {
+    private const val GITHUB_USER_NAME = "recloudstream"
+    private const val GITHUB_REPO = "cloudstream"
+
+    private const val PRERELEASE_PACKAGE_NAME = "com.lagradost.cloudstream3.prerelease"
+    private const val LOG_TAG = "InAppUpdater"
+
+    private data class GithubAsset(
+        @JsonProperty("name") val name: String,
+        @JsonProperty("size") val size: Int, // Size in bytes
+        @JsonProperty("browser_download_url") val browserDownloadUrl: String,
+        @JsonProperty("content_type") val contentType: String, // application/vnd.android.package-archive
+    )
+
+    private data class GithubRelease(
+        @JsonProperty("tag_name") val tagName: String, // Version code
+        @JsonProperty("body") val body: String, // Description
+        @JsonProperty("assets") val assets: List<GithubAsset>,
+        @JsonProperty("target_commitish") val targetCommitish: String, // Branch
+        @JsonProperty("prerelease") val prerelease: Boolean,
+        @JsonProperty("node_id") val nodeId: String,
+    )
+
+    private data class GithubObject(
+        @JsonProperty("sha") val sha: String, // SHA-256 hash
+        @JsonProperty("type") val type: String,
+        @JsonProperty("url") val url: String,
+    )
+
+    private data class GithubTag(
+        @JsonProperty("object") val githubObject: GithubObject,
+    )
+
+    private data class Update(
+        @JsonProperty("shouldUpdate") val shouldUpdate: Boolean,
+        @JsonProperty("updateURL") val updateURL: String?,
+        @JsonProperty("updateVersion") val updateVersion: String?,
+        @JsonProperty("changelog") val changelog: String?,
+        @JsonProperty("updateNodeId") val updateNodeId: String?,
+    )
+
+    private suspend fun Activity.getAppUpdate(installPrerelease: Boolean): Update {
+        return try {
+            when {
+                // No updates on debug version
+                BuildConfig.DEBUG -> Update(false, null, null, null, null)
+                BuildConfig.FLAVOR == "prerelease" || installPrerelease -> getPreReleaseUpdate()
+                else -> getReleaseUpdate()
+            }
+        } catch (e: Exception) {
+            Log.e(LOG_TAG, Log.getStackTraceString(e))
+            Update(false, null, null, null, null)
+        }
+    }
+
+    private suspend fun Activity.getReleaseUpdate(): Update {
+        val url = "https://api.github.com/repos/$GITHUB_USER_NAME/$GITHUB_REPO/releases"
+        val headers = mapOf("Accept" to "application/vnd.github.v3+json")
+        val response = parseJson<List<GithubRelease>>(
+            app.get(url, headers = headers).text
+        )
 
-class InAppUpdater {
-    companion object {
-        private const val GITHUB_USER_NAME = "recloudstream"
-        private const val GITHUB_REPO = "cloudstream"
+        val versionRegex = Regex("""(.*?((\d+)\.(\d+)\.(\d+))\.apk)""")
+        val versionRegexLocal = Regex("""(.*?((\d+)\.(\d+)\.(\d+)).*)""")
+        val foundList = response.filter { rel ->
+            !rel.prerelease
+        }.sortedWith(compareBy { release ->
+            release.assets.firstOrNull { it.contentType == "application/vnd.android.package-archive" }?.name?.let { it1 ->
+                versionRegex.find(
+                    it1
+                )?.groupValues?.let {
+                    it[3].toInt() * 100_000_000 + it[4].toInt() * 10_000 + it[5].toInt()
+                }
+            }
+        }).toList()
 
-        private const val LOG_TAG = "InAppUpdater"
+        val found = foundList.lastOrNull()
+        val foundAsset = found?.assets?.getOrNull(0)
+        val foundVersion = foundAsset?.name?.let { versionRegex.find(it) }
 
-        // === IN APP UPDATER ===
-        data class GithubAsset(
-            @JsonProperty("name") val name: String,
-            @JsonProperty("size") val size: Int, // Size bytes
-            @JsonProperty("browser_download_url") val browserDownloadUrl: String, // download link
-            @JsonProperty("content_type") val contentType: String, // application/vnd.android.package-archive
-        )
+        if (foundVersion == null) {
+            return Update(false, null, null, null, null)
+        }
 
-        data class GithubRelease(
-            @JsonProperty("tag_name") val tagName: String, // Version code
-            @JsonProperty("body") val body: String, // Desc
-            @JsonProperty("assets") val assets: List<GithubAsset>,
-            @JsonProperty("target_commitish") val targetCommitish: String, // branch
-            @JsonProperty("prerelease") val prerelease: Boolean,
-            @JsonProperty("node_id") val nodeId: String //Node Id
-        )
+        val currentVersion = packageName?.let {
+            packageManager.getPackageInfo(it, 0)
+        }
 
-        data class GithubObject(
-            @JsonProperty("sha") val sha: String, // sha 256 hash
-            @JsonProperty("type") val type: String, // object type
-            @JsonProperty("url") val url: String,
-        )
+        val shouldUpdate = if (foundAsset.browserDownloadUrl.isBlank()) {
+            false
+        } else {
+            currentVersion?.versionName?.let { versionName ->
+                versionRegexLocal.find(versionName)?.groupValues?.let {
+                    it[3].toInt() * 100_000_000 + it[4].toInt() * 10_000 + it[5].toInt()
+                }
+            }?.compareTo(
+                foundVersion.groupValues.let {
+                    it[3].toInt() * 100_000_000 + it[4].toInt() * 10_000 + it[5].toInt()
+                })!! < 0
+        }
 
-        data class GithubTag(
-            @JsonProperty("object") val githubObject: GithubObject,
+        return Update(
+            shouldUpdate,
+            foundAsset.browserDownloadUrl,
+            foundVersion.groupValues[2],
+            found.body,
+            found.nodeId
         )
+    }
 
-        data class Update(
-            @JsonProperty("shouldUpdate") val shouldUpdate: Boolean,
-            @JsonProperty("updateURL") val updateURL: String?,
-            @JsonProperty("updateVersion") val updateVersion: String?,
-            @JsonProperty("changelog") val changelog: String?,
-            @JsonProperty("updateNodeId") val updateNodeId: String?
+    private suspend fun Activity.getPreReleaseUpdate(): Update {
+        val tagUrl =
+            "https://api.github.com/repos/$GITHUB_USER_NAME/$GITHUB_REPO/git/ref/tags/pre-release"
+        val releaseUrl = "https://api.github.com/repos/$GITHUB_USER_NAME/$GITHUB_REPO/releases"
+        val headers = mapOf("Accept" to "application/vnd.github.v3+json")
+        val response = parseJson<List<GithubRelease>>(
+            app.get(releaseUrl, headers = headers).text
         )
 
-        private suspend fun Activity.getAppUpdate(): Update {
-            return try {
-                val settingsManager = PreferenceManager.getDefaultSharedPreferences(this)
-                if (settingsManager.getBoolean(
-                        getString(R.string.prerelease_update_key),
-                        resources.getBoolean(R.bool.is_prerelease)
-                    )
-                ) {
-                    getPreReleaseUpdate()
-                } else {
-                    getReleaseUpdate()
-                }
-            } catch (e: Exception) {
-                Log.e(LOG_TAG, Log.getStackTraceString(e))
-                Update(false, null, null, null, null)
-            }
+        val found = response.lastOrNull { rel ->
+            rel.prerelease || rel.tagName == "pre-release"
         }
 
-        private suspend fun Activity.getReleaseUpdate(): Update {
-            val url = "https://api.github.com/repos/$GITHUB_USER_NAME/$GITHUB_REPO/releases"
-            val headers = mapOf("Accept" to "application/vnd.github.v3+json")
-            val response =
-                parseJson<List<GithubRelease>>(
-                    app.get(
-                        url,
-                        headers = headers
-                    ).text
-                )
-
-            val versionRegex = Regex("""(.*?((\d+)\.(\d+)\.(\d+))\.apk)""")
-            val versionRegexLocal = Regex("""(.*?((\d+)\.(\d+)\.(\d+)).*)""")
-            /*
-            val releases = response.map { it.assets }.flatten()
-                .filter { it.content_type == "application/vnd.android.package-archive" }
-            val found =
-                releases.sortedWith(compareBy {
-                    versionRegex.find(it.name)?.groupValues?.get(2)
-                }).toList().lastOrNull()*/
-            val foundList =
-                response.filter { rel ->
-                    !rel.prerelease
-                }.sortedWith(compareBy { release ->
-                    release.assets.firstOrNull { it.contentType == "application/vnd.android.package-archive" }?.name?.let { it1 ->
-                            versionRegex.find(
-                                it1
-                            )?.groupValues?.let {
-                                it[3].toInt() * 100_000_000 + it[4].toInt() * 10_000 + it[5].toInt()
-                            }
-                        }
-                }).toList()
-            val found = foundList.lastOrNull()
-            val foundAsset = found?.assets?.getOrNull(0)
-            val currentVersion = packageName?.let {
-                packageManager.getPackageInfo(
-                    it,
-                    0
-                )
-            }
+        val foundAsset = found?.assets?.filter { it ->
+            it.contentType == "application/vnd.android.package-archive"
+        }?.getOrNull(0)
 
-            foundAsset?.name?.let { assetName ->
-                val foundVersion = versionRegex.find(assetName)
-                val shouldUpdate =
-                    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()
-                        }
-                    }?.compareTo(
-                        foundVersion.groupValues.let {
-                            it[3].toInt() * 100_000_000 + it[4].toInt() * 10_000 + it[5].toInt()
-                        }
-                    )!! < 0 else false
-                return if (foundVersion != null) {
-                    Update(
-                        shouldUpdate,
-                        foundAsset.browserDownloadUrl,
-                        foundVersion.groupValues[2],
-                        found.body,
-                        found.nodeId
-                    )
-                } else {
-                    Update(false, null, null, null, null)
-                }
-            }
+        if (foundAsset == null) {
             return Update(false, null, null, null, null)
         }
 
-        private suspend fun Activity.getPreReleaseUpdate(): Update {
-            val tagUrl =
-                "https://api.github.com/repos/$GITHUB_USER_NAME/$GITHUB_REPO/git/ref/tags/pre-release"
-            val releaseUrl = "https://api.github.com/repos/$GITHUB_USER_NAME/$GITHUB_REPO/releases"
-            val headers = mapOf("Accept" to "application/vnd.github.v3+json")
-            val response =
-                parseJson<List<GithubRelease>>(app.get(releaseUrl, headers = headers).text)
-
-            val found =
-                response.lastOrNull { rel ->
-                    rel.prerelease || rel.tagName == "pre-release"
-                }
-            val foundAsset = found?.assets?.filter { it ->
-                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.githubObject.sha.take(7)}")
-
-            val shouldUpdate =
-                (getString(R.string.commit_hash)
-                    .trim { c -> c.isWhitespace() }
-                    .take(7)
-                        !=
-                        tagResponse.githubObject.sha
-                            .trim { c -> c.isWhitespace() }
-                            .take(7))
-
-            return if (foundAsset != null) {
-                Update(
-                    shouldUpdate,
-                    foundAsset.browserDownloadUrl,
-                    tagResponse.githubObject.sha.take(10),
-                    found.body,
-                    found.nodeId
-                )
-            } else {
-                Update(false, null, null, null, null)
+        val tagResponse = parseJson<GithubTag>(app.get(tagUrl, headers = headers).text)
+        val updateCommitHash = tagResponse.githubObject.sha.trim().take(7)
+        Log.d(LOG_TAG, "Fetched GitHub tag: $updateCommitHash")
+
+        return Update(
+            currentCommitHash() != updateCommitHash,
+            foundAsset.browserDownloadUrl,
+            updateCommitHash,
+            found.body,
+            found.nodeId
+        )
+    }
+
+    private val updateLock = Mutex()
+
+    private suspend fun Activity.downloadUpdate(url: String): Boolean {
+        try {
+            Log.d(LOG_TAG, "Downloading update: $url")
+            val appUpdateName = "CloudStream"
+            val appUpdateSuffix = "apk"
+
+            // Delete all old updates
+            this.cacheDir.listFiles()?.filter {
+                it.name.startsWith(appUpdateName) && it.extension == appUpdateSuffix
+            }?.forEach { deleteFileOnExit(it) }
+
+            val downloadedFile = File.createTempFile(appUpdateName, ".$appUpdateSuffix")
+            val sink: BufferedSink = downloadedFile.sink().buffer()
+
+            updateLock.withLock {
+                sink.writeAll(app.get(url).body.source())
+                sink.close()
+                openApk(this, Uri.fromFile(downloadedFile))
             }
+
+            return true
+        } catch (e: Exception) {
+            logError(e)
+            return false
         }
+    }
 
+    private fun openApk(context: Context, uri: Uri) = safe {
+        val path = uri.path ?: return@safe
+        val contentUri = FileProvider.getUriForFile(
+            context, BuildConfig.APPLICATION_ID + ".provider", File(path)
+        )
+        val installIntent = Intent(Intent.ACTION_VIEW).apply {
+            addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+            addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
+            putExtra(Intent.EXTRA_NOT_UNKNOWN_SOURCE, true)
+            data = contentUri
+        }
+        context.startActivity(installIntent)
+    }
 
-        private val updateLock = Mutex()
+    fun Activity.installPreReleaseIfNeeded() = ioSafe {
+        val isInstalled = try {
+            packageManager.getPackageInfo(PRERELEASE_PACKAGE_NAME, 0)
+            true
+        } catch (_: NameNotFoundException) {
+            false
+        }
 
-        private suspend fun Activity.downloadUpdate(url: String): Boolean {
-            try {
-                Log.d(LOG_TAG, "Downloading update: $url")
-                val appUpdateName = "CloudStream"
-                val appUpdateSuffix = "apk"
+        if (isInstalled) {
+            showToast(R.string.prerelease_already_installed)
+        } else if (!runAutoUpdate(checkAutoUpdate = false, installPrerelease = true)) {
+            showToast(R.string.prerelease_install_failed)
+        }
+    }
 
-                // Delete all old updates
-                this.cacheDir.listFiles()?.filter {
-                    it.name.startsWith(appUpdateName) && it.extension == appUpdateSuffix
-                }?.forEach {
-                    deleteFileOnExit(it)
-                }
 
-                val downloadedFile = File.createTempFile(appUpdateName, ".$appUpdateSuffix")
-                val sink: BufferedSink = downloadedFile.sink().buffer()
+    /**
+     * @param checkAutoUpdate if the update check was launched automatically
+     * @param installPrerelease if we want to install the pre-release version
+     */
+    suspend fun Activity.runAutoUpdate(
+        checkAutoUpdate: Boolean = true, installPrerelease: Boolean = false
+    ): Boolean {
+        val settingsManager = PreferenceManager.getDefaultSharedPreferences(this)
+        val autoUpdateEnabled =
+            settingsManager.getBoolean(getString(R.string.auto_update_key), true)
+        if (checkAutoUpdate && !autoUpdateEnabled) {
+            return false
+        }
 
-                updateLock.withLock {
-                    sink.writeAll(app.get(url).body.source())
-                    sink.close()
-                    openApk(this, Uri.fromFile(downloadedFile))
-                }
-                return true
-            } catch (e: Exception) {
-                return false
-            }
+        val update = getAppUpdate(installPrerelease)
+        if (!update.shouldUpdate || update.updateURL == null) {
+            return false
         }
 
-        private fun openApk(context: Context, uri: Uri) {
-            try {
-                uri.path?.let {
-                    val contentUri = FileProvider.getUriForFile(
-                        context,
-                        BuildConfig.APPLICATION_ID + ".provider",
-                        File(it)
-                    )
-                    val installIntent = Intent(Intent.ACTION_VIEW).apply {
-                        addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
-                        addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
-                        putExtra(Intent.EXTRA_NOT_UNKNOWN_SOURCE, true)
-                        data = contentUri
-                    }
-                    context.startActivity(installIntent)
-                }
-            } catch (e: Exception) {
-                logError(e)
-            }
+        // Check if update should be skipped
+        val updateNodeId = settingsManager.getString(
+            getString(R.string.skip_update_key), ""
+        )
+
+        // Skips the update if its an automatic update and the update is skipped
+        // This allows updating manually
+        if (update.updateNodeId.equals(updateNodeId) && checkAutoUpdate) {
+            return false
         }
 
-        /**
-         * @param checkAutoUpdate if the update check was launched automatically
-         **/
-        suspend fun Activity.runAutoUpdate(checkAutoUpdate: Boolean = true): Boolean {
-            val settingsManager = PreferenceManager.getDefaultSharedPreferences(this)
+        runOnUiThread {
+            safe {
+                val currentVersion = packageName?.let {
+                    packageManager.getPackageInfo(it, 0)
+                }
 
-            if (!checkAutoUpdate || settingsManager.getBoolean(
-                    getString(R.string.auto_update_key),
-                    true
+                val builder = AlertDialog.Builder(this, R.style.AlertDialogCustom)
+                builder.setTitle(
+                    getString(R.string.new_update_format).format(
+                        currentVersion?.versionName, update.updateVersion
+                    )
                 )
-            ) {
-                val update = getAppUpdate()
-                if (
-                    update.shouldUpdate &&
-                        update.updateURL != null) {
-
-                    // Check if update should be skipped
-                    val updateNodeId =
-                        settingsManager.getString(getString(R.string.skip_update_key), "")
-
-                    // Skips the update if its an automatic update and the update is skipped
-                    // This allows updating manually
-                    if (update.updateNodeId.equals(updateNodeId) && checkAutoUpdate) {
-                        return false
-                    }
 
-                    runOnUiThread {
-                        try {
-                            val currentVersion = packageName?.let {
-                                packageManager.getPackageInfo(
-                                    it,
-                                    0
-                                )
+                val logRegex = Regex("\\[(.*?)]\\((.*?)\\)")
+                val sanitizedChangelog = update.changelog?.replace(logRegex) { matchResult ->
+                    matchResult.groupValues[1]
+                } // Sanitized because it looks cluttered
+
+                builder.setMessage(sanitizedChangelog)
+                builder.apply {
+                    setPositiveButton(R.string.update) { _, _ ->
+                        // Forcefully start any delayed installations
+                        if (ApkInstaller.delayedInstaller?.startInstallation() == true) return@setPositiveButton
+
+                        showToast(R.string.download_started, Toast.LENGTH_LONG)
+
+                        // Check if the setting hasn't been changed
+                        if (settingsManager.getInt(
+                                getString(R.string.apk_installer_key), -1
+                            ) == -1
+                        ) {
+                            // Set to legacy installer if using MIUI
+                            if (isMiUi()) {
+                                settingsManager.edit {
+                                    putInt(getString(R.string.apk_installer_key), 1)
+                                }
                             }
+                        }
 
-                            val builder: AlertDialog.Builder = AlertDialog.Builder(this)
-                            builder.setTitle(
-                                getString(R.string.new_update_format).format(
-                                    currentVersion?.versionName,
-                                    update.updateVersion
-                                )
-                            )
-
-                            val logRegex = Regex("\\[(.*?)\\]\\((.*?)\\)")
-                            val sanitizedChangelog = update.changelog?.replace(logRegex) { matchResult ->
-                                matchResult.groupValues[1]
-                            } // Sanitized because it looks cluttered
-
-                            builder.setMessage(sanitizedChangelog)
-
-                            val context = this
-                            builder.apply {
-                                setPositiveButton(R.string.update) { _, _ ->
-                                    // Forcefully start any delayed installations
-                                    if (ApkInstaller.delayedInstaller?.startInstallation() == true) return@setPositiveButton
-
-                                    showToast(R.string.download_started, Toast.LENGTH_LONG)
-
-                                    // Check if the setting hasn't been changed
-                                    if (settingsManager.getInt(
-                                            getString(R.string.apk_installer_key),
-                                            -1
-                                        ) == -1
-                                    ) {
-                                        if (isMiUi()) // Set to legacy if using miui
-                                            settingsManager.edit()
-                                                .putInt(getString(R.string.apk_installer_key), 1)
-                                                .apply()
-                                    }
+                        val currentInstaller = settingsManager.getInt(
+                            getString(R.string.apk_installer_key), 1
+                        )
 
-                                    val currentInstaller =
-                                        settingsManager.getInt(
-                                            getString(R.string.apk_installer_key),
-                                            0
-                                        )
-
-                                    when (currentInstaller) {
-                                        // New method
-                                        0 -> {
-                                            val intent = PackageInstallerService.Companion.getIntent(
-                                                context,
-                                                update.updateURL
+                        when (currentInstaller) {
+                            // New method
+                            0 -> {
+                                val intent = PackageInstallerService.Companion.getIntent(
+                                    this@runAutoUpdate, update.updateURL
+                                )
+                                ContextCompat.startForegroundService(
+                                    this@runAutoUpdate, intent
+                                )
+                            }
+                            // Legacy
+                            1 -> {
+                                ioSafe {
+                                    if (!downloadUpdate(update.updateURL)) {
+                                        runOnUiThread {
+                                            showToast(
+                                                R.string.download_failed, Toast.LENGTH_LONG
                                             )
-                                            ContextCompat.startForegroundService(context, intent)
-                                        }
-                                        // Legacy
-                                        1 -> {
-                                            ioSafe {
-                                                if (!downloadUpdate(update.updateURL))
-                                                    runOnUiThread {
-                                                        showToast(
-                                                            R.string.download_failed,
-                                                            Toast.LENGTH_LONG
-                                                        )
-                                                    }
-                                            }
                                         }
                                     }
                                 }
+                            }
+                        }
+                    }
 
-                                setNegativeButton(R.string.cancel) { _, _ -> }
+                    setNegativeButton(R.string.cancel) { _, _ -> }
 
-                                if (checkAutoUpdate) {
-                                    setNeutralButton(R.string.skip_update) { _, _ ->
-                                        settingsManager.edit().putString(
-                                            getString(R.string.skip_update_key),
-                                            update.updateNodeId ?: ""
-                                        ).apply()
-                                    }
-                                }
+                    if (checkAutoUpdate) {
+                        setNeutralButton(R.string.skip_update) { _, _ ->
+                            settingsManager.edit {
+                                putString(
+                                    getString(R.string.skip_update_key), update.updateNodeId ?: ""
+                                )
                             }
-                            builder.show().setDefaultFocus()
-                        } catch (e: Exception) {
-                            logError(e)
                         }
                     }
-                    return true
                 }
-                return false
+                builder.show().setDefaultFocus()
             }
-            return false
         }
+        return true
+    }
 
-        private fun isMiUi(): Boolean {
-            return !TextUtils.isEmpty(getSystemProperty("ro.miui.ui.version.name"))
-        }
+    private fun isMiUi(): Boolean = !getSystemProperty("ro.miui.ui.version.name").isNullOrEmpty()
 
-        private fun getSystemProperty(propName: String): String? {
-            return try {
-                val p = Runtime.getRuntime().exec("getprop $propName")
-                BufferedReader(InputStreamReader(p.inputStream), 1024).use {
-                    it.readLine()
-                }
-            } catch (ex: IOException) {
-                null
-            }
+    private fun getSystemProperty(propName: String): String? = try {
+        val p = Runtime.getRuntime().exec("getprop $propName")
+        BufferedReader(InputStreamReader(p.inputStream), 1024).use {
+            it.readLine()
         }
+    } catch (_: IOException) {
+        null
     }
 }
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 4be0dd56c30..67851f629cc 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/PackageInstaller.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/PackageInstaller.kt
@@ -11,7 +11,7 @@ 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.CloudStreamApp.Companion.context
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.services.PackageInstallerService
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/PercentageCropImageView.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/PercentageCropImageView.kt
index 1e572fb7c3e..6580182bba8 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/PercentageCropImageView.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/PercentageCropImageView.kt
@@ -4,16 +4,67 @@ import android.content.Context
 import android.graphics.Matrix
 import android.graphics.drawable.Drawable
 import android.util.AttributeSet
+import androidx.core.content.withStyledAttributes
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.mvvm.logError
 
+/**
+ * A custom [AppCompatImageView] that allows precise control over the visible crop area
+ * of an image by adjusting its horizontal and vertical center offset percentages.
+ *
+ * ### Key Features:
+ * - Allows **manual vertical or horizontal cropping** via percentage offsets.
+ * - Works seamlessly with Coil, Glide, or any image loading library.
+ *
+ * ### Usage (XML):
+ * You can set the crop offset directly in XML using custom attributes:
+ * ```xml
+ * <com.lagradost.cloudstream3.utils.PercentageCropImageView
+ *     android:id="@+id/home_scroll_preview"
+ *     android:layout_width="match_parent"
+ *     android:layout_height="match_parent"
+ *     android:scaleType="matrix"
+ *     app:cropYCenterOffsetPct="0.2"
+ *     app:cropXCenterOffsetPct="0.5"
+ *     tools:src="@drawable/example_poster" />
+ * ```
+ * - `app:cropYCenterOffsetPct` → controls how far vertically the image shifts
+ *   `0.0` = top-aligned, `0.5` = centered, `1.0` = bottom-aligned.
+ * - `app:cropXCenterOffsetPct` → controls how far horizontally the image shifts
+ *   `0.0` = left, `0.5` = center, `1.0` = right.
+ *
+ * ### Programmatic Example:
+ * ```kotlin
+ * imageView.cropYCenterOffsetPct = 0.15f   // Show slightly more (15%) of the top area
+ * imageView.cropXCenterOffsetPct = 0.5f    // Keep image centered horizontally
+ * imageView.redraw()    //Only needed if you changed cropYCenterOffsetPct/cropXCenterOffsetPct at runtime
+ * ```
+ *
+ * ### Notes:
+ * - Must use `android:scaleType="matrix"` to enable manual matrix transformations.
+ * - Reference: https://stackoverflow.com/a/29055283
+ *
+ * @property cropYCenterOffsetPct the vertical crop percentage (0.0–1.0)
+ * @property cropXCenterOffsetPct the horizontal crop percentage (0.0–1.0)
+ *
+ * @see ImageView.ScaleType.MATRIX
+ */
 class PercentageCropImageView : androidx.appcompat.widget.AppCompatImageView {
     private var mCropYCenterOffsetPct: Float? = null
     private var mCropXCenterOffsetPct: Float? = null
+
     constructor(context: Context?) : super(context!!)
-    constructor(context: Context?, attrs: AttributeSet?) : super(context!!, attrs)
+
+    constructor(context: Context?, attrs: AttributeSet?) : super(context!!, attrs) {
+        initAttrs(context, attrs)
+    }
+
     constructor(
         context: Context?, attrs: AttributeSet?,
         defStyle: Int
-    ) : super(context!!, attrs, defStyle)
+    ) : super(context!!, attrs, defStyle) {
+        initAttrs(context, attrs)
+    }
 
     var cropYCenterOffsetPct: Float
         get() = mCropYCenterOffsetPct!!
@@ -43,12 +94,12 @@ class PercentageCropImageView : androidx.appcompat.widget.AppCompatImageView {
                 var dy = 0f
                 if (dWidth * vHeight > vWidth * dHeight) {
                     val cropXCenterOffsetPct =
-                        if (mCropXCenterOffsetPct != null) mCropXCenterOffsetPct!!.toFloat() else 0.5f
+                        if (mCropXCenterOffsetPct != null) mCropXCenterOffsetPct!! else 0.5f
                     scale = vHeight.toFloat() / dHeight.toFloat()
                     dx = (vWidth - dWidth * scale) * cropXCenterOffsetPct
                 } else {
                     val cropYCenterOffsetPct =
-                        if (mCropYCenterOffsetPct != null) mCropYCenterOffsetPct!!.toFloat() else 0f
+                        if (mCropYCenterOffsetPct != null) mCropYCenterOffsetPct!! else 0f
                     scale = vWidth.toFloat() / dWidth.toFloat()
                     dy = (vHeight - dHeight * scale) * cropYCenterOffsetPct
                 }
@@ -80,6 +131,7 @@ class PercentageCropImageView : androidx.appcompat.widget.AppCompatImageView {
         super.setImageResource(resId)
         myConfigureBounds()
     }
+
     // In case you can change the ScaleType in code you have to call redraw()
     //fullsizeImageView.setScaleType(ScaleType.FIT_CENTER);
     //fullsizeImageView.redraw();
@@ -91,4 +143,26 @@ class PercentageCropImageView : androidx.appcompat.widget.AppCompatImageView {
             setImageDrawable(d)
         }
     }
+
+    private fun initAttrs(context: Context, attrs: AttributeSet?) {
+        attrs ?: return
+        context.withStyledAttributes(attrs, R.styleable.PercentageCropImageView) {
+            try {
+                if (hasValue(R.styleable.PercentageCropImageView_cropYCenterOffsetPct)) {
+                    mCropYCenterOffsetPct = getFloat(
+                        R.styleable.PercentageCropImageView_cropYCenterOffsetPct,
+                        0.5f
+                    )
+                }
+                if (hasValue(R.styleable.PercentageCropImageView_cropXCenterOffsetPct)) {
+                    mCropXCenterOffsetPct = getFloat(
+                        R.styleable.PercentageCropImageView_cropXCenterOffsetPct,
+                        0.5f
+                    )
+                }
+            } catch (e: Exception) {
+                logError(e)
+            }
+        }
+    }
 }
\ No newline at end of file
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 0d7a8abc4a1..e3c7d68dffd 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/PowerManagerAPI.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/PowerManagerAPI.kt
@@ -3,12 +3,13 @@ package com.lagradost.cloudstream3.utils
 import android.content.ActivityNotFoundException
 import android.content.Context
 import android.content.Intent
-import android.net.Uri
 import android.os.Build.VERSION.SDK_INT
 import android.os.PowerManager
 import android.provider.Settings
 import android.util.Log
 import androidx.appcompat.app.AlertDialog
+import androidx.core.content.edit
+import androidx.core.net.toUri
 import androidx.preference.PreferenceManager
 import com.lagradost.cloudstream3.BuildConfig
 import com.lagradost.cloudstream3.CommonActivity.showToast
@@ -38,7 +39,6 @@ object BatteryOptimizationChecker {
 
     fun Context.showBatteryOptimizationDialog() {
         val settingsManager = PreferenceManager.getDefaultSharedPreferences(this)
-
         try {
             AlertDialog.Builder(this)
                 .setTitle(R.string.battery_dialog_title)
@@ -46,9 +46,9 @@ object BatteryOptimizationChecker {
                 .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()
+                    settingsManager.edit {
+                        putBoolean(getString(R.string.battery_optimisation_key), false)
+                    }
                 }
                 .show()
         } catch (t: Throwable) {
@@ -67,7 +67,7 @@ object BatteryOptimizationChecker {
         try {
             val intent = Intent().apply {
                 action =  Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS
-                data = Uri.parse("package:$PACKAGE_NAME")
+                data = "package:$PACKAGE_NAME".toUri()
             }
             startActivity(intent)
         } catch (t: Throwable) {
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 ea75ff62e4b..26c710103fa 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/SingleSelectionHelper.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/SingleSelectionHelper.kt
@@ -22,6 +22,7 @@ import com.lagradost.cloudstream3.databinding.BottomSelectionDialogBinding
 import com.lagradost.cloudstream3.databinding.BottomTextDialogBinding
 import com.lagradost.cloudstream3.databinding.OptionsPopupTvBinding
 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.utils.ImageLoader.loadImage
@@ -113,8 +114,12 @@ object SingleSelectionHelper {
         val textView = binding.text1
         val applyButton = binding.applyBtt
         val cancelButton = binding.cancelBtt
-        val applyHolder =
-            binding.applyBttHolder
+        val applyHolder = binding.applyBttHolder
+
+        if (isLayout(PHONE or EMULATOR) && dialog is BottomSheetDialog) {
+            binding.dragHandle.isVisible = true
+            listView.isNestedScrollingEnabled = true
+        }
 
         applyHolder.isVisible = realShowApply
         if (!realShowApply) {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/SubtitleUtils.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/SubtitleUtils.kt
index 66a6e156c76..c0068f91a83 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/SubtitleUtils.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/SubtitleUtils.kt
@@ -2,8 +2,8 @@ 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
+import com.lagradost.cloudstream3.utils.downloader.DownloadFileManagement.basePathToFile
+import com.lagradost.cloudstream3.utils.downloader.DownloadObjects
 
 object SubtitleUtils {
 
@@ -13,17 +13,21 @@ object SubtitleUtils {
         ".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()}")
-                }
+    fun deleteMatchingSubtitles(context: Context, info: DownloadObjects.DownloadedFileInfo) {
+        val cleanDisplay = cleanDisplayName(info.displayName)
+
+        val base = basePathToFile(context, info.basePath)
+        val folder =
+            base?.gotoDirectory(info.relativePath, createMissingDirectories = false) ?: return
+        val folderFiles = folder.listFiles() ?: return
+
+        for (file in folderFiles) {
+            val name = file.name() ?: continue
+            if (!isMatchingSubtitle(name, info.displayName, cleanDisplay)) {
+                continue
+            }
+            if (file.delete() != true) {
+                Log.e("SubtitleDeletion", "Failed to delete subtitle file: $name")
             }
         }
     }
@@ -39,7 +43,7 @@ object SubtitleUtils {
         cleanDisplay: String
     ): Boolean {
         // Check if the file has a valid subtitle extension
-        val hasValidExtension = allowedExtensions.any { name.contains(it, ignoreCase = true) }
+        val hasValidExtension = allowedExtensions.any { name.endsWith(it, ignoreCase = true) }
 
         // We can't have the exact same file as a subtitle
         val isNotDisplayName = !name.equals(display, ignoreCase = true)
@@ -53,4 +57,4 @@ object SubtitleUtils {
     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/TestingUtils.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/TestingUtils.kt
index 049f92fb4cc..91c8a2fc1fb 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/TestingUtils.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/TestingUtils.kt
@@ -112,7 +112,7 @@ object TestingUtils {
         val searchResults = testQueries.firstNotNullOfOrNull { query ->
             try {
                 logger.log("Searching for: $query")
-                api.search(query).takeIf { !it.isNullOrEmpty() }
+                api.search(query, 1)?.items?.takeIf { it.isNotEmpty() }
             } catch (e: Throwable) {
                 if (e is NotImplementedError) {
                     Assert.fail("Provider has not implemented search()")
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/TvChannelUtils.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/TvChannelUtils.kt
new file mode 100644
index 00000000000..feecbe312df
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/TvChannelUtils.kt
@@ -0,0 +1,164 @@
+package com.lagradost.cloudstream3.utils
+
+import android.annotation.SuppressLint
+import android.content.ComponentName
+import android.content.ContentUris
+import android.content.Context
+import android.content.Intent
+import android.util.Log
+import androidx.core.net.toUri
+import androidx.tvprovider.media.tv.Channel
+import androidx.tvprovider.media.tv.PreviewProgram
+import androidx.tvprovider.media.tv.TvContractCompat
+import com.lagradost.cloudstream3.MainActivity
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.SearchResponse
+import com.lagradost.cloudstream3.base64Encode
+import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.APP_STRING_SHARE
+import com.lagradost.cloudstream3.utils.DataStore.getKey
+import com.lagradost.cloudstream3.utils.DataStore.setKey
+import java.net.URLEncoder
+
+const val PROGRAM_ID_LIST_KEY = "persistent_program_ids"
+
+object TvChannelUtils {
+    fun Context.saveProgramId(programId: Long) {
+        val existing: List<Long> = getKey(PROGRAM_ID_LIST_KEY) ?: emptyList()
+        val updated = (existing + programId).distinct()
+        setKey(PROGRAM_ID_LIST_KEY, updated)
+    }
+    fun Context.getStoredProgramIds(): List<Long> {
+        return getKey(PROGRAM_ID_LIST_KEY) ?: emptyList()
+    }
+    fun Context.removeProgramId(programId: Long) {
+        val existing: List<Long> = getKey(PROGRAM_ID_LIST_KEY) ?: emptyList()
+        val updated = existing.filter { it != programId }
+        setKey(PROGRAM_ID_LIST_KEY, updated)
+    }
+
+
+    fun getChannelId(context: Context, channelName: String): Long? {
+        return try {
+            context.contentResolver.query(
+                TvContractCompat.Channels.CONTENT_URI,
+                arrayOf(
+                    TvContractCompat.Channels._ID,
+                    TvContractCompat.Channels.COLUMN_DISPLAY_NAME
+                ),
+                null,
+                null,
+                null
+            )?.use { cursor ->
+                while (cursor.moveToNext()) {
+                    val id = cursor.getLong(
+                        cursor.getColumnIndexOrThrow(TvContractCompat.Channels._ID)
+                    )
+                    val name = cursor.getString(
+                        cursor.getColumnIndexOrThrow(TvContractCompat.Channels.COLUMN_DISPLAY_NAME)
+                    )
+                    if (name == channelName) return id
+                }
+                null
+            }
+        } catch (e: Exception) {
+            Log.e("TvChannelUtils", "Query failed: ${e.message}", e)
+            null
+        }
+    }
+
+    /** Insert programs into a channel */
+    @SuppressLint("RestrictedApi")
+    fun addPrograms(context: Context, channelId: Long, items: List<SearchResponse>) {
+        for (item in items) {
+            try {
+                val nameBase64 = base64Encode(item.apiName.toByteArray(Charsets.UTF_8))
+                val urlBase64 = base64Encode(item.url.toByteArray(Charsets.UTF_8))
+                val csshareUri = "$APP_STRING_SHARE:$nameBase64?$urlBase64"
+                val poster=item.posterUrl
+                val builder = PreviewProgram.Builder()
+                    .setChannelId(channelId)
+                    .setTitle(item.name)
+                    .apply {
+                        val scoreText = item.score?.toStringNull(0.1, 10, 1)?.let {
+                            " - " + txt(R.string.rating_format, it).asString(context)
+                        } ?: ""
+                        setDescription("${item.apiName}$scoreText")
+                    }
+                    .setContentId(item.url)
+                    .setType(TvContractCompat.PreviewPrograms.TYPE_MOVIE)
+                    .setIntentUri(csshareUri.toUri())
+                    .setPosterArtAspectRatio(TvContractCompat.PreviewPrograms.ASPECT_RATIO_2_3)
+
+                // Validate poster URL before setting
+                if (!poster.isNullOrBlank() && poster.startsWith("http")) {
+                    builder.setPosterArtUri(poster.toUri())
+
+                }
+                val program = builder.build()
+
+                val uri = context.contentResolver.insert(
+                    TvContractCompat.PreviewPrograms.CONTENT_URI,
+                    program.toContentValues()
+                )
+
+                if (uri != null) {
+                    val programId = ContentUris.parseId(uri)
+                    context.saveProgramId(programId)
+                    Log.d("TvChannelUtils", "Inserted program ${item.name}, ID=$programId")
+                } else {
+                    Log.e("TvChannelUtils", "Insert failed for ${item.name}")
+                }
+
+            } catch (error: Exception) {
+                Log.e("TvChannelUtils", "Error inserting ${item.name}: $error")
+            }
+        }
+    }
+
+    fun deleteStoredPrograms(context: Context) {
+        val programIds = context.getStoredProgramIds()
+
+        for (id in programIds) {
+            val uri = ContentUris.withAppendedId(TvContractCompat.PreviewPrograms.CONTENT_URI, id)
+            try {
+                val rowsDeleted = context.contentResolver.delete(uri, null, null)
+                if (rowsDeleted > 0) {
+                    context.removeProgramId(id) // Remove from persistent list
+                } else {
+                    Log.w("ProgramDelete", "No program found for ID: $id")
+                }
+            } catch (e: Exception) {
+                Log.e("ProgramDelete", "Failed to delete program ID: $id", e)
+            }
+        }
+
+        Log.d("ProgramDelete", "Finished deleting stored programs")
+    }
+
+    fun createTvChannel(context: Context) {
+        val componentName = ComponentName(context, MainActivity::class.java)
+        val iconUri = "android.resource://${context.packageName}/mipmap/ic_launcher".toUri()
+        val inputId = TvContractCompat.buildInputId(componentName)
+        val channel = Channel.Builder()
+            .setType(TvContractCompat.Channels.TYPE_PREVIEW)
+            .setAppLinkIconUri(iconUri)
+            .setDisplayName(context.getString(R.string.app_name))
+            .setAppLinkIntent(Intent(Intent.ACTION_VIEW).apply {
+                data = "cloudstreamapp://open".toUri()
+            })
+            .setInputId(inputId)
+            .build()
+
+        val channelUri = context.contentResolver.insert(
+            TvContractCompat.Channels.CONTENT_URI,
+            channel.toContentValues()
+        )
+
+        channelUri?.let {
+            val channelId = ContentUris.parseId(it)
+            TvContractCompat.requestChannelBrowsable(context, channelId)
+            Log.d("TvChannelUtils", "Channel Created: $channelId")
+        }
+    }
+
+}
\ No newline at end of file
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 de5314fe022..c12674816dc 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/UIHelper.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/UIHelper.kt
@@ -13,7 +13,12 @@ import android.content.pm.PackageManager
 import android.content.res.Configuration
 import android.content.res.Resources
 import android.graphics.Bitmap
+import android.graphics.Canvas
 import android.graphics.Color
+import android.graphics.ColorFilter
+import android.graphics.Paint
+import android.graphics.PixelFormat
+import android.graphics.drawable.Drawable
 import android.os.Build
 import android.os.Bundle
 import android.os.TransactionTooLargeException
@@ -23,7 +28,6 @@ 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.ListAdapter
@@ -31,6 +35,7 @@ import android.widget.ListView
 import android.widget.Toast.LENGTH_LONG
 import androidx.annotation.AttrRes
 import androidx.annotation.ColorInt
+import androidx.annotation.DimenRes
 import androidx.annotation.StyleRes
 import androidx.appcompat.view.ContextThemeWrapper
 import androidx.appcompat.view.menu.MenuBuilder
@@ -38,6 +43,7 @@ import androidx.appcompat.widget.PopupMenu
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import androidx.core.content.getSystemService
+import androidx.core.content.withStyledAttributes
 import androidx.core.graphics.alpha
 import androidx.core.graphics.blue
 import androidx.core.graphics.green
@@ -47,6 +53,11 @@ import androidx.core.view.marginLeft
 import androidx.core.view.marginRight
 import androidx.core.view.marginTop
 import androidx.core.view.updateLayoutParams
+import androidx.core.view.updatePadding
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.WindowInsetsControllerCompat
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import androidx.navigation.NavOptions
@@ -57,19 +68,21 @@ 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.CloudStreamApp.Companion.context
 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.settings.Globals
 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.utils.AppContextUtils.isRtl
 import com.lagradost.cloudstream3.utils.Coroutines.main
-import com.lagradost.cloudstream3.utils.UIHelper.navigate
 import kotlinx.coroutines.delay
 import kotlin.math.roundToInt
+import com.lagradost.cloudstream3.utils.BackPressedCallbackHelper.disableBackPressedCallback
+import com.lagradost.cloudstream3.utils.BackPressedCallbackHelper.enableBackPressedCallback
 
 object UIHelper {
     val Int.toPx: Int get() = (this * Resources.getSystem().displayMetrics.density).toInt()
@@ -88,7 +101,12 @@ object UIHelper {
                 || Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU)
     }
 
-    fun populateChips(view: ChipGroup?, tags: List<String>, @StyleRes style : Int = R.style.ChipFilled) {
+    fun populateChips(
+        view: ChipGroup?,
+        tags: List<String>,
+        @StyleRes style: Int = R.style.ChipFilled,
+        @AttrRes textColor: Int? = R.attr.white,
+    ) {
         if (view == null) return
         view.removeAllViews()
         val context = view.context ?: return
@@ -108,7 +126,9 @@ object UIHelper {
             chip.isCheckable = false
             chip.isFocusable = false
             chip.isClickable = false
-            chip.setTextColor(context.colorFromAttribute(R.attr.white))
+            textColor?.let {
+                chip.setTextColor(context.colorFromAttribute(it))
+            }
             view.addView(chip)
         }
     }
@@ -184,17 +204,15 @@ object UIHelper {
         listView.requestLayout()
     }
 
-    fun Context?.getSpanCount(): Int? {
-        val compactView = false
-        val spanCountLandscape = if (compactView) 2 else 6
-        val spanCountPortrait = if (compactView) 1 else 3
-        val orientation = this?.resources?.configuration?.orientation ?: return null
+    fun Context.getSpanCount(isHorizontal:Boolean=false): Int {
+//        val compactView = false
+        val spanCountLandscape = if (isHorizontal) 3 else 6
+        val spanCountPortrait = if (isHorizontal) 2 else 3
+        val orientation = resources.configuration.orientation
 
         return if (orientation == Configuration.ORIENTATION_LANDSCAPE) {
             spanCountLandscape
-        } else {
-            spanCountPortrait
-        }
+        } else spanCountPortrait
     }
 
     fun Fragment.hideKeyboard() {
@@ -205,7 +223,7 @@ object UIHelper {
     }
 
     fun View?.setAppBarNoScrollFlagsOnTV() {
-        if (isLayout(Globals.TV or EMULATOR)) {
+        if (isLayout(TV or EMULATOR)) {
             this?.updateLayoutParams<AppBarLayout.LayoutParams> {
                 scrollFlags = AppBarLayout.LayoutParams.SCROLL_FLAG_NO_SCROLL
             }
@@ -241,10 +259,12 @@ object UIHelper {
     }
 
     // Open activities from an activity outside the nav graph
-    fun Context.openActivity(activity: Class<*>, args: Bundle? = null) {
+    fun Context.openActivity(activity: Class<*>, args: Bundle? = null, baseIntent: Intent? = null) {
         val tag = "NavComponent"
         try {
-            val intent = Intent(this, activity)
+            val intent = baseIntent ?: Intent()
+            intent.setClass(this, activity)
+
             if (args != null) {
                 intent.putExtras(args)
             }
@@ -255,11 +275,15 @@ object UIHelper {
         }
     }
 
-    fun FragmentActivity.popCurrentPage() {
+    /** If you want to call this from a BackPressedCallback, pass the name of the callback to temporarily disable it */
+    fun FragmentActivity.popCurrentPage(fromBackPressedCallback: String? = null) {
         // 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 (fromBackPressedCallback != null) {
+                disableBackPressedCallback(fromBackPressedCallback)
+            }
             if (!supportFragmentManager.isStateSaved) {
                 // Get the top fragment from the back stack
                 Log.d("popFragment", "Destroying Fragment")
@@ -275,23 +299,33 @@ object UIHelper {
                     onBackPressedDispatcher.onBackPressed()
                 }
             }
+            if (fromBackPressedCallback != null) {
+                enableBackPressedCallback(fromBackPressedCallback)
+            }
         }
     }
 
     @ColorInt
     fun Context.getResourceColor(@AttrRes resource: Int, alphaFactor: Float = 1f): Int {
-        val typedArray = obtainStyledAttributes(intArrayOf(resource))
-        val color = typedArray.getColor(0, 0)
-        typedArray.recycle()
+        val color = colorFromAttribute(resource)
+        return if (alphaFactor < 1f) adjustAlpha(color, alphaFactor) else color
+    }
 
-        if (alphaFactor < 1f) {
-            val alpha = (color.alpha * alphaFactor).roundToInt()
-            return Color.argb(alpha, color.red, color.green, color.blue)
+    @ColorInt
+    fun Context.colorFromAttribute(@AttrRes attribute: Int): Int {
+        var color = 0
+        withStyledAttributes(attrs = intArrayOf(attribute)) {
+            color = getColor(0, 0)
         }
-
         return color
     }
 
+    @ColorInt
+    fun adjustAlpha(@ColorInt color: Int, factor: Float): Int {
+        val alpha = (color.alpha * factor).roundToInt()
+        return Color.argb(alpha, color.red, color.green, color.blue)
+    }
+
     var createPaletteAsyncCache: HashMap<String, Palette> = hashMapOf()
     fun createPaletteAsync(url: String, bitmap: Bitmap, callback: (Palette) -> Unit) {
         createPaletteAsyncCache[url]?.let { palette ->
@@ -306,52 +340,48 @@ object UIHelper {
         }
     }
 
-    fun adjustAlpha(@ColorInt color: Int, factor: Float): Int {
-        val alpha = (Color.alpha(color) * factor).roundToInt()
-        val red = Color.red(color)
-        val green = Color.green(color)
-        val blue = Color.blue(color)
-        return Color.argb(alpha, red, green, blue)
-    }
-
-    fun Context.colorFromAttribute(attribute: Int): Int {
-        val attributes = obtainStyledAttributes(intArrayOf(attribute))
-        val color = attributes.getColor(0, 0)
-        attributes.recycle()
-        return color
-    }
-
     fun Activity.hideSystemUI() {
         // Enables regular immersive mode.
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            val controller = WindowCompat.getInsetsController(window, window.decorView)
+            controller.systemBarsBehavior =
+                WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
+            controller.hide(WindowInsetsCompat.Type.systemBars())
+            return
+        }
+
         // For "lean back" mode, remove SYSTEM_UI_FLAG_IMMERSIVE.
         // Or for "sticky immersive," replace it with SYSTEM_UI_FLAG_IMMERSIVE_STICKY
-        /** BUGGED AF  **/
-        /*if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+        @Suppress("DEPRECATION")
+        window.decorView.systemUiVisibility = (
+                View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
+                        // Set the content to appear under the system bars so that the
+                        // content doesn't resize when the system bars hide and show.
+                        or View.SYSTEM_UI_FLAG_LAYOUT_STABLE
+                        or View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
+                        or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+                        // Hide the nav bar and status bar
+                        or View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
+                        or View.SYSTEM_UI_FLAG_FULLSCREEN
+                )
+    }
 
-            WindowCompat.setDecorFitsSystemWindows(window, false)
-            WindowInsetsControllerCompat(window, View(this)).let { controller ->
-                controller.hide(WindowInsetsCompat.Type.systemBars())
-                controller.systemBarsBehavior = WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
-            }
-        }*/
-
-            @Suppress("DEPRECATION")
-            window.decorView.systemUiVisibility = (
-                    View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
-                            // Set the content to appear under the system bars so that the
-                            // content doesn't resize when the system bars hide and show.
-                            or View.SYSTEM_UI_FLAG_LAYOUT_STABLE
-                            or View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
-                            or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
-                            // 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 Activity.enableEdgeToEdgeCompat() {
+        // edge-to-edge is very buggy on earlier versions
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R) return
+        WindowCompat.enableEdgeToEdge(window)
+    }
+
+    fun Activity.setNavigationBarColorCompat(@AttrRes resourceId: Int) {
+        // edge-to-edge handles this
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) return
+
+        @Suppress("DEPRECATION")
+        window?.navigationBarColor = colorFromAttribute(resourceId)
     }
 
     fun Context.getStatusBarHeight(): Int {
-        if (isLayout(Globals.TV or EMULATOR)) {
+        if (isLayout(TV or EMULATOR)) {
             return 0
         }
 
@@ -363,17 +393,6 @@ object UIHelper {
         return result
     }
 
-    fun fixPaddingStatusbar(v: View?) {
-        if (v == null) return
-        val ctx = v.context ?: return
-        v.setPadding(
-            v.paddingLeft,
-            v.paddingTop + ctx.getStatusBarHeight(),
-            v.paddingRight,
-            v.paddingBottom
-        )
-    }
-
     fun fixPaddingStatusbarMargin(v: View?) {
         if (v == null) return
         val ctx = v.context ?: return
@@ -398,6 +417,84 @@ object UIHelper {
         v.layoutParams = params
     }
 
+    fun fixSystemBarsPadding(
+        v: View,
+        @DimenRes heightResId: Int? = null,
+        @DimenRes widthResId: Int? = null,
+        padTop: Boolean = true,
+        padBottom: Boolean = true,
+        padLeft: Boolean = true,
+        padRight: Boolean = true,
+        overlayCutout: Boolean = true,
+        fixIme: Boolean = false
+    ) {
+        // edge-to-edge is very buggy on earlier versions so we just
+        // handle the status bar here instead.
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R) {
+            if (padTop) {
+                val ctx = v.context ?: return
+                v.updatePadding(top = ctx.getStatusBarHeight())
+            }
+            return
+        }
+
+        ViewCompat.setOnApplyWindowInsetsListener(v) { view, windowInsets ->
+            val leftCheck = if (view.isRtl()) padRight else padLeft
+            val rightCheck = if (view.isRtl()) padLeft else padRight
+
+            val insetTypes = WindowInsetsCompat.Type.systemBars() or
+                WindowInsetsCompat.Type.displayCutout() or
+                if (fixIme) WindowInsetsCompat.Type.ime() else 0
+
+            val insets = windowInsets.getInsets(insetTypes)
+
+            view.updatePadding(
+                left = if (leftCheck) insets.left else view.paddingLeft,
+                right = if (rightCheck) insets.right else view.paddingRight,
+                bottom = if (padBottom) insets.bottom else view.paddingBottom,
+                top = if (padTop) insets.top else view.paddingTop
+            )
+
+            heightResId?.let {
+                val heightPx = view.resources.getDimensionPixelSize(it)
+                view.updateLayoutParams {
+                    height = heightPx + insets.bottom
+                }
+            }
+
+            widthResId?.let {
+                val widthPx = view.resources.getDimensionPixelSize(it)
+                view.updateLayoutParams {
+                    val startInset = if (view.isRtl()) insets.right else insets.left
+                    width = if (startInset > 0) widthPx + startInset else widthPx
+                }
+            }
+
+            if (overlayCutout && isLayout(PHONE)) {
+                // Draw a black overlay over the cutout. We do this so that
+                // it doesn't use the fragment background. We want it to
+                // appear as if the screen actually ends at cutout.
+                val cutout = windowInsets.displayCutout
+                if (cutout != null) {
+                    val left = if (!leftCheck) 0 else cutout.safeInsetLeft
+                    val right = if (!rightCheck) 0 else cutout.safeInsetRight
+                    view.overlay.clear()
+                    if (left > 0 || right > 0) {
+                        view.overlay.add(
+                            CutoutOverlayDrawable(
+                                view,
+                                leftCutout = left,
+                                rightCutout = right
+                            )
+                        )
+                    }
+                }
+            }
+
+            WindowInsetsCompat.CONSUMED
+        }
+    }
+
     fun Context.getNavigationBarHeight(): Int {
         var result = 0
         val resourceId = resources.getIdentifier("navigation_bar_height", "dimen", "android")
@@ -413,84 +510,52 @@ object UIHelper {
         return settingsManager.getBoolean(getString(R.string.bottom_title_key), true)
     }
 
-    fun Activity.changeStatusBarState(hide: Boolean): Int {
-        return if (hide) {
-
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-                window.insetsController?.hide(WindowInsets.Type.statusBars())
-
-            } else {
-                @Suppress("DEPRECATION")
-                window.setFlags(
-                    WindowManager.LayoutParams.FLAG_FULLSCREEN,
-                    WindowManager.LayoutParams.FLAG_FULLSCREEN
-                )
-            }
-            0
-        } else {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-                window.insetsController?.show(WindowInsets.Type.statusBars())
+    fun Activity.changeStatusBarState(hide: Boolean) {
+        try {
+            if (hide) {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                    val controller = WindowCompat.getInsetsController(window, window.decorView)
+                    controller.hide(WindowInsetsCompat.Type.statusBars())
+                } else {
+                    @Suppress("DEPRECATION")
+                    window.setFlags(
+                        WindowManager.LayoutParams.FLAG_FULLSCREEN,
+                        WindowManager.LayoutParams.FLAG_FULLSCREEN
+                    )
+                }
             } else {
-                @Suppress("DEPRECATION")
-                window.clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN)
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                    val controller = WindowCompat.getInsetsController(window, window.decorView)
+                    controller.show(WindowInsetsCompat.Type.statusBars())
+                } else {
+                    @Suppress("DEPRECATION")
+                    window.clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN)
+                }
             }
-
-            this.getStatusBarHeight()
+        } catch (t: Throwable) {
+            logError(t)
         }
     }
 
     // Shows the system bars by removing all the flags
     // except for the ones that make the content appear under the system bars.
     fun Activity.showSystemUI() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            val controller = WindowCompat.getInsetsController(window, window.decorView)
+            if (isLayout(EMULATOR)) {
+                controller.show(WindowInsetsCompat.Type.navigationBars())
+                controller.hide(WindowInsetsCompat.Type.statusBars())
+            } else controller.show(WindowInsetsCompat.Type.systemBars())
+            return
+        }
 
-        /*if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-
-            WindowCompat.setDecorFitsSystemWindows(window, true)
-            WindowInsetsControllerCompat(window, View(this)).show(WindowInsetsCompat.Type.systemBars())
-
-        } else {*/ /** WINDOW COMPAT IS BUGGY DUE TO FU*KED UP PLAYER AND TRAILERS **/
         @Suppress("DEPRECATION")
         window.decorView.systemUiVisibility =
-            (View.SYSTEM_UI_FLAG_LAYOUT_STABLE or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN) // FIXME this should be replaced
-        //}
+            (View.SYSTEM_UI_FLAG_LAYOUT_STABLE or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN)
 
         changeStatusBarState(isLayout(EMULATOR))
     }
 
-    fun Context.shouldShowPIPMode(isInPlayer: Boolean): Boolean {
-        return try {
-            val settingsManager = PreferenceManager.getDefaultSharedPreferences(this)
-            settingsManager?.getBoolean(
-                getString(R.string.pip_enabled_key),
-                true
-            ) ?: true && isInPlayer
-        } catch (e: Exception) {
-            logError(e)
-            false
-        }
-    }
-
-    fun Context.hasPIPPermission(): Boolean {
-        val appOps =
-            getSystemService(Context.APP_OPS_SERVICE) as AppOpsManager
-        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(),
-                packageName
-            ) == AppOpsManager.MODE_ALLOWED
-        } else {
-            return true
-        }
-    }
-
     fun hideKeyboard(view: View?) {
         if (view == null) return
 
@@ -525,7 +590,13 @@ object UIHelper {
         onMenuItemClick: MenuItem.() -> Unit,
     ): PopupMenu {
         val ctw = ContextThemeWrapper(context, R.style.PopupMenu)
-        val popup = PopupMenu(ctw, this, Gravity.NO_GRAVITY, androidx.appcompat.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)
@@ -549,7 +620,13 @@ object UIHelper {
         onMenuItemClick: MenuItem.() -> Unit,
     ): PopupMenu {
         val ctw = ContextThemeWrapper(context, R.style.PopupMenu)
-        val popup = PopupMenu(ctw, this, Gravity.NO_GRAVITY, androidx.appcompat.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)
@@ -565,4 +642,39 @@ object UIHelper {
         popup.show()
         return popup
     }
+}
+
+private class CutoutOverlayDrawable(
+    private val view: View,
+    private val leftCutout: Int,
+    private val rightCutout: Int,
+) : Drawable() {
+    private val paint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+        color = Color.BLACK
+        style = Paint.Style.FILL
+    }
+
+    override fun draw(canvas: Canvas) {
+        if (leftCutout > 0) canvas.drawRect(
+            0f,
+            0f,
+            leftCutout.toFloat(),
+            view.height.toFloat(),
+            paint
+        )
+        if (rightCutout > 0) {
+            canvas.drawRect(
+                view.width - rightCutout.toFloat(),
+                0f, view.width.toFloat(),
+                view.height.toFloat(),
+                paint
+            )
+        }
+    }
+
+    override fun setAlpha(alpha: Int) {}
+    override fun setColorFilter(colorFilter: ColorFilter?) {}
+
+    @Suppress("OVERRIDE_DEPRECATION")
+    override fun getOpacity() = PixelFormat.OPAQUE
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/VideoDownloadHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/VideoDownloadHelper.kt
deleted file mode 100644
index 30f66f835bb..00000000000
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/VideoDownloadHelper.kt
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.lagradost.cloudstream3.utils
-
-import com.fasterxml.jackson.annotation.JsonProperty
-import com.lagradost.cloudstream3.TvType
-object VideoDownloadHelper {
-    abstract class DownloadCached(
-        @JsonProperty("id") open val id: Int,
-    )
-
-    data class DownloadEpisodeCached(
-        @JsonProperty("name") val name: String?,
-        @JsonProperty("poster") val poster: String?,
-        @JsonProperty("episode") val episode: Int,
-        @JsonProperty("season") val season: Int?,
-        @JsonProperty("parentId") val parentId: Int,
-        @JsonProperty("rating") val rating: Int?,
-        @JsonProperty("description") val description: String?,
-        @JsonProperty("cacheTime") val cacheTime: Long,
-        override val id: Int,
-    ): DownloadCached(id)
-
-    data class DownloadHeaderCached(
-        @JsonProperty("apiName") val apiName: String,
-        @JsonProperty("url") val url: String,
-        @JsonProperty("type") val type: TvType,
-        @JsonProperty("name") val name: String,
-        @JsonProperty("poster") val poster: String?,
-        @JsonProperty("cacheTime") val cacheTime: Long,
-        override val id: Int,
-    ): DownloadCached(id)
-
-    data class ResumeWatching(
-        @JsonProperty("parentId") val parentId: Int,
-        @JsonProperty("episodeId") val episodeId: Int?,
-        @JsonProperty("episode") val episode: Int?,
-        @JsonProperty("season") val season: Int?,
-        @JsonProperty("updateTime") val updateTime: Long,
-        @JsonProperty("isFromDownload") val isFromDownload: Boolean,
-    )
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/downloader/DownloadFileManagement.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/downloader/DownloadFileManagement.kt
new file mode 100644
index 00000000000..898c30a1ca9
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/downloader/DownloadFileManagement.kt
@@ -0,0 +1,132 @@
+package com.lagradost.cloudstream3.utils.downloader
+
+import android.content.Context
+import android.net.Uri
+import androidx.core.net.toUri
+import androidx.preference.PreferenceManager
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.TvType
+import com.lagradost.cloudstream3.getFolderPrefix
+import com.lagradost.cloudstream3.isEpisodeBased
+import com.lagradost.safefile.MediaFileContentType
+import com.lagradost.safefile.SafeFile
+
+object DownloadFileManagement {
+    private const val RESERVED_CHARS = "|\\?*<\":>+[]/\'"
+    internal fun sanitizeFilename(name: String, removeSpaces: Boolean = false): String {
+        var tempName = name
+        for (c in RESERVED_CHARS) {
+            tempName = tempName.replace(c, ' ')
+        }
+        if (removeSpaces) tempName = tempName.replace(" ", "")
+        return tempName.replace("  ", " ").trim(' ')
+    }
+
+    /**
+     * Used for getting video player subs.
+     * @return List of pairs for the files in this format: <Name, Uri>
+     * */
+    internal fun getFolder(
+        context: Context,
+        relativePath: String,
+        basePath: String?
+    ): List<Pair<String, Uri>>? {
+        val base = basePathToFile(context, basePath)
+        val folder =
+            base?.gotoDirectory(relativePath, createMissingDirectories = false) ?: return null
+
+        //if (folder.isDirectory() != false) return null
+
+        return folder.listFiles()
+            ?.mapNotNull { (it.name() ?: "") to (it.uri() ?: return@mapNotNull null) }
+    }
+
+    /**
+     * Turns a string to an UniFile. Used for stored string paths such as settings.
+     * Should only be used to get a download path.
+     * */
+    internal fun basePathToFile(context: Context, path: String?): SafeFile? {
+        return when {
+            path.isNullOrBlank() -> getDefaultDir(context)
+            path.startsWith("content://") -> SafeFile.fromUri(context, path.toUri())
+            else -> SafeFile.fromFilePath(context, path)
+        }
+    }
+
+    /**
+     * Base path where downloaded things should be stored, changes depending on settings.
+     * Returns the file and a string to be stored for future file retrieval.
+     * UniFile.filePath is not sufficient for storage.
+     * */
+    internal fun Context.getBasePath(): Pair<SafeFile?, String?> {
+        val settingsManager = PreferenceManager.getDefaultSharedPreferences(this)
+        val basePathSetting = settingsManager.getString(getString(R.string.download_path_key), null)
+        return basePathToFile(this, basePathSetting) to basePathSetting
+    }
+
+    internal fun getFileName(
+        context: Context,
+        metadata: DownloadObjects.DownloadEpisodeMetadata
+    ): String {
+        return getFileName(context, metadata.name, metadata.episode, metadata.season)
+    }
+
+    internal fun getFileName(
+        context: Context,
+        epName: String?,
+        episode: Int?,
+        season: Int?
+    ): String {
+        // kinda ugly ik
+        return sanitizeFilename(
+            if (epName == null) {
+                if (season != null) {
+                    "${context.getString(R.string.season)} $season ${context.getString(R.string.episode)} $episode"
+                } else {
+                    "${context.getString(R.string.episode)} $episode"
+                }
+            } else {
+                if (episode != null) {
+                    if (season != null) {
+                        "${context.getString(R.string.season)} $season ${context.getString(R.string.episode)} $episode - $epName"
+                    } else {
+                        "${context.getString(R.string.episode)} $episode - $epName"
+                    }
+                } else {
+                    epName
+                }
+            }
+        )
+    }
+
+
+    internal fun DownloadObjects.DownloadedFileInfo.toFile(context: Context): SafeFile? {
+        return basePathToFile(context, this.basePath)?.gotoDirectory(
+            relativePath,
+            createMissingDirectories = false
+        )
+            ?.findFile(displayName)
+    }
+
+    internal fun getFolder(currentType: TvType, titleName: String): String {
+        return if (currentType.isEpisodeBased()) {
+            val sanitizedFileName = sanitizeFilename(titleName)
+            "${currentType.getFolderPrefix()}/$sanitizedFileName"
+        } else currentType.getFolderPrefix()
+    }
+
+    /**
+     * Gets the default download path as an UniFile.
+     * Vital for legacy downloads, be careful about changing anything here.
+     *
+     * As of writing UniFile is used for everything but download directory on scoped storage.
+     * Special ContentResolver fuckery is needed for that as UniFile doesn't work.
+     * */
+    fun getDefaultDir(context: Context): SafeFile? {
+        // See https://www.py4u.net/discuss/614761
+        return SafeFile.fromMedia(
+            context, MediaFileContentType.Downloads
+        )
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/VideoDownloadManager.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/downloader/DownloadManager.kt
similarity index 65%
rename from app/src/main/java/com/lagradost/cloudstream3/utils/VideoDownloadManager.kt
rename to app/src/main/java/com/lagradost/cloudstream3/utils/downloader/DownloadManager.kt
index fcb2a25d3a0..d209d544bd7 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/VideoDownloadManager.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/downloader/DownloadManager.kt
@@ -1,40 +1,30 @@
-package com.lagradost.cloudstream3.utils
+package com.lagradost.cloudstream3.utils.downloader
+
 
 import android.Manifest
 import android.annotation.SuppressLint
 import android.app.Notification
-import android.app.NotificationChannel
-import android.app.NotificationManager
 import android.app.PendingIntent
-import android.content.*
+import android.content.Context
+import android.content.Intent
 import android.content.pm.PackageManager
-import android.graphics.Bitmap
-import android.net.Uri
 import android.os.Build
 import android.os.Build.VERSION.SDK_INT
 import android.util.Log
+import android.widget.Toast
 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 coil3.Extras
-import coil3.SingletonImageLoader
-import coil3.asDrawable
-import coil3.request.ImageRequest
-import coil3.request.SuccessResult
-import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.APIHolder.getApiFromNameNull
-import com.lagradost.cloudstream3.AcraApplication.Companion.removeKey
-import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
 import com.lagradost.cloudstream3.BuildConfig
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.getKey
+import com.lagradost.cloudstream3.CommonActivity.showToast
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.removeKey
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.setKey
 import com.lagradost.cloudstream3.IDownloadableMinimum
 import com.lagradost.cloudstream3.MainActivity
 import com.lagradost.cloudstream3.R
@@ -42,14 +32,58 @@ 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.mvvm.safe
 import com.lagradost.cloudstream3.services.VideoDownloadService
+import com.lagradost.cloudstream3.sortUrls
+import com.lagradost.cloudstream3.ui.download.DOWNLOAD_NAVIGATE_TO
+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.player.source_priority.QualityDataHelper
+import com.lagradost.cloudstream3.ui.player.source_priority.QualityDataHelper.getLinkPriority
+import com.lagradost.cloudstream3.ui.result.ExtractorSubtitleLink
+import com.lagradost.cloudstream3.ui.result.ResultEpisode
+import com.lagradost.cloudstream3.ui.subtitles.SubtitlesFragment
+import com.lagradost.cloudstream3.utils.AppContextUtils.createNotificationChannel
+import com.lagradost.cloudstream3.utils.AppContextUtils.sortSubs
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import com.lagradost.cloudstream3.utils.Coroutines.main
+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.removeKey
+import com.lagradost.cloudstream3.utils.Event
+import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.ExtractorLinkType
+import com.lagradost.cloudstream3.utils.M3u8Helper
+import com.lagradost.cloudstream3.utils.M3u8Helper2
+import com.lagradost.cloudstream3.utils.SubtitleHelper.fromTagToEnglishLanguageName
 import com.lagradost.cloudstream3.utils.SubtitleUtils.deleteMatchingSubtitles
 import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute
-import com.lagradost.safefile.MediaFileContentType
+import com.lagradost.cloudstream3.utils.downloader.DownloadFileManagement.getBasePath
+import com.lagradost.cloudstream3.utils.downloader.DownloadFileManagement.getDefaultDir
+import com.lagradost.cloudstream3.utils.downloader.DownloadFileManagement.getFileName
+import com.lagradost.cloudstream3.utils.downloader.DownloadFileManagement.getFolder
+import com.lagradost.cloudstream3.utils.downloader.DownloadFileManagement.sanitizeFilename
+import com.lagradost.cloudstream3.utils.downloader.DownloadFileManagement.toFile
+import com.lagradost.cloudstream3.utils.downloader.DownloadObjects.CreateNotificationMetadata
+import com.lagradost.cloudstream3.utils.downloader.DownloadObjects.DownloadEpisodeMetadata
+import com.lagradost.cloudstream3.utils.downloader.DownloadObjects.DownloadItem
+import com.lagradost.cloudstream3.utils.downloader.DownloadObjects.DownloadResumePackage
+import com.lagradost.cloudstream3.utils.downloader.DownloadObjects.DownloadStatus
+import com.lagradost.cloudstream3.utils.downloader.DownloadObjects.DownloadedFileInfo
+import com.lagradost.cloudstream3.utils.downloader.DownloadObjects.DownloadedFileInfoResult
+import com.lagradost.cloudstream3.utils.downloader.DownloadObjects.LazyStreamDownloadResponse
+import com.lagradost.cloudstream3.utils.downloader.DownloadObjects.StreamData
+import com.lagradost.cloudstream3.utils.downloader.DownloadObjects.DownloadQueueWrapper
+import com.lagradost.cloudstream3.utils.downloader.DownloadUtils.appendAndDontOverride
+import com.lagradost.cloudstream3.utils.downloader.DownloadUtils.cancel
+import com.lagradost.cloudstream3.utils.downloader.DownloadUtils.downloadSubtitle
+import com.lagradost.cloudstream3.utils.downloader.DownloadUtils.getEstimatedTimeLeft
+import com.lagradost.cloudstream3.utils.downloader.DownloadUtils.getImageBitmapFromUrl
+import com.lagradost.cloudstream3.utils.downloader.DownloadUtils.join
+import com.lagradost.cloudstream3.utils.txt
 import com.lagradost.safefile.SafeFile
 import com.lagradost.safefile.closeQuietly
 import kotlinx.coroutines.CancellationException
@@ -60,23 +94,24 @@ import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.update
 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 java.io.Closeable
 import java.io.IOException
 import java.io.OutputStream
-import java.util.*
 
 const val DOWNLOAD_CHANNEL_ID = "cloudstream3.general"
 const val DOWNLOAD_CHANNEL_NAME = "Downloads"
 const val DOWNLOAD_CHANNEL_DESCRIPT = "The download notification channel"
 
 object VideoDownloadManager {
-    private fun maxConcurrentDownloads(context: Context): Int =
+    fun maxConcurrentDownloads(context: Context): Int =
         PreferenceManager.getDefaultSharedPreferences(context)
             ?.getInt(context.getString(R.string.download_parallel_key), 3) ?: 3
 
@@ -84,8 +119,11 @@ object VideoDownloadManager {
         PreferenceManager.getDefaultSharedPreferences(context)
             ?.getInt(context.getString(R.string.download_concurrent_key), 3) ?: 3
 
-    private var currentDownloads = mutableListOf<Int>()
+    private val _currentDownloads: MutableStateFlow<Set<Int>> = MutableStateFlow(emptySet())
+    val currentDownloads: StateFlow<Set<Int>> = _currentDownloads
+
     const val TAG = "VDM"
+    private const val DOWNLOAD_NOTIFICATION_TAG = "FROM_DOWNLOADER"
 
     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"
@@ -129,56 +167,6 @@ object VideoDownloadManager {
         Stop,
     }
 
-    data class DownloadEpisodeMetadata(
-        @JsonProperty("id") val id: Int,
-        @JsonProperty("mainName") val mainName: String,
-        @JsonProperty("sourceApiName") val sourceApiName: String?,
-        @JsonProperty("poster") val poster: String?,
-        @JsonProperty("name") val name: String?,
-        @JsonProperty("season") val season: Int?,
-        @JsonProperty("episode") val episode: Int?,
-        @JsonProperty("type") val type: TvType?,
-    )
-
-    data class DownloadItem(
-        @JsonProperty("source") val source: String?,
-        @JsonProperty("folder") val folder: String?,
-        @JsonProperty("ep") val ep: DownloadEpisodeMetadata,
-        @JsonProperty("links") val links: List<ExtractorLink>,
-    )
-
-    data class DownloadResumePackage(
-        @JsonProperty("item") val item: DownloadItem,
-        @JsonProperty("linkIndex") val linkIndex: Int?,
-    )
-
-    data class DownloadedFileInfo(
-        @JsonProperty("totalBytes") val totalBytes: Long,
-        @JsonProperty("relativePath") val relativePath: String,
-        @JsonProperty("displayName") val displayName: String,
-        @JsonProperty("extraInfo") val extraInfo: String? = null,
-        @JsonProperty("basePath") val basePath: String? = null // null is for legacy downloads. See getDefaultPath()
-    )
-
-    data class DownloadedFileInfoResult(
-        @JsonProperty("fileLength") val fileLength: Long,
-        @JsonProperty("totalBytes") val totalBytes: Long,
-        @JsonProperty("path") val path: Uri,
-    )
-
-    data class DownloadQueueResumePackage(
-        @JsonProperty("index") val index: Int,
-        @JsonProperty("pkg") val pkg: DownloadResumePackage,
-    )
-
-    data class DownloadStatus(
-        /** if you should retry with the same args and hope for a better result */
-        val retrySame: Boolean,
-        /** if you should try the next mirror */
-        val tryNext: Boolean,
-        /** if the result is what the user intended */
-        val success: Boolean,
-    )
 
     /** Invalid input, just skip to the next one as the same args will give the same error */
     private val DOWNLOAD_INVALID_INPUT =
@@ -195,91 +183,60 @@ object VideoDownloadManager {
     /** the process failed due to some reason, so we retry and also try the next mirror */
     private val DOWNLOAD_FAILED = DownloadStatus(retrySame = true, tryNext = true, success = false)
 
+    /** The download only downloaded partial */
+    private val DOWNLOAD_PARTIAL_SUCCESS =
+        DownloadStatus(retrySame = true, tryNext = false, success = true)
+
+    /** 50MB minimum size */
+    const val DOWNLOAD_PARTIAL_MIN_SIZE = 1_048_576L * 50L
+
     /** bad config, skip all mirrors as every call to download will have the same bad config */
     private val DOWNLOAD_BAD_CONFIG =
         DownloadStatus(retrySame = false, tryNext = false, success = false)
 
-    const val KEY_RESUME_PACKAGES = "download_resume"
+    const val KEY_RESUME_PACKAGES = "download_resume_2"
     const val KEY_DOWNLOAD_INFO = "download_info"
-    private const val KEY_RESUME_QUEUE_PACKAGES = "download_q_resume"
+
+    /** A key to save all the downloads which have not yet started and those currently running, using [DownloadQueueWrapper]
+     * [KEY_RESUME_PACKAGES] can store keys which should not be automatically queued, unlike this key.
+     */
+    const val KEY_RESUME_IN_QUEUE = "download_resume_queue_key"
+//    private const val KEY_RESUME_QUEUE_PACKAGES = "download_q_resume"
 
     val downloadStatus = HashMap<Int, DownloadType>()
     val downloadStatusEvent = Event<Pair<Int, DownloadType>>()
     val downloadDeleteEvent = Event<Int>()
     val downloadEvent = Event<Pair<Int, DownloadActionType>>()
     val downloadProgressEvent = Event<Triple<Int, Long, Long>>()
-    val downloadQueue = LinkedList<DownloadResumePackage>()
+//    val downloadQueue = LinkedList<DownloadResumePackage>()
 
-    private var hasCreatedNotChanel = false
+    private var hasCreatedNotChannel = false
 
     private fun Context.createNotificationChannel() {
-        hasCreatedNotChanel = true
-        // Create the NotificationChannel, but only on API 26+ because
-        // the NotificationChannel class is new and not in the support library
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            val name = DOWNLOAD_CHANNEL_NAME //getString(R.string.channel_name)
-            val descriptionText = DOWNLOAD_CHANNEL_DESCRIPT//getString(R.string.channel_description)
-            val importance = NotificationManager.IMPORTANCE_DEFAULT
-            val channel = NotificationChannel(DOWNLOAD_CHANNEL_ID, name, importance).apply {
-                description = descriptionText
-            }
-            // Register the channel with the system
-            val notificationManager: NotificationManager =
-                this.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-            notificationManager.createNotificationChannel(channel)
-        }
-    }
-
-    ///** Will return IsDone if not found or error */
-    //fun getDownloadState(id: Int): DownloadType {
-    //    return try {
-    //        downloadStatus[id] ?: DownloadType.IsDone
-    //    } catch (e: Exception) {
-    //        logError(e)
-    //        DownloadType.IsDone
-    //    }
-    //}
-
-    private val cachedBitmaps = hashMapOf<String, Bitmap>()
-    fun Context.getImageBitmapFromUrl(url: String, headers: Map<String, String>? = null): Bitmap? {
-        try {
-            if (cachedBitmaps.containsKey(url)) {
-                return cachedBitmaps[url]
-            }
+        hasCreatedNotChannel = true
 
-            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()
-            }
+        this.createNotificationChannel(
+            DOWNLOAD_CHANNEL_ID,
+            DOWNLOAD_CHANNEL_NAME,
+            DOWNLOAD_CHANNEL_DESCRIPT
+        )
+    }
 
-            bitmap?.let {
-                cachedBitmaps[url] = it
+    fun cancelAllDownloadNotifications(context: Context) {
+        val manager = NotificationManagerCompat.from(context)
+        manager.activeNotifications.forEach { notification ->
+            if (notification.tag == DOWNLOAD_NOTIFICATION_TAG) {
+                manager.cancel(DOWNLOAD_NOTIFICATION_TAG, notification.id)
             }
-
-            return bitmap
-        } catch (e: Exception) {
-            logError(e)
-            return null
         }
     }
 
+
     /**
      * @param hlsProgress will together with hlsTotal display another notification if used, to lessen the confusion about estimated size.
      * */
     @SuppressLint("StringFormatInvalid")
-    private suspend fun createNotification(
+    private suspend fun createDownloadNotification(
         context: Context,
         source: String?,
         linkName: String?,
@@ -295,7 +252,6 @@ object VideoDownloadManager {
         try {
             if (total <= 0) return null// crash, invalid data
 
-//        main { // DON'T WANT TO SLOW IT DOWN
             val builder = NotificationCompat.Builder(context, DOWNLOAD_CHANNEL_ID)
                 .setAutoCancel(true)
                 .setColorized(true)
@@ -362,7 +318,7 @@ object VideoDownloadManager {
                 val mbFormat = "%.1f MB"
 
                 if (hlsProgress != null && hlsTotal != null) {
-                    progressPercentage = hlsProgress.toLong() * 100 / hlsTotal
+                    progressPercentage = hlsProgress * 100 / hlsTotal
                     progressMbString = hlsProgress.toString()
                     totalMbString = hlsTotal.toString()
                     suffix = " - $mbFormat".format(progress / 1000000f)
@@ -378,10 +334,15 @@ object VideoDownloadManager {
                         " ($mbFormat/s)".format(bytesPerSecond.toFloat() / 1000000f)
                     } else ""
 
+                val remainingTime =
+                    if (state == DownloadType.IsDownloading) {
+                        getEstimatedTimeLeft(context, bytesPerSecond, progress, total)
+                    } else ""
+
                 val bigText =
                     when (state) {
                         DownloadType.IsDownloading, DownloadType.IsPaused -> {
-                            (if (linkName == null) "" else "$linkName\n") + "$rowTwo\n$progressPercentage % ($progressMbString/$totalMbString)$suffix$mbPerSecondString"
+                            (if (linkName == null) "" else "$linkName\n") + "$rowTwo\n$progressPercentage % ($progressMbString/$totalMbString)$suffix$mbPerSecondString $remainingTime"
                         }
 
                         DownloadType.IsPending -> {
@@ -439,7 +400,7 @@ object VideoDownloadManager {
                 builder.setContentText(txt)
             }
 
-            if ((state == DownloadType.IsDownloading || state == DownloadType.IsPaused) && SDK_INT >= Build.VERSION_CODES.O) {
+            if ((state == DownloadType.IsDownloading || state == DownloadType.IsPaused || state == DownloadType.IsPending) && SDK_INT >= Build.VERSION_CODES.O) {
                 val actionTypes: MutableList<DownloadActionType> = ArrayList()
                 // INIT
                 if (state == DownloadType.IsDownloading) {
@@ -451,6 +412,9 @@ object VideoDownloadManager {
                     actionTypes.add(DownloadActionType.Resume)
                     actionTypes.add(DownloadActionType.Stop)
                 }
+                if (state == DownloadType.IsPending) {
+                    actionTypes.add(DownloadActionType.Stop)
+                }
 
                 // ADD ACTIONS
                 for ((index, i) in actionTypes.withIndex()) {
@@ -489,7 +453,7 @@ object VideoDownloadManager {
                 }
             }
 
-            if (!hasCreatedNotChanel) {
+            if (!hasCreatedNotChannel) {
                 context.createNotificationChannel()
             }
 
@@ -504,7 +468,7 @@ object VideoDownloadManager {
                 ) {
                     return null
                 }
-                notify(ep.id, notification)
+                notify(DOWNLOAD_NOTIFICATION_TAG, ep.id, notification)
             }
             return notification
         } catch (e: Exception) {
@@ -513,69 +477,6 @@ object VideoDownloadManager {
         }
     }
 
-    private const val RESERVED_CHARS = "|\\?*<\":>+[]/\'"
-    fun sanitizeFilename(name: String, removeSpaces: Boolean = false): String {
-        var tempName = name
-        for (c in RESERVED_CHARS) {
-            tempName = tempName.replace(c, ' ')
-        }
-        if (removeSpaces) tempName = tempName.replace(" ", "")
-        return tempName.replace("  ", " ").trim(' ')
-    }
-
-    /**
-     * Used for getting video player subs.
-     * @return List of pairs for the files in this format: <Name, Uri>
-     * */
-    fun getFolder(
-        context: Context,
-        relativePath: String,
-        basePath: String?
-    ): List<Pair<String, Uri>>? {
-        val base = basePathToFile(context, basePath)
-        val folder =
-            base?.gotoDirectory(relativePath, createMissingDirectories = false) ?: return null
-
-        //if (folder.isDirectory() != false) return null
-
-        return folder.listFiles()
-            ?.mapNotNull { (it.name() ?: "") to (it.uri() ?: return@mapNotNull null) }
-    }
-
-
-    data class CreateNotificationMetadata(
-        val type: DownloadType,
-        val bytesDownloaded: Long,
-        val bytesTotal: Long,
-        val hlsProgress: Long? = null,
-        val hlsTotal: Long? = null,
-        val bytesPerSecond: Long
-    )
-
-    data class StreamData(
-        private val fileLength: Long,
-        val file: SafeFile,
-        //val fileStream: OutputStream,
-    ) {
-        @Throws(IOException::class)
-        fun open(): OutputStream {
-            return file.openOutputStreamOrThrow(resume)
-        }
-
-        @Throws(IOException::class)
-        fun openNew(): OutputStream {
-            return file.openOutputStreamOrThrow(false)
-        }
-
-        fun delete(): Boolean {
-            return file.delete() == true
-        }
-
-        val resume: Boolean get() = fileLength > 0L
-        val startAt: Long get() = if (resume) fileLength else 0L
-        val exists: Boolean get() = file.exists() == true
-    }
-
 
     @Throws(IOException::class)
     fun setupStream(
@@ -597,7 +498,7 @@ object VideoDownloadManager {
 
     /**
      * Sets up the appropriate file and creates a data stream from the file.
-     * Used for initializing downloads.
+     * Used for initializing downloads and backups.
      * */
     @Throws(IOException::class)
     fun setupStream(
@@ -630,6 +531,7 @@ object VideoDownloadManager {
     /** This class handles the notifications, as well as the relevant key */
     data class DownloadMetaData(
         private val id: Int?,
+        private val linkHash : Int,
         var bytesDownloaded: Long = 0,
         var bytesWritten: Long = 0,
 
@@ -641,7 +543,7 @@ object VideoDownloadManager {
         private val createNotificationCallback: (CreateNotificationMetadata) -> Unit,
 
         private var internalType: DownloadType = DownloadType.IsPending,
-
+        val isHLS : Boolean,
         // how many segments that we have downloaded
         var hlsProgress: Int = 0,
         // how many segments that exist
@@ -659,13 +561,17 @@ object VideoDownloadManager {
             lastDownloadedBytes = length
         }
 
+        /** Returns the appropriate failed status based on download progress */
+        fun failedStatus() = if (this.bytesWritten > DOWNLOAD_PARTIAL_MIN_SIZE)
+            DOWNLOAD_PARTIAL_SUCCESS
+        else
+            DOWNLOAD_FAILED
+
         val approxTotalBytes: Long
             get() = totalBytes ?: hlsTotal?.let { total ->
                 (bytesDownloaded * (total / hlsProgress.toFloat())).toLong()
             } ?: bytesDownloaded
 
-        private val isHLS get() = hlsTotal != null
-
         private var stopListener: (() -> Unit)? = null
 
         /** on cancel button pressed or failed invoke this once and only once */
@@ -686,8 +592,6 @@ object VideoDownloadManager {
 
                     DownloadActionType.Stop -> {
                         type = DownloadType.IsStopped
-                        removeKey(KEY_RESUME_PACKAGES, event.first.toString())
-                        saveQueue()
                         stopListener?.invoke()
                         stopListener = null
                     }
@@ -702,11 +606,32 @@ object VideoDownloadManager {
         private fun updateFileInfo() {
             if (id == null) return
             downloadFileInfoTemplate?.let { template ->
+                /** This looks strange, but fixes an issue where we do an instant retry, and it fails immediately,
+                 * eg. by turning off wifi */
+                val totalBytesValue = if (approxTotalBytes <= bytesDownloaded) {
+                    val prevInfo = getKey<DownloadedFileInfo>(
+                        KEY_DOWNLOAD_INFO,
+                        id.toString()
+                    )
+
+                    /** If this link is the same as the last cached video link metadata */
+                    if (prevInfo != null && prevInfo.linkHash == linkHash) {
+                        /** Try to use totalBytes if it exists, otherwise the max of the prev data,
+                         * and download size to ensure total >= downloaded */
+                        totalBytes ?: maxOf(prevInfo.totalBytes, bytesDownloaded)
+                    } else {
+                        approxTotalBytes
+                    }
+                } else {
+                    approxTotalBytes
+                }
+
                 setKey(
                     KEY_DOWNLOAD_INFO,
                     id.toString(),
                     template.copy(
-                        totalBytes = approxTotalBytes,
+                        linkHash = linkHash,
+                        totalBytes = totalBytesValue,
                         extraInfo = if (isHLS) hlsWrittenProgress.toString() else null
                     )
                 )
@@ -849,34 +774,12 @@ object VideoDownloadManager {
         }
     }
 
-    /** bytes have the size end-start where the byte range is [start,end)
-     * note that ByteArray is a pointer and therefore cant be stored without cloning it */
-    data class LazyStreamDownloadResponse(
-        val bytes: ByteArray,
-        val startByte: Long,
-        val endByte: Long,
-    ) {
-        val size get() = endByte - startByte
-
-        override fun toString(): String {
-            return "$startByte->$endByte"
-        }
-
-        override fun equals(other: Any?): Boolean {
-            if (other !is LazyStreamDownloadResponse) return false
-            return other.startByte == startByte && other.endByte == endByte
-        }
-
-        override fun hashCode(): Int {
-            return Objects.hash(startByte, endByte)
-        }
-    }
 
     data class LazyStreamDownloadData(
         private val url: String,
         private val headers: Map<String, String>,
         private val referer: String,
-        /** This specifies where chunck i starts and ends,
+        /** This specifies where chunk i starts and ends,
          * bytes=${chuckStartByte[ i ]}-${chuckStartByte[ i+1 ] -1}
          * where out of bounds => bytes=${chuckStartByte[ i ]}- */
         private val chuckStartByte: LongArray,
@@ -963,11 +866,11 @@ object VideoDownloadManager {
                     if (end == null) return true
                     // we have download more or exactly what we needed
                     if (start >= end) return true
-                } catch (e: IllegalStateException) {
+                } catch (_: IllegalStateException) {
                     return false
-                } catch (e: CancellationException) {
+                } catch (_: CancellationException) {
                     return false
-                } catch (t: Throwable) {
+                } catch (_: Throwable) {
                     continue
                 }
             }
@@ -1086,38 +989,6 @@ object VideoDownloadManager {
         )
     }
 
-    /** Helper function to make sure duplicate attributes don't get overriden or inserted without lowercase cmp
-     * example: map("a" to 1) appendAndDontOverride map("A" to 2, "a" to 3, "c" to 4) = map("a" to 1, "c" to 4)
-     * */
-    private fun <V> Map<String, V>.appendAndDontOverride(rhs: Map<String, V>): Map<String, V> {
-        val out = this.toMutableMap()
-        val current = this.keys.map { it.lowercase() }
-        for ((key, value) in rhs) {
-            if (current.contains(key.lowercase())) continue
-            out[key] = value
-        }
-        return out
-    }
-
-    private fun List<Job>.cancel() {
-        forEach { job ->
-            try {
-                job.cancel()
-            } catch (t: Throwable) {
-                logError(t)
-            }
-        }
-    }
-
-    private suspend fun List<Job>.join() {
-        forEach { job ->
-            try {
-                job.join()
-            } catch (t: Throwable) {
-                logError(t)
-            }
-        }
-    }
 
     /** download a file that consist of a single stream of data*/
     suspend fun downloadThing(
@@ -1145,6 +1016,8 @@ object VideoDownloadManager {
             bytesDownloaded = 0,
             createNotificationCallback = createNotificationCallback,
             id = parentId,
+            linkHash = link.url.hashCode(),
+            isHLS = false
         )
         try {
             // get the file path
@@ -1166,14 +1039,7 @@ object VideoDownloadManager {
                 startByte = stream.startAt,
                 headers = link.headers.appendAndDontOverride(
                     mapOf(
-                        "Accept-Encoding" to "identity",
-                        "accept" to "*/*",
                         "user-agent" to USER_AGENT,
-                        "sec-ch-ua" to "\"Chromium\";v=\"91\", \" Not;A Brand\";v=\"99\"",
-                        "sec-fetch-mode" to "navigate",
-                        "sec-fetch-dest" to "video",
-                        "sec-fetch-user" to "?1",
-                        "sec-ch-ua-mobile" to "?0",
                     )
                 )
             )
@@ -1295,10 +1161,23 @@ object VideoDownloadManager {
                     // this will take up the first available job and resolve
                     while (true) {
                         if (!isActive) return@launch
+
+                        var isTooFarAhead = false
                         fileMutex.withLock {
                             if (metadata.type == DownloadType.IsStopped
                                 || metadata.type == DownloadType.IsFailed
                             ) return@launch
+
+                            // Limit RAM usage by throttling if too much data is downloaded but not yet written to disk
+                            // 50MB limit
+                            if (metadata.bytesDownloaded - metadata.bytesWritten > 50_000_000) {
+                                isTooFarAhead = true
+                            }
+                        }
+
+                        if (isTooFarAhead) {
+                            delay(500)
+                            continue
                         }
 
                         // mutex just in case, we never want this to fail due to multithreading
@@ -1334,7 +1213,7 @@ object VideoDownloadManager {
             if (!stream.exists) metadata.type = DownloadType.IsStopped
 
             if (metadata.type == DownloadType.IsFailed) {
-                return@withContext DOWNLOAD_FAILED
+                return@withContext metadata.failedStatus()
             }
 
             if (metadata.type == DownloadType.IsStopped) {
@@ -1364,11 +1243,11 @@ object VideoDownloadManager {
             throw e
         } catch (t: Throwable) {
             // some sort of network error, will error
-
+            logError(t)
             // note that when failing we don't want to delete the file,
             // only user interaction has that power
             metadata.type = DownloadType.IsFailed
-            return@withContext DOWNLOAD_FAILED
+            return@withContext metadata.failedStatus()
         } finally {
             fileStream?.closeQuietly()
             //requestStream?.closeQuietly()
@@ -1390,7 +1269,9 @@ object VideoDownloadManager {
 
         val metadata = DownloadMetaData(
             createNotificationCallback = createNotificationCallback,
-            id = parentId
+            id = parentId,
+            linkHash = link.url.hashCode(),
+            isHLS = true
         )
         var fileStream: OutputStream? = null
         try {
@@ -1413,6 +1294,7 @@ object VideoDownloadManager {
             // push the metadata
             metadata.setResumeLength(stream.startAt)
             metadata.hlsProgress = startAt
+            metadata.hlsWrittenProgress = startAt
             metadata.type = DownloadType.IsPending
             metadata.setDownloadFileInfoTemplate(
                 DownloadedFileInfo(
@@ -1427,8 +1309,6 @@ object VideoDownloadManager {
             val m3u8 = M3u8Helper.M3u8Stream(
                 link.url, link.quality, link.headers.appendAndDontOverride(
                     mapOf(
-                        "Accept-Encoding" to "identity",
-                        "accept" to "*/*",
                         "user-agent" to USER_AGENT,
                     ) + if (link.referer.isNotBlank()) mapOf("referer" to link.referer) else emptyMap()
                 )
@@ -1466,10 +1346,23 @@ object VideoDownloadManager {
                 launch(Dispatchers.IO) {
                     while (true) {
                         if (!isActive) return@launch
+
+                        var isTooFarAhead = false
                         fileMutex.withLock {
                             if (metadata.type == DownloadType.IsStopped
                                 || metadata.type == DownloadType.IsFailed
                             ) return@launch
+
+                            // Limit RAM usage by throttling if too much data is downloaded but not yet written to disk
+                            // 50MB limit
+                            if (metadata.bytesDownloaded - metadata.bytesWritten > 50_000_000) {
+                                isTooFarAhead = true
+                            }
+                        }
+
+                        if (isTooFarAhead) {
+                            delay(500)
+                            continue
                         }
 
                         // mutex just in case, we never want this to fail due to multithreading
@@ -1489,50 +1382,45 @@ object VideoDownloadManager {
                             return@launch
                         }
 
-                        try {
-                            fileMutex.lock()
-                            // user pause
-                            while (metadata.type == DownloadType.IsPaused) delay(100)
-                            // if stopped then break to delete
-                            if (metadata.type == DownloadType.IsStopped || metadata.type == DownloadType.IsFailed || !isActive) return@launch
+                        fileMutex.withLock {
+                            try {
+                                // user pause
+                                while (metadata.type == DownloadType.IsPaused) delay(100)
+                                // if stopped then break to delete
+                                if (metadata.type == DownloadType.IsStopped || metadata.type == DownloadType.IsFailed || !isActive) return@launch
 
-                            val segmentLength = bytes.size.toLong()
-                            // send notification, no matter the actual write order
-                            metadata.addSegment(segmentLength)
+                                val segmentLength = bytes.size.toLong()
+                                // send notification, no matter the actual write order
+                                metadata.addSegment(segmentLength)
 
-                            // directly write the bytes if you are first
-                            if (metadata.hlsWrittenProgress == index) {
-                                fileStream.write(bytes)
+                                // directly write the bytes if you are first
+                                if (metadata.hlsWrittenProgress == index) {
+                                    fileStream.write(bytes)
 
-                                metadata.addBytesWritten(segmentLength)
-                                metadata.setWrittenSegment(index)
-                            } else {
-                                // no need to clone as there will be no modification of this bytearray
-                                pendingData[index] = bytes
-                            }
+                                    metadata.addBytesWritten(segmentLength)
+                                    metadata.setWrittenSegment(index)
+                                } else {
+                                    // no need to clone as there will be no modification of this bytearray
+                                    pendingData[index] = bytes
+                                }
 
-                            // write the cached bytes submitted by other threads
-                            while (true) {
-                                val cache = pendingData.remove(metadata.hlsWrittenProgress) ?: break
-                                val cacheLength = cache.size.toLong()
+                                // write the cached bytes submitted by other threads
+                                while (true) {
+                                    val cache =
+                                        pendingData.remove(metadata.hlsWrittenProgress) ?: break
+                                    val cacheLength = cache.size.toLong()
 
-                                fileStream.write(cache)
+                                    fileStream.write(cache)
 
-                                metadata.addBytesWritten(cacheLength)
-                                metadata.setWrittenSegment(metadata.hlsWrittenProgress)
-                            }
-                        } catch (t: Throwable) {
-                            // this is in case of write fail
-                            logError(t)
-                            if (metadata.type != DownloadType.IsStopped) {
-                                metadata.type = DownloadType.IsFailed
-                            }
-                        } finally {
-                            try {
-                                // may cause java.lang.IllegalStateException: Mutex is not locked because of cancelling
-                                fileMutex.unlock()
+                                    metadata.addBytesWritten(cacheLength)
+                                    metadata.setWrittenSegment(metadata.hlsWrittenProgress)
+                                }
                             } catch (t: Throwable) {
+                                // this is in case of write fail
                                 logError(t)
+                                if (metadata.type != DownloadType.IsStopped) {
+                                    metadata.type = DownloadType.IsFailed
+                                }
                             }
                         }
                     }
@@ -1552,7 +1440,7 @@ object VideoDownloadManager {
             if (!stream.exists) metadata.type = DownloadType.IsStopped
 
             if (metadata.type == DownloadType.IsFailed) {
-                return@withContext DOWNLOAD_FAILED
+                return@withContext metadata.failedStatus()
             }
 
             if (metadata.type == DownloadType.IsStopped) {
@@ -1568,7 +1456,7 @@ object VideoDownloadManager {
         } catch (t: Throwable) {
             logError(t)
             metadata.type = DownloadType.IsFailed
-            return@withContext DOWNLOAD_FAILED
+            return@withContext metadata.failedStatus()
         } finally {
             fileStream?.closeQuietly()
             metadata.close()
@@ -1579,75 +1467,6 @@ object VideoDownloadManager {
         return "$name.$extension"
     }
 
-    /**
-     * Gets the default download path as an UniFile.
-     * Vital for legacy downloads, be careful about changing anything here.
-     *
-     * As of writing UniFile is used for everything but download directory on scoped storage.
-     * Special ContentResolver fuckery is needed for that as UniFile doesn't work.
-     * */
-    fun getDefaultDir(context: Context): SafeFile? {
-        // See https://www.py4u.net/discuss/614761
-        return SafeFile.fromMedia(
-            context, MediaFileContentType.Downloads
-        )
-    }
-
-    /**
-     * Turns a string to an UniFile. Used for stored string paths such as settings.
-     * Should only be used to get a download path.
-     * */
-    private fun basePathToFile(context: Context, path: String?): SafeFile? {
-        return when {
-            path.isNullOrBlank() -> getDefaultDir(context)
-            path.startsWith("content://") -> SafeFile.fromUri(context, path.toUri())
-            else -> SafeFile.fromFilePath(context, path)
-        }
-    }
-
-    /**
-     * Base path where downloaded things should be stored, changes depending on settings.
-     * Returns the file and a string to be stored for future file retrieval.
-     * UniFile.filePath is not sufficient for storage.
-     * */
-    fun Context.getBasePath(): Pair<SafeFile?, String?> {
-        val settingsManager = PreferenceManager.getDefaultSharedPreferences(this)
-        val basePathSetting = settingsManager.getString(getString(R.string.download_path_key), null)
-        return basePathToFile(this, basePathSetting) to basePathSetting
-    }
-
-    fun getFileName(context: Context, metadata: DownloadEpisodeMetadata): String {
-        return getFileName(context, metadata.name, metadata.episode, metadata.season)
-    }
-
-    private fun getFileName(
-        context: Context,
-        epName: String?,
-        episode: Int?,
-        season: Int?
-    ): String {
-        // kinda ugly ik
-        return sanitizeFilename(
-            if (epName == null) {
-                if (season != null) {
-                    "${context.getString(R.string.season)} $season ${context.getString(R.string.episode)} $episode"
-                } else {
-                    "${context.getString(R.string.episode)} $episode"
-                }
-            } else {
-                if (episode != null) {
-                    if (season != null) {
-                        "${context.getString(R.string.season)} $season ${context.getString(R.string.episode)} $episode - $epName"
-                    } else {
-                        "${context.getString(R.string.episode)} $episode - $epName"
-                    }
-                } else {
-                    epName
-                }
-            }
-        )
-    }
-
     private suspend fun downloadSingleEpisode(
         context: Context,
         source: String?,
@@ -1673,7 +1492,7 @@ object VideoDownloadManager {
 
         val callback: (CreateNotificationMetadata) -> Unit = { meta ->
             main {
-                createNotification(
+                createDownloadNotification(
                     context,
                     source,
                     link.name,
@@ -1727,100 +1546,17 @@ object VideoDownloadManager {
                     )
                 }
 
-                else -> throw IllegalArgumentException("unsuported download type")
+                else -> throw IllegalArgumentException("Unsupported download type")
             }
-        } catch (t: Throwable) {
+        } catch (_: Throwable) {
             return DOWNLOAD_FAILED
         } finally {
             extractorJob.cancel()
         }
     }
 
-    suspend fun downloadCheck(
-        context: Context, notificationCallback: (Int, Notification) -> Unit,
-    ) {
-        if (!(currentDownloads.size < maxConcurrentDownloads(context) && downloadQueue.size > 0)) return
-
-        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
-            downloadEvent.invoke(id to DownloadActionType.Resume)
-            return
-        }
-
-        currentDownloads.add(id)
-        try {
-            for (index in (pkg.linkIndex ?: 0) until item.links.size) {
-                val link = item.links[index]
-                val resume = pkg.linkIndex == index
-
-                setKey(
-                    KEY_RESUME_PACKAGES,
-                    id.toString(),
-                    DownloadResumePackage(item, index)
-                )
-
-                var connectionResult =
-                    downloadSingleEpisode(
-                        context,
-                        item.source,
-                        item.folder,
-                        item.ep,
-                        link,
-                        notificationCallback,
-                        resume
-                    )
-
-                if (connectionResult.retrySame) {
-                    connectionResult = downloadSingleEpisode(
-                        context,
-                        item.source,
-                        item.folder,
-                        item.ep,
-                        link,
-                        notificationCallback,
-                        true
-                    )
-                }
-
-                if (connectionResult.success) { // SUCCESS
-                    removeKey(KEY_RESUME_PACKAGES, id.toString())
-                    break
-                } else if (!connectionResult.tryNext || index >= item.links.lastIndex) {
-                    downloadStatusEvent.invoke(Pair(id, DownloadType.IsFailed))
-                    break
-                }
-            }
-        } catch (e: Exception) {
-            logError(e)
-        } finally {
-            currentDownloads.remove(id)
-            // Because otherwise notifications will not get caught by the work manager
-            downloadCheckUsingWorker(context)
-        }
-
-        // return id
-    }
-
-    /* fun getDownloadFileInfoAndUpdateSettings(context: Context, id: Int): DownloadedFileInfoResult? {
-         val res = getDownloadFileInfo(context, id)
-         if (res == null) context.removeKey(KEY_DOWNLOAD_INFO, id.toString())
-         return res
-     }
- */
-    fun getDownloadFileInfoAndUpdateSettings(context: Context, id: Int): DownloadedFileInfoResult? =
-        getDownloadFileInfo(context, id)
-
-    private fun DownloadedFileInfo.toFile(context: Context): SafeFile? {
-        return basePathToFile(context, this.basePath)?.gotoDirectory(
-            relativePath,
-            createMissingDirectories = false
-        )
-            ?.findFile(displayName)
-    }
 
-    private fun getDownloadFileInfo(
+    fun getDownloadFileInfo(
         context: Context,
         id: Int,
     ): DownloadedFileInfoResult? {
@@ -1830,8 +1566,7 @@ object VideoDownloadManager {
             val file = info.toFile(context)
 
             // only delete the key if the file is not found
-            if (file == null || !file.existsOrThrow()) {
-                //if (removeKeys) context.removeKey(KEY_DOWNLOAD_INFO, id.toString()) // TODO READD
+            if (file == null || file.exists() == false) {
                 return null
             }
 
@@ -1882,35 +1617,20 @@ object VideoDownloadManager {
         return success
     }
 
-    /*private fun deleteFile(
-        context: Context,
-        folder: SafeFile?,
-        relativePath: String,
-        displayName: String
-    ): Boolean {
-        val file = folder?.gotoDirectory(relativePath)?.findFile(displayName) ?: return false
-        if (file.exists() == false) return true
-        return try {
-            file.delete()
-        } catch (e: Exception) {
-            logError(e)
-            (context.contentResolver?.delete(file.uri() ?: return true, null, null)
-                ?: return false) > 0
-        }
-    }*/
-
     private fun deleteFile(context: Context, id: Int): Boolean {
         val info =
             context.getKey<DownloadedFileInfo>(KEY_DOWNLOAD_INFO, id.toString()) ?: return false
         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)
-
         val isFileDeleted = file?.delete() == true || file?.exists() == false
-        if (isFileDeleted) deleteMatchingSubtitles(context, info)
+
+        if (isFileDeleted) {
+            deleteMatchingSubtitles(context, info)
+            downloadEvent.invoke(id to DownloadActionType.Stop)
+            downloadProgressEvent.invoke(Triple(id, 0, 0))
+            downloadStatusEvent.invoke(id to DownloadType.IsStopped)
+            downloadDeleteEvent.invoke(id)
+        }
 
         return isFileDeleted
     }
@@ -1919,119 +1639,453 @@ object VideoDownloadManager {
         return context.getKey(KEY_RESUME_PACKAGES, id.toString())
     }
 
-    suspend fun downloadFromResume(
-        context: Context,
-        pkg: DownloadResumePackage,
-        notificationCallback: (Int, Notification) -> Unit,
-        setKey: Boolean = true
+    fun getDownloadQueuePackage(context: Context, id: Int): DownloadQueueWrapper? {
+        return context.getKey(KEY_RESUME_IN_QUEUE, id.toString())
+    }
+
+    fun getDownloadEpisodeMetadata(
+        episode: ResultEpisode,
+        titleName: String,
+        apiName: String,
+        currentPoster: String?,
+        currentIsMovie: Boolean,
+        tvType: TvType,
+    ): DownloadEpisodeMetadata {
+        return DownloadEpisodeMetadata(
+            episode.id,
+            episode.parentId,
+            sanitizeFilename(titleName),
+            apiName,
+            episode.poster ?: currentPoster,
+            episode.name,
+            if (currentIsMovie) null else episode.season,
+            if (currentIsMovie) null else episode.episode,
+            tvType,
+        )
+    }
+
+    class EpisodeDownloadInstance(
+        val context: Context,
+        val downloadQueueWrapper: DownloadQueueWrapper
     ) {
-        if (!currentDownloads.any { it == pkg.item.ep.id } && !downloadQueue.any { it.item.ep.id == pkg.item.ep.id }) {
-            downloadQueue.addLast(pkg)
-            downloadCheck(context, notificationCallback)
-            if (setKey) saveQueue()
-            //ret
-        } else {
-            downloadEvent(
-                pkg.item.ep.id to DownloadActionType.Resume
-            )
-            //null
+        private val TAG = "EpisodeDownloadInstance"
+        private var subtitleDownloadJob: Job? = null
+        private var downloadJob: Job? = null
+        private var linkLoadingJob: Job? = null
+
+        /** isCompleted just means the download should not be retried.
+         * It includes stopped by user AND completion of file download.
+         * */
+        var isCompleted = false
+            set(value) {
+                field = value
+                if (value) {
+                    removeKey(KEY_RESUME_IN_QUEUE, downloadQueueWrapper.id.toString())
+                    // Do not emit events when completed as it may also trigger on cancellation.
+
+
+                    // Force refresh the queue when completed.
+                    // May lead to some redundant calls, but ensures that the queue is always up to date.
+                    DownloadQueueManager.forceRefreshQueue()
+                }
+            }
+
+        /** Cancels all active jobs and sets instance to failed. */
+        fun cancelDownload() {
+            val cause = "Cancel call from cancelDownload"
+            this.subtitleDownloadJob?.cancel(cause)
+            this.linkLoadingJob?.cancel(cause)
+
+            // Should not cancel the download job, it may need to clean up itself.
+            // Better to send a status event using isStopped and let it cancel itself.
+            isCancelled = true
         }
-    }
 
-    private fun saveQueue() {
-        try {
-            val dQueue =
-                downloadQueue.toList()
-                    .mapIndexed { index, any -> DownloadQueueResumePackage(index, any) }
-                    .toTypedArray()
-            setKey(KEY_RESUME_QUEUE_PACKAGES, dQueue)
-        } catch (t: Throwable) {
-            logError(t)
+        // Run to cancel ongoing work, delete partial work and refresh queue
+        private fun cleanup(status: DownloadType) {
+            removeKey(KEY_RESUME_IN_QUEUE, downloadQueueWrapper.id.toString())
+            val id = downloadQueueWrapper.id
+
+            // Delete subtitles on cancel
+            safe {
+                val info = context.getKey<DownloadedFileInfo>(KEY_DOWNLOAD_INFO, id.toString())
+                if (info != null) {
+                    deleteMatchingSubtitles(context, info)
+                }
+            }
+
+            downloadStatusEvent.invoke(Pair(id, status))
+            downloadStatus[id] = status
+            downloadEvent.invoke(Pair(id, DownloadActionType.Stop))
+
+            // Force refresh the queue when failed.
+            // May lead to some redundant calls, but ensures that the queue is always up to date.
+            DownloadQueueManager.forceRefreshQueue()
         }
-    }
 
-    /*fun isMyServiceRunning(context: Context, serviceClass: Class<*>): Boolean {
-        val manager = context.getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager?
-        for (service in manager!!.getRunningServices(Int.MAX_VALUE)) {
-            if (serviceClass.name == service.service.className) {
-                return true
+        var isCancelled = false
+            set(value) {
+                val oldField = field
+                field = value
+
+                // Clean up cancelled work, but only once
+                if (value && !oldField) {
+                    cleanup(DownloadType.IsStopped)
+                }
+            }
+
+
+        /** This failure can be both downloader and user initiated.
+         * Do not automatically retry in case of failure. */
+        var isFailed = false
+            set(value) {
+                val oldField = field
+                field = value
+
+                // Clean up failed work, but only once
+                if (value && !oldField) {
+                    cleanup(DownloadType.IsFailed)
+                }
+            }
+
+        companion object {
+            private fun displayNotification(context: Context, id: Int, notification: Notification) {
+                safe {
+                    if (context.checkSelfPermission(Manifest.permission.POST_NOTIFICATIONS)
+                        != PackageManager.PERMISSION_GRANTED
+                    ) return@safe
+
+                    NotificationManagerCompat.from(context)
+                        .notify(DOWNLOAD_NOTIFICATION_TAG, id, notification)
+                }
             }
         }
-        return false
-    }*/
 
-    suspend fun downloadEpisode(
-        context: Context?,
-        source: String?,
-        folder: String?,
-        ep: DownloadEpisodeMetadata,
-        links: List<ExtractorLink>,
-        notificationCallback: (Int, Notification) -> Unit,
-    ) {
-        if (context == null) return
-        if (links.isEmpty()) return
-        downloadFromResume(
-            context,
-            DownloadResumePackage(DownloadItem(source, folder, ep, links), null),
-            notificationCallback
-        )
-    }
+        private suspend fun downloadFromResume(
+            downloadResumePackage: DownloadResumePackage,
+            notificationCallback: (Int, Notification) -> Unit,
+        ) {
+            val item = downloadResumePackage.item
+            val id = item.ep.id
+            if (currentDownloads.value.contains(id)) { // IF IT IS ALREADY DOWNLOADING, RESUME IT
+                downloadEvent.invoke(id to DownloadActionType.Resume)
+                return
+            }
 
-    /** Worker stuff */
-    private fun startWork(context: Context, key: String) {
-        val req = OneTimeWorkRequest.Builder(DownloadFileWorkManager::class.java)
-            .setInputData(
-                Data.Builder()
-                    .putString("key", key)
-                    .build()
-            )
-            .build()
-        (WorkManager.getInstance(context)).enqueueUniqueWork(
-            key,
-            ExistingWorkPolicy.KEEP,
-            req
-        )
-    }
+            _currentDownloads.update { downloads ->
+                downloads + id
+            }
 
-    fun downloadCheckUsingWorker(
-        context: Context,
-    ) {
-        startWork(context, DOWNLOAD_CHECK)
-    }
+            try {
+                for (index in (downloadResumePackage.linkIndex ?: 0) until item.links.size) {
+                    val link = item.links[index]
+                    val resume = downloadResumePackage.linkIndex == index
+
+                    setKey(
+                        KEY_RESUME_PACKAGES,
+                        id.toString(),
+                        DownloadResumePackage(item, index)
+                    )
 
-    fun downloadFromResumeUsingWorker(
-        context: Context,
-        pkg: DownloadResumePackage,
-    ) {
-        val key = pkg.item.ep.id.toString()
-        setKey(WORK_KEY_PACKAGE, key, pkg)
-        startWork(context, key)
-    }
+                    var connectionResult =
+                        downloadSingleEpisode(
+                            context,
+                            item.source,
+                            item.folder,
+                            item.ep,
+                            link,
+                            notificationCallback,
+                            resume
+                        )
+
+                    if (connectionResult.retrySame) {
+                        connectionResult = downloadSingleEpisode(
+                            context,
+                            item.source,
+                            item.folder,
+                            item.ep,
+                            link,
+                            notificationCallback,
+                            true
+                        )
+                    }
 
-    // Keys are needed to transfer the data to the worker reliably and without exceeding the data limit
-    const val WORK_KEY_PACKAGE = "work_key_package"
-    const val WORK_KEY_INFO = "work_key_info"
+                    if (connectionResult.success) { // SUCCESS
+                        isCompleted = true
+                        break
+                    } else if (!connectionResult.tryNext || index >= item.links.lastIndex) {
+                        isFailed = true
+                        break
+                    }
+                }
+            } catch (e: Exception) {
+                isFailed = true
+                logError(e)
+            } finally {
+                isFailed = !isCompleted
+                _currentDownloads.update { downloads ->
+                    downloads - id
+                }
+            }
+        }
 
-    fun downloadEpisodeUsingWorker(
-        context: Context,
-        source: String?,
-        folder: String?,
-        ep: DownloadEpisodeMetadata,
-        links: List<ExtractorLink>,
-    ) {
-        val info = DownloadInfo(
-            source, folder, ep, links
-        )
+        private suspend fun startDownload(
+            info: DownloadItem?,
+            pkg: DownloadResumePackage?
+        ) {
+            try {
+                if (info != null) {
+                    getDownloadResumePackage(context, info.ep.id)?.let { dpkg ->
+                        downloadFromResume(dpkg) { id, notification ->
+                            displayNotification(context, id, notification)
+                        }
+                    } ?: run {
+                        if (info.links.isEmpty()) return
+                        downloadFromResume(
+                            DownloadResumePackage(info, null)
+                        ) { id, notification ->
+                            displayNotification(context, id, notification)
+                        }
+                    }
+                } else if (pkg != null) {
+                    downloadFromResume(pkg) { id, notification ->
+                        displayNotification(context, id, notification)
+                    }
+                }
+                return
+            } catch (e: Exception) {
+                isFailed = true
+                logError(e)
+                return
+            }
+        }
 
-        val key = info.ep.id.toString()
-        setKey(WORK_KEY_INFO, key, info)
-        startWork(context, key)
-    }
+        private suspend fun downloadFromResume() {
+            val resumePackage = downloadQueueWrapper.resumePackage ?: return
+            downloadFromResume(resumePackage) { id, notification ->
+                displayNotification(context, id, notification)
+            }
+        }
+
+        fun startDownload() {
+            Log.d(TAG, "Starting download ${downloadQueueWrapper.id}")
+            setKey(KEY_RESUME_IN_QUEUE, downloadQueueWrapper.id.toString(), downloadQueueWrapper)
+
+            ioSafe {
+                if (downloadQueueWrapper.resumePackage != null) {
+                    downloadFromResume()
+                    // Load links if they are not already loaded
+                } else if (downloadQueueWrapper.downloadItem != null && downloadQueueWrapper.downloadItem.links.isNullOrEmpty()) {
+                    downloadEpisodeWithoutLinks()
+                } else if (downloadQueueWrapper.downloadItem?.links != null) {
+                    downloadEpisodeWithLinks(
+                        sortUrls(downloadQueueWrapper.downloadItem.links.toSet()),
+                        downloadQueueWrapper.downloadItem.subs
+                    )
+                }
+            }
+        }
+
+        private fun downloadEpisodeWithLinks(
+            links: List<ExtractorLink>,
+            subs: List<SubtitleData>?
+        ) {
+            val downloadItem = downloadQueueWrapper.downloadItem ?: return
+            try {
+                // Prepare visual keys
+                setKey(
+                    DOWNLOAD_HEADER_CACHE,
+                    downloadItem.resultId.toString(),
+                    DownloadObjects.DownloadHeaderCached(
+                        apiName = downloadItem.apiName,
+                        url = downloadItem.resultUrl,
+                        type = downloadItem.resultType,
+                        name = downloadItem.resultName,
+                        poster = downloadItem.resultPoster,
+                        id = downloadItem.resultId,
+                        cacheTime = System.currentTimeMillis(),
+                    )
+                )
+                setKey(
+                    getFolderName(
+                        DOWNLOAD_EPISODE_CACHE,
+                        downloadItem.resultId.toString()
+                    ), // 3 deep folder for faster access
+                    downloadItem.episode.id.toString(),
+                    DownloadObjects.DownloadEpisodeCached(
+                        name = downloadItem.episode.name,
+                        poster = downloadItem.episode.poster,
+                        episode = downloadItem.episode.episode,
+                        season = downloadItem.episode.season,
+                        id = downloadItem.episode.id,
+                        parentId = downloadItem.resultId,
+                        score = downloadItem.episode.score,
+                        description = downloadItem.episode.description,
+                        cacheTime = System.currentTimeMillis(),
+                    )
+                )
 
-    data class DownloadInfo(
-        @JsonProperty("source") val source: String?,
-        @JsonProperty("folder") val folder: String?,
-        @JsonProperty("ep") val ep: DownloadEpisodeMetadata,
-        @JsonProperty("links") val links: List<ExtractorLink>
-    )
+                val meta =
+                    getDownloadEpisodeMetadata(
+                        downloadItem.episode,
+                        downloadItem.resultName,
+                        downloadItem.apiName,
+                        downloadItem.resultPoster,
+                        downloadItem.isMovie,
+                        downloadItem.resultType
+                    )
+
+                val folder =
+                    getFolder(downloadItem.resultType, downloadItem.resultName)
+                val src = "$DOWNLOAD_NAVIGATE_TO/${downloadItem.resultId}"
+
+                // DOWNLOAD VIDEO
+                val info = DownloadItem(src, folder, meta, links)
+
+                this.downloadJob = ioSafe {
+                    startDownload(info, null)
+                }
+
+                // 1. Checks if the lang should be downloaded
+                // 2. Makes it into the download format
+                // 3. Downloads it as a .vtt file
+                this.subtitleDownloadJob = ioSafe {
+                    try {
+                        val downloadList = SubtitlesFragment.getDownloadSubsLanguageTagIETF()
+
+                        subs?.filter { subtitle ->
+                            downloadList.any { langTagIETF ->
+                                subtitle.languageCode == langTagIETF ||
+                                        subtitle.originalName.contains(
+                                            fromTagToEnglishLanguageName(
+                                                langTagIETF
+                                            ) ?: langTagIETF
+                                        )
+                            }
+                        }
+                            ?.map { ExtractorSubtitleLink(it.name, it.url, "", it.headers) }
+                            ?.take(3) // max subtitles download hardcoded (?_?)
+                            ?.forEach { link ->
+                                val fileName = getFileName(context, meta)
+                                downloadSubtitle(context, link, fileName, folder)
+                            }
+
+                    } catch (_: CancellationException) {
+                        val fileName = getFileName(context, meta)
+
+                        val info = DownloadedFileInfo(
+                            totalBytes = 0,
+                            relativePath = folder,
+                            displayName = fileName,
+                            basePath = context.getBasePath().second
+                        )
+
+                        deleteMatchingSubtitles(context, info)
+                    }
+                }
+            } catch (e: Exception) {
+                // The work is only failed if the job did not get started
+                if (this.downloadJob == null) {
+                    isFailed = true
+                }
+                logError(e)
+            }
+        }
+
+        private suspend fun downloadEpisodeWithoutLinks() {
+            val downloadItem = downloadQueueWrapper.downloadItem ?: return
+
+            val generator = RepoLinkGenerator(listOf(downloadItem.episode))
+            val currentLinks = mutableSetOf<ExtractorLink>()
+            val currentSubs = mutableSetOf<SubtitleData>()
+            val meta =
+                getDownloadEpisodeMetadata(
+                    downloadItem.episode,
+                    downloadItem.resultName,
+                    downloadItem.apiName,
+                    downloadItem.resultPoster,
+                    downloadItem.isMovie,
+                    downloadItem.resultType
+                )
+
+            createDownloadNotification(
+                context,
+                downloadItem.apiName,
+                txt(R.string.loading).asString(context),
+                meta,
+                DownloadType.IsPending,
+                0,
+                1,
+                { _, _ -> },
+                null,
+                null,
+                0
+            )?.let { linkLoadingNotification ->
+                displayNotification(context, downloadItem.episode.id, linkLoadingNotification)
+            }
+
+            linkLoadingJob = ioSafe {
+                generator.generateLinks(
+                    offset = 0,
+                    isCasting = false,
+                    clearCache = false,
+                    sourceTypes = LOADTYPE_INAPP_DOWNLOAD,
+                    callback = {
+                        it.first?.let { link ->
+                            currentLinks.add(link)
+                        }
+                    },
+                    subtitleCallback = { sub ->
+                        currentSubs.add(sub)
+                    })
+            }
+
+            // Wait for link loading completion
+            linkLoadingJob?.join()
+
+            // Remove link loading notification
+            NotificationManagerCompat.from(context)
+                .cancel(DOWNLOAD_NOTIFICATION_TAG, downloadItem.episode.id)
+
+            if (linkLoadingJob?.isCancelled == true) {
+                // Same as if no links, but no toast.
+                // Cancelled link loading is presumed to be user initiated
+                isCancelled = true
+                return
+            } else if (currentLinks.isEmpty()) {
+                main {
+                    showToast(
+                        R.string.no_links_found_toast,
+                        Toast.LENGTH_SHORT
+                    )
+                }
+                isFailed = true
+                return
+            } else {
+                main {
+                    showToast(
+                        R.string.download_started,
+                        Toast.LENGTH_SHORT
+                    )
+                }
+            }
+
+            // Profiles should always contain a download type
+            val profile = QualityDataHelper.getProfiles().first {
+                it.types.contains(
+                    QualityDataHelper.QualityProfileType.Download
+                )
+            }
+
+            val sortedLinks = currentLinks.sortedBy { link ->
+                // Negative, because the highest priority should be first
+                -getLinkPriority(profile.id, link)
+            }
+
+            downloadEpisodeWithLinks(
+                sortedLinks,
+                sortSubs(currentSubs),
+            )
+        }
+    }
 }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/downloader/DownloadObjects.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/downloader/DownloadObjects.kt
new file mode 100644
index 00000000000..25a9fdf2a4f
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/downloader/DownloadObjects.kt
@@ -0,0 +1,224 @@
+package com.lagradost.cloudstream3.utils.downloader
+
+import android.net.Uri
+import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.cloudstream3.Score
+import com.lagradost.cloudstream3.TvType
+import com.lagradost.cloudstream3.services.DownloadQueueService
+import com.lagradost.cloudstream3.ui.player.SubtitleData
+import com.lagradost.cloudstream3.ui.result.ResultEpisode
+import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.safefile.SafeFile
+import java.io.IOException
+import java.io.OutputStream
+import java.util.Objects
+
+object DownloadObjects {
+    /** An item can either be something to resume or something new to start */
+    data class DownloadQueueWrapper(
+        @JsonProperty("resumePackage") val resumePackage: DownloadResumePackage?,
+        @JsonProperty("downloadItem") val downloadItem: DownloadQueueItem?,
+    ) {
+        init {
+            assert(resumePackage != null || downloadItem != null) {
+                "ResumeID and downloadItem cannot both be null at the same time!"
+            }
+        }
+
+        /** Loop through the current download instances to see if it is currently downloading. Also includes link loading. */
+        fun isCurrentlyDownloading(): Boolean {
+            return DownloadQueueService.downloadInstances.value.any { it.downloadQueueWrapper.id == this.id }
+        }
+
+        @JsonProperty("id")
+        val id = resumePackage?.item?.ep?.id ?: downloadItem!!.episode.id
+
+        @JsonProperty("parentId")
+        val parentId = resumePackage?.item?.ep?.parentId ?: downloadItem!!.episode.parentId
+    }
+
+    /** General data about the episode and show to start a download from. */
+    data class DownloadQueueItem(
+        @JsonProperty("episode") val episode: ResultEpisode,
+        @JsonProperty("isMovie") val isMovie: Boolean,
+        @JsonProperty("resultName") val resultName: String,
+        @JsonProperty("resultType") val resultType: TvType,
+        @JsonProperty("resultPoster") val resultPoster: String?,
+        @JsonProperty("apiName") val apiName: String,
+        @JsonProperty("resultId") val resultId: Int,
+        @JsonProperty("resultUrl") val resultUrl: String,
+        @JsonProperty("links") val links: List<ExtractorLink>? = null,
+        @JsonProperty("subs") val subs: List<SubtitleData>? = null,
+    ) {
+        fun toWrapper(): DownloadQueueWrapper {
+            return DownloadQueueWrapper(null, this)
+        }
+    }
+
+
+    abstract class DownloadCached(
+        @JsonProperty("id") open val id: Int,
+    )
+
+    data class DownloadEpisodeCached(
+        @JsonProperty("name") val name: String?,
+        @JsonProperty("poster") val poster: String?,
+        @JsonProperty("episode") val episode: Int,
+        @JsonProperty("season") val season: Int?,
+        @JsonProperty("parentId") val parentId: Int,
+        @JsonProperty("score") var score: Score? = null,
+        @JsonProperty("description") val description: String?,
+        @JsonProperty("cacheTime") val cacheTime: Long,
+        override val id: Int,
+    ) : DownloadCached(id) {
+        @JsonProperty("rating", access = JsonProperty.Access.WRITE_ONLY)
+        @Deprecated(
+            "`rating` is the old scoring system, use score instead",
+            replaceWith = ReplaceWith("score"),
+            level = DeprecationLevel.ERROR
+        )
+        var rating: Int? = null
+            set(value) {
+                if (value != null) {
+                    @Suppress("DEPRECATION_ERROR")
+                    score = Score.fromOld(value)
+                }
+            }
+    }
+
+    /** What to display to the user for a downloaded show/movie. Includes info such as name, poster and url */
+    data class DownloadHeaderCached(
+        @JsonProperty("apiName") val apiName: String,
+        @JsonProperty("url") val url: String,
+        @JsonProperty("type") val type: TvType,
+        @JsonProperty("name") val name: String,
+        @JsonProperty("poster") val poster: String?,
+        @JsonProperty("cacheTime") val cacheTime: Long,
+        override val id: Int,
+    ) : DownloadCached(id)
+
+    data class DownloadResumePackage(
+        @JsonProperty("item") val item: DownloadItem,
+        /** Tills which link should get resumed */
+        @JsonProperty("linkIndex") val linkIndex: Int?,
+    ) {
+        fun toWrapper(): DownloadQueueWrapper {
+            return DownloadQueueWrapper(this, null)
+        }
+    }
+
+    data class DownloadItem(
+        @JsonProperty("source") val source: String?,
+        @JsonProperty("folder") val folder: String?,
+        @JsonProperty("ep") val ep: DownloadEpisodeMetadata,
+        @JsonProperty("links") val links: List<ExtractorLink>,
+    )
+
+    /** Metadata for a specific episode and how to display it. */
+    data class DownloadEpisodeMetadata(
+        @JsonProperty("id") val id: Int,
+        @JsonProperty("parentId") val parentId: Int,
+        @JsonProperty("mainName") val mainName: String,
+        @JsonProperty("sourceApiName") val sourceApiName: String?,
+        @JsonProperty("poster") val poster: String?,
+        @JsonProperty("name") val name: String?,
+        @JsonProperty("season") val season: Int?,
+        @JsonProperty("episode") val episode: Int?,
+        @JsonProperty("type") val type: TvType?,
+    )
+
+
+    data class DownloadedFileInfo(
+        @JsonProperty("totalBytes") val totalBytes: Long,
+        @JsonProperty("relativePath") val relativePath: String,
+        @JsonProperty("displayName") val displayName: String,
+        @JsonProperty("extraInfo") val extraInfo: String? = null,
+        @JsonProperty("basePath") val basePath: String? = null, // null is for legacy downloads. See getBasePath()
+        // Hash of the link associated with this DownloadFile, used so not override old data in the DownloadedFileInfo
+        @JsonProperty("linkHash") val linkHash : Int? = null
+    )
+
+    data class DownloadedFileInfoResult(
+        @JsonProperty("fileLength") val fileLength: Long,
+        @JsonProperty("totalBytes") val totalBytes: Long,
+        @JsonProperty("path") val path: Uri,
+    )
+
+
+    data class ResumeWatching(
+        @JsonProperty("parentId") val parentId: Int,
+        @JsonProperty("episodeId") val episodeId: Int?,
+        @JsonProperty("episode") val episode: Int?,
+        @JsonProperty("season") val season: Int?,
+        @JsonProperty("updateTime") val updateTime: Long,
+        @JsonProperty("isFromDownload") val isFromDownload: Boolean,
+    )
+
+
+    data class DownloadStatus(
+        /** if you should retry with the same args and hope for a better result */
+        val retrySame: Boolean,
+        /** if you should try the next mirror */
+        val tryNext: Boolean,
+        /** if the result is what the user intended */
+        val success: Boolean,
+    )
+
+
+    data class CreateNotificationMetadata(
+        val type: VideoDownloadManager.DownloadType,
+        val bytesDownloaded: Long,
+        val bytesTotal: Long,
+        val hlsProgress: Long? = null,
+        val hlsTotal: Long? = null,
+        val bytesPerSecond: Long
+    )
+
+    data class StreamData(
+        private val fileLength: Long,
+        val file: SafeFile,
+        //val fileStream: OutputStream,
+    ) {
+        @Throws(IOException::class)
+        fun open(): OutputStream {
+            return file.openOutputStreamOrThrow(resume)
+        }
+
+        @Throws(IOException::class)
+        fun openNew(): OutputStream {
+            return file.openOutputStreamOrThrow(false)
+        }
+
+        fun delete(): Boolean {
+            return file.delete() == true
+        }
+
+        val resume: Boolean get() = fileLength > 0L
+        val startAt: Long get() = if (resume) fileLength else 0L
+        val exists: Boolean get() = file.exists() == true
+    }
+
+
+    /** bytes have the size end-start where the byte range is [start,end)
+     * note that ByteArray is a pointer and therefore cant be stored without cloning it */
+    data class LazyStreamDownloadResponse(
+        val bytes: ByteArray,
+        val startByte: Long,
+        val endByte: Long,
+    ) {
+        val size get() = endByte - startByte
+
+        override fun toString(): String {
+            return "$startByte->$endByte"
+        }
+
+        override fun equals(other: Any?): Boolean {
+            if (other !is LazyStreamDownloadResponse) return false
+            return other.startByte == startByte && other.endByte == endByte
+        }
+
+        override fun hashCode(): Int {
+            return Objects.hash(startByte, endByte)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/downloader/DownloadQueueManager.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/downloader/DownloadQueueManager.kt
new file mode 100644
index 00000000000..f3866408833
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/downloader/DownloadQueueManager.kt
@@ -0,0 +1,250 @@
+package com.lagradost.cloudstream3.utils.downloader
+
+import android.content.Context
+import android.util.Log
+import androidx.core.content.ContextCompat
+import com.lagradost.cloudstream3.CloudStreamApp
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.getKey
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.getKeys
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.removeKeys
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.setKey
+import com.lagradost.cloudstream3.MainActivity.Companion.lastError
+import com.lagradost.cloudstream3.mvvm.safe
+import com.lagradost.cloudstream3.plugins.PluginManager
+import com.lagradost.cloudstream3.services.DownloadQueueService
+import com.lagradost.cloudstream3.services.DownloadQueueService.Companion.downloadInstances
+import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
+import com.lagradost.cloudstream3.utils.downloader.DownloadObjects.DownloadQueueWrapper
+import com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager.KEY_RESUME_IN_QUEUE
+import com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager.downloadStatus
+import com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager.downloadStatusEvent
+import com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager.getDownloadFileInfo
+import com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager.getDownloadQueuePackage
+import com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager.getDownloadResumePackage
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.getAndUpdate
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.flow.updateAndGet
+
+// 1. Put a download on the queue
+// 2. The queue manager starts a foreground service to handle the queue
+// 3. The service starts work manager jobs to handle the downloads?
+object DownloadQueueManager {
+    private const val TAG = "DownloadQueueManager"
+    const val QUEUE_KEY = "download_queue_key"
+
+    /** Flow of all active queued download, no active downloads.
+     * This flow may see many changes, do not place expensive observers.
+     * downloadInstances is the flow keeping track of active downloads.
+     * @see com.lagradost.cloudstream3.services.DownloadQueueService.Companion.downloadInstances
+     */
+    private val _queue: MutableStateFlow<Array<DownloadQueueWrapper>> by lazy {
+        /** Persistent queue */
+        val currentValue = getKey<Array<DownloadQueueWrapper>>(QUEUE_KEY) ?: emptyArray()
+        MutableStateFlow(currentValue)
+    }
+
+    val queue: StateFlow<Array<DownloadQueueWrapper>> by lazy { _queue }
+
+    /** Start the queue, marks all queue objects as in progress.
+     * Note that this may run twice without the service restarting
+     * because MainActivity may be recreated. */
+    fun init(context: Context) {
+        ioSafe {
+            _queue.collect { queue ->
+                setKey(QUEUE_KEY, queue)
+            }
+        }
+
+        ioSafe startQueue@{
+            // Do not automatically start the queue if safe mode is activated.
+            if (PluginManager.isSafeMode()) {
+                // Prevent misleading UI
+                VideoDownloadManager.cancelAllDownloadNotifications(context)
+                return@startQueue
+            }
+
+            val resumeQueue =
+                getPreResumeIds().filterNot {
+                    VideoDownloadManager.currentDownloads.value.contains(it)
+                }
+                    .mapNotNull { id ->
+                        getDownloadResumePackage(context, id)?.toWrapper()
+                            ?: getDownloadQueuePackage(context, id)
+                    }
+
+            val newQueue = _queue.updateAndGet { localQueue ->
+                // Add resume packages to the first part of the queue, since they may have been removed from the queue when they started
+                (resumeQueue + localQueue).distinctBy { it.id }.toTypedArray()
+            }
+
+            // Once added to the queue they can be safely removed
+            removeKeys(KEY_RESUME_IN_QUEUE)
+
+            // Make sure the download buttons display a pending status
+            newQueue.forEach { obj ->
+                setQueueStatus(obj.id, VideoDownloadManager.DownloadType.IsPending)
+            }
+
+            if (newQueue.any()) {
+                startQueueService(context)
+            }
+        }
+    }
+
+    /** Downloads not yet started or in progress. */
+    private fun getPreResumeIds(): Set<Int> {
+        return getKeys(KEY_RESUME_IN_QUEUE)?.mapNotNull {
+            it.substringAfter("$KEY_RESUME_IN_QUEUE/").toIntOrNull()
+        }?.toSet()
+            ?: emptySet()
+    }
+
+    /** Adds an object to the internal persistent queue. It does not re-add an existing item. @return true if successfully added  */
+    private fun add(downloadQueueWrapper: DownloadQueueWrapper): Boolean {
+        Log.d(TAG, "Download added to queue: $downloadQueueWrapper")
+        val newQueue = _queue.updateAndGet { localQueue ->
+            // Do not add the same episode twice
+            if (downloadQueueWrapper.isCurrentlyDownloading() || localQueue.any { it.id == downloadQueueWrapper.id }) {
+                return@updateAndGet localQueue
+            }
+            localQueue + downloadQueueWrapper
+        }
+        return newQueue.any { it.id == downloadQueueWrapper.id }
+    }
+
+    /** Removes all objects with the same id from the internal persistent queue */
+    private fun remove(id: Int) {
+        Log.d(TAG, "Download removed from the queue: $id")
+        _queue.update { localQueue ->
+            // The check is to prevent unnecessary updates
+            if (!localQueue.any { it.id == id }) {
+                return@update localQueue
+            }
+
+            localQueue.filter { it.id != id }.toTypedArray()
+        }
+    }
+
+    /** Removes all items and returns the previous queue */
+    private fun removeAll(): Array<DownloadQueueWrapper> {
+        Log.d(TAG, "Removed everything from queue")
+        return _queue.getAndUpdate {
+            emptyArray()
+        }
+    }
+
+    private fun reorder(downloadQueueWrapper: DownloadQueueWrapper, newPosition: Int) {
+        _queue.update { localQueue ->
+            val newIndex = newPosition.coerceIn(0, localQueue.size)
+            val id = downloadQueueWrapper.id
+
+            val newQueue = localQueue.filter { it.id != id }.toMutableList().apply {
+                this.add(newIndex, downloadQueueWrapper)
+            }.toTypedArray()
+
+            newQueue
+        }
+    }
+
+    /** Start a real download from the first item in the queue */
+    fun popQueue(context: Context): VideoDownloadManager.EpisodeDownloadInstance? {
+        val first = queue.value.firstOrNull() ?: return null
+
+        remove(first.id)
+
+        val downloadInstance = VideoDownloadManager.EpisodeDownloadInstance(context, first)
+
+        return downloadInstance
+    }
+
+    /** Marks the item as in queue for the download button */
+    private fun setQueueStatus(id: Int, status: VideoDownloadManager.DownloadType) {
+        downloadStatusEvent.invoke(
+            Pair(
+                id,
+                status
+            )
+        )
+        downloadStatus[id] = status
+    }
+
+    private fun startQueueService(context: Context?) {
+        if (context == null) {
+            Log.d(TAG, "Cannot start download queue service, null context.")
+            return
+        }
+        // Do not restart the download queue service
+        if (DownloadQueueService.isRunning) {
+            return
+        }
+        ioSafe {
+            val intent = DownloadQueueService.getIntent(context)
+            ContextCompat.startForegroundService(context, intent)
+        }
+    }
+
+    /** Cancels an active download or removes it from queue depending on where it is. */
+    fun cancelDownload(id: Int) {
+        Log.d(TAG, "Cancelling download: $id")
+
+        val currentInstance = downloadInstances.value.find { it.downloadQueueWrapper.id == id }
+
+        if (currentInstance != null) {
+            currentInstance.cancelDownload()
+        } else {
+            removeFromQueue(id)
+        }
+    }
+
+    /** Removes all queued items */
+    fun removeAllFromQueue() {
+        removeAll().forEach { wrapper ->
+            setQueueStatus(wrapper.id, VideoDownloadManager.DownloadType.IsStopped)
+        }
+    }
+
+    /** Removes all objects with the same id from the internal persistent queue  */
+    fun removeFromQueue(id: Int) {
+        ioSafe {
+            remove(id)
+            setQueueStatus(id, VideoDownloadManager.DownloadType.IsStopped)
+        }
+    }
+
+    /** Will move the download queue wrapper to a new position in the queue.
+     * If the item does not exist it will also insert it. */
+    fun reorderItem(downloadQueueWrapper: DownloadQueueWrapper, newPosition: Int) {
+        ioSafe {
+            reorder(downloadQueueWrapper, newPosition)
+        }
+    }
+
+    /** Add a new object to the queue. Will not queue completed downloads or current downloads. */
+    fun addToQueue(downloadQueueWrapper: DownloadQueueWrapper) = safe {
+        val context = CloudStreamApp.context ?: return@safe
+        val fileInfo = getDownloadFileInfo(context, downloadQueueWrapper.id)
+        val isComplete = fileInfo != null &&
+                // Assure no division by 0
+                fileInfo.totalBytes > 0 &&
+                // If more than 98% downloaded then do not add to queue
+                (fileInfo.fileLength.toFloat() / fileInfo.totalBytes.toFloat()) > 0.98f
+        // Do not queue completed files!
+        if (isComplete) return@safe
+
+        if (add(downloadQueueWrapper)) {
+            setQueueStatus(downloadQueueWrapper.id, VideoDownloadManager.DownloadType.IsPending)
+            startQueueService(context)
+        }
+    }
+
+
+    /** Refreshes the queue flow with the same value, but copied.
+     * Good to run if the downloads are affected by some outside value change. */
+    fun forceRefreshQueue() {
+        _queue.update { localQueue ->
+            localQueue.copyOf()
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/downloader/DownloadUtils.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/downloader/DownloadUtils.kt
new file mode 100644
index 00000000000..9f2c31d9a37
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/downloader/DownloadUtils.kt
@@ -0,0 +1,165 @@
+package com.lagradost.cloudstream3.utils.downloader
+
+import android.content.Context
+import android.graphics.Bitmap
+import androidx.core.graphics.drawable.toBitmap
+import coil3.Extras
+import coil3.SingletonImageLoader
+import coil3.asDrawable
+import coil3.request.ImageRequest
+import coil3.request.SuccessResult
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.mvvm.logError
+import com.lagradost.cloudstream3.mvvm.safe
+import com.lagradost.cloudstream3.ui.player.SubtitleData
+import com.lagradost.cloudstream3.ui.result.ExtractorSubtitleLink
+import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
+import com.lagradost.cloudstream3.utils.UiText
+import com.lagradost.cloudstream3.utils.downloader.DownloadFileManagement.getFileName
+import com.lagradost.cloudstream3.utils.downloader.DownloadFileManagement.getFolder
+import com.lagradost.cloudstream3.utils.txt
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.runBlocking
+import java.util.concurrent.ConcurrentHashMap
+
+/** Separate object with helper functions for the downloader */
+object DownloadUtils {
+    private val cachedBitmaps = ConcurrentHashMap<String, Bitmap>()
+    internal fun Context.getImageBitmapFromUrl(
+        url: String,
+        headers: Map<String, String>? = null
+    ): Bitmap? = safe {
+        cachedBitmaps[url]?.let {
+            return@safe it
+        }
+
+        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()
+        }
+
+        bitmap?.let {
+            cachedBitmaps.putIfAbsent(url, it)
+        }
+
+        return@safe bitmap
+    }
+
+    //calculate the time
+    internal fun getEstimatedTimeLeft(
+        context: Context,
+        bytesPerSecond: Long,
+        progress: Long,
+        total: Long
+    ): String {
+        if (bytesPerSecond <= 0) return ""
+        val timeInSec = (total - progress) / bytesPerSecond
+        val hrs = timeInSec / 3600
+        val mins = (timeInSec % 3600) / 60
+        val secs = timeInSec % 60
+        val timeFormated: UiText? = when {
+            hrs > 0 -> txt(
+                R.string.download_time_left_hour_min_sec_format,
+                hrs,
+                mins,
+                secs
+            )
+
+            mins > 0 -> txt(
+                R.string.download_time_left_min_sec_format,
+                mins,
+                secs
+            )
+
+            secs > 0 -> txt(
+                R.string.download_time_left_sec_format,
+                secs
+            )
+
+            else -> null
+        }
+        return timeFormated?.asString(context) ?: ""
+    }
+
+    internal fun downloadSubtitle(
+        context: Context?,
+        link: ExtractorSubtitleLink,
+        fileName: String,
+        folder: String
+    ) {
+        ioSafe {
+            VideoDownloadManager.downloadThing(
+                context ?: return@ioSafe,
+                link,
+                "$fileName ${link.name}",
+                folder,
+                if (link.url.contains(".srt")) "srt" else "vtt",
+                false,
+                null, createNotificationCallback = {}
+            )
+        }
+    }
+
+    fun downloadSubtitle(
+        context: Context?,
+        link: SubtitleData,
+        meta: DownloadObjects.DownloadEpisodeMetadata,
+    ) {
+        context?.let { ctx ->
+            val fileName = getFileName(ctx, meta)
+            val folder = getFolder(meta.type ?: return, meta.mainName)
+            downloadSubtitle(
+                ctx,
+                ExtractorSubtitleLink(link.name, link.url, "", link.headers),
+                fileName,
+                folder
+            )
+        }
+    }
+
+
+    /** Helper function to make sure duplicate attributes don't get overridden or inserted without lowercase cmp
+     * example: map("a" to 1) appendAndDontOverride map("A" to 2, "a" to 3, "c" to 4) = map("a" to 1, "c" to 4)
+     * */
+    internal fun <V> Map<String, V>.appendAndDontOverride(rhs: Map<String, V>): Map<String, V> {
+        val out = this.toMutableMap()
+        val current = this.keys.map { it.lowercase() }
+        for ((key, value) in rhs) {
+            if (current.contains(key.lowercase())) continue
+            out[key] = value
+        }
+        return out
+    }
+
+    internal fun List<Job>.cancel() {
+        forEach { job ->
+            try {
+                job.cancel()
+            } catch (t: Throwable) {
+                logError(t)
+            }
+        }
+    }
+
+    internal suspend fun List<Job>.join() {
+        forEach { job ->
+            try {
+                job.join()
+            } catch (t: Throwable) {
+                logError(t)
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/AniSkip.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/AniSkip.kt
new file mode 100644
index 00000000000..0db90afeaef
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/AniSkip.kt
@@ -0,0 +1,68 @@
+package com.lagradost.cloudstream3.utils.videoskip
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize
+import com.lagradost.cloudstream3.AnimeLoadResponse
+import com.lagradost.cloudstream3.LoadResponse
+import com.lagradost.cloudstream3.LoadResponse.Companion.getMalId
+import com.lagradost.cloudstream3.TvType
+import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.ui.result.ResultEpisode
+
+// taken from https://github.com/saikou-app/saikou/blob/3803f8a7a59b826ca193664d46af3a22bbc989f7/app/src/main/java/ani/saikou/others/AniSkip.kt
+// the following is GPLv3 code https://github.com/saikou-app/saikou/blob/main/LICENSE.md
+class AniSkip : SkipAPI() {
+    override val name: String = "AniSkip"
+    override val supportedTypes: Set<TvType> = setOf(TvType.Anime, TvType.OVA)
+
+    override suspend fun stamps(
+        data: LoadResponse,
+        episode: ResultEpisode,
+        episodeDurationMs: Long
+    ): List<SkipStamp>? {
+        if (data !is AnimeLoadResponse) return null // Filter actual anime
+
+        val malId = data.getMalId()?.toIntOrNull() ?: return null
+        val url =
+            "https://api.aniskip.com/v2/skip-times/$malId/${episode.episode}?types[]=ed&types[]=mixed-ed&types[]=mixed-op&types[]=op&types[]=recap&episodeLength=${episodeDurationMs / 1000L}"
+
+        val response = app.get(url).parsed<AniSkipResponse>()
+
+        // because it also returns an expected episode length we use that just in case it is mismatched with like 2s next episode will still work
+        return response.results?.mapNotNull { stamp ->
+            val skipType = when (stamp.skipType) {
+                "op" -> SkipType.Opening
+                "ed" -> SkipType.Ending
+                "recap" -> SkipType.Recap
+                "mixed-ed" -> SkipType.MixedEnding
+                "mixed-op" -> SkipType.MixedOpening
+                else -> null
+            } ?: return@mapNotNull null
+            val end = (stamp.interval.endTime * 1000.0).toLong()
+            val start = (stamp.interval.startTime * 1000.0).toLong()
+            SkipStamp(
+                type = skipType,
+                startMs = start,
+                endMs = end,
+            )
+        }
+    }
+
+    data class AniSkipResponse(
+        @JsonSerialize val found: Boolean,
+        @JsonSerialize val results: List<Stamp>?,
+        @JsonSerialize val message: String?,
+        @JsonSerialize val statusCode: Int
+    )
+
+    data class Stamp(
+        @JsonSerialize val interval: AniSkipInterval,
+        @JsonSerialize val skipType: String,
+        @JsonSerialize val skipId: String,
+        @JsonSerialize val episodeLength: Double
+    )
+
+    data class AniSkipInterval(
+        @JsonSerialize val startTime: Double,
+        @JsonSerialize val endTime: Double
+    )
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/AnimeSkip.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/AnimeSkip.kt
new file mode 100644
index 00000000000..f9254576bb5
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/AnimeSkip.kt
@@ -0,0 +1,370 @@
+package com.lagradost.cloudstream3.utils.videoskip
+
+import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.cloudstream3.AnimeLoadResponse
+import com.lagradost.cloudstream3.ErrorLoadingException
+import com.lagradost.cloudstream3.LoadResponse
+import com.lagradost.cloudstream3.TvSeriesLoadResponse
+import com.lagradost.cloudstream3.TvType
+import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.animeSkipApi
+import com.lagradost.cloudstream3.syncproviders.AuthAPI
+import com.lagradost.cloudstream3.syncproviders.AuthLoginRequirement
+import com.lagradost.cloudstream3.syncproviders.AuthLoginResponse
+import com.lagradost.cloudstream3.syncproviders.AuthToken
+import com.lagradost.cloudstream3.syncproviders.AuthUser
+import com.lagradost.cloudstream3.syncproviders.PlainAuthRepo
+import com.lagradost.cloudstream3.ui.result.ResultEpisode
+import com.lagradost.cloudstream3.utils.AppUtils.parseJson
+import com.lagradost.cloudstream3.utils.AppUtils.toJson
+import java.math.BigInteger
+import java.util.concurrent.ConcurrentHashMap
+import java.security.MessageDigest
+
+class AnimeSkipAuth : AuthAPI() {
+    override val name = "AnimeSkip"
+    override val inAppLoginRequirement: AuthLoginRequirement =
+        AuthLoginRequirement(password = true, username = true)
+    override val idPrefix = "anime-skip"
+    override val hasInApp = true
+    override val createAccountUrl = "https://anime-skip.com/account"
+    val baseClientId = "as1JgiMbW4wKfmTLWXS79iTDQFll76pk"
+    fun md5(input: String): String {
+        val md = MessageDigest.getInstance("MD5")
+        return BigInteger(1, md.digest(input.toByteArray())).toString(16).padStart(32, '0')
+    }
+
+    data class LoginRoot(
+        @JsonProperty("data")
+        val data: LoginData,
+    )
+
+    data class LoginData(
+        @JsonProperty("login")
+        val login: Login,
+    )
+
+    data class Login(
+        @JsonProperty("authToken")
+        val authToken: String,
+        @JsonProperty("refreshToken")
+        val refreshToken: String,
+        @JsonProperty("account")
+        val account: Account,
+    )
+
+    data class ApiRoot(
+        @JsonProperty("data")
+        val data: ApiData,
+    )
+
+    data class ApiData(
+        @JsonProperty("myApiClients")
+        val myApiClients: List<MyApiClient>,
+    )
+
+    data class MyApiClient(
+        @JsonProperty("id")
+        val id: String,
+    )
+
+    data class Account(
+        @JsonProperty("profileUrl")
+        val profileUrl: String,
+        @JsonProperty("username")
+        val username: String,
+        @JsonProperty("email")
+        val email: String,
+    )
+
+    data class Payload(
+        @JsonProperty("profileUrl")
+        val profileUrl: String,
+        @JsonProperty("username")
+        val username: String,
+        @JsonProperty("email")
+        val email: String,
+        @JsonProperty("clientId")
+        val clientId: String,
+    )
+
+    override suspend fun user(token: AuthToken?): AuthUser? {
+        val payload = parseJson<Payload>(token?.payload ?: return null)
+        return AuthUser(
+            name = payload.username,
+            id = payload.email.hashCode(),
+            profilePicture = payload.profileUrl
+        )
+    }
+
+    override suspend fun login(form: AuthLoginResponse): AuthToken? {
+        val hash = md5(form.password ?: return null)
+        val emailOrUserName = form.email ?: form.username ?: return null
+
+        val loginQuery = """
+    {
+      login(usernameEmail: "$emailOrUserName", passwordHash: "$hash") {
+        authToken
+        refreshToken
+        account {
+          profileUrl
+          username
+          email
+        }
+      }
+    }
+"""
+        val loginRoot = app.post(
+            "https://api.anime-skip.com/graphql",
+            json = mapOf("query" to loginQuery),
+            headers = mapOf(
+                "Accept" to "*/*",
+                "content-type" to "application/json",
+                "X-Client-ID" to baseClientId
+            )
+        ).parsed<LoginRoot>()
+
+        val authToken = loginRoot.data.login.authToken
+        val refreshToken = loginRoot.data.login.refreshToken
+        val account = loginRoot.data.login.account
+
+        val clientQuery = """
+            {
+              myApiClients {
+                id
+              }
+            }
+        """.trimIndent()
+
+        val apiRoot = app.post(
+            "https://api.anime-skip.com/graphql",
+            json = mapOf("query" to clientQuery),
+            headers = mapOf(
+                "Accept" to "*/*",
+                "content-type" to "application/json",
+                "Authorization" to "Bearer $authToken",
+                "X-Client-ID" to baseClientId
+            )
+        ).parsed<ApiRoot>()
+
+        val clientId = apiRoot.data.myApiClients.getOrNull(0)?.id
+            ?: throw ErrorLoadingException("No API token found")
+
+        val payload = Payload(
+            profileUrl = account.profileUrl,
+            username = account.username,
+            email = account.email,
+            clientId = clientId,
+        )
+        return AuthToken(
+            accessToken = authToken,
+            refreshToken = refreshToken,
+            payload = payload.toJson()
+        )
+    }
+}
+
+class AnimeSkip : SkipAPI() {
+    override val name: String = "AniSkip"
+    override val supportedTypes: Set<TvType> = setOf(TvType.Anime, TvType.OVA)
+
+    val auth = PlainAuthRepo(animeSkipApi)
+    //val clientId = "ZGfO0sMF3eCwLYf8yMSCJjlynwNGRXWE"
+
+    companion object {
+        const val MIN_LENGTH: Int = 4
+
+        private val strip = Regex("[ :\\-.!]")
+
+        /** Makes names more uniform to make partial matches more still give a result */
+        fun stripName(name: String?): String? =
+            name?.replace(strip, "")?.lowercase()
+
+        private val asciiRegex = Regex("[^a-zA-Z0-9 ]")
+
+        /** Makes names more uniform to make partial matches more still give a result */
+        fun asciiName(name: String?): String? =
+            name?.replace(asciiRegex, "")?.lowercase()
+    }
+
+    data class Root(
+        @JsonProperty("data")
+        val data: Data,
+    )
+
+    data class Data(
+        @JsonProperty("searchShows")
+        val searchShows: List<SearchShow>,
+    )
+
+    data class SearchShow(
+        @JsonProperty("name")
+        val name: String,
+        @JsonProperty("originalName")
+        val originalName: String?,
+        @JsonProperty("seasonCount")
+        val seasonCount: Long,
+        @JsonProperty("episodeCount")
+        val episodeCount: Long,
+        @JsonProperty("baseDuration")
+        val baseDuration: Double,
+        @JsonProperty("episodes")
+        val episodes: List<Episode>,
+    )
+
+    data class Episode(
+        @JsonProperty("number")
+        val number: String?,
+        @JsonProperty("absoluteNumber")
+        val absoluteNumber: String?,
+        @JsonProperty("season")
+        val season: String?,
+        @JsonProperty("timestamps")
+        val timestamps: List<Timestamp>,
+    )
+
+    data class Timestamp(
+        @JsonProperty("at")
+        val at: Double,
+        @JsonProperty("type")
+        val type: Type,
+    )
+
+    data class Type(
+        @JsonProperty("name")
+        val name: String,
+    )
+
+    val cache: ConcurrentHashMap<String, Data> = ConcurrentHashMap()
+
+    override suspend fun stamps(
+        data: LoadResponse,
+        episode: ResultEpisode,
+        episodeDurationMs: Long
+    ): List<SkipStamp>? {
+        val clientId : String = parseJson<AnimeSkipAuth.Payload>(
+            auth.authData()?.token?.payload ?: return null
+        ).clientId
+
+        when (data) {
+            is AnimeLoadResponse, is TvSeriesLoadResponse -> {
+                /** Require episode based anime */
+            }
+
+            else -> return null
+        }
+
+        val query = """{
+  searchShows(search: "${data.name}", limit: 1) {
+    name
+    originalName
+    seasonCount
+    episodeCount
+    episodes {
+      number
+      absoluteNumber
+      season
+      baseDuration
+      timestamps {
+        at
+        type {
+          name
+        }
+      }
+    }
+  }
+}"""
+        val root = cache[data.name] ?: run {
+            app.post(
+                "https://api.anime-skip.com/graphql",
+                json = mapOf("query" to query),
+                headers = mapOf(
+                    "Accept" to "*/*",
+                    "content-type" to "application/json",
+                    "X-Client-ID" to clientId
+                )
+            )
+                .parsed<Root>().data.also { root ->
+                    cache[data.name] = root
+                }
+        }
+        val show = root.searchShows.firstOrNull { show ->
+            /** Match ascii */
+            val ascii1 = asciiName(data.name)
+            val ascii2 = asciiName(show.name)
+            if (ascii1 == ascii2 && (ascii1?.length ?: 0) > MIN_LENGTH) {
+                return@firstOrNull true
+            }
+
+            if (data !is AnimeLoadResponse) {
+                return@firstOrNull false
+            }
+
+            /** Match original name */
+            val strip1 = stripName(show.originalName)
+            val strip2 = stripName(data.japName)
+
+            /** Match english name*/
+            val ascii3 = stripName(data.engName)
+            (strip1 == strip2 && (strip1?.length ?: 0) > MIN_LENGTH) ||
+                    (ascii2 == ascii3 && (ascii2?.length ?: 0) > MIN_LENGTH)
+        } ?: return null
+
+        val showEpisode = when (data) {
+            is AnimeLoadResponse -> {
+                val episodeNumber = episode.episode.toString()
+                /** For anime, match on number */
+                show.episodes.firstOrNull {
+                    it.absoluteNumber == episodeNumber
+                } ?: show.episodes.firstOrNull {
+                    it.number == episodeNumber
+                }
+            }
+
+            is TvSeriesLoadResponse -> {
+                /** For tv-series, match on season + number */
+                val seasonNumber = episode.season?.toString()
+                val episodeNumber = episode.episode.toString()
+                val episodeIndex = episode.totalEpisodeIndex.toString()
+
+                show.episodes.firstOrNull {
+                    it.season == seasonNumber && it.number == episodeNumber
+                } ?: show.episodes.firstOrNull {
+                    it.absoluteNumber == episodeIndex
+                }
+            }
+
+            else -> null
+        } ?: return null
+
+        val result = ArrayList<SkipStamp>()
+        var pending: SkipStamp? = null
+        for (stamp in showEpisode.timestamps) {
+            val startMS = (stamp.at * 1000.0).toLong()
+            pending?.let { pending ->
+                result.add(pending.copy(endMs = startMS))
+            }
+            val type = when (stamp.type.name) {
+                "Intro", "New Intro" -> SkipType.Intro
+                "Credits" -> SkipType.Credits
+                "Preview" -> SkipType.Preview
+                "Recap" -> SkipType.Recap
+                "Mixed Credits" -> SkipType.MixedEnding
+                "Filler", "Transition", "Branding", "Canon", "Title Card" -> null
+                else -> null
+            }
+            if (type == null) {
+                pending = null
+                continue
+            }
+            pending = SkipStamp(type, startMS, 0L)
+        }
+        pending?.let { pending ->
+            result.add(pending.copy(endMs = episodeDurationMs))
+            /** Base duration = fucked */
+        }
+
+        return result
+    }
+}
+
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/IntroDbSkip.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/IntroDbSkip.kt
new file mode 100644
index 00000000000..869515f4390
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/IntroDbSkip.kt
@@ -0,0 +1,77 @@
+package com.lagradost.cloudstream3.utils.videoskip
+
+import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.cloudstream3.LoadResponse
+import com.lagradost.cloudstream3.LoadResponse.Companion.getImdbId
+import com.lagradost.cloudstream3.TvType
+import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.ui.result.ResultEpisode
+
+class IntroDbSkip : SkipAPI() {
+    override val name = "IntroDb"
+
+    override val supportedTypes = setOf(TvType.TvSeries, TvType.AsianDrama)
+
+    override suspend fun stamps(
+        data: LoadResponse,
+        episode: ResultEpisode,
+        episodeDurationMs: Long
+    ): List<SkipStamp>? {
+        val season = episode.season ?: return null
+        val imdbId = data.getImdbId() ?: return null
+
+        val url =
+            "https://api.introdb.app/segments?imdb_id=$imdbId&season=$season&episode=${episode.episode}"
+        val response = app.get(url).parsed<IntroDbResponse>()
+
+        return listOfNotNull(
+            response.intro?.let {
+                val start = it.startMs ?: return@let null
+                val end = it.endMs ?: return@let null
+                SkipStamp(
+                    type = SkipType.Opening,
+                    startMs = start,
+                    endMs = end
+                )
+            },
+            response.recap?.let {
+                val start = it.startMs ?: return@let null
+                val end = it.endMs ?: return@let null
+                SkipStamp(
+                    type = SkipType.Recap,
+                    startMs = start,
+                    endMs = end
+                )
+            },
+            response.outro?.let {
+                val start = it.startMs ?: return@let null
+                val end = it.endMs ?: return@let null
+                SkipStamp(
+                    type = SkipType.Ending,
+                    startMs = start,
+                    endMs = end
+                )
+            }
+        )
+    }
+
+
+    data class IntroDbResponse(
+        @JsonProperty("imdb_id") val imdbId: String?,
+        val season: Int?,
+        val episode: Int?,
+        val intro: Segment?,
+        val recap: Segment?,
+        val outro: Segment?,
+    )
+
+    data class Segment(
+        @JsonProperty("start_sec") val startSec: Double?,
+        @JsonProperty("end_sec") val endSec: Double?,
+        @JsonProperty("start_ms") val startMs: Long?,
+        @JsonProperty("end_ms") val endMs: Long?,
+        val confidence: Double?,
+        @JsonProperty("submission_count") val submissionCount: Int?,
+        @JsonProperty("updated_at") val updatedAt: String?,
+    )
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/SkipAPI.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/SkipAPI.kt
new file mode 100644
index 00000000000..60cc3ae1e23
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/SkipAPI.kt
@@ -0,0 +1,105 @@
+package com.lagradost.cloudstream3.utils.videoskip
+
+import androidx.annotation.StringRes
+import com.lagradost.cloudstream3.LoadResponse
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.TvType
+import com.lagradost.cloudstream3.mvvm.safeAsync
+import com.lagradost.cloudstream3.ui.result.ResultEpisode
+import com.lagradost.cloudstream3.utils.txt
+import java.util.concurrent.ConcurrentHashMap
+
+
+enum class SkipType(@StringRes val res: Int) {
+    Opening(R.string.skip_type_op),
+    Ending(R.string.skip_type_ed),
+    Recap(R.string.skip_type_recap),
+    MixedOpening(R.string.skip_type_mixed_op),
+    MixedEnding(R.string.skip_type_mixed_ed),
+    Credits(R.string.skip_type_credits),
+    Intro(R.string.skip_type_intro),
+    Preview(R.string.skip_type_preview),
+}
+
+data class SkipStamp(
+    val type: SkipType,
+    /** Start position in milliseconds of the skip, where it should start showing up */
+    val startMs: Long,
+    /** End position in milliseconds of the skip, where it will skip to */
+    val endMs: Long,
+    /** Custom visual label instead of using the type. Only use this for content not covered by SkipType */
+    val label: String? = null,
+)
+
+data class VideoSkipStamp(
+    val timestamp: SkipStamp,
+    val skipToNextEpisode: Boolean,
+    val source: String,
+) {
+    val uiText =
+        if (skipToNextEpisode) txt(R.string.next_episode) else
+            txt(
+                R.string.skip_type_format,
+                timestamp.label?.let { txt(it) } ?: txt(timestamp.type.res)
+            )
+}
+
+abstract class SkipAPI {
+    open val name: String = "NONE"
+
+    /** On what types SkipAPI should trigger on */
+    abstract val supportedTypes: Set<TvType>
+
+    /** Get all video skip stamps of the associated episode */
+    @Throws
+    open suspend fun stamps(
+        data: LoadResponse,
+        episode: ResultEpisode,
+        episodeDurationMs: Long,
+    ): List<SkipStamp>? {
+        throw NotImplementedError()
+    }
+
+    companion object {
+        private val skipApis: List<SkipAPI> = listOf(AniSkip(), TheIntroDBSkip(), IntroDbSkip(), AnimeSkip())
+        private val cachedStamps = ConcurrentHashMap<Int, List<VideoSkipStamp>>()
+
+        /** Get all video timestamps from an episode */
+        suspend fun videoStamps(
+            data: LoadResponse,
+            episode: ResultEpisode,
+            episodeDurationMs: Long,
+            hasNextEpisode: Boolean,
+        ): List<VideoSkipStamp> {
+            cachedStamps[episode.id]?.let { list ->
+                return list
+            }
+
+            for (api in skipApis) {
+                /** Unsupported type, so we do not waste a get call */
+                if (!api.supportedTypes.contains(data.type)) {
+                    continue
+                }
+
+                /** Find first non-empty stamps */
+                val stamps = safeAsync { api.stamps(data, episode, episodeDurationMs) }
+                if (stamps.isNullOrEmpty()) {
+                    continue
+                }
+
+                return stamps.map { stamp ->
+                    VideoSkipStamp(
+                        timestamp = stamp,
+                        skipToNextEpisode = hasNextEpisode && episodeDurationMs - stamp.endMs < 20_000L,
+                        source = api.name
+                    )
+                }.also { stamps ->
+                    /** Put in cache, this is such small data, it should be fine to never clear it */
+                    cachedStamps[episode.id] = stamps
+                }
+            }
+            return emptyList()
+        }
+    }
+}
+
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/TheIntroDBSkip.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/TheIntroDBSkip.kt
new file mode 100644
index 00000000000..cc2661cb096
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/TheIntroDBSkip.kt
@@ -0,0 +1,76 @@
+package com.lagradost.cloudstream3.utils.videoskip
+
+import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.cloudstream3.LoadResponse
+import com.lagradost.cloudstream3.LoadResponse.Companion.getImdbId
+import com.lagradost.cloudstream3.LoadResponse.Companion.getTMDbId
+import com.lagradost.cloudstream3.LoadResponse.Companion.isMovie
+import com.lagradost.cloudstream3.TvType
+import com.lagradost.cloudstream3.ui.result.ResultEpisode
+import com.lagradost.cloudstream3.app
+
+/** https://theintrodb.org/docs */
+class TheIntroDBSkip : SkipAPI() {
+    override val name = "TheIntroDB"
+    override val supportedTypes = setOf(
+        TvType.TvSeries, TvType.Cartoon, TvType.Anime, TvType.Movie,
+        TvType.AsianDrama
+    )
+
+    val mainUrl = "https://api.theintrodb.org"
+
+    override suspend fun stamps(
+        data: LoadResponse,
+        episode: ResultEpisode,
+        episodeDurationMs: Long
+    ): List<SkipStamp>? {
+        val idSuffix =
+            data.getTMDbId()?.let { tmdbId -> "tmdb_id=$tmdbId" }
+                ?: data.getImdbId()?.let { imdbId -> "imdb_id=$imdbId" }
+                ?: return null
+
+        val url = if (data.isMovie()) {
+            "$mainUrl/v2/media?$idSuffix"
+        } else {
+            val season = episode.season ?: return null
+            "$mainUrl/v2/media?$idSuffix&season=$season&episode=${episode.episode}"
+        }
+        val root = app.get(url).parsed<Root>()
+        return arrayOf(
+            root.intro to SkipType.Intro,
+            root.credits to SkipType.Credits,
+            root.recap to SkipType.Recap,
+            root.preview to SkipType.Preview
+        ).map { (list, type) ->
+            list.map { stamp ->
+                SkipStamp(
+                    type,
+                    stamp.startMs ?: 0L,
+                    stamp.endMs ?: episodeDurationMs
+                )
+            }
+        }.flatten()
+    }
+
+    data class Root(
+        @JsonProperty("tmdb_id")
+        val tmdbId: Long,
+        @JsonProperty("type")
+        val type: String,
+        @JsonProperty("intro")
+        val intro: List<Stamp> = emptyList(),
+        @JsonProperty("recap")
+        val recap: List<Stamp> = emptyList(),
+        @JsonProperty("credits")
+        val credits: List<Stamp> = emptyList(),
+        @JsonProperty("preview")
+        val preview: List<Stamp> = emptyList(),
+    )
+
+    data class Stamp(
+        @JsonProperty("start_ms")
+        val startMs: Long?,
+        @JsonProperty("end_ms")
+        val endMs: Long?,
+    )
+}
\ 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 624370032e3..c18ad39c682 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.content.withStyledAttributes
 import androidx.core.view.isVisible
 import androidx.core.view.marginEnd
 import com.lagradost.cloudstream3.R
@@ -19,9 +20,9 @@ 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)
-        t.recycle()
+        c.withStyledAttributes(attrs, R.styleable.FlowLayout_Layout) {
+            itemSpacing = getDimensionPixelSize(R.styleable.FlowLayout_Layout_itemSpacing, 0)
+        }
     }
 
     override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
@@ -104,9 +105,9 @@ class FlowLayout : ViewGroup {
 
         @SuppressLint("CustomViewStyleable")
         internal constructor(c: Context, attrs: AttributeSet?) : super(c, attrs) {
-            val t = c.obtainStyledAttributes(attrs, R.styleable.FlowLayout_Layout)
-            spacing = 0//t.getDimensionPixelSize(R.styleable.FlowLayout_Layout_itemSpacing, 0);
-            t.recycle()
+            c.withStyledAttributes(attrs, R.styleable.FlowLayout_Layout) {
+                spacing = 0
+            }
         }
 
         internal constructor(width: Int, height: Int) : super(width, height) {
diff --git a/app/src/main/res/color/black_button_ripple.xml b/app/src/main/res/color/black_button_ripple.xml
new file mode 100644
index 00000000000..d2a6b6c4d62
--- /dev/null
+++ b/app/src/main/res/color/black_button_ripple.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/transparent" android:state_focused="true" />
+    <item android:color="?attr/textColor" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/item_select_color_tv.xml b/app/src/main/res/color/item_select_color_tv.xml
new file mode 100644
index 00000000000..3042fd58896
--- /dev/null
+++ b/app/src/main/res/color/item_select_color_tv.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="?attr/primaryGrayBackground" android:state_checked="true"/>
+    <item android:color="?attr/white" android:state_checked="false"/>
+</selector>
diff --git a/app/src/main/res/drawable/animeskip.xml b/app/src/main/res/drawable/animeskip.xml
new file mode 100644
index 00000000000..8f1bb3105ed
--- /dev/null
+++ b/app/src/main/res/drawable/animeskip.xml
@@ -0,0 +1,36 @@
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:name="vector"
+    android:width="20dp"
+    android:height="13.8073394495dp"
+    android:tint="?attr/white"
+    android:viewportWidth="436"
+    android:viewportHeight="301">
+    <group android:name="wrapper">
+        <clip-path
+            android:name="clip0"
+            android:pathData="M 0 0.5 L 435.349 0.5 L 435.349 300.5 L 0 300.5 Z"/>
+        <group android:name="group">
+            <path
+                android:name="path"
+                android:pathData="M 125.839 10.155 C 111.48 10.155 99.84 21.796 99.84 36.156 L 99.84 58.903 C 99.536 77.757 84.157 92.948 65.231 92.948 C 46.114 92.948 30.617 108.445 30.617 127.561 C 30.617 146.678 46.114 162.175 65.231 162.175 C 84.157 162.175 99.536 177.365 99.84 196.22 L 99.84 197.356 C 99.536 216.21 84.157 231.401 65.231 231.401 L 34.613 231.401 C 15.497 231.401 0 246.898 0 266.014 C 0 285.131 15.497 300.628 34.613 300.628 L 146.839 300.628 C 156.228 300.628 163.839 293.017 163.839 283.628 L 163.839 10.155 L 125.839 10.155 Z"
+                android:fillColor="#975fe8"
+                android:strokeWidth="1"/>
+            <path
+                android:name="path_1"
+                android:pathData="M 125.839 10.155 C 111.48 10.155 99.84 21.796 99.84 36.156 L 99.84 58.903 C 99.65 70.686 93.572 81.038 84.421 87.146 C 84.35 87.21 84.263 87.275 84.159 87.339 C 70.728 95.697 61.786 110.592 61.786 127.577 C 61.786 144.128 70.278 158.697 83.142 167.163 C 93.002 173.137 99.641 183.896 99.84 196.22 L 99.84 197.356 C 99.536 216.21 84.157 231.401 65.231 231.401 L 64.613 231.401 C 45.497 231.401 30 246.898 30 266.014 C 30 285.131 45.497 300.628 64.613 300.628 L 146.839 300.628 C 156.228 300.628 163.839 293.017 163.839 283.628 L 163.839 10.155 L 125.839 10.155 Z"
+                android:fillColor="#975fe8"
+                android:strokeWidth="1"/>
+            <path
+                android:name="path_2"
+                android:pathData="M 253.526 13.499 C 240.704 6.38 228.101 0.5 216.822 0.5 L 108.821 0.5 C 90.087 0.5 74.9 15.687 74.9 34.421 C 74.9 53.155 90.087 68.342 108.821 68.342 L 177.605 68.342 C 196.339 68.342 211.526 83.529 211.526 102.263 C 211.526 120.997 196.339 136.184 177.605 136.184 L 167.344 136.184 C 148.61 136.184 133.423 151.37 133.423 170.104 C 133.423 188.838 148.61 204.025 167.344 204.025 L 181.618 204.025 C 200.352 204.025 215.539 219.212 215.539 237.946 L 215.92 236.45 L 215.92 241.642 C 215.92 271.114 248.698 288.757 273.298 272.525 L 419.362 176.148 C 440.926 161.919 440.926 130.28 419.362 116.051 L 273.298 19.674 C 267.013 15.527 260.195 13.591 253.526 13.499 Z"
+                android:fillColor="#22baff"
+                android:strokeWidth="1"/>
+            <path
+                android:name="path_3"
+                android:pathData="M 215.575 237.794 L 215.575 280.893 C 215.575 293.634 229.741 301.264 240.379 294.253 L 269.878 274.812 C 271.085 274.187 272.276 273.488 273.449 272.711 L 330.3 235.06 C 331.216 234.453 332.119 233.836 333.009 233.208 L 340.415 228.327 L 340.415 227.499 C 390.819 185.09 390.819 106.611 340.415 64.202 L 340.415 63.782 L 340.135 63.967 C 337.045 61.384 333.766 58.937 330.3 56.641 L 273.449 18.99 C 272.356 18.266 271.247 17.609 270.125 17.017 C 251.954 6.755 232.806 0.5 216.822 0.5 L 158.821 0.5 C 140.087 0.5 124.9 15.687 124.9 34.421 C 124.9 53.155 140.087 68.342 158.821 68.342 L 177.605 68.342 C 196.339 68.342 211.526 83.529 211.526 102.263 C 211.526 115.982 203.381 127.799 191.663 133.142 C 178.94 140.093 170.309 153.597 170.309 169.117 C 170.309 185.971 180.488 200.448 195.033 206.736 C 195.129 206.777 195.208 206.827 195.271 206.886 C 207.205 212.14 215.537 224.07 215.537 237.946 L 215.575 237.794 Z"
+                android:fillColor="#22baff"
+                android:strokeWidth="1"/>
+        </group>
+    </group>
+</vector>
diff --git a/app/src/main/res/drawable/bg_color_both.xml b/app/src/main/res/drawable/bg_color_both.xml
new file mode 100644
index 00000000000..bb71f8731a4
--- /dev/null
+++ b/app/src/main/res/drawable/bg_color_both.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="?attr/primaryGrayBackground" />
+    <corners android:radius="@dimen/rounded_image_radius"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_color_bottom.xml b/app/src/main/res/drawable/bg_color_bottom.xml
new file mode 100644
index 00000000000..7c744f19f1d
--- /dev/null
+++ b/app/src/main/res/drawable/bg_color_bottom.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="?attr/primaryGrayBackground" />
+    <corners
+        android:bottomLeftRadius="@dimen/rounded_image_radius"
+        android:bottomRightRadius="@dimen/rounded_image_radius"
+        android:topLeftRadius="@dimen/rounded_button_radius"
+        android:topRightRadius="@dimen/rounded_button_radius" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_color_center.xml b/app/src/main/res/drawable/bg_color_center.xml
new file mode 100644
index 00000000000..7cb4374526c
--- /dev/null
+++ b/app/src/main/res/drawable/bg_color_center.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="?attr/primaryGrayBackground"/>
+    <corners android:radius="@dimen/rounded_button_radius"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_color_top.xml b/app/src/main/res/drawable/bg_color_top.xml
new file mode 100644
index 00000000000..45497d27218
--- /dev/null
+++ b/app/src/main/res/drawable/bg_color_top.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="?attr/primaryGrayBackground" />
+    <corners
+        android:bottomLeftRadius="@dimen/rounded_button_radius"
+        android:bottomRightRadius="@dimen/rounded_button_radius"
+        android:topLeftRadius="@dimen/rounded_image_radius"
+        android:topRightRadius="@dimen/rounded_image_radius" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_imdb_badge.xml b/app/src/main/res/drawable/bg_imdb_badge.xml
new file mode 100644
index 00000000000..de7a6704b5c
--- /dev/null
+++ b/app/src/main/res/drawable/bg_imdb_badge.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#F5C518" />
+    <corners android:radius="4dp" />
+    <padding
+        android:bottom="2dp"
+        android:left="4dp"
+        android:right="4dp"
+        android:top="2dp" />
+</shape>
diff --git a/app/src/main/res/drawable/bg_player_metadata_scrim_netflix.xml b/app/src/main/res/drawable/bg_player_metadata_scrim_netflix.xml
new file mode 100644
index 00000000000..b4701e42a73
--- /dev/null
+++ b/app/src/main/res/drawable/bg_player_metadata_scrim_netflix.xml
@@ -0,0 +1,7 @@
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient
+        android:startColor="#E6000000"
+        android:centerColor="#99000000"
+        android:endColor="#00000000"
+        android:angle="0" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bookmark_star_24px.xml b/app/src/main/res/drawable/bookmark_star_24px.xml
new file mode 100644
index 00000000000..81b400d925a
--- /dev/null
+++ b/app/src/main/res/drawable/bookmark_star_24px.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/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M389,560L480,505L571,560L547,456L627,387L522,378L480,280L438,378L333,387L413,456L389,560ZM200,840L200,200Q200,167 223.5,143.5Q247,120 280,120L680,120Q713,120 736.5,143.5Q760,167 760,200L760,840L480,720L200,840ZM280,718L480,632L680,718L680,200Q680,200 680,200Q680,200 680,200L280,200Q280,200 280,200Q280,200 280,200L280,718ZM280,200L280,200Q280,200 280,200Q280,200 280,200L680,200Q680,200 680,200Q680,200 680,200L680,200L480,200L280,200Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/clear_all_24px.xml b/app/src/main/res/drawable/clear_all_24px.xml
new file mode 100644
index 00000000000..dbbc7dc9f21
--- /dev/null
+++ b/app/src/main/res/drawable/clear_all_24px.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/white"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M120,680L120,600L680,600L680,680L120,680ZM200,520L200,440L760,440L760,520L200,520ZM280,360L280,280L840,280L840,360L280,360Z" />
+
+</vector>
diff --git a/app/src/main/res/drawable/dashed_line_horizontal.xml b/app/src/main/res/drawable/dashed_line_horizontal.xml
new file mode 100644
index 00000000000..737ff195947
--- /dev/null
+++ b/app/src/main/res/drawable/dashed_line_horizontal.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="line">
+
+    <stroke
+        android:width="2dp"
+        android:color="?attr/white"
+        android:dashWidth="8dp"
+        android:dashGap="4dp" />
+</shape>
diff --git a/app/src/main/res/drawable/go_back_30.xml b/app/src/main/res/drawable/go_back_30.xml
index e57946b65e2..14999011662 100644
--- a/app/src/main/res/drawable/go_back_30.xml
+++ b/app/src/main/res/drawable/go_back_30.xml
@@ -1,6 +1,7 @@
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools" android:name="vector"
+    android:tint="?attr/white"
     android:width="21.378dp"
     android:height="24dp"
     android:viewportWidth="636"
diff --git a/app/src/main/res/drawable/go_forward_30.xml b/app/src/main/res/drawable/go_forward_30.xml
index f5ff4c02757..7ac36cdeca4 100644
--- a/app/src/main/res/drawable/go_forward_30.xml
+++ b/app/src/main/res/drawable/go_forward_30.xml
@@ -1,6 +1,7 @@
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools" android:name="vector"
+    android:tint="?attr/white"
     android:width="21.378dp"
     android:height="24dp"
     android:viewportWidth="636"
diff --git a/app/src/main/res/drawable/ic_baseline_bug_report_24.xml b/app/src/main/res/drawable/ic_baseline_bug_report_24.xml
deleted file mode 100644
index dad38dca6ce..00000000000
--- a/app/src/main/res/drawable/ic_baseline_bug_report_24.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="?attr/white"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M20,8h-2.81c-0.45,-0.78 -1.07,-1.45 -1.82,-1.96L17,4.41 15.59,3l-2.17,2.17C12.96,5.06 12.49,5 12,5c-0.49,0 -0.96,0.06 -1.41,0.17L8.41,3 7,4.41l1.62,1.63C7.88,6.55 7.26,7.22 6.81,8L4,8v2h2.09c-0.05,0.33 -0.09,0.66 -0.09,1v1L4,12v2h2v1c0,0.34 0.04,0.67 0.09,1L4,16v2h2.81c1.04,1.79 2.97,3 5.19,3s4.15,-1.21 5.19,-3L20,18v-2h-2.09c0.05,-0.33 0.09,-0.66 0.09,-1v-1h2v-2h-2v-1c0,-0.34 -0.04,-0.67 -0.09,-1L20,10L20,8zM14,16h-4v-2h4v2zM14,12h-4v-2h4v2z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_baseline_close_24.xml b/app/src/main/res/drawable/ic_baseline_close_24.xml
index 70db409b338..7dea8241e9e 100644
--- a/app/src/main/res/drawable/ic_baseline_close_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_close_24.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="?attr/white"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="@android:color/white" android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
diff --git a/app/src/main/res/drawable/ic_baseline_exit_24.xml b/app/src/main/res/drawable/ic_baseline_exit_24.xml
index bf421c227be..6aebfabdc7e 100644
--- a/app/src/main/res/drawable/ic_baseline_exit_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_exit_24.xml
@@ -1,5 +1,13 @@
-<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 xmlns:android="http://schemas.android.com/apk/res/android"
+    android:autoMirrored="true"
+    android:height="24dp"
+    android:tint="?attr/white"
+    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
index 6e130c3c948..66afaed2c7b 100644
--- a/app/src/main/res/drawable/ic_baseline_folder_open_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_folder_open_24.xml
@@ -1,5 +1,12 @@
-<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 xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/white"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="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_north_west_24.xml b/app/src/main/res/drawable/ic_baseline_north_west_24.xml
new file mode 100644
index 00000000000..c46eb4b0cc4
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_north_west_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:fillColor="@android:color/white"
+        android:pathData="M5,15h2v-4.586l7.293,7.293l1.414,-1.414L8.414,9H13V7H5V15z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_baseline_people_24.xml b/app/src/main/res/drawable/ic_baseline_people_24.xml
new file mode 100644
index 00000000000..2e7c9b0703a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_people_24.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:strokeColor="@android:color/white"
+        android:strokeWidth="1.2"
+        android:pathData="M12,2c5.52,0 10,4.48 10,10s-4.48,10 -10,10S2,17.52 2,12 6.48,2 12,2z"/>
+
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,11.5c1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3 1.34,3 3,3z M12,13c-2.33,0 -7,1.17 -7,3.5 0,1.2 0.7,2.3 2,3.1 1.4,0.9 3.2,1.4 5,1.4s3.6,-0.5 5,-1.4c1.3,-0.8 2,-1.9 2,-3.1C19,14.17 14.33,13 12,13z"/>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_offline_pin_24.xml b/app/src/main/res/drawable/ic_offline_pin_24.xml
new file mode 100644
index 00000000000..455006b3176
--- /dev/null
+++ b/app/src/main/res/drawable/ic_offline_pin_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="M320,680h320v-80L320,600v80ZM438,560 L664,334 607,279 438,448 352,362 296,418 438,560ZM480,880q-83,0 -156,-31.5T197,763q-54,-54 -85.5,-127T80,480q0,-83 31.5,-156T197,197q54,-54 127,-85.5T480,80q83,0 156,31.5T763,197q54,54 85.5,127T880,480q0,83 -31.5,156T763,763q-54,54 -127,85.5T480,880ZM480,800q134,0 227,-93t93,-227q0,-134 -93,-227t-227,-93q-134,0 -227,93t-93,227q0,134 93,227t227,93ZM480,480Z"
+      android:fillColor="#e3e3e3"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_refresh.xml b/app/src/main/res/drawable/ic_refresh.xml
new file mode 100644
index 00000000000..e61dcf1ce75
--- /dev/null
+++ b/app/src/main/res/drawable/ic_refresh.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="M480,800q-134,0 -227,-93t-93,-227q0,-134 93,-227t227,-93q69,0 132,28.5T720,270v-110h80v280L520,440v-80h168q-32,-56 -87.5,-88T480,240q-100,0 -170,70t-70,170q0,100 70,170t170,70q77,0 139,-44t87,-116h84q-28,106 -114,173t-196,67Z"
+      android:fillColor="#e3e3e3"/>
+</vector>
diff --git a/app/src/main/res/drawable/kid_star_24px.xml b/app/src/main/res/drawable/kid_star_24px.xml
new file mode 100644
index 00000000000..2efe84195b8
--- /dev/null
+++ b/app/src/main/res/drawable/kid_star_24px.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="10dp"
+    android:height="10dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/white">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M305,256L417,111Q429,95 445.5,87.5Q462,80 480,80Q498,80 514.5,87.5Q531,95 543,111L655,256L825,313Q851,321 866,342.5Q881,364 881,390Q881,402 877.5,414Q874,426 866,437L756,593L760,757Q761,792 737,816Q713,840 681,840Q679,840 659,837L480,787L301,837Q296,839 290,839.5Q284,840 279,840Q247,840 223,816Q199,792 200,757L204,592L95,437Q87,426 83.5,414Q80,402 80,390Q80,365 94.5,343.5Q109,322 135,313L305,256Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/metadata_overlay_icon.xml b/app/src/main/res/drawable/metadata_overlay_icon.xml
new file mode 100644
index 00000000000..6d1b6510af1
--- /dev/null
+++ b/app/src/main/res/drawable/metadata_overlay_icon.xml
@@ -0,0 +1,36 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="?android:attr/colorControlNormal"
+        android:fillAlpha="0.4"
+        android:pathData="
+            M4,6
+            h12
+            a2,2 0 0,1 2,2
+            v8
+            a2,2 0 0,1 -2,2
+            h-12
+            a2,2 0 0,1 -2,-2
+            v-8
+            a2,2 0 0,1 2,-2
+            z" />
+
+    <path
+        android:fillColor="?android:attr/colorControlNormal"
+        android:pathData="
+            M7,4
+            h12
+            a2,2 0 0,1 2,2
+            v8
+            a2,2 0 0,1 -2,2
+            h-12
+            a2,2 0 0,1 -2,-2
+            v-8
+            a2,2 0 0,1 2,-2
+            z" />
+
+</vector>
diff --git a/app/src/main/res/drawable/netflix_download_batch.xml b/app/src/main/res/drawable/netflix_download_batch.xml
new file mode 100644
index 00000000000..8ef633fd236
--- /dev/null
+++ b/app/src/main/res/drawable/netflix_download_batch.xml
@@ -0,0 +1,19 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:name="vector"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="850"
+    android:viewportHeight="850">
+    <path
+        android:name="path_2"
+        android:pathData="M 233.86 666.14 L 616.54 666.14 M 425.2 539.08 L 425.2 210 M 410.14 554.17 L 581.98 454.96 M 268.41 454.96 L 440.25 554.17"
+        android:strokeWidth="60"
+        android:strokeColor="?attr/white"
+        android:strokeMiterLimit="10" />
+    <path
+        android:pathData="M 233.86 776.14 L 616.54 776.14"
+        android:strokeWidth="60"
+        android:strokeColor="?attr/white"
+        android:strokeMiterLimit="10" />
+</vector>
+
diff --git a/app/src/main/res/drawable/outline_big_15_gray.xml b/app/src/main/res/drawable/outline_big_15_gray.xml
new file mode 100644
index 00000000000..b9450027971
--- /dev/null
+++ b/app/src/main/res/drawable/outline_big_15_gray.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <stroke
+        android:width="2dp"
+        android:color="@color/white_attr_20" />
+    <corners
+        android:bottomLeftRadius="15dp"
+        android:bottomRightRadius="15dp"
+        android:topLeftRadius="15dp"
+        android:topRightRadius="15dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/outline_big_20_gray.xml b/app/src/main/res/drawable/outline_big_20_gray.xml
new file mode 100644
index 00000000000..ebcdc0bf4ee
--- /dev/null
+++ b/app/src/main/res/drawable/outline_big_20_gray.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="@color/white_attr_20"/>
+    <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_big_25_gray.xml b/app/src/main/res/drawable/outline_big_25_gray.xml
new file mode 100644
index 00000000000..ea5f31a1f7e
--- /dev/null
+++ b/app/src/main/res/drawable/outline_big_25_gray.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <stroke
+        android:width="2dp"
+        android:color="@color/white_attr_20" />
+    <corners
+        android:bottomLeftRadius="25dp"
+        android:bottomRightRadius="25dp"
+        android:topLeftRadius="25dp"
+        android:topRightRadius="25dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/outline_big_35_gray.xml b/app/src/main/res/drawable/outline_big_35_gray.xml
new file mode 100644
index 00000000000..ab18a1354d1
--- /dev/null
+++ b/app/src/main/res/drawable/outline_big_35_gray.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="@color/white_attr_20"/>
+    <corners
+            android:bottomLeftRadius="35dp"
+            android:bottomRightRadius="35dp"
+            android:topLeftRadius="35dp"
+            android:topRightRadius="35dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/outline_drawable_less_inset.xml b/app/src/main/res/drawable/outline_drawable_less_inset.xml
new file mode 100644
index 00000000000..29096d867bb
--- /dev/null
+++ b/app/src/main/res/drawable/outline_drawable_less_inset.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+    android:drawable="@drawable/outline_drawable_less"
+    android:insetTop="@dimen/dialog_buttons_inset"
+    android:insetBottom="@dimen/dialog_buttons_inset" />
\ No newline at end of file
diff --git a/app/src/main/res/drawable/pin_ic.xml b/app/src/main/res/drawable/pin_ic.xml
new file mode 100644
index 00000000000..1425ff05a79
--- /dev/null
+++ b/app/src/main/res/drawable/pin_ic.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="m640,480 l80,80v80L520,640v240l-40,40 -40,-40v-240L240,640v-80l80,-80v-280h-40v-80h400v80h-40v280ZM354,560h252l-46,-46v-314L400,200v314l-46,46ZM480,560Z"
+      android:fillColor="#e3e3e3"/>
+</vector>
diff --git a/app/src/main/res/drawable/play_button.xml b/app/src/main/res/drawable/play_button.xml
index 04886b6e500..ee3d47dfe97 100644
--- a/app/src/main/res/drawable/play_button.xml
+++ b/app/src/main/res/drawable/play_button.xml
@@ -1,25 +1,19 @@
 <vector
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:name="vector"
-        android:width="842dp"
-        android:height="842dp"
-        android:viewportWidth="842"
-        android:viewportHeight="842">
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:name="vector"
+    android:width="842dp"
+    android:height="842dp"
+    android:viewportWidth="842"
+    android:viewportHeight="842">
     <!--70% https://stackoverflow.com/questions/11285961/how-to-make-a-background-20-transparent-on-android -->
     <path
-            android:name="path"
-            android:pathData="M 421.44 17.5 C 336.15 17.5 253.011 44.513 184.01 94.646 C 115.009 144.778 63.626 215.5 37.27 296.616 C 10.914 377.732 10.914 465.148 37.27 546.264 C 63.626 627.38 115.009 698.102 184.01 748.234 C 253.011 798.367 336.15 825.38 421.44 825.38 C 506.73 825.38 589.869 798.367 658.87 748.234 C 727.871 698.102 779.254 627.38 805.61 546.264 C 831.966 465.148 831.966 377.732 805.61 296.616 C 779.254 215.5 727.871 144.778 658.87 94.646 C 589.869 44.513 506.73 17.5 421.44 17.5 Z"
-            android:fillColor="#B3000000"
-            android:strokeWidth="1"/>
+        android:name="path"
+        android:pathData="M 421.44 17.5 C 336.15 17.5 253.011 44.513 184.01 94.646 C 115.009 144.778 63.626 215.5 37.27 296.616 C 10.914 377.732 10.914 465.148 37.27 546.264 C 63.626 627.38 115.009 698.102 184.01 748.234 C 253.011 798.367 336.15 825.38 421.44 825.38 C 506.73 825.38 589.869 798.367 658.87 748.234 C 727.871 698.102 779.254 627.38 805.61 546.264 C 831.966 465.148 831.966 377.732 805.61 296.616 C 779.254 215.5 727.871 144.778 658.87 94.646 C 589.869 44.513 506.73 17.5 421.44 17.5 Z"
+        android:fillColor="#B3000000"
+        android:strokeWidth="1"/>
     <path
-            android:name="path_1"
-            android:pathData="M 421.44 17.5 C 336.15 17.5 253.011 44.513 184.01 94.646 C 115.009 144.778 63.626 215.5 37.27 296.616 C 10.914 377.732 10.914 465.148 37.27 546.264 C 63.626 627.38 115.009 698.102 184.01 748.234 C 253.011 798.367 336.15 825.38 421.44 825.38 C 506.73 825.38 589.869 798.367 658.87 748.234 C 727.871 698.102 779.254 627.38 805.61 546.264 C 831.966 465.148 831.966 377.732 805.61 296.616 C 779.254 215.5 727.871 144.778 658.87 94.646 C 589.869 44.513 506.73 17.5 421.44 17.5 Z"
-            android:strokeColor="#ffffff"
-            android:strokeWidth="35"
-            android:strokeMiterLimit="10"/>
-    <path
-            android:name="path_2"
-            android:pathData="M 598.91 419.24 L 333.91 266.24 L 333.91 572.24 L 598.91 419.24 Z"
-            android:fillColor="#ffffff"
-            android:strokeWidth="1"/>
+        android:name="path_2"
+        android:pathData="M 598.91 419.24 L 333.91 266.24 L 333.91 572.24 L 598.91 419.24 Z"
+        android:fillColor="#ffffff"
+        android:strokeWidth="1"/>
 </vector>
diff --git a/app/src/main/res/drawable/play_button_transparent.xml b/app/src/main/res/drawable/play_button_transparent.xml
new file mode 100644
index 00000000000..caa7041e608
--- /dev/null
+++ b/app/src/main/res/drawable/play_button_transparent.xml
@@ -0,0 +1,15 @@
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:name="vector"
+    android:width="842dp"
+    android:height="842dp"
+    android:viewportWidth="842"
+    android:viewportHeight="842"
+    android:tint="?attr/white">
+  <!--70% https://stackoverflow.com/questions/11285961/how-to-make-a-background-20-transparent-on-android -->
+  <path
+      android:name="path_2"
+      android:pathData="M 598.91 419.24 L 333.91 266.24 L 333.91 572.24 L 598.91 419.24 Z"
+      android:fillColor="#ffffff"
+      android:strokeWidth="1"/>
+</vector>
diff --git a/app/src/main/res/drawable/player_gradient_tv.xml b/app/src/main/res/drawable/player_gradient_tv.xml
index 79bb3af5fe3..8077b418fbe 100644
--- a/app/src/main/res/drawable/player_gradient_tv.xml
+++ b/app/src/main/res/drawable/player_gradient_tv.xml
@@ -4,10 +4,10 @@
         <shape>
             <gradient
                 android:angle="90"
-                android:startColor="#000000"
+                android:startColor="#FF000000"
                 android:centerColor="#00000000"
                 android:endColor="#00000000"
-                android:centerY="0.7"
+                android:centerY="0.3"
                 />
         </shape>
     </item>
@@ -15,10 +15,10 @@
         <shape>
             <gradient
                 android:angle="270"
-                android:startColor="#000000"
+                android:startColor="#66000000"
                 android:centerColor="#00000000"
                 android:endColor="#00000000"
-                android:centerY="0.7"
+                android:centerY="0.5"
                 />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/rating_bg_color.xml b/app/src/main/res/drawable/rating_bg_color.xml
index 2aa20b92f86..4cf33aba0e9 100644
--- a/app/src/main/res/drawable/rating_bg_color.xml
+++ b/app/src/main/res/drawable/rating_bg_color.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <solid android:color="?attr/colorPrimary"/>
-    <corners android:radius="@dimen/rounded_image_radius"/>
+    <corners android:radius="4dp"/>
    <!-- <stroke android:color="@color/subColor" android:width="2dp"/>-->
-</shape>
\ No newline at end of file
+</shape>
diff --git a/app/src/main/res/drawable/round_keyboard_arrow_up_24.xml b/app/src/main/res/drawable/round_keyboard_arrow_up_24.xml
new file mode 100644
index 00000000000..d1360f9489f
--- /dev/null
+++ b/app/src/main/res/drawable/round_keyboard_arrow_up_24.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/white"
+    >
+
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M8.12,14.71L12,10.83l3.88,3.88c0.39,0.39 1.02,0.39 1.41,0 0.39,-0.39 0.39,-1.02 0,-1.41L12.7,8.71c-0.39,-0.39 -1.02,-0.39 -1.41,0L6.7,13.3c-0.39,0.39 -0.39,1.02 0,1.41 0.39,0.38 1.03,0.39 1.42,0z" />
+
+</vector>
diff --git a/app/src/main/res/drawable/rounded_select_ripple.xml b/app/src/main/res/drawable/rounded_select_ripple.xml
new file mode 100644
index 00000000000..5dd7559b39e
--- /dev/null
+++ b/app/src/main/res/drawable/rounded_select_ripple.xml
@@ -0,0 +1,14 @@
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?attr/colorControlHighlight">
+    <item>
+        <shape android:shape="oval">
+            <solid android:color="@android:color/transparent" />
+        </shape>
+    </item>
+
+    <item android:id="@android:id/mask">
+        <shape android:shape="oval">
+            <solid android:color="#FFFFFF" />
+        </shape>
+    </item>
+</ripple>
diff --git a/app/src/main/res/drawable/speedup.xml b/app/src/main/res/drawable/speedup.xml
index 79ef428ac47..879ef852cec 100644
--- a/app/src/main/res/drawable/speedup.xml
+++ b/app/src/main/res/drawable/speedup.xml
@@ -1,12 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
     android:tint="?attr/white">
-    <path
-        android:fillColor="?attr/white"
-        android:strokeWidth="0.5"
-        android:pathData="M5.125 17.075V11.2h4.25v-2.775h-4.25v-1.5h5.75V12.7h-4.25v2.875h4.25v1.5h-5.75ZM12.25 17l2.85 -5.15 -2.725 -4.85H14l2 3.575L17.975 7h1.625l-2.7 4.85L19.775 17h-1.6L16 13.15 13.875 17H12.25Z" />
-</vector>
\ No newline at end of file
+  <path
+      android:pathData="M200,680v-160q0,-33 23.5,-56.5T280,440h80v-80L200,360v-80h160q33,0 56.5,23.5T440,360v80q0,33 -23.5,56.5T360,520h-80v80h160v80L200,680ZM480,680 L600,480 480,280h80l80,133 80,-133h80L680,480l120,200h-80l-80,-133 -80,133h-80Z"
+      android:fillColor="#e3e3e3"/>
+</vector>
diff --git a/app/src/main/res/drawable/subdl_logo_big.xml b/app/src/main/res/drawable/subdl_logo_big.xml
index a6cbb3115fe..12116eabc2a 100644
--- a/app/src/main/res/drawable/subdl_logo_big.xml
+++ b/app/src/main/res/drawable/subdl_logo_big.xml
@@ -1,10 +1,12 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
     android:height="20dp"
-    android:viewportHeight="320"
+    android:tint="?attr/white"
     android:viewportWidth="320"
-    android:width="20dp">
-      
-    <path android:fillColor="@color/white"
-        android:pathData="m107.87,39.3l-8.44,8.59l0,35.68l0,35.83l18.95,22.5c10.36,12.44 30.35,36.27 44.41,53l25.46,30.5l0,12.14l0,12.29l-24.43,-0l-24.43,-0l0,-11.84l0,-11.84l-19.99,-0l-19.99,-0l0,23.24l0,23.24l8.44,8.59l8.44,8.59l48.26,-0l48.26,-0l7.7,-7.85l7.7,-7.85l0,-36.86l-0.15,-37.01l-23.98,-28.28c-13.18,-15.54 -33.16,-39.23 -44.26,-52.55l-20.43,-24.13l0,-12.29l0,-12.29l24.43,-0l24.43,-0l0,12.58l0,12.58l19.99,-0l19.99,-0l0,-24.87l0,-24.87l-7.85,-7.7l-7.85,-7.7l-48.11,-0l-48.11,-0l-8.44,8.59z"/>
-    
+    android:viewportHeight="320">
+
+    <path
+        android:fillColor="@color/white"
+        android:pathData="m107.87,39.3l-8.44,8.59l0,35.68l0,35.83l18.95,22.5c10.36,12.44 30.35,36.27 44.41,53l25.46,30.5l0,12.14l0,12.29l-24.43,-0l-24.43,-0l0,-11.84l0,-11.84l-19.99,-0l-19.99,-0l0,23.24l0,23.24l8.44,8.59l8.44,8.59l48.26,-0l48.26,-0l7.7,-7.85l7.7,-7.85l0,-36.86l-0.15,-37.01l-23.98,-28.28c-13.18,-15.54 -33.16,-39.23 -44.26,-52.55l-20.43,-24.13l0,-12.29l0,-12.29l24.43,-0l24.43,-0l0,12.58l0,12.58l19.99,-0l19.99,-0l0,-24.87l0,-24.87l-7.85,-7.7l-7.85,-7.7l-48.11,-0l-48.11,-0l-8.44,8.59z" />
+
 </vector>
diff --git a/app/src/main/res/drawable/sun_7_24.xml b/app/src/main/res/drawable/sun_7_24.xml
new file mode 100644
index 00000000000..26e3f43e88b
--- /dev/null
+++ b/app/src/main/res/drawable/sun_7_24.xml
@@ -0,0 +1,111 @@
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:name="vector"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="205"
+    android:viewportHeight="205">
+    <path
+        android:name="path"
+        android:pathData="M 103.3 69.97 C 94.551 69.97 86.152 73.449 79.965 79.635 C 73.779 85.822 70.3 94.221 70.3 102.97 C 70.3 111.719 73.779 120.118 79.965 126.305 C 86.152 132.491 94.551 135.97 103.3 135.97 C 112.049 135.97 120.448 132.491 126.635 126.305 C 132.821 120.118 136.3 111.719 136.3 102.97 C 136.3 94.221 132.821 85.822 126.635 79.635 C 120.448 73.449 112.049 69.97 103.3 69.97 Z"
+        android:fillColor="#ffffff"
+        android:strokeColor="#ffffff"
+        android:strokeWidth="1"
+        android:strokeMiterLimit="10"/>
+    <path
+        android:name="path_1"
+        android:pathData="M 102.97 0.5 L 102.98 0.5 C 104.777 0.5 106.503 1.215 107.774 2.486 C 109.045 3.757 109.76 5.483 109.76 7.28 L 109.76 46.56 C 109.76 48.357 109.045 50.083 107.774 51.354 C 106.503 52.625 104.777 53.34 102.98 53.34 L 102.97 53.34 C 101.173 53.34 99.447 52.625 98.176 51.354 C 96.905 50.083 96.19 48.357 96.19 46.56 L 96.19 7.28 C 96.19 5.483 96.905 3.757 98.176 2.486 C 99.447 1.215 101.173 0.5 102.97 0.5"
+        android:fillColor="#ffffff"
+        android:strokeWidth="1"/>
+    <path
+        android:name="path_2"
+        android:pathData="M 102.97 0.5 L 102.98 0.5 C 104.777 0.5 106.503 1.215 107.774 2.486 C 109.045 3.757 109.76 5.483 109.76 7.28 L 109.76 46.56 C 109.76 48.357 109.045 50.083 107.774 51.354 C 106.503 52.625 104.777 53.34 102.98 53.34 L 102.97 53.34 C 101.173 53.34 99.447 52.625 98.176 51.354 C 96.905 50.083 96.19 48.357 96.19 46.56 L 96.19 7.28 C 96.19 5.483 96.905 3.757 98.176 2.486 C 99.447 1.215 101.173 0.5 102.97 0.5"
+        android:strokeColor="#ffffff"
+        android:strokeWidth="1"
+        android:strokeMiterLimit="10"/>
+    <path
+        android:name="path_3"
+        android:pathData="M 102.97 152.6 L 102.98 152.6 C 104.777 152.6 106.503 153.315 107.774 154.586 C 109.045 155.857 109.76 157.583 109.76 159.38 L 109.76 198.66 C 109.76 200.457 109.045 202.183 107.774 203.454 C 106.503 204.725 104.777 205.44 102.98 205.44 L 102.97 205.44 C 101.173 205.44 99.447 204.725 98.176 203.454 C 96.905 202.183 96.19 200.457 96.19 198.66 L 96.19 159.38 C 96.19 157.583 96.905 155.857 98.176 154.586 C 99.447 153.315 101.173 152.6 102.97 152.6"
+        android:fillColor="#ffffff"
+        android:strokeWidth="1"/>
+    <path
+        android:name="path_4"
+        android:pathData="M 102.97 152.6 L 102.98 152.6 C 104.777 152.6 106.503 153.315 107.774 154.586 C 109.045 155.857 109.76 157.583 109.76 159.38 L 109.76 198.66 C 109.76 200.457 109.045 202.183 107.774 203.454 C 106.503 204.725 104.777 205.44 102.98 205.44 L 102.97 205.44 C 101.173 205.44 99.447 204.725 98.176 203.454 C 96.905 202.183 96.19 200.457 96.19 198.66 L 96.19 159.38 C 96.19 157.583 96.905 155.857 98.176 154.586 C 99.447 153.315 101.173 152.6 102.97 152.6"
+        android:strokeColor="#ffffff"
+        android:strokeWidth="1"
+        android:strokeMiterLimit="10"/>
+    <path
+        android:name="path_5"
+        android:pathData="M 138.065 58.287 L 165.84 30.512 C 166.681 29.67 167.73 29.065 168.879 28.757 C 170.029 28.449 171.239 28.449 172.389 28.757 C 173.538 29.065 174.587 29.67 175.428 30.512 L 175.435 30.519 C 176.706 31.79 177.421 33.516 177.421 35.313 C 177.421 37.111 176.706 38.836 175.435 40.107 L 147.66 67.882 C 146.819 68.724 145.77 69.329 144.621 69.637 C 143.471 69.945 142.261 69.945 141.111 69.637 C 139.962 69.329 138.913 68.724 138.072 67.882 L 138.065 67.875 C 137.223 67.034 136.618 65.985 136.31 64.836 C 136.002 63.686 136.002 62.476 136.31 61.326 C 136.618 60.177 137.223 59.128 138.065 58.287"
+        android:fillColor="#ffffff"
+        android:strokeWidth="1"/>
+    <path
+        android:name="path_6"
+        android:pathData="M 138.065 58.287 L 165.84 30.512 C 166.681 29.67 167.73 29.065 168.879 28.757 C 170.029 28.449 171.239 28.449 172.389 28.757 C 173.538 29.065 174.587 29.67 175.428 30.512 L 175.435 30.519 C 176.706 31.79 177.421 33.516 177.421 35.313 C 177.421 37.111 176.706 38.836 175.435 40.107 L 147.66 67.882 C 146.819 68.724 145.77 69.329 144.621 69.637 C 143.471 69.945 142.261 69.945 141.111 69.637 C 139.962 69.329 138.913 68.724 138.072 67.882 L 138.065 67.875 C 137.223 67.034 136.618 65.985 136.31 64.836 C 136.002 63.686 136.002 62.476 136.31 61.326 C 136.618 60.177 137.223 59.128 138.065 58.287"
+        android:strokeColor="#ffffff"
+        android:strokeWidth="1"
+        android:strokeMiterLimit="10"/>
+    <path
+        android:name="path_7"
+        android:pathData="M 30.522 165.843 L 58.297 138.068 C 59.138 137.226 60.187 136.621 61.336 136.313 C 62.486 136.005 63.696 136.005 64.846 136.313 C 65.995 136.621 67.044 137.226 67.885 138.068 L 67.892 138.075 C 68.734 138.916 69.339 139.965 69.647 141.114 C 69.955 142.264 69.955 143.474 69.647 144.624 C 69.339 145.773 68.734 146.822 67.892 147.663 L 40.117 175.438 C 39.276 176.28 38.227 176.885 37.078 177.193 C 35.928 177.501 34.718 177.501 33.568 177.193 C 32.419 176.885 31.37 176.28 30.529 175.438 L 30.522 175.431 C 29.251 174.16 28.536 172.434 28.536 170.637 C 28.536 168.839 29.251 167.114 30.522 165.843"
+        android:fillColor="#ffffff"
+        android:strokeWidth="1"/>
+    <path
+        android:name="path_8"
+        android:pathData="M 30.522 165.843 L 58.297 138.068 C 59.138 137.226 60.187 136.621 61.336 136.313 C 62.486 136.005 63.696 136.005 64.846 136.313 C 65.995 136.621 67.044 137.226 67.885 138.068 L 67.892 138.075 C 68.734 138.916 69.339 139.965 69.647 141.114 C 69.955 142.264 69.955 143.474 69.647 144.624 C 69.339 145.773 68.734 146.822 67.892 147.663 L 40.117 175.438 C 39.276 176.28 38.227 176.885 37.078 177.193 C 35.928 177.501 34.718 177.501 33.568 177.193 C 32.419 176.885 31.37 176.28 30.529 175.438 L 30.522 175.431 C 29.251 174.16 28.536 172.434 28.536 170.637 C 28.536 168.839 29.251 167.114 30.522 165.843"
+        android:strokeColor="#ffffff"
+        android:strokeWidth="1"
+        android:strokeMiterLimit="10"/>
+    <group android:name="group">
+        <path
+            android:name="path_9"
+            android:pathData="M 159.38 96.19 L 198.66 96.19 C 200.457 96.19 202.183 96.905 203.454 98.176 C 204.725 99.447 205.44 101.173 205.44 102.97 L 205.44 102.98 C 205.44 104.777 204.725 106.503 203.454 107.774 C 202.183 109.045 200.457 109.76 198.66 109.76 L 159.38 109.76 C 157.583 109.76 155.857 109.045 154.586 107.774 C 153.315 106.503 152.6 104.777 152.6 102.98 L 152.6 102.97 C 152.6 101.173 153.315 99.447 154.586 98.176 C 155.857 96.905 157.583 96.19 159.38 96.19"
+            android:fillColor="#ffffff"
+            android:strokeWidth="1"/>
+        <path
+            android:name="path_10"
+            android:pathData="M 159.38 96.19 L 198.66 96.19 C 200.457 96.19 202.183 96.905 203.454 98.176 C 204.725 99.447 205.44 101.173 205.44 102.97 L 205.44 102.98 C 205.44 104.777 204.725 106.503 203.454 107.774 C 202.183 109.045 200.457 109.76 198.66 109.76 L 159.38 109.76 C 157.583 109.76 155.857 109.045 154.586 107.774 C 153.315 106.503 152.6 104.777 152.6 102.98 L 152.6 102.97 C 152.6 101.173 153.315 99.447 154.586 98.176 C 155.857 96.905 157.583 96.19 159.38 96.19"
+            android:strokeColor="#ffffff"
+            android:strokeWidth="1"
+            android:strokeMiterLimit="10"/>
+    </group>
+    <group android:name="group_1">
+        <path
+            android:name="path_11"
+            android:pathData="M 7.28 96.19 L 46.56 96.19 C 48.357 96.19 50.083 96.905 51.354 98.176 C 52.625 99.447 53.34 101.173 53.34 102.97 L 53.34 102.98 C 53.34 104.777 52.625 106.503 51.354 107.774 C 50.083 109.045 48.357 109.76 46.56 109.76 L 7.28 109.76 C 5.483 109.76 3.757 109.045 2.486 107.774 C 1.215 106.503 0.5 104.777 0.5 102.98 L 0.5 102.97 C 0.5 101.173 1.215 99.447 2.486 98.176 C 3.757 96.905 5.483 96.19 7.28 96.19"
+            android:fillColor="#ffffff"
+            android:strokeWidth="1"/>
+        <path
+            android:name="path_12"
+            android:pathData="M 7.28 96.19 L 46.56 96.19 C 48.357 96.19 50.083 96.905 51.354 98.176 C 52.625 99.447 53.34 101.173 53.34 102.97 L 53.34 102.98 C 53.34 104.777 52.625 106.503 51.354 107.774 C 50.083 109.045 48.357 109.76 46.56 109.76 L 7.28 109.76 C 5.483 109.76 3.757 109.045 2.486 107.774 C 1.215 106.503 0.5 104.777 0.5 102.98 L 0.5 102.97 C 0.5 101.173 1.215 99.447 2.486 98.176 C 3.757 96.905 5.483 96.19 7.28 96.19"
+            android:strokeColor="#ffffff"
+            android:strokeWidth="1"
+            android:strokeMiterLimit="10"/>
+    </group>
+    <group android:name="group_2">
+        <path
+            android:name="path_13"
+            android:pathData="M 138.071 138.068 L 138.078 138.061 C 138.92 137.22 139.968 136.614 141.118 136.306 C 142.267 135.998 143.478 135.998 144.627 136.306 C 145.777 136.614 146.825 137.22 147.667 138.061 L 175.442 165.836 C 176.283 166.678 176.889 167.726 177.197 168.876 C 177.505 170.025 177.505 171.236 177.197 172.385 C 176.889 173.535 176.283 174.583 175.442 175.425 L 175.435 175.432 C 174.593 176.273 173.545 176.879 172.395 177.187 C 171.246 177.495 170.035 177.495 168.886 177.187 C 167.736 176.879 166.688 176.273 165.846 175.432 L 138.071 147.657 C 137.23 146.815 136.624 145.767 136.316 144.617 C 136.008 143.468 136.008 142.257 136.316 141.108 C 136.624 139.958 137.23 138.91 138.071 138.068"
+            android:fillColor="#ffffff"
+            android:strokeWidth="1"/>
+        <path
+            android:name="path_14"
+            android:pathData="M 138.071 138.068 L 138.078 138.061 C 138.92 137.22 139.968 136.614 141.118 136.306 C 142.267 135.998 143.478 135.998 144.627 136.306 C 145.777 136.614 146.825 137.22 147.667 138.061 L 175.442 165.836 C 176.283 166.678 176.889 167.726 177.197 168.876 C 177.505 170.025 177.505 171.236 177.197 172.385 C 176.889 173.535 176.283 174.583 175.442 175.425 L 175.435 175.432 C 174.593 176.273 173.545 176.879 172.395 177.187 C 171.246 177.495 170.035 177.495 168.886 177.187 C 167.736 176.879 166.688 176.273 165.846 175.432 L 138.071 147.657 C 137.23 146.815 136.624 145.767 136.316 144.617 C 136.008 143.468 136.008 142.257 136.316 141.108 C 136.624 139.958 137.23 138.91 138.071 138.068"
+            android:strokeColor="#ffffff"
+            android:strokeWidth="1"
+            android:strokeMiterLimit="10"/>
+    </group>
+    <group android:name="group_3">
+        <path
+            android:name="path_15"
+            android:pathData="M 30.515 30.525 L 30.522 30.518 C 31.364 29.677 32.412 29.071 33.562 28.763 C 34.711 28.455 35.922 28.455 37.071 28.763 C 38.221 29.071 39.269 29.677 40.111 30.518 L 67.886 58.293 C 68.727 59.135 69.333 60.183 69.641 61.333 C 69.949 62.482 69.949 63.693 69.641 64.842 C 69.333 65.992 68.727 67.04 67.886 67.882 L 67.879 67.889 C 67.037 68.73 65.989 69.336 64.84 69.644 C 63.69 69.952 62.479 69.952 61.33 69.644 C 60.18 69.336 59.132 68.73 58.291 67.889 L 30.515 40.114 C 29.674 39.272 29.069 38.224 28.761 37.074 C 28.453 35.925 28.453 34.714 28.761 33.565 C 29.069 32.415 29.674 31.367 30.515 30.525"
+            android:fillColor="#ffffff"
+            android:strokeWidth="1"/>
+        <path
+            android:name="path_16"
+            android:pathData="M 30.515 30.525 L 30.522 30.518 C 31.364 29.677 32.412 29.071 33.562 28.763 C 34.711 28.455 35.922 28.455 37.071 28.763 C 38.221 29.071 39.269 29.677 40.111 30.518 L 67.886 58.293 C 68.727 59.135 69.333 60.183 69.641 61.333 C 69.949 62.482 69.949 63.693 69.641 64.842 C 69.333 65.992 68.727 67.04 67.886 67.882 L 67.879 67.889 C 67.037 68.73 65.989 69.336 64.84 69.644 C 63.69 69.952 62.479 69.952 61.33 69.644 C 60.18 69.336 59.132 68.73 58.291 67.889 L 30.515 40.114 C 29.674 39.272 29.069 38.224 28.761 37.074 C 28.453 35.925 28.453 34.714 28.761 33.565 C 29.069 32.415 29.674 31.367 30.515 30.525"
+            android:strokeColor="#ffffff"
+            android:strokeWidth="1"
+            android:strokeMiterLimit="10"/>
+    </group>
+</vector>
diff --git a/app/src/main/res/drawable/video_outline.xml b/app/src/main/res/drawable/video_outline.xml
new file mode 100644
index 00000000000..558c4ec3e98
--- /dev/null
+++ b/app/src/main/res/drawable/video_outline.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <stroke android:color="#C0FFFFFF" android:width="30dp"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout-port/player_select_source_and_subs.xml b/app/src/main/res/layout-port/player_select_source_and_subs.xml
new file mode 100644
index 00000000000..4710473d4fa
--- /dev/null
+++ b/app/src/main/res/layout-port/player_select_source_and_subs.xml
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:padding="8dp">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:id="@+id/sort_sources_holder"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:layout_marginBottom="8dp"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:id="@+id/profiles_click_settings"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                android:padding="10dp">
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@string/pick_source"
+                    android:textColor="?attr/textColor"
+                    android:textSize="20sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:id="@+id/source_settings_btt"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:minWidth="140dp"
+                    android:paddingHorizontal="10dp"
+                    android:textColor="?attr/textColor"
+                    android:textSize="15sp"
+                    app:drawableEndCompat="@drawable/ic_outline_settings_24"
+                    tools:text="@string/profile_number" />
+            </LinearLayout>
+
+            <ListView
+                android:id="@+id/sort_providers"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:background="?attr/primaryBlackBackground"
+                android:listSelector="@drawable/outline_drawable_forced"
+                android:requiresFadingEdge="vertical"
+                tools:listitem="@layout/sort_bottom_single_choice" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/sort_subtitles_holder"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:gravity="center_vertical"
+                android:padding="10dp">
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:orientation="horizontal"
+                    android:gravity="center_vertical">
+
+                    <TextView
+                        android:id="@+id/subtitles_text"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/pick_subtitle"
+                        android:textColor="?attr/textColor"
+                        android:textSize="20sp"
+                        android:textStyle="bold" />
+
+                    <TextView
+                        android:id="@+id/subtitles_encoding_format"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="8dp"
+                        android:layout_marginTop="3dp"
+                        android:textColor="?attr/textColor"
+                        android:textSize="14sp"
+                        android:ellipsize="end"
+                        android:singleLine="true"
+                        tools:text="Thai (TIS 620-2533/ISO 8859-11)" />
+                </LinearLayout>
+
+                <ImageView
+                    android:id="@+id/subtitle_settings_btt"
+                    android:layout_width="44dp"
+                    android:layout_height="44dp"
+                    android:contentDescription="@string/subtitles_settings"
+                    android:foreground="@drawable/outline_drawable_forced"
+                    android:padding="10dp"
+                    android:src="@drawable/ic_outline_settings_24" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:baselineAligned="false"
+                android:orientation="horizontal">
+
+                <ListView
+                    android:id="@+id/sort_subtitles"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:background="?attr/primaryBlackBackground"
+                    android:listSelector="@drawable/outline_drawable_forced"
+                    android:requiresFadingEdge="vertical"
+                    tools:listitem="@layout/sort_bottom_single_choice" />
+
+                <ListView
+                    android:id="@+id/sort_subtitles_options"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:background="?attr/primaryBlackBackground"
+                    android:listSelector="@drawable/outline_drawable_forced"
+                    android:requiresFadingEdge="vertical"
+                    tools:listitem="@layout/sort_bottom_single_choice" />
+            </LinearLayout>
+        </LinearLayout>
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/apply_btt_holder"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="end|center_vertical"
+        android:padding="8dp"
+        android:orientation="horizontal">
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/apply_btt"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:text="@string/sort_apply"
+            style="@style/WhiteButton" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/cancel_btt"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:text="@string/sort_cancel"
+            style="@style/BlackButton" />
+    </LinearLayout>
+</LinearLayout>
diff --git a/app/src/main/res/layout-port/player_select_source_priority.xml b/app/src/main/res/layout-port/player_select_source_priority.xml
new file mode 100644
index 00000000000..2cba9c869bb
--- /dev/null
+++ b/app/src/main/res/layout-port/player_select_source_priority.xml
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:id="@+id/sort_sources_holder"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:orientation="vertical"
+        android:paddingBottom="8dp">
+        
+        <LinearLayout
+            android:id="@+id/subtitles_click_settings"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:gravity="center_vertical"
+            android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+            android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/pick_source"
+                android:textColor="?attr/textColor"
+                android:textSize="20sp"
+                android:textStyle="bold" />
+
+            <ImageView
+                android:id="@+id/help_btt"
+                android:layout_width="44dp"
+                android:layout_height="44dp"
+                android:background="?attr/selectableItemBackgroundBorderless"
+                android:padding="10dp"
+                android:src="@drawable/baseline_help_outline_24"
+                android:contentDescription="@string/help" />
+        </LinearLayout>
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/sort_sources"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:background="?attr/primaryBlackBackground"
+            android:requiresFadingEdge="vertical"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+            tools:layout_height="200dp"
+            tools:listitem="@layout/player_prioritize_item" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/sort_subtitles_holder"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:orientation="vertical"
+        android:paddingBottom="8dp">
+        
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+            android:paddingTop="10dp"
+            android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+            android:paddingBottom="10dp"
+            android:text="@string/qualities"
+            android:textColor="?attr/textColor"
+            android:textSize="20sp"
+            android:textStyle="bold" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/sort_qualities"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:background="?attr/primaryBlackBackground"
+            android:requiresFadingEdge="vertical"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+            tools:layout_height="200dp"
+            tools:listfooter="@layout/sort_bottom_footer_add_choice"
+            tools:listitem="@layout/player_prioritize_item" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/apply_btt_holder"
+        android:layout_width="match_parent"
+        android:layout_height="60dp"
+        android:orientation="horizontal"
+        android:gravity="center_vertical"
+        android:paddingHorizontal="?android:attr/listPreferredItemPaddingStart">
+
+        <EditText
+            android:id="@+id/profile_text_editable"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:autofillHints="username"
+            android:inputType="text"
+            android:maxLength="32"
+            android:textColor="?attr/textColor"
+            android:textSize="20sp"
+            android:textStyle="bold"
+            tools:text="@string/profile_number"
+            tools:ignore="LabelFor" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/save_btt"
+            android:layout_width="wrap_content"
+            android:text="@string/sort_save"
+            style="@style/WhiteButton" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/close_btt"
+            android:layout_width="wrap_content"
+            android:text="@string/sort_close"
+            style="@style/BlackButton" />
+    </LinearLayout>
+</LinearLayout>
diff --git a/app/src/main/res/layout-port/subtitle_offset.xml b/app/src/main/res/layout-port/subtitle_offset.xml
new file mode 100644
index 00000000000..b6c4f61fd2d
--- /dev/null
+++ b/app/src/main/res/layout-port/subtitle_offset.xml
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:padding="8dp">
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1">
+
+        <TextView
+            android:id="@+id/no_subtitles_loaded_notice"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:textSize="18sp"
+            android:textStyle="italic"
+            android:alpha="0.7"
+            android:text="@string/no_subtitles_loaded" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/subtitle_offset_recyclerview"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:paddingVertical="10dp"
+            android:requiresFadingEdge="vertical"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+            tools:listitem="@layout/subtitle_offset_item"
+            tools:visibility="gone" />
+    </FrameLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:gravity="center_horizontal"
+        android:paddingVertical="10dp">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="0dp"
+            android:paddingTop="10dp"
+            android:text="@string/subtitle_offset_title"
+            style="@style/WatchHeaderText" />
+
+        <TextView
+            android:id="@+id/subtitle_offset_sub_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="?attr/grayTextColor"
+            tools:text="@string/subtitle_offset_extra_hint_none_format" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:gravity="center"
+            android:paddingTop="8dp">
+
+            <ImageView
+                android:id="@+id/subtitle_offset_subtract_more"
+                android:layout_width="44dp"
+                android:layout_height="44dp"
+                android:background="?android:attr/selectableItemBackgroundBorderless"
+                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:background="?android:attr/selectableItemBackgroundBorderless"
+                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:gravity="center"
+                android:autofillHints="no"
+                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:background="?android:attr/selectableItemBackgroundBorderless"
+                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:background="?android:attr/selectableItemBackgroundBorderless"
+                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="wrap_content"
+        android:gravity="end|center_vertical"
+        android:orientation="horizontal"
+        android:padding="8dp">
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/apply_btt"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:text="@string/sort_apply"
+            style="@style/WhiteButton" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/reset_btt"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:text="@string/reset_btn"
+            style="@style/BlackButton" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/cancel_btt"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:text="@string/sort_cancel"
+            style="@style/BlackButton" />
+    </LinearLayout>
+</LinearLayout>
diff --git a/app/src/main/res/layout/account_edit_dialog.xml b/app/src/main/res/layout/account_edit_dialog.xml
index 9d39425a499..f52c8ea5196 100644
--- a/app/src/main/res/layout/account_edit_dialog.xml
+++ b/app/src/main/res/layout/account_edit_dialog.xml
@@ -37,6 +37,33 @@
         android:layout_marginBottom="60dp"
         android:orientation="vertical">
 
+        <androidx.cardview.widget.CardView
+            android:layout_width="@dimen/account_select_linear_item_size"
+            android:layout_height="@dimen/account_select_linear_item_size"
+            android:layout_gravity="center"
+            app:cardCornerRadius="@dimen/rounded_image_radius">
+
+            <ImageView
+                android:id="@+id/account_image"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_gravity="center"
+                android:contentDescription="@string/preview_background_img_des"
+                android:focusable="true"
+                android:foreground="@drawable/outline_drawable_forced_round"
+                android:scaleType="centerCrop"
+                android:src="@drawable/profile_bg_blue" />
+
+            <ImageView
+                android:id="@+id/edit_profile_photo_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom|end"
+                android:background="@color/skipOpTransparent"
+                android:padding="5dp"
+                android:src="@drawable/ic_baseline_edit_24" />
+        </androidx.cardview.widget.CardView>
+
         <EditText
             android:id="@+id/account_name"
             android:layout_width="match_parent"
@@ -55,63 +82,49 @@
             android:id="@+id/lockProfileCheckbox"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/lock_profile" />
+            android:buttonTint="?attr/textColor"
+            android:text="@string/lock_profile"
+            android:textColor="?attr/grayTextColor" />
 
-        <androidx.cardview.widget.CardView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:cardCornerRadius="@dimen/rounded_image_radius">
-
-            <ImageView
-                android:id="@+id/account_image"
-                android:src="@drawable/profile_bg_blue"
-                android:focusable="true"
-                android:contentDescription="@string/preview_background_img_des"
-                android:scaleType="centerCrop"
-                android:foreground="@drawable/outline_drawable_forced_round"
-                android:layout_width="match_parent"
-                android:layout_height="60dp"
-                android:layout_gravity="center" />
 
-        </androidx.cardview.widget.CardView>
     </LinearLayout>
 
     <RelativeLayout
         android:id="@+id/apply_btt_holder"
-        android:orientation="horizontal"
-        android:padding="10dp"
         android:layout_width="match_parent"
         android:layout_height="60dp"
         android:layout_gravity="bottom"
-        android:layout_marginTop="-60dp">
+        android:layout_marginTop="-60dp"
+        android:orientation="horizontal"
+        android:padding="10dp">
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/delete_btt"
-            android:text="@string/delete"
+            style="@style/BlackButton"
             android:layout_width="wrap_content"
             android:layout_alignParentStart="true"
             android:layout_gravity="center_vertical"
             android:nextFocusRight="@id/apply_btt"
-            style="@style/BlackButton" />
+            android:text="@string/delete" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/apply_btt"
-            android:text="@string/sort_apply"
+            style="@style/WhiteButton"
             android:layout_width="wrap_content"
             android:layout_gravity="center_vertical|end"
             android:layout_toStartOf="@+id/cancel_btt"
             android:nextFocusLeft="@id/delete_btt"
             android:nextFocusRight="@id/cancel_btt"
-            style="@style/WhiteButton" />
+            android:text="@string/sort_apply" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/cancel_btt"
-            android:text="@string/sort_cancel"
+            style="@style/BlackButton"
             android:layout_width="wrap_content"
             android:layout_alignParentEnd="true"
             android:layout_gravity="center_vertical|end"
             android:nextFocusLeft="@id/apply_btt"
-            style="@style/BlackButton" />
+            android:text="@string/sort_cancel" />
 
     </RelativeLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/account_list_item.xml b/app/src/main/res/layout/account_list_item.xml
index f133d6c3f28..3cbfc72fb1e 100644
--- a/app/src/main/res/layout/account_list_item.xml
+++ b/app/src/main/res/layout/account_list_item.xml
@@ -6,11 +6,11 @@
     android:id="@+id/card_view"
     android:layout_width="110dp"
     android:layout_height="110dp"
-    android:animateLayoutChanges="true"
-    android:backgroundTint="?attr/primaryGrayBackground"
-    android:foreground="?attr/selectableItemBackground"
     android:layout_margin="10dp"
+    android:animateLayoutChanges="true"
+    android:backgroundTint="@color/primaryGrayBackground"
     android:focusable="true"
+    android:foreground="?attr/selectableItemBackground"
     app:cardCornerRadius="@dimen/rounded_image_radius"
     app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintDimensionRatio="1"
@@ -42,6 +42,7 @@
         android:layout_margin="4dp"
         android:src="@drawable/video_locked"
         android:visibility="gone"
+        app:tint="@color/textColor"
         tools:visibility="visible" />
 
     <TextView
@@ -51,6 +52,8 @@
         android:layout_gravity="center"
         android:gravity="center"
         android:padding="10dp"
-        android:textSize="16sp" />
+        android:textColor="@color/textColor"
+        android:textSize="16sp"
+        tools:text="Hello World!" />
 
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/account_list_item_edit.xml b/app/src/main/res/layout/account_list_item_edit.xml
index 0adade19fc0..3f41a23c230 100644
--- a/app/src/main/res/layout/account_list_item_edit.xml
+++ b/app/src/main/res/layout/account_list_item_edit.xml
@@ -6,11 +6,11 @@
     android:id="@+id/card_view"
     android:layout_width="110dp"
     android:layout_height="110dp"
-    android:animateLayoutChanges="true"
-    android:backgroundTint="?attr/primaryGrayBackground"
-    android:foreground="?attr/selectableItemBackground"
     android:layout_margin="10dp"
+    android:animateLayoutChanges="true"
+    android:backgroundTint="@color/primaryGrayBackground"
     android:focusable="true"
+    android:foreground="?attr/selectableItemBackground"
     app:cardCornerRadius="@dimen/rounded_image_radius"
     app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintDimensionRatio="1"
@@ -42,6 +42,7 @@
         android:layout_margin="4dp"
         android:src="@drawable/video_locked"
         android:visibility="gone"
+        app:tint="@color/textColor"
         tools:visibility="visible" />
 
     <ImageView
@@ -49,7 +50,8 @@
         android:layout_width="42dp"
         android:layout_height="42dp"
         android:layout_gravity="top|start"
-        android:src="@drawable/ic_baseline_edit_24" />
+        android:src="@drawable/ic_baseline_edit_24"
+        app:tint="@color/textColor" />
 
     <TextView
         android:id="@+id/account_name"
@@ -58,6 +60,8 @@
         android:layout_gravity="center"
         android:gravity="center"
         android:padding="10dp"
-        android:textSize="16sp" />
+        android:textColor="@color/textColor"
+        android:textSize="16sp"
+        tools:text="Hello World!" />
 
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/account_switch.xml b/app/src/main/res/layout/account_switch.xml
index 5153f0e3565..ac6e41a60c1 100644
--- a/app/src/main/res/layout/account_switch.xml
+++ b/app/src/main/res/layout/account_switch.xml
@@ -16,6 +16,13 @@
         android:layout_height="wrap_content"
         android:focusable="true"/>
 
+    <TextView
+        android:id="@+id/account_none"
+        android:text="@string/no_account"
+        style="@style/SettingsItem"
+        android:focusable="true">
+    </TextView>
+
     <TextView
         android:id="@+id/account_add"
         android:text="@string/add_account"
diff --git a/app/src/main/res/layout/activity_account_select.xml b/app/src/main/res/layout/activity_account_select.xml
index bd6007dcf64..9f62d56015c 100644
--- a/app/src/main/res/layout/activity_account_select.xml
+++ b/app/src/main/res/layout/activity_account_select.xml
@@ -6,7 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/edit_account_button"
         android:layout_width="40dp"
         android:layout_height="40dp"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index a06e6a157c6..2483a37145c 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -14,7 +14,7 @@
 
         <com.google.android.material.navigationrail.NavigationRailView
             android:id="@+id/nav_rail_view"
-            android:layout_width="62dp"
+            android:layout_width="@dimen/nav_rail_view_width"
             android:layout_height="match_parent"
             android:background="?attr/primaryGrayBackground"
             android:descendantFocusability="afterDescendants"
@@ -36,7 +36,7 @@
                   -->
         <com.google.android.material.bottomnavigation.BottomNavigationView
             android:id="@+id/nav_view"
-            android:layout_height="70dp"
+            android:layout_height="@dimen/nav_view_height"
             android:layout_width="0dp"
             app:labelVisibilityMode="unlabeled"
             android:background="?attr/primaryGrayBackground"
diff --git a/app/src/main/res/layout/activity_main_tv.xml b/app/src/main/res/layout/activity_main_tv.xml
index 0003b26187d..c51d77d162b 100644
--- a/app/src/main/res/layout/activity_main_tv.xml
+++ b/app/src/main/res/layout/activity_main_tv.xml
@@ -15,43 +15,57 @@
         <androidx.fragment.app.FragmentContainerView
             android:id="@+id/nav_host_fragment"
             android:name="androidx.navigation.fragment.NavHostFragment"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
             app:defaultNavHost="true"
-            app:layout_constraintBottom_toTopOf="@id/cast_mini_controller_holder"
+            app:layout_constraintBottom_toTopOf="@+id/cast_mini_controller_holder"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
             app:navGraph="@navigation/mobile_navigation" />
 
         <com.google.android.material.navigationrail.NavigationRailView
             android:id="@+id/nav_rail_view"
-            android:layout_width="62dp"
+            android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            app:itemIconTint="@color/item_select_color"
-            app:itemTextColor="@color/item_select_color"
             android:background="?attr/primaryGrayBackground"
             android:descendantFocusability="afterDescendants"
+            android:maxWidth="@dimen/nav_rail_view_width"
+            android:minWidth="@dimen/nav_rail_view_width"
+            app:collapsedItemMinHeight="0dp"
+            app:expanded="false"
+            app:expandedItemMinHeight="0dp"
+            app:expandedMaxWidth="220dp"
+
             app:headerLayout="@layout/rail_header"
+            app:itemActiveIndicatorStyle="@style/CustomIndicator"
+            app:itemIconSize="24dp"
+            app:itemIconTint="@color/item_select_color_tv"
+
+            app:itemMinHeight="0dp"
+            app:itemPaddingBottom="0dp"
+            app:itemPaddingTop="0dp"
+            app:itemSpacing="12dp"
+            app:itemTextColor="@color/item_select_color_tv"
             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"/>
+            <include layout="@layout/rail_footer" />
 
         </com.google.android.material.navigationrail.NavigationRailView>
 
         <com.google.android.material.bottomnavigation.BottomNavigationView
             android:id="@+id/nav_view"
-            android:layout_height="70dp"
             android:layout_width="0dp"
-            app:labelVisibilityMode="unlabeled"
-            android:visibility="gone"
+            android:layout_height="@dimen/nav_view_height"
             android:background="?attr/primaryGrayBackground"
-
+            android:visibility="gone"
             app:itemIconTint="@color/item_select_color"
             app:itemTextColor="@color/item_select_color"
+            app:labelVisibilityMode="unlabeled"
 
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintLeft_toLeftOf="parent"
@@ -84,15 +98,14 @@
         android:layout_height="match_parent">
 
         <ImageView
-            android:focusable="false"
-            android:focusableInTouchMode="false"
-            android:clickable="false"
-            android:visibility="gone"
             android:id="@+id/focus_outline"
-            android:src="@drawable/outline"
             android:layout_width="100dp"
             android:layout_height="100dp"
-            android:importantForAccessibility="no">
-        </ImageView>
+            android:clickable="false"
+            android:focusable="false"
+            android:focusableInTouchMode="false"
+            android:importantForAccessibility="no"
+            android:src="@drawable/outline"
+            android:visibility="gone" />
     </FrameLayout>
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/add_account_input.xml b/app/src/main/res/layout/add_account_input.xml
index ea48a80f006..4f96b109e9b 100644
--- a/app/src/main/res/layout/add_account_input.xml
+++ b/app/src/main/res/layout/add_account_input.xml
@@ -80,6 +80,7 @@
             android:id="@+id/login_server_input"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:autofillHints="no"
             android:hint="@string/example_ip"
             android:inputType="textUri"
             android:nextFocusLeft="@id/apply_btt"
@@ -96,7 +97,7 @@
             android:layout_height="wrap_content"
             android:autofillHints="password"
             android:hint="@string/example_password"
-            android:inputType="textVisiblePassword"
+            android:inputType="textPassword"
             android:nextFocusLeft="@id/apply_btt"
 
             android:nextFocusRight="@id/cancel_btt"
diff --git a/app/src/main/res/layout/add_repo_input.xml b/app/src/main/res/layout/add_repo_input.xml
index cb4224d10b5..a8bdf2a3872 100644
--- a/app/src/main/res/layout/add_repo_input.xml
+++ b/app/src/main/res/layout/add_repo_input.xml
@@ -81,6 +81,7 @@
             android:id="@+id/repo_url_input"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:autofillHints="no"
             android:hint="@string/repository_url_hint"
             android:inputType="textUri"
             android:nextFocusLeft="@id/apply_btt"
diff --git a/app/src/main/res/layout/add_site_input.xml b/app/src/main/res/layout/add_site_input.xml
index 1c61f8b4da9..519b790da96 100644
--- a/app/src/main/res/layout/add_site_input.xml
+++ b/app/src/main/res/layout/add_site_input.xml
@@ -62,6 +62,7 @@
 
         <EditText
                 android:textColorHint="?attr/grayTextColor"
+                android:autofillHints="no"
                 android:hint="@string/example_site_url"
                 android:id="@+id/site_url_input"
                 android:nextFocusRight="@id/cancel_btt"
diff --git a/app/src/main/res/layout/bottom_input_dialog.xml b/app/src/main/res/layout/bottom_input_dialog.xml
index aacc4024cfa..bfb72805208 100644
--- a/app/src/main/res/layout/bottom_input_dialog.xml
+++ b/app/src/main/res/layout/bottom_input_dialog.xml
@@ -1,10 +1,10 @@
 <?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:nextFocusDown="@id/nginx_text_input"
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:nextFocusDown="@id/nginx_text_input"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
     <TextView
         android:id="@+id/text1"
@@ -21,41 +21,42 @@
         tools:text="Test" />
 
     <EditText
-            android:id="@+id/nginx_text_input"
-            android:nextFocusRight="@id/cancel_btt"
-            android:nextFocusLeft="@id/apply_btt"
-            android:layout_marginBottom="60dp"
-            android:layout_marginHorizontal="10dp"
-            android:paddingTop="10dp"
-            android:requiresFadingEdge="vertical"
-            tools:text="nginx.com"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_rowWeight="1"
-            android:inputType="text"
-            tools:ignore="LabelFor" />
+        android:id="@+id/nginx_text_input"
+        android:nextFocusRight="@id/cancel_btt"
+        android:nextFocusLeft="@id/apply_btt"
+        android:layout_marginBottom="60dp"
+        android:layout_marginHorizontal="10dp"
+        android:paddingTop="10dp"
+        android:requiresFadingEdge="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_rowWeight="1"
+        android:autofillHints="no"
+        android:inputType="text"
+        tools:text="nginx.com"
+        tools:ignore="LabelFor" />
 
     <LinearLayout
-            android:id="@+id/apply_btt_holder"
-            android:orientation="horizontal"
-            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:orientation="horizontal"
+        android:layout_gravity="bottom"
+        android:gravity="bottom|end"
+        android:layout_marginTop="-60dp"
+        android:layout_width="match_parent"
+        android:layout_height="60dp">
 
         <com.google.android.material.button.MaterialButton
-                style="@style/WhiteButton"
-                android:layout_gravity="center_vertical|end"
-                android:text="@string/sort_apply"
-                android:id="@+id/apply_btt"
-                android:layout_width="wrap_content" />
+            android:layout_width="wrap_content"
+            android:layout_gravity="center_vertical|end"
+            android:text="@string/sort_apply"
+            android:id="@+id/apply_btt"
+            style="@style/WhiteButton" />
 
         <com.google.android.material.button.MaterialButton
-                style="@style/BlackButton"
-                android:layout_gravity="center_vertical|end"
-                android:text="@string/sort_cancel"
-                android:id="@+id/cancel_btt"
-                android:layout_width="wrap_content" />
+            android:layout_width="wrap_content"
+            android:layout_gravity="center_vertical|end"
+            android:text="@string/sort_cancel"
+            android:id="@+id/cancel_btt"
+            style="@style/BlackButton" />
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/bottom_selection_dialog.xml b/app/src/main/res/layout/bottom_selection_dialog.xml
index 0532f2506b1..55ca6562e4e 100644
--- a/app/src/main/res/layout/bottom_selection_dialog.xml
+++ b/app/src/main/res/layout/bottom_selection_dialog.xml
@@ -1,58 +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"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="10dp">
+
+        <com.google.android.material.bottomsheet.BottomSheetDragHandleView
+            android:id="@+id/drag_handle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:visibility="gone" />
 
-    <TextView
+        <TextView
             android:id="@+id/text1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="30dp"
             android:paddingStart="?android:attr/listPreferredItemPaddingStart"
             android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-            android:layout_marginTop="20dp"
-            android:layout_marginBottom="10dp"
             android:textStyle="bold"
             android:textSize="20sp"
             android:textColor="?attr/textColor"
-            android:layout_width="match_parent"
-            android:layout_rowWeight="1"
-            tools:text="Test"
-            android:layout_height="wrap_content" />
+            tools:text="Test" />
+    </FrameLayout>
 
     <ListView
-            android:nextFocusRight="@id/cancel_btt"
-            android:nextFocusLeft="@id/apply_btt"
-
-            android:id="@+id/listview1"
-            android:layout_marginBottom="60dp"
-            android:paddingTop="10dp"
-            android:requiresFadingEdge="vertical"
-            tools:listitem="@layout/sort_bottom_single_choice"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_rowWeight="1" />
+        android:id="@+id/listview1"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:paddingTop="10dp"
+        android:dividerHeight="1dp"
+        android:requiresFadingEdge="vertical"
+        android:nextFocusRight="@id/cancel_btt"
+        android:nextFocusLeft="@id/apply_btt"
+        tools:listitem="@layout/sort_bottom_single_choice" />
 
     <LinearLayout
-            android:id="@+id/apply_btt_holder"
-            android:orientation="horizontal"
-            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:layout_width="match_parent"
+        android:layout_height="60dp"
+        android:gravity="center_vertical|end"
+        android:orientation="horizontal">
 
         <com.google.android.material.button.MaterialButton
-                style="@style/WhiteButton"
-                android:layout_gravity="center_vertical|end"
-                android:text="@string/sort_apply"
-                android:id="@+id/apply_btt"
-                android:layout_width="wrap_content" />
+            android:id="@+id/apply_btt"
+            android:layout_width="wrap_content"
+            android:layout_gravity="center_vertical|end"
+            android:text="@string/sort_apply"
+            style="@style/WhiteButton" />
 
         <com.google.android.material.button.MaterialButton
-                style="@style/BlackButton"
-                android:layout_gravity="center_vertical|end"
-                android:text="@string/sort_cancel"
-                android:id="@+id/cancel_btt"
-                android:layout_width="wrap_content" />
+            android:id="@+id/cancel_btt"
+            android:layout_width="wrap_content"
+            android:layout_gravity="center_vertical|end"
+            android:text="@string/sort_cancel"
+            style="@style/BlackButton" />
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/cast_item.xml b/app/src/main/res/layout/cast_item.xml
index 99a9750b291..4f7bdf74d9f 100644
--- a/app/src/main/res/layout/cast_item.xml
+++ b/app/src/main/res/layout/cast_item.xml
@@ -7,9 +7,9 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_margin="5dp"
+    android:focusable="true"
     android:foreground="@drawable/outline_drawable"
     app:cardBackgroundColor="@color/transparent"
-    android:focusable="true"
     app:cardCornerRadius="@dimen/rounded_image_radius"
     app:cardElevation="0dp">
 
@@ -25,38 +25,42 @@
             android:layout_gravity="center_horizontal">
 
             <androidx.cardview.widget.CardView
+                android:id="@+id/voice_actor_image_holder"
                 android:layout_width="70dp"
                 android:layout_height="70dp"
+                android:layout_gravity="end|bottom"
+                android:layout_marginStart="10dp"
+                android:layout_marginTop="5dp"
+                android:alpha="0.2"
                 android:foreground="@drawable/outline_drawable"
                 app:cardCornerRadius="35dp">
 
                 <ImageView
-
-                    android:id="@+id/actor_image"
+                    android:id="@+id/voice_actor_image"
                     android:layout_width="match_parent"
+
                     android:layout_height="match_parent"
                     android:contentDescription="@string/episode_poster_img_des"
+                    android:foreground="@drawable/outline_big_35_gray"
                     android:scaleType="centerCrop"
-                    tools:src="@drawable/example_poster" />
-
+                    tools:src="@drawable/profile_bg_blue" />
             </androidx.cardview.widget.CardView>
 
             <androidx.cardview.widget.CardView
-                android:id="@+id/voice_actor_image_holder"
-                android:layout_width="40dp"
-                android:layout_height="40dp"
-                android:layout_gravity="end|bottom"
+                android:layout_width="70dp"
+                android:layout_height="70dp"
                 android:foreground="@drawable/outline_drawable"
-                app:cardCornerRadius="20dp">
+                app:cardCornerRadius="35dp">
 
                 <ImageView
-                    android:id="@+id/voice_actor_image"
+                    android:id="@+id/actor_image"
                     android:layout_width="match_parent"
-
                     android:layout_height="match_parent"
                     android:contentDescription="@string/episode_poster_img_des"
+                    android:foreground="@drawable/outline_big_35_gray"
                     android:scaleType="centerCrop"
                     tools:src="@drawable/example_poster" />
+
             </androidx.cardview.widget.CardView>
         </FrameLayout>
 
diff --git a/app/src/main/res/layout/chromecast_subtitle_settings.xml b/app/src/main/res/layout/chromecast_subtitle_settings.xml
index 4d3b50dfe4b..92d0bd35023 100644
--- a/app/src/main/res/layout/chromecast_subtitle_settings.xml
+++ b/app/src/main/res/layout/chromecast_subtitle_settings.xml
@@ -1,16 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/subs_root"
+    android:background="?attr/primaryBlackBackground"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:id="@+id/subs_root"
-        android:background="?attr/primaryBlackBackground">
+        android:layout_height="match_parent">
 
-    <LinearLayout
-            android:orientation="vertical"
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
 
-        <TextView
+            <TextView
                 android:paddingStart="20dp"
                 android:paddingEnd="20dp"
                 android:layout_marginTop="20dp"
@@ -23,28 +28,28 @@
                 android:layout_rowWeight="1"
                 android:layout_height="wrap_content" />
 
-        <FrameLayout
+            <FrameLayout
                 android:visibility="gone"
                 android:layout_width="match_parent"
                 android:layout_height="75sp">
 
-            <ImageView
+                <ImageView
                     android:scaleType="centerCrop"
                     android:src="@drawable/subtitles_preview_background"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:contentDescription="@string/preview_background_img_des" />
 
-            <androidx.media3.ui.SubtitleView
+                <androidx.media3.ui.SubtitleView
                     android:id="@+id/subtitle_text"
 
                     android:layout_width="match_parent"
                     android:layout_gravity="center"
                     android:foregroundGravity="center"
                     android:layout_height="match_parent" />
-        </FrameLayout>
+            </FrameLayout>
 
-        <TextView
+            <TextView
                 android:nextFocusDown="@id/subs_font_size"
                 android:nextFocusLeft="@id/apply_btt"
                 android:nextFocusRight="@id/cancel_btt"
@@ -53,7 +58,7 @@
                 android:text="@string/subs_font"
                 style="@style/SettingsItem" />
 
-        <TextView
+            <TextView
                 android:nextFocusUp="@id/subs_font"
                 android:nextFocusDown="@id/subs_text_color"
                 android:nextFocusLeft="@id/apply_btt"
@@ -63,7 +68,7 @@
                 android:text="@string/subs_font_size"
                 style="@style/SettingsItem" />
 
-        <TextView
+            <TextView
                 android:nextFocusUp="@id/subs_font_size"
                 android:nextFocusDown="@id/subs_outline_color"
                 android:nextFocusLeft="@id/apply_btt"
@@ -73,7 +78,7 @@
                 android:text="@string/subs_text_color"
                 style="@style/SettingsItem" />
 
-        <TextView
+            <TextView
                 android:nextFocusUp="@id/subs_text_color"
                 android:nextFocusDown="@id/subs_background_color"
                 android:nextFocusLeft="@id/apply_btt"
@@ -83,7 +88,7 @@
                 android:text="@string/subs_outline_color"
                 style="@style/SettingsItem" />
 
-        <TextView
+            <TextView
                 android:nextFocusUp="@id/subs_outline_color"
                 android:nextFocusDown="@id/subs_window_color"
                 android:nextFocusLeft="@id/apply_btt"
@@ -93,7 +98,7 @@
                 android:text="@string/subs_background_color"
                 style="@style/SettingsItem" />
 
-        <TextView
+            <TextView
                 android:visibility="gone"
                 android:nextFocusUp="@id/subs_background_color"
                 android:nextFocusDown="@id/subs_edge_type"
@@ -104,7 +109,7 @@
                 android:text="@string/subs_window_color"
                 style="@style/SettingsItem" />
 
-        <TextView
+            <TextView
                 android:nextFocusUp="@id/subs_window_color"
                 android:nextFocusDown="@id/apply_btt"
                 android:nextFocusLeft="@id/apply_btt"
@@ -114,7 +119,7 @@
                 android:text="@string/subs_edge_type"
                 style="@style/SettingsItem" />
 
-        <TextView
+            <TextView
                 android:gravity="center"
                 android:text="@string/subs_hold_to_reset_to_default"
                 android:textSize="14sp"
@@ -124,14 +129,14 @@
                 android:layout_rowWeight="1"
                 android:layout_height="wrap_content" />
 
-        <LinearLayout
+            <LinearLayout
                 android:orientation="horizontal"
                 android:layout_gravity="bottom"
                 android:gravity="bottom|end"
                 android:layout_width="match_parent"
                 android:layout_height="60dp">
 
-            <com.google.android.material.button.MaterialButton
+                <com.google.android.material.button.MaterialButton
                     android:nextFocusUp="@id/subs_edge_type"
                     android:nextFocusRight="@id/cancel_btt"
                     style="@style/WhiteButton"
@@ -141,10 +146,10 @@
                     android:id="@+id/apply_btt"
                     android:layout_width="wrap_content">
 
-                <requestFocus />
-            </com.google.android.material.button.MaterialButton>
+                    <requestFocus />
+                </com.google.android.material.button.MaterialButton>
 
-            <com.google.android.material.button.MaterialButton
+                <com.google.android.material.button.MaterialButton
                     android:nextFocusUp="@id/subs_edge_type"
                     android:nextFocusLeft="@id/apply_btt"
                     style="@style/BlackButton"
@@ -152,6 +157,7 @@
                     android:text="@string/sort_cancel"
                     android:id="@+id/cancel_btt"
                     android:layout_width="wrap_content" />
+            </LinearLayout>
         </LinearLayout>
-    </LinearLayout>
-</ScrollView>
\ No newline at end of file
+    </ScrollView>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/confirm_exit_dialog.xml b/app/src/main/res/layout/confirm_exit_dialog.xml
index 518aaa4777d..c312e64e32a 100644
--- a/app/src/main/res/layout/confirm_exit_dialog.xml
+++ b/app/src/main/res/layout/confirm_exit_dialog.xml
@@ -5,9 +5,11 @@
     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" />
+        android:text="@string/dont_show_again"
+        android:textColor="?attr/grayTextColor" />
 </LinearLayout>
diff --git a/app/src/main/res/layout/custom_preference_category_material.xml b/app/src/main/res/layout/custom_preference_category_material.xml
index 06db9901755..f5d78e83507 100644
--- a/app/src/main/res/layout/custom_preference_category_material.xml
+++ b/app/src/main/res/layout/custom_preference_category_material.xml
@@ -19,9 +19,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
     android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-    android:paddingRight="?android:attr/listPreferredItemPaddingRight"
     android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
     android:background="@drawable/outline_drawable_less"
     android:baselineAligned="false"
@@ -52,7 +50,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@android:id/title"
-            android:layout_alignLeft="@android:id/title"
             android:layout_alignStart="@android:id/title"
             android:layout_gravity="start"
             android:textAlignment="viewStart"
diff --git a/app/src/main/res/layout/custom_preference_material.xml b/app/src/main/res/layout/custom_preference_material.xml
index 0ab98c22be0..c6685ee29f2 100644
--- a/app/src/main/res/layout/custom_preference_material.xml
+++ b/app/src/main/res/layout/custom_preference_material.xml
@@ -21,9 +21,7 @@
     android:layout_height="wrap_content"
     android:minHeight="?android:attr/listPreferredItemHeightSmall"
     android:gravity="center_vertical"
-    android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
     android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-    android:paddingRight="?android:attr/listPreferredItemPaddingRight"
     android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
     android:background="?attr/focusBackground"
     android:clipToPadding="false"
@@ -51,7 +49,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@android:id/title"
-            android:layout_alignLeft="@android:id/title"
             android:layout_alignStart="@android:id/title"
             android:layout_gravity="start"
             android:textAlignment="viewStart"
@@ -67,9 +64,7 @@
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:gravity="end|center_vertical"
-        android:paddingLeft="16dp"
         android:paddingStart="16dp"
-        android:paddingRight="0dp"
         android:paddingEnd="0dp"
         android:orientation="vertical"/>
 
diff --git a/app/src/main/res/layout/custom_preference_widget_seekbar.xml b/app/src/main/res/layout/custom_preference_widget_seekbar.xml
index 02c5ec1be36..132091e5f09 100644
--- a/app/src/main/res/layout/custom_preference_widget_seekbar.xml
+++ b/app/src/main/res/layout/custom_preference_widget_seekbar.xml
@@ -18,13 +18,12 @@
 <!-- Layout used by SeekBarPreference for the seekbar widget style. -->
 <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:minHeight="?android:attr/listPreferredItemHeightSmall"
     android:gravity="center_vertical"
-    android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
     android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-    android:paddingRight="?android:attr/listPreferredItemPaddingRight"
     android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
     android:background="?attr/focusBackground"
     android:clipChildren="false"
@@ -54,14 +53,14 @@
                 android:layout_height="wrap_content"
                 android:singleLine="true"
                 android:textAppearance="?android:attr/textAppearanceListItem"
-                android:ellipsize="marquee"/>
+                android:ellipsize="marquee"
+                tools:ignore="LabelFor" />
 
             <TextView
                 android:id="@android:id/summary"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_below="@android:id/title"
-                android:layout_alignLeft="@android:id/title"
                 android:layout_alignStart="@android:id/title"
                 android:layout_gravity="start"
                 android:textAlignment="viewStart"
@@ -79,9 +78,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center_vertical"
-            android:paddingLeft="0dp"
             android:paddingStart="0dp"
-            android:paddingRight="16dp"
             android:paddingEnd="16dp"
             android:clipChildren="false"
             android:clipToPadding="false">
@@ -99,9 +96,7 @@
                 android:layout_width="0dp"
                 android:layout_weight="1"
                 android:layout_height="wrap_content"
-                android:paddingLeft="@dimen/preference_seekbar_padding_horizontal"
                 android:paddingStart="@dimen/preference_seekbar_padding_horizontal"
-                android:paddingRight="@dimen/preference_seekbar_padding_horizontal"
                 android:paddingEnd="@dimen/preference_seekbar_padding_horizontal"
                 android:paddingTop="@dimen/preference_seekbar_padding_vertical"
                 android:paddingBottom="@dimen/preference_seekbar_padding_vertical"
@@ -113,13 +108,11 @@
             <TextView
                 android:id="@+id/seekbar_value"
                 android:minWidth="@dimen/preference_seekbar_value_minWidth"
-                android:paddingLeft="8dp"
                 android:paddingStart="8dp"
-                android:paddingRight="0dp"
                 android:paddingEnd="0dp"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:gravity="right"
+                android:gravity="end"
                 android:singleLine="true"
                 android:textAppearance="?android:attr/textAppearanceListItem"
                 android:ellipsize="marquee"
diff --git a/app/src/main/res/layout/dialog_online_subtitles.xml b/app/src/main/res/layout/dialog_online_subtitles.xml
index e0eac5e0aab..48dc48a049d 100644
--- a/app/src/main/res/layout/dialog_online_subtitles.xml
+++ b/app/src/main/res/layout/dialog_online_subtitles.xml
@@ -22,25 +22,23 @@
             android:orientation="vertical">
 
             <!--   android:id="@+id/subs_settings"                 android:foreground="?android:attr/selectableItemBackgroundBorderless"
+-->
+<!--
 -->
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal"
-                tools:ignore="UseCompoundDrawables">
-
-                <FrameLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="40dp"
-                    android:layout_margin="10dp"
-                    android:background="@drawable/search_background"
-                    android:visibility="visible">
+                tools:ignore="UseCompoundDrawables"
+                android:padding="10dp">
 
                     <FrameLayout
-                        android:layout_width="match_parent"
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
                         android:layout_height="30dp"
                         android:layout_gravity="center_vertical"
-                        android:layout_marginEnd="40dp">
+                        android:layout_marginEnd="10dp"
+                        android:background="@drawable/search_background">
 
                         <androidx.appcompat.widget.SearchView
                             android:id="@+id/subtitles_search"
@@ -52,6 +50,7 @@
                             android:inputType="text"
 
                             android:paddingStart="-10dp"
+                            android:paddingEnd="10dp"
                             app:iconifiedByDefault="false"
 
                             app:queryBackground="@color/transparent"
@@ -64,46 +63,33 @@
                                         app:searchHintIcon="@drawable/search_white"
                                         -->
                         </androidx.appcompat.widget.SearchView>
-
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="match_parent"
-                            android:layout_gravity="end"
-                            android:gravity="end">
-
-                            <androidx.core.widget.ContentLoadingProgressBar
-                                android:id="@+id/search_loading_bar"
-                                style="@style/Widget.AppCompat.ProgressBar"
-                                android:layout_width="20dp"
-                                android:layout_height="20dp"
-                                android:layout_gravity="center"
-                                android:layout_marginEnd="10dp"
-                                android:foregroundTint="@color/white"
-                                android:progressTint="@color/white"
-                                android:visibility="visible"
-                                tools:visibility="visible">
-
-                            </androidx.core.widget.ContentLoadingProgressBar>
-
-                            <com.google.android.material.button.MaterialButton
-                                android:id="@+id/year_btt"
-                                style="@style/WhiteButton"
-                                android:layout_width="wrap_content"
-                                android:layout_height="match_parent"
-                                android:layout_gravity="center_vertical|end"
-                                android:nextFocusLeft="@id/subtitles_search"
-                                android:nextFocusRight="@id/search_filter"
-                                android:text="@string/none"
-                                />
-                        </LinearLayout>
+                        <androidx.core.widget.ContentLoadingProgressBar
+                            android:id="@+id/search_loading_bar"
+                            style="@style/Widget.AppCompat.ProgressBar"
+                            android:layout_width="20dp"
+                            android:layout_height="20dp"
+                            android:layout_gravity="end|center_vertical"
+                            android:foregroundTint="@color/white"
+                            android:progressTint="@color/white"
+                            android:visibility="visible"
+                            tools:visibility="visible">
+
+                        </androidx.core.widget.ContentLoadingProgressBar>
                     </FrameLayout>
-
+                    <com.google.android.material.button.MaterialButton
+                        android:id="@+id/year_btt"
+                        style="@style/WhiteButton"
+                        android:layout_width="wrap_content"
+                        android:layout_height="30dp"
+                        android:layout_gravity="center_vertical|end"
+                        android:nextFocusLeft="@id/subtitles_search"
+                        android:nextFocusRight="@id/search_filter"
+                        android:text="@string/none" />
                     <ImageView
                         android:id="@+id/search_filter"
                         android:layout_width="25dp"
                         android:layout_height="25dp"
                         android:layout_gravity="end|center_vertical"
-
                         android:layout_margin="10dp"
                         android:background="?selectableItemBackgroundBorderless"
                         android:contentDescription="@string/change_providers_img_des"
@@ -114,8 +100,6 @@
                         android:nextFocusDown="@id/search_autofit_results"
                         android:src="@drawable/ic_baseline_tune_24"
                         app:tint="?attr/textColor" />
-                </FrameLayout>
-
 
             </LinearLayout>
 
diff --git a/app/src/main/res/layout/download_child_episode.xml b/app/src/main/res/layout/download_child_episode.xml
index e53e63d312f..cb9c13d5394 100644
--- a/app/src/main/res/layout/download_child_episode.xml
+++ b/app/src/main/res/layout/download_child_episode.xml
@@ -14,30 +14,44 @@
     app:cardCornerRadius="@dimen/rounded_image_radius"
     app:cardElevation="0dp">
 
-    <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"
-        android:layout_gravity="bottom"
-        android:layout_marginBottom="-1.5dp"
-        android:progressBackgroundTint="?attr/colorPrimary"
-        android:progressTint="?attr/colorPrimary"
-        tools:progress="50" />
+<!--    <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"-->
+<!--        android:layout_gravity="bottom"-->
+<!--        android:layout_marginBottom="-1.5dp"-->
+<!--        android:progressBackgroundTint="?attr/colorPrimary"-->
+<!--        android:progressTint="?attr/colorPrimary"-->
+<!--        tools:progress="50" />-->
 
     <GridLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:foreground="?android:attr/selectableItemBackgroundBorderless">
 
-        <ImageView
-            android:id="@+id/download_child_episode_play"
-            android:layout_gravity="center_vertical"
-            android:layout_marginStart="10dp"
-            android:layout_marginEnd="10dp"
-            android:contentDescription="@string/episode_play_img_des"
-            android:src="@drawable/ic_baseline_play_arrow_24"
-            android:visibility="gone" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center">
+
+            <FrameLayout
+                android:id="@+id/watch_progress_container"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginStart="5dp">
+
+                <ImageView
+                    android:id="@+id/download_child_episode_play"
+                    style="@style/ContinueWatchingPlayUnderlayProgress"
+                    android:layout_margin="4dp"/>
+
+                <com.google.android.material.progressindicator.CircularProgressIndicator
+                    android:id="@+id/download_child_episode_progress"
+                    style="@style/ContinueWatchingCircularProgress"
+                    android:progress="50"/>
+            </FrameLayout>
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -72,7 +86,7 @@
                 android:textColor="?attr/grayTextColor"
                 tools:text="128MB / 237MB" />
         </LinearLayout>
-
+        </LinearLayout>
         <com.lagradost.cloudstream3.ui.download.button.PieFetchButton
             android:id="@+id/download_button"
             android:layout_width="@dimen/download_size"
diff --git a/app/src/main/res/layout/download_header_episode.xml b/app/src/main/res/layout/download_header_episode.xml
index 385fb2e0bb9..7b8b2c91eb5 100644
--- a/app/src/main/res/layout/download_header_episode.xml
+++ b/app/src/main/res/layout/download_header_episode.xml
@@ -14,16 +14,16 @@
     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" />
+<!--    <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/white"-->
+<!--        android:progressTint="?attr/white"-->
+<!--        tools:progress="50" />-->
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -42,6 +42,23 @@
                 android:contentDescription="@string/episode_poster_img_des"
                 android:scaleType="centerCrop"
                 tools:src="@drawable/example_poster" />
+            <FrameLayout
+                android:id="@+id/watch_progress_container"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:visibility="gone"
+                tools:visibility="visible">
+
+                <com.google.android.material.imageview.ShapeableImageView
+                    android:id="@+id/play_icon"
+                    style="@style/DownloadHeaderPlayUnderlayProgress"
+                    />
+                <com.google.android.material.progressindicator.CircularProgressIndicator
+                    android:id="@+id/download_header_episode_progress"
+                    style="@style/DownloadHeaderCircularProgress"
+                    tools:progress="100" />
+            </FrameLayout>
         </androidx.cardview.widget.CardView>
 
         <LinearLayout
diff --git a/app/src/main/res/layout/download_queue_item.xml b/app/src/main/res/layout/download_queue_item.xml
new file mode 100644
index 00000000000..86562a5139c
--- /dev/null
+++ b/app/src/main/res/layout/download_queue_item.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:id="@+id/root_holder"
+    android:layout_marginVertical="2.5dp"
+    android:orientation="vertical">
+
+    <androidx.cardview.widget.CardView
+        tools:visibility="visible"
+        android:id="@+id/download_child_episode_holder"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:focusable="true"
+        android:foreground="@drawable/outline_drawable"
+        android:nextFocusLeft="@id/nav_rail_view"
+        android:nextFocusRight="@id/download_button"
+        app:cardBackgroundColor="@color/transparent"
+        app:cardCornerRadius="@dimen/rounded_image_radius"
+        app:cardElevation="0dp">
+
+        <GridLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:foreground="?android:attr/selectableItemBackgroundBorderless">
+
+            <ImageView
+                android:id="@+id/download_child_episode_play"
+                android:layout_gravity="center_vertical"
+                android:layout_marginStart="10dp"
+                android:layout_marginEnd="10dp"
+                android:contentDescription="@string/episode_play_img_des"
+                android:src="@drawable/ic_baseline_play_arrow_24"
+                android:visibility="gone" />
+
+            <LinearLayout
+                android:gravity="center"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginEnd="50dp"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/download_child_episode_text"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginStart="10dp"
+                    android:layout_marginEnd="10dp"
+                    android:ellipsize="end"
+                    android:gravity="center_vertical"
+                    android:singleLine="true"
+                    android:textColor="?attr/textColor"
+                    tools:text="Episode 1 Episode 1 Episode 1 Episode 1 Episode 1 Episode 1 Episode 1" />
+
+                <TextView
+                    android:id="@+id/download_child_episode_text_extra"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginStart="10dp"
+                    android:layout_marginEnd="10dp"
+                    android:gravity="center_vertical"
+                    android:textColor="?attr/grayTextColor"
+                    tools:text="One piece" />
+            </LinearLayout>
+
+            <com.lagradost.cloudstream3.ui.download.button.PieFetchButton
+                android:id="@+id/download_button"
+                android:layout_width="@dimen/download_size"
+                android:layout_height="@dimen/download_size"
+                android:layout_gravity="center_vertical|end"
+                android:layout_marginStart="-50dp"
+                android:focusable="true"
+                app:download_animate_waiting="true"
+                android:foreground="@drawable/outline_drawable"
+                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>
+
+    <LinearLayout
+        android:visibility="gone"
+        tools:visibility="visible"
+        android:id="@+id/separator_holder"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:orientation="horizontal">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingHorizontal="5dp"
+            android:text="@string/parallel_downloads">
+
+        </TextView>
+
+        <ImageView
+            android:layout_width="match_parent"
+            android:layout_height="5dp"
+            android:src="@drawable/dashed_line_horizontal" />
+    </LinearLayout>
+
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/empty_layout.xml b/app/src/main/res/layout/empty_layout.xml
index 388e862b2b9..e128f7cec08 100644
--- a/app/src/main/res/layout/empty_layout.xml
+++ b/app/src/main/res/layout/empty_layout.xml
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+<androidx.constraintlayout.widget.ConstraintLayout 
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
-    <fragment
-            android:id="@+id/nav_host_fragment"
-            android:name="androidx.navigation.fragment.NavHostFragment"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            app:defaultNavHost="true"
-            app:navGraph="@navigation/mobile_navigation"
-            app:layout_constraintWidth="match_parent"
-            app:layout_constraintHeight="match_parent"
-            app:layout_constraintStart_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="parent" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+    <androidx.fragment.app.FragmentContainerView
+        android:id="@+id/nav_host_fragment"
+        android:name="androidx.navigation.fragment.NavHostFragment"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:defaultNavHost="true"
+        app:navGraph="@navigation/mobile_navigation"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/extra_brightness_overlay.xml b/app/src/main/res/layout/extra_brightness_overlay.xml
new file mode 100644
index 00000000000..8f82121bb05
--- /dev/null
+++ b/app/src/main/res/layout/extra_brightness_overlay.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<View xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/extra_brightness_overlay"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/white"
+    android:alpha="0"
+/>
\ 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 64ed1d7006d..0a7b42327ee 100644
--- a/app/src/main/res/layout/fragment_child_downloads.xml
+++ b/app/src/main/res/layout/fragment_child_downloads.xml
@@ -12,14 +12,14 @@
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@android:color/transparent">
+        android:background="?attr/primaryGrayBackground">
 
         <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:background="?attr/primaryGrayBackground"
             android:padding="8dp"
             android:visibility="gone">
 
@@ -32,8 +32,8 @@
                 android:contentDescription="@string/cancel"
                 android:padding="8dp"
                 android:layout_gravity="center_vertical"
-                android:nextFocusLeft="@id/nav_rail_view"
-                app:tint="@android:color/white" />
+                android:nextFocusLeft="@id/navigation_downloads"
+                app:tint="?attr/white" />
 
             <Button
                 android:id="@+id/btnDelete"
@@ -41,7 +41,7 @@
                 android:layout_height="wrap_content"
                 android:background="?attr/selectableItemBackground"
                 android:text="@string/delete"
-                android:textColor="@android:color/white"
+                android:textColor="?attr/white"
                 android:layout_gravity="center_vertical" />
 
             <TextView
@@ -50,7 +50,7 @@
                 android:layout_height="wrap_content"
                 android:background="?attr/selectableItemBackground"
                 android:text="@string/downloads_delete_select"
-                android:textColor="@android:color/white"
+                android:textColor="?attr/white"
                 android:layout_gravity="center_vertical"
                 android:visibility="gone" />
 
@@ -65,7 +65,7 @@
                 android:layout_height="wrap_content"
                 android:background="?attr/selectableItemBackground"
                 android:text="@string/select_all"
-                android:textColor="@android:color/white"
+                android:textColor="?attr/white"
                 android:layout_marginEnd="8dp"
                 android:nextFocusDown="@id/download_child_list" />
         </LinearLayout>
@@ -87,7 +87,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="?attr/primaryBlackBackground"
-        android:nextFocusLeft="@id/nav_rail_view"
+        android:nextFocusLeft="@id/navigation_downloads"
         android:nextFocusUp="@id/download_child_toolbar"
         android:padding="10dp"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"
diff --git a/app/src/main/res/layout/fragment_download_queue.xml b/app/src/main/res/layout/fragment_download_queue.xml
new file mode 100644
index 00000000000..c562940f903
--- /dev/null
+++ b/app/src/main/res/layout/fragment_download_queue.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/download_queue_root"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?attr/primaryBlackBackground">
+
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <com.google.android.material.appbar.AppBarLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@android:color/transparent">
+
+            <com.google.android.material.appbar.MaterialToolbar
+                android:id="@+id/download_queue_toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="?attr/primaryGrayBackground"
+                android:paddingTop="@dimen/navbar_height"
+                app:layout_scrollFlags="scroll|enterAlways"
+                app:menu="@menu/download_queue"
+                app:navigationIconTint="?attr/iconColor"
+                app:titleTextColor="?attr/textColor"
+                tools:title="Overlord" />
+
+        </com.google.android.material.appbar.AppBarLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/download_queue_list"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:nextFocusLeft="@id/navigation_downloads"
+                android:nextFocusUp="@id/download_queue_toolbar"
+                android:padding="10dp"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                tools:listitem="@layout/download_queue_item" />
+
+        </LinearLayout>
+
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
+
+    <TextView
+        android:id="@+id/text_no_queue"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:text="@string/queue_empty_message"
+        android:visibility="visible" />
+
+</FrameLayout>
diff --git a/app/src/main/res/layout/fragment_downloads.xml b/app/src/main/res/layout/fragment_downloads.xml
index 2879703df34..96e1e50ab05 100644
--- a/app/src/main/res/layout/fragment_downloads.xml
+++ b/app/src/main/res/layout/fragment_downloads.xml
@@ -5,14 +5,14 @@
     android:id="@+id/download_root"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="?attr/primaryGrayBackground"
     android:orientation="vertical"
     tools:context=".ui.download.DownloadFragment">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?attr/primaryGrayBackground"
-        tools:layout_height="100dp">
+        android:background="?attr/primaryGrayBackground">
         <!--
         For Scroll add to LinearLayout
         app:layout_scrollFlags="scroll|enterAlways"
@@ -22,7 +22,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
-            android:background="?attr/colorPrimary"
+            android:background="?attr/primaryGrayBackground"
             android:padding="8dp"
             android:visibility="gone">
 
@@ -35,8 +35,8 @@
                 android:contentDescription="@string/cancel"
                 android:padding="8dp"
                 android:layout_gravity="center_vertical"
-                android:nextFocusLeft="@id/nav_rail_view"
-                app:tint="@android:color/white" />
+                android:nextFocusLeft="@id/navigation_downloads"
+                app:tint="?attr/white" />
 
             <Button
                 android:id="@+id/btnDelete"
@@ -44,7 +44,7 @@
                 android:layout_height="wrap_content"
                 android:background="?attr/selectableItemBackground"
                 android:text="@string/delete"
-                android:textColor="@android:color/white"
+                android:textColor="?attr/white"
                 android:layout_gravity="center_vertical" />
 
             <TextView
@@ -53,7 +53,7 @@
                 android:layout_height="wrap_content"
                 android:background="?attr/selectableItemBackground"
                 android:text="@string/downloads_delete_select"
-                android:textColor="@android:color/white"
+                android:textColor="?attr/white"
                 android:layout_gravity="center_vertical"
                 android:visibility="gone" />
 
@@ -68,208 +68,316 @@
                 android:layout_height="wrap_content"
                 android:background="?attr/selectableItemBackground"
                 android:text="@string/select_all"
-                android:textColor="@android:color/white"
+                android:textColor="?attr/white"
                 android:layout_marginEnd="8dp"
                 android:nextFocusDown="@id/download_list" />
         </LinearLayout>
 
         <LinearLayout
-            android:id="@+id/download_storage_appbar"
+            android:id="@+id/download_appbar"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_margin="10dp"
-            android:orientation="vertical"
-            android:visibility="gone"
-            tools:visibility="visible">
+            android:layout_height="match_parent"
+            android:background="?attr/primaryGrayBackground"
+            android:baselineAligned="false"
+            android:focusable="true"
+            android:foreground="@drawable/outline_drawable"
+            android:nextFocusLeft="@id/navigation_downloads"
+            android:nextFocusRight="@id/download_stream_button_tv"
+            android:nextFocusDown="@id/download_list"
+            android:orientation="horizontal">
 
-            <TextView
-                android:layout_width="wrap_content"
+            <LinearLayout
+                android:id="@+id/download_storage_appbar"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="5dp"
-                android:text="@string/download_storage_text"
-                android:textColor="?attr/textColor" />
+                android:layout_margin="10dp"
+                android:layout_weight="1"
+                android:orientation="vertical"
+                android:visibility="visible">
 
-            <androidx.cardview.widget.CardView
-                android:layout_width="fill_parent"
-                android:layout_height="12dp"
-                android:layout_marginBottom="5dp"
-                android:elevation="0dp"
-                app:cardCornerRadius="@dimen/storage_radius"
-                app:cardElevation="0dp"
-                app:cardMaxElevation="0dp">
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="5dp"
+                    android:text="@string/download_storage_text"
+                    android:textColor="?attr/textColor" />
 
-                <LinearLayout
+                <com.facebook.shimmer.ShimmerFrameLayout
+                    android:id="@+id/download_loading_bytes"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:orientation="horizontal">
-
-                    <View
-                        android:id="@+id/download_used"
-                        android:layout_width="0dp"
-                        android:layout_height="match_parent"
-                        android:layout_weight="0.5"
-                        android:background="@drawable/storage_bar_left" />
-
-                    <View
-                        android:id="@+id/download_app"
-                        android:layout_width="0dp"
-                        android:layout_height="match_parent"
-                        android:layout_weight="0.10"
-                        android:background="@drawable/storage_bar_mid" />
-
-                    <View
-                        android:id="@+id/download_free"
-                        android:layout_width="0dp"
-                        android:layout_height="match_parent"
-                        android:layout_weight="0.10"
-                        android:background="@drawable/storage_bar_right" />
-                </LinearLayout>
-            </androidx.cardview.widget.CardView>
+                    android:layout_gravity="center"
+                    android:orientation="vertical"
+                    app:shimmer_auto_start="true"
+                    app:shimmer_base_alpha="0.2"
+                    app:shimmer_duration="@integer/loading_time"
+                    app:shimmer_highlight_alpha="0.3"
+                    tools:ignore="MissingClass"
+                    tools:visibility="gone">
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-
-                <View
-                    android:layout_width="10dp"
-                    android:layout_height="10dp"
-                    android:layout_gravity="center_vertical"
-                    android:layout_marginTop="5dp"
-                    android:layout_marginEnd="5dp"
-                    android:layout_marginBottom="5dp"
-                    android:background="@drawable/storage_bar_left_box" />
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical">
 
-                <TextView
-                    android:id="@+id/download_used_txt"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:textColor="?attr/textColor"
-                    android:textSize="12sp"
-                    tools:text="Used • 30.58GB" />
-
-                <View
-                    android:layout_width="10dp"
-                    android:layout_height="10dp"
-                    android:layout_gravity="center_vertical"
-                    android:layout_margin="5dp"
-                    android:background="@drawable/storage_bar_mid_box" />
+                        <include layout="@layout/loading_line" />
 
-                <TextView
-                    android:id="@+id/download_app_txt"
+                        <include layout="@layout/loading_line_short" />
+                    </LinearLayout>
+                </com.facebook.shimmer.ShimmerFrameLayout>
+
+                <LinearLayout
+                    android:id="@+id/download_bytes_bar"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:textColor="?attr/textColor"
-                    android:textSize="12sp"
-                    tools:text="App • 30.58GB" />
-
-                <View
-                    android:layout_width="10dp"
-                    android:layout_height="10dp"
-                    android:layout_gravity="center_vertical"
-                    android:layout_margin="5dp"
-                    android:background="@drawable/storage_bar_right_box" />
+                    android:orientation="vertical"
+                    android:visibility="gone"
+                    tools:visibility="visible">
+
+                    <androidx.cardview.widget.CardView
+                        android:layout_width="fill_parent"
+                        android:layout_height="12dp"
+                        android:layout_marginBottom="5dp"
+                        android:elevation="0dp"
+                        app:cardCornerRadius="@dimen/storage_radius"
+                        app:cardElevation="0dp"
+                        app:cardMaxElevation="0dp">
+
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:orientation="horizontal">
+
+                            <View
+                                android:id="@+id/download_used"
+                                android:layout_width="0dp"
+                                android:layout_height="match_parent"
+                                android:layout_weight="0.5"
+                                android:background="@drawable/storage_bar_left" />
+
+                            <View
+                                android:id="@+id/download_app"
+                                android:layout_width="0dp"
+                                android:layout_height="match_parent"
+                                android:layout_weight="0.10"
+                                android:background="@drawable/storage_bar_mid" />
+
+                            <View
+                                android:id="@+id/download_free"
+                                android:layout_width="0dp"
+                                android:layout_height="match_parent"
+                                android:layout_weight="0.10"
+                                android:background="@drawable/storage_bar_right" />
+                        </LinearLayout>
+                    </androidx.cardview.widget.CardView>
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal">
+
+                        <View
+                            android:layout_width="10dp"
+                            android:layout_height="10dp"
+                            android:layout_gravity="center_vertical"
+                            android:layout_marginTop="5dp"
+                            android:layout_marginEnd="5dp"
+                            android:layout_marginBottom="5dp"
+                            android:background="@drawable/storage_bar_left_box" />
+
+                        <TextView
+                            android:id="@+id/download_used_txt"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:textColor="?attr/textColor"
+                            android:textSize="12sp"
+                            tools:text="Used • 30.58GB" />
+
+                        <View
+                            android:layout_width="10dp"
+                            android:layout_height="10dp"
+                            android:layout_gravity="center_vertical"
+                            android:layout_margin="5dp"
+                            android:background="@drawable/storage_bar_mid_box" />
+
+                        <TextView
+                            android:id="@+id/download_app_txt"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:textColor="?attr/textColor"
+                            android:textSize="12sp"
+                            tools:text="App • 30.58GB" />
+
+                        <View
+                            android:layout_width="10dp"
+                            android:layout_height="10dp"
+                            android:layout_gravity="center_vertical"
+                            android:layout_margin="5dp"
+                            android:background="@drawable/storage_bar_right_box" />
+
+                        <TextView
+                            android:id="@+id/download_free_txt"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:textColor="?attr/textColor"
+                            android:textSize="12sp"
+                            tools:text="Free • 30.58GB" />
+                    </LinearLayout>
+                </LinearLayout>
+            </LinearLayout>
+
+            <LinearLayout
+
+                android:id="@+id/steam_imageview_holder"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:gravity="center"
+                android:orientation="vertical"
+                android:paddingStart="10dp"
+                android:paddingEnd="10dp">
 
                 <TextView
-                    android:id="@+id/download_free_txt"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:textColor="?attr/textColor"
-                    android:textSize="12sp"
-                    tools:text="Free • 30.58GB" />
+
+                    android:layout_gravity="center"
+                    android:text="@string/stream"
+                    android:textColor="?attr/textColor" />
+
+                <ImageView
+                    android:id="@+id/download_stream_button_tv"
+                    android:layout_width="40dp"
+                    android:layout_height="40dp"
+                    android:layout_gravity="center"
+                    android:background="@drawable/outline_drawable"
+
+                    android:contentDescription="@string/stream"
+                    android:focusable="true"
+                    android:nextFocusLeft="@id/download_appbar"
+                    android:nextFocusDown="@id/download_list"
+                    android:padding="8dp"
+
+                    android:src="@drawable/ic_network_stream"
+                    app:tint="?attr/textColor"></ImageView>
             </LinearLayout>
         </LinearLayout>
     </com.google.android.material.appbar.AppBarLayout>
 
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/download_list"
+    <FrameLayout
         android:layout_width="match_parent"
-        android:paddingBottom="100dp"
-        android:clipToPadding="false"
         android:layout_height="match_parent"
         android:background="?attr/primaryBlackBackground"
-        android:descendantFocusability="afterDescendants"
-        android:nextFocusLeft="@id/nav_rail_view"
-        android:tag="@string/tv_no_focus_tag"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior"
-        tools:listitem="@layout/download_header_episode" />
-
-    <TextView
-        android:id="@+id/text_no_downloads"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_margin="30dp"
-        android:text="@string/downloads_empty"
-        android:gravity="center"
-        android:visibility="gone"
-        tools:visibility="visible" />
-
-    <!--
-    <ProgressBar
-        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
-        android:id="@+id/download_loading"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_gravity="center"
-        android:orientation="vertical"
-        android:paddingTop="40dp"
-        app:shimmer_auto_start="true"
-        app:shimmer_base_alpha="0.2"
-        app:shimmer_duration="@integer/loading_time"
-        app:shimmer_highlight_alpha="0.3"
-        tools:visibility="gone">
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+        <com.facebook.shimmer.ShimmerFrameLayout
+            android:id="@+id/download_loading"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:paddingTop="20dp"
+            app:shimmer_auto_start="true"
+            app:shimmer_base_alpha="0.2"
+            app:shimmer_duration="@integer/loading_time"
+            app:shimmer_highlight_alpha="0.3"
+            tools:visibility="gone">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/loading_margin"
+                android:layout_marginEnd="@dimen/loading_margin"
+                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>
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/download_list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:paddingBottom="100dp"
+            android:clipToPadding="false"
+            android:descendantFocusability="afterDescendants"
+            android:nextFocusUp="@id/download_appbar"
+            android:nextFocusLeft="@id/navigation_downloads"
+            android:nextFocusDown="@id/download_queue_button"
+            android:tag="@string/tv_no_focus_tag"
+            tools:listitem="@layout/download_header_episode" />
 
         <LinearLayout
+            android:focusable="true"
+            android:nextFocusUp="@id/download_list"
+            android:foreground="@drawable/outline_drawable"
+            android:id="@+id/download_queue_button"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/loading_margin"
-            android:layout_marginEnd="@dimen/loading_margin"
+            android:layout_height="50dp"
+            android:layout_gravity="bottom"
+            android:background="?attr/primaryGrayBackground"
             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" />
+            <ImageView
+                android:paddingTop="5dp"
+                android:layout_width="20dp"
+                android:layout_height="25dp"
+                android:layout_gravity="center"
+                android:src="@drawable/round_keyboard_arrow_up_24" />
+
+            <TextView
+                android:id="@+id/download_queue_text"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text="@string/download_queue"
+                android:textColor="?attr/textColor" />
+
         </LinearLayout>
-    </com.facebook.shimmer.ShimmerFrameLayout>
+
+        <TextView
+            android:id="@+id/text_no_downloads"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginBottom="30dp"
+            android:text="@string/downloads_empty"
+            android:gravity="center"
+            android:visibility="gone"
+            tools:visibility="visible" />
+    </FrameLayout>
 
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:layout_gravity="bottom|end">
+        android:layout_gravity="bottom|end"
+        android:layout_marginBottom="50dp"
+        android:orientation="vertical">
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
             android:id="@+id/open_local_video_button"
+            style="?attr/floatingActionButtonSmallStyle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            style="?attr/floatingActionButtonSmallStyle"
+            android:layout_gravity="bottom|end"
+            android:layout_marginEnd="16dp"
             android:backgroundTint="?attr/primaryGrayBackground"
+            android:contentDescription="@string/open_local_video"
             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" />
+            app:tint="?attr/textColor"
+            android:tooltipText="@string/open_local_video" />
 
         <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
             android:id="@+id/download_stream_button"
             style="@style/ExtendedFloatingActionButton"
+            android:contentDescription="@string/stream"
             android:text="@string/stream"
             android:textColor="?attr/textColor"
-            app:icon="@drawable/ic_network_stream"
-            android:contentDescription="@string/stream" />
+            app:icon="@drawable/ic_network_stream" />
     </LinearLayout>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_extensions.xml b/app/src/main/res/layout/fragment_extensions.xml
index 71dd372b4b1..b7cf4b6cd34 100644
--- a/app/src/main/res/layout/fragment_extensions.xml
+++ b/app/src/main/res/layout/fragment_extensions.xml
@@ -4,6 +4,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/extensions_root"
+    android:background="?attr/primaryGrayBackground"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
@@ -13,6 +14,7 @@
     <androidx.recyclerview.widget.RecyclerView
         android:clipToPadding="false"
         android:id="@+id/repo_recycler_view"
+        android:background="?attr/primaryBlackBackground"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginBottom="80dp"
@@ -27,9 +29,9 @@
 
     <LinearLayout
         android:id="@+id/blank_repo_screen"
+        android:background="?attr/primaryBlackBackground"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_margin="20dp"
         android:gravity="center"
         android:orientation="vertical"
         tools:visibility="gone">
@@ -43,7 +45,7 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="20dp"
+            android:layout_margin="20dp"
             android:gravity="center"
             android:text="@string/blank_repo_message"
             android:textSize="16sp" />
@@ -68,8 +70,8 @@
         android:nextFocusUp="@id/repo_recycler_view"
         android:orientation="horizontal"
         android:padding="10dp"
-
-        android:visibility="visible">
+        android:visibility="visible"
+        android:baselineAligned="false">
 
         <LinearLayout
             android:layout_width="0dp"
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 9949a79a4ec..99a764deee8 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -93,6 +93,7 @@
         </com.facebook.shimmer.ShimmerFrameLayout>
 
         <LinearLayout
+            android:id="@+id/home_api_holder"
             android:layout_width="wrap_content"
             android:layout_height="40dp"
             android:layout_gravity="end"
@@ -113,6 +114,24 @@
                 android:nextFocusLeft="@id/nav_rail_view"
                 android:nextFocusRight="@id/home_switch_account" />
 
+            <ImageView
+                android:id="@+id/home_preview_reload_provider"
+                android:layout_width="50dp"
+                android:layout_height="match_parent"
+                android:layout_gravity="end"
+                android:background="@drawable/player_button_tv_attr_no_bg"
+                android:contentDescription="@string/reload_provider"
+                android:focusable="true"
+                android:nextFocusLeft="@id/home_change_api"
+                android:nextFocusRight="@id/home_preview_search_button"
+                android:nextFocusUp="@id/home_preview_reload_provider"
+                android:nextFocusDown="@id/home_preview_info_btt"
+                android:padding="10dp"
+                android:src="@drawable/ic_refresh"
+                android:tag="@string/tv_no_focus_tag"
+                android:visibility="gone"
+                app:tint="@color/player_on_button_tv_attr" />
+
             <ImageView
                 android:id="@+id/home_preview_search_button"
                 android:layout_width="50dp"
@@ -121,7 +140,7 @@
                 android:background="@drawable/player_button_tv_attr_no_bg"
                 android:contentDescription="@string/search"
                 android:nextFocusLeft="@id/home_change_api"
-                android:nextFocusRight="@id/home_preview_switch_account"
+                android:nextFocusRight="@id/home_switch_account"
                 android:nextFocusDown="@id/home_preview_info_btt"
                 android:padding="10dp"
                 android:src="@drawable/search_icon"
@@ -228,4 +247,11 @@
         app:icon="@drawable/ic_baseline_play_arrow_24"
         tools:ignore="ContentDescription"
         tools:visibility="visible" />
+
+    <!-- Placeholder for TV layout random button - always hidden on phone -->
+    <ImageView
+        android:id="@+id/home_random_button_tv"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:visibility="gone" />
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home_head.xml b/app/src/main/res/layout/fragment_home_head.xml
index 1014c20fa98..c57c32ceed6 100644
--- a/app/src/main/res/layout/fragment_home_head.xml
+++ b/app/src/main/res/layout/fragment_home_head.xml
@@ -30,20 +30,21 @@
             android:id="@+id/home_padding"
             android:layout_width="match_parent"
             android:layout_height="50dp"
-            android:gravity="center"
-            android:orientation="horizontal">
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            android:paddingHorizontal="0dp">
+
 
             <androidx.appcompat.widget.SearchView
                 android:id="@+id/home_search"
-                android:layout_width="match_parent"
+                android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_gravity="center_vertical"
-                android:layout_marginEnd="50dp"
+                android:layout_marginEnd="8dp"
+                android:layout_weight="1"
                 android:editTextColor="@color/white"
                 android:gravity="center_vertical"
                 android:iconifiedByDefault="true"
-                android:nextFocusRight="@id/home_preview_switch_account"
-
+                android:nextFocusRight="@id/home_head_profile_padding"
                 android:padding="0dp"
                 android:textColor="@color/white"
                 android:textColorHint="@color/white"
@@ -54,18 +55,36 @@
                 app:searchIcon="@drawable/search_icon"
                 tools:ignore="RtlSymmetry" />
 
-            <ImageView
-                android:id="@+id/home_preview_switch_account"
-
+            <LinearLayout
+                android:id="@+id/home_head_profile_padding"
                 android:layout_width="50dp"
-                android:layout_height="match_parent"
-                android:layout_gravity="center"
-                android:layout_marginStart="-50dp"
-                android:foreground="?android:attr/selectableItemBackgroundBorderless"
-                android:contentDescription="@string/account"
+                android:layout_height="50dp"
+                android:clickable="true"
+                android:focusable="true"
+                android:foreground="@drawable/rounded_select_ripple"
+                android:gravity="center"
                 android:nextFocusLeft="@id/home_search"
-                android:padding="10dp"
-                android:src="@drawable/ic_outline_account_circle_24" />
+                android:orientation="horizontal">
+
+                <androidx.cardview.widget.CardView
+                    android:id="@+id/home_head_profile_card"
+                    android:layout_width="30dp"
+                    android:layout_height="30dp"
+                    android:layout_gravity="center"
+                    android:background="@color/transparent"
+                    android:focusable="true"
+                    android:foreground="@drawable/outline_big_15_gray"
+                    app:cardCornerRadius="20dp">
+
+                    <ImageView
+                        android:id="@+id/home_head_profile_pic"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:contentDescription="@string/account"
+                        android:scaleType="centerCrop"
+                        tools:src="@drawable/profile_bg_orange" />
+                </androidx.cardview.widget.CardView>
+            </LinearLayout>
         </LinearLayout>
 
         <!--
@@ -94,43 +113,43 @@
             android:gravity="center"
             android:orientation="horizontal">
 
-                <TextView
-                    android:id="@+id/home_preview_bookmark"
-                    android:layout_width="70dp"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:layout_marginStart="25dp"
-                    android:layout_marginEnd="25dp"
-                    android:background="?android:attr/selectableItemBackgroundBorderless"
-                    android:gravity="center"
-                    android:text="@string/none"
-                    android:textColor="?attr/white"
-                    app:drawableTint="?attr/white"
-                    app:drawableTopCompat="@drawable/ic_baseline_add_24"
-                    app:tint="?attr/white" />
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/home_preview_play"
-                    style="@style/WhiteButton"
-                    android:layout_width="wrap_content"
-                    android:layout_gravity="center"
-                    android:text="@string/home_play"
-                    app:icon="@drawable/ic_baseline_play_arrow_24" />
+            <TextView
+                android:id="@+id/home_preview_bookmark"
+                android:layout_width="70dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginStart="25dp"
+                android:layout_marginEnd="25dp"
+                android:background="?android:attr/selectableItemBackgroundBorderless"
+                android:gravity="center"
+                android:text="@string/none"
+                android:textColor="?attr/white"
+                app:drawableTint="?attr/white"
+                app:drawableTopCompat="@drawable/ic_baseline_add_24"
+                app:tint="?attr/white" />
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/home_preview_play"
+                style="@style/WhiteButton"
+                android:layout_width="wrap_content"
+                android:layout_gravity="center"
+                android:text="@string/home_play"
+                app:icon="@drawable/ic_baseline_play_arrow_24" />
 
-                <TextView
-                    android:id="@+id/home_preview_info"
-                    android:layout_width="70dp"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:layout_marginStart="25dp"
-                    android:layout_marginEnd="25dp"
-                    android:background="?android:attr/selectableItemBackgroundBorderless"
-                    android:gravity="center"
-                    android:text="@string/home_info"
-                    android:textColor="?attr/white"
-                    app:drawableTint="?attr/white"
-                    app:drawableTopCompat="@drawable/ic_outline_info_24"
-                    app:tint="?attr/white" />
+            <TextView
+                android:id="@+id/home_preview_info"
+                android:layout_width="70dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginStart="25dp"
+                android:layout_marginEnd="25dp"
+                android:background="?android:attr/selectableItemBackgroundBorderless"
+                android:gravity="center"
+                android:text="@string/home_info"
+                android:textColor="?attr/white"
+                app:drawableTint="?attr/white"
+                app:drawableTopCompat="@drawable/ic_outline_info_24"
+                app:tint="?attr/white" />
 
         </LinearLayout>
 
@@ -140,19 +159,40 @@
         android:id="@+id/alternative_account_padding"
         android:layout_width="match_parent"
         android:layout_height="50dp"
-        android:gravity="right"
-        android:orientation="horizontal">
+        android:gravity="end"
+        android:orientation="horizontal"
+        android:paddingHorizontal="0dp">
 
-        <ImageView
-            android:id="@+id/alternative_switch_account"
+        <LinearLayout
+            android:id="@+id/alternate_home_head_profile_padding"
             android:layout_width="50dp"
-            android:layout_height="match_parent"
-            android:layout_gravity="center"
-            android:layout_marginStart="-50dp"
-            android:foreground="?android:attr/selectableItemBackgroundBorderless"
-            android:contentDescription="@string/account"
-            android:padding="10dp"
-            android:src="@drawable/ic_outline_account_circle_24" />
+            android:layout_height="50dp"
+            android:clickable="true"
+            android:focusable="true"
+            android:foreground="@drawable/rounded_select_ripple"
+            android:gravity="center"
+            android:nextFocusLeft="@id/home_search"
+            android:orientation="horizontal">
+
+            <androidx.cardview.widget.CardView
+                android:id="@+id/alternate_home_head_profile_card"
+                android:layout_width="30dp"
+                android:layout_height="30dp"
+                android:layout_gravity="center"
+                android:background="@color/transparent"
+                android:focusable="true"
+                android:foreground="@drawable/outline_big_15_gray"
+                app:cardCornerRadius="20dp">
+
+                <ImageView
+                    android:id="@+id/alternate_home_head_profile_pic"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:contentDescription="@string/account"
+                    android:scaleType="centerCrop"
+                    tools:src="@drawable/profile_bg_orange" />
+            </androidx.cardview.widget.CardView>
+        </LinearLayout>
     </LinearLayout>
 
 
diff --git a/app/src/main/res/layout/fragment_home_head_tv.xml b/app/src/main/res/layout/fragment_home_head_tv.xml
index caebef0d707..09b1e313068 100644
--- a/app/src/main/res/layout/fragment_home_head_tv.xml
+++ b/app/src/main/res/layout/fragment_home_head_tv.xml
@@ -6,7 +6,7 @@
     android:id="@+id/home_header"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?attr/primaryBlackBackground"
+    android:layout_marginTop="60dp"
     android:orientation="vertical">
 
     <View
@@ -18,15 +18,168 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <androidx.viewpager2.widget.ViewPager2
-            android:id="@+id/home_preview_viewpager"
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="400dp"
-            android:descendantFocusability="blocksDescendants"
-            android:orientation="horizontal">
+            android:layout_height="match_parent"
+            android:orientation="horizontal"
+            tools:ignore="UselessParent">
+
+            <View
+                android:id="@+id/home_preview_hidden_prev_focus"
+                android:layout_width="0.1dp"
+                android:layout_height="0.1dp"
+                android:focusable="true"
+                android:tag="@string/tv_no_focus_tag" />
 
-        </androidx.viewpager2.widget.ViewPager2>
+            <androidx.cardview.widget.CardView
+                android:id="@+id/home_preview_info_btt"
+                android:layout_width="match_parent"
+                android:layout_height="400dp"
+                android:layout_marginStart="10dp"
+                android:layout_marginTop="10dp"
+                android:layout_marginEnd="10dp"
+
+                android:backgroundTint="@color/transparent"
+                android:focusable="true"
+                android:foreground="@drawable/outline_drawable"
+                android:nextFocusLeft="@id/home_preview_hidden_prev_focus"
+                android:nextFocusRight="@id/home_preview_hidden_next_focus"
+                android:nextFocusUp="@id/home_change_api"
+                android:nextFocusDown="@id/home_watch_child_recyclerview"
+
+                app:cardCornerRadius="@dimen/rounded_image_radius">
+
+                <androidx.viewpager2.widget.ViewPager2
+                    android:id="@+id/home_preview_viewpager"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:descendantFocusability="blocksDescendants"
+                    android:orientation="horizontal">
+
+                </androidx.viewpager2.widget.ViewPager2>
+
+                <LinearLayout
+                    android:id="@+id/home_preview_viewpager_text"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="@drawable/player_gradient_tv"
+                    android:layout_gravity="bottom"
+                    android:layout_marginStart="@dimen/navbar_width"
+                    android:gravity="bottom"
+                    android:orientation="vertical"
+                    android:padding="20dp">
+
+                    <ImageView
+                        android:id="@+id/home_background_poster_watermark_badge_holder"
+                        android:layout_width="wrap_content"
+                        android:layout_height="72dp"
+                        android:contentDescription="LogoURL"
+                        android:minHeight="72dp"
+                        android:maxWidth="220dp"
+                        android:scaleType="fitStart"
+                        android:adjustViewBounds="true" />
+
+
+                    <TextView
+                        android:textColor="@color/textColor"
+                        android:id="@+id/home_preview_text"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="10dp"
+                        android:ellipsize="end"
+                        android:maxLines="1"
+                        android:textSize="25sp"
+                        android:textStyle="bold"
+                        android:shadowColor="#B0000000"
+                        android:shadowDx="0"
+                        android:shadowDy="2"
+                        android:shadowRadius="4"
+                        tools:text="The Perfect Run" />
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        android:layout_marginTop="10dp"
+                        android:layout_marginBottom="4dp"
+                        android:gravity="center_vertical">
+
+                        <TextView
+                            android:id="@+id/home_preview_score"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:background="@drawable/rating_bg_color"
+                            android:textColor="@color/white"
+                            android:textStyle="bold"
+                            android:paddingStart="6dp"
+                            android:paddingEnd="6dp"
+                            android:paddingTop="2dp"
+                            android:paddingBottom="2dp"
+                            android:layout_marginEnd="12dp"
+                            tools:text="IMDb : 8.5" />
+
+                        <TextView
+                            android:id="@+id/home_preview_year"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textColor="@color/gray_200"
+                            android:layout_marginEnd="12dp"
+                            tools:text="2021" />
+
+                        <TextView
+                            android:id="@+id/home_preview_duration"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textColor="@color/gray_200"
+                            tools:text="120m" />
+
+                    </LinearLayout>
+
+                    <TextView
+                        android:id="@+id/home_preview_description"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:ellipsize="end"
+                        android:maxLines="3"
+                        android:paddingBottom="5dp"
+                        android:textSize="15sp"
+                        android:textColor="@color/textColor"
+                        android:shadowColor="#B0000000"
+                        android:shadowDx="0"
+                        android:shadowDy="2"
+                        android:shadowRadius="4"
+                        tools:text="very nice tv series" />
+
+                    <TextView
+                        android:id="@+id/home_preview_cast"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:ellipsize="end"
+                        android:maxLines="1"
+                        android:textSize="13sp"
+                        android:textColor="@color/gray_400"
+                        android:paddingBottom="5dp"
+                        tools:text="Cast: Actor One, Actor Two" />
+
+                    <com.google.android.material.chip.ChipGroup
+                        android:id="@+id/home_preview_tags"
+                        style="@style/ChipParent"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
+                </LinearLayout>
+
+            </androidx.cardview.widget.CardView>
+
+            <View
+                android:id="@+id/home_preview_hidden_next_focus"
+                android:layout_width="0.1dp"
+                android:layout_height="0.1dp"
+                android:focusable="true"
+                android:tag="@string/tv_no_focus_tag" />
+
+        </LinearLayout>
 
+        <!--
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="40dp"
@@ -44,12 +197,32 @@
                 android:layout_marginEnd="0dp"
                 android:background="@drawable/player_button_tv_attr_no_bg"
                 android:gravity="center_vertical"
-                android:nextFocusLeft="@id/home_preview_play_btt"
-                android:nextFocusRight="@id/home_preview_search_button"
-                android:nextFocusDown="@id/home_preview_play_btt" >
+                android:nextFocusLeft="@id/home_preview_info_btt"
+                android:nextFocusRight="@id/home_preview_reload_provider"
+                android:nextFocusUp="@id/home_preview_change_api"
+                android:nextFocusDown="@id/home_preview_info_btt">
+
                 <requestFocus />
             </com.google.android.material.button.MaterialButton>
 
+            <ImageView
+                android:id="@+id/home_preview_reload_provider"
+                android:layout_width="50dp"
+                android:layout_height="match_parent"
+                android:layout_gravity="end"
+                android:background="@drawable/player_button_tv_attr_no_bg"
+                android:contentDescription="@string/reload_provider"
+                android:focusable="true"
+                android:nextFocusLeft="@id/home_preview_change_api"
+                android:nextFocusRight="@id/home_preview_search_button"
+                android:nextFocusUp="@id/home_preview_reload_provider"
+                android:nextFocusDown="@id/home_preview_info_btt"
+                android:padding="10dp"
+                android:src="@drawable/ic_refresh"
+                android:tag="@string/tv_no_focus_tag"
+                android:visibility="gone"
+                app:tint="@color/player_on_button_tv_attr" />
+
             <ImageView
                 android:id="@+id/home_preview_search_button"
                 android:layout_width="50dp"
@@ -58,8 +231,9 @@
                 android:background="@drawable/player_button_tv_attr_no_bg"
                 android:contentDescription="@string/search"
                 android:focusable="true"
-                android:nextFocusLeft="@id/home_preview_change_api"
+                android:nextFocusLeft="@id/home_preview_reload_provider"
                 android:nextFocusRight="@id/home_preview_switch_account"
+                android:nextFocusUp="@id/home_preview_search_button"
                 android:nextFocusDown="@id/home_preview_info_btt"
                 android:padding="10dp"
                 android:src="@drawable/search_icon"
@@ -77,13 +251,13 @@
                 android:nextFocusLeft="@id/home_preview_search_button"
                 android:nextFocusRight="@id/home_preview_switch_account"
                 android:nextFocusDown="@id/home_preview_info_btt"
-
                 android:padding="10dp"
                 android:src="@drawable/ic_outline_account_circle_24"
                 android:tag="@string/tv_no_focus_tag"
+                android:visibility="gone"
                 app:tint="@color/player_on_button_tv_attr" />
         </LinearLayout>
-
+        -->
         <!--<FrameLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -113,89 +287,6 @@
                 android:src="@drawable/ic_outline_account_circle_24" />
 
         </FrameLayout>-->
-        <LinearLayout
-            android:id="@+id/home_preview_viewpager_text"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_gravity="bottom"
-            android:layout_marginStart="@dimen/navbar_width"
-            android:gravity="bottom"
-            android:orientation="vertical"
-            android:padding="10dp">
-
-
-            <TextView
-                android:id="@+id/home_preview_text"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:ellipsize="end"
-                android:maxLines="1"
-                android:textSize="25sp"
-                android:textStyle="bold"
-                tools:text="The Perfect Run" />
-
-            <TextView
-                android:id="@+id/home_preview_description"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:ellipsize="end"
-                android:maxLines="3"
-                android:paddingBottom="5dp"
-                android:textSize="15sp"
-                tools:text="very nice tv series" />
-
-            <com.google.android.material.chip.ChipGroup
-                android:id="@+id/home_preview_tags"
-                style="@style/ChipParent"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="5dp">
-
-                <View
-                    android:id="@+id/home_preview_hidden_prev_focus"
-                    android:layout_width="1dp"
-                    android:layout_height="1dp"
-                    android:tag="@string/tv_no_focus_tag"
-                    android:focusable="false" />
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/home_preview_play_btt"
-                    style="@style/RegularButtonTV"
-                    android:layout_width="wrap_content"
-                    android:layout_margin="0dp"
-                    android:minWidth="150dp"
-                    android:nextFocusLeft="@id/home_preview_hidden_prev_focus"
-                    android:nextFocusRight="@id/home_preview_info_btt"
-                    android:nextFocusUp="@id/home_preview_change_api"
-                    android:nextFocusDown="@id/home_watch_child_recyclerview"
-                    android:text="@string/home_play"
-                    app:icon="@drawable/ic_baseline_play_arrow_24" />
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/home_preview_info_btt"
-                    style="@style/RegularButtonTV"
-                    android:layout_width="wrap_content"
-                    android:minWidth="150dp"
-
-                    android:nextFocusLeft="@id/home_preview_play_btt"
-                    android:nextFocusRight="@id/home_preview_hidden_next_focus"
-                    android:nextFocusUp="@id/home_preview_change_api"
-                    android:nextFocusDown="@id/home_watch_child_recyclerview"
-                    android:text="@string/home_info"
-                    app:icon="@drawable/ic_outline_info_24" />
-
-                <View
-                    android:id="@+id/home_preview_hidden_next_focus"
-                    android:layout_width="1dp"
-                    android:layout_height="1dp"
-                    android:tag="@string/tv_no_focus_tag"
-                    android:focusable="false" />
-            </LinearLayout>
-        </LinearLayout>
 
 
     </FrameLayout>
@@ -235,9 +326,9 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/navbar_width"
             android:layout_marginEnd="0dp"
+            android:background="?android:attr/selectableItemBackground"
             android:padding="12dp"
             android:text="@string/continue_watching"
-            android:background="?android:attr/selectableItemBackground"
             app:drawableTint="?attr/white" />
 
         <androidx.recyclerview.widget.RecyclerView
@@ -246,10 +337,10 @@
             android:layout_height="wrap_content"
             android:clipToPadding="false"
             android:descendantFocusability="afterDescendants"
-            android:nextFocusUp="@id/home_preview_play_btt"
+            android:nextFocusUp="@id/home_preview_info_btt"
             android:nextFocusDown="@id/home_type_holder"
             android:orientation="horizontal"
-            android:paddingStart="@dimen/navbar_width"
+            android:paddingStart="8dp"
             android:paddingEnd="5dp"
             app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
             tools:listitem="@layout/home_result_grid" />
@@ -271,103 +362,103 @@
             android:layout_height="wrap_content"
             android:background="?android:attr/selectableItemBackground">
 
-        <HorizontalScrollView
-            android:id="@+id/horizontal_scroll_chips"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:fadingEdge="horizontal"
-
-            android:foreground="?android:attr/selectableItemBackgroundBorderless"
-            android:paddingStart="12dp"
-            android:paddingTop="5dp"
-            android:paddingEnd="12dp"
-
-            android:paddingBottom="5dp"
-            android:requiresFadingEdge="horizontal">
-
-            <com.google.android.material.chip.ChipGroup
-                android:id="@+id/home_type_holder"
-                android:layout_width="wrap_content"
+            <HorizontalScrollView
+                android:id="@+id/horizontal_scroll_chips"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/navbar_width"
-
-                android:descendantFocusability="afterDescendants"
-                android:nextFocusLeft="@id/nav_rail_view"
-                android:nextFocusUp="@id/home_watch_child_recyclerview"
-                android:nextFocusDown="@id/home_bookmarked_child_recyclerview"
-                android:orientation="horizontal">
-
-                <com.google.android.material.chip.Chip
-                    android:id="@+id/home_type_watching_btt"
-                    style="@style/ChipFilled"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:nextFocusLeft="@id/nav_rail_view"
-                    android:nextFocusRight="@id/home_plan_to_watch_btt"
-
-                    android:nextFocusUp="@id/home_watch_child_recyclerview"
-                    android:nextFocusDown="@id/home_bookmarked_child_recyclerview"
-                    android:text="@string/type_watching" />
-
-                <com.google.android.material.chip.Chip
-                    android:id="@+id/home_plan_to_watch_btt"
-                    style="@style/ChipFilled"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:nextFocusLeft="@id/home_type_watching_btt"
-                    android:nextFocusRight="@id/home_type_on_hold_btt"
-
-                    android:nextFocusUp="@id/home_watch_child_recyclerview"
-                    android:nextFocusDown="@id/home_bookmarked_child_recyclerview"
-                    android:text="@string/type_plan_to_watch" />
-
-                <com.google.android.material.chip.Chip
-                    android:id="@+id/home_type_on_hold_btt"
-                    style="@style/ChipFilled"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:nextFocusLeft="@id/home_plan_to_watch_btt"
-                    android:nextFocusRight="@id/home_type_dropped_btt"
-
-                    android:nextFocusUp="@id/home_watch_child_recyclerview"
-                    android:nextFocusDown="@id/home_bookmarked_child_recyclerview"
-                    android:text="@string/type_on_hold" />
+                android:fadingEdge="horizontal"
 
-                <com.google.android.material.chip.Chip
-                    android:id="@+id/home_type_dropped_btt"
-                    style="@style/ChipFilled"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:nextFocusLeft="@id/home_type_on_hold_btt"
-                    android:nextFocusRight="@id/home_type_completed_btt"
+                android:foreground="?android:attr/selectableItemBackgroundBorderless"
+                android:paddingStart="12dp"
+                android:paddingTop="5dp"
+                android:paddingEnd="12dp"
 
-                    android:nextFocusUp="@id/home_watch_child_recyclerview"
-                    android:nextFocusDown="@id/home_bookmarked_child_recyclerview"
-                    android:text="@string/type_dropped" />
+                android:paddingBottom="5dp"
+                android:requiresFadingEdge="horizontal">
 
-                <com.google.android.material.chip.Chip
-                    android:id="@+id/home_type_completed_btt"
-                    style="@style/ChipFilled"
+                <com.google.android.material.chip.ChipGroup
+                    android:id="@+id/home_type_holder"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:nextFocusLeft="@id/home_type_dropped_btt"
+                    android:layout_marginStart="@dimen/navbar_width"
 
+                    android:descendantFocusability="afterDescendants"
+                    android:nextFocusLeft="@id/navigation_home"
                     android:nextFocusUp="@id/home_watch_child_recyclerview"
                     android:nextFocusDown="@id/home_bookmarked_child_recyclerview"
-                    android:text="@string/type_completed" />
-            </com.google.android.material.chip.ChipGroup>
-        </HorizontalScrollView>
+                    android:orientation="horizontal">
+
+                    <com.google.android.material.chip.Chip
+                        android:id="@+id/home_type_watching_btt"
+                        style="@style/ChipFilled"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:nextFocusLeft="@id/navigation_home"
+                        android:nextFocusRight="@id/home_plan_to_watch_btt"
+
+                        android:nextFocusUp="@id/home_watch_child_recyclerview"
+                        android:nextFocusDown="@id/home_bookmarked_child_recyclerview"
+                        android:text="@string/type_watching" />
+
+                    <com.google.android.material.chip.Chip
+                        android:id="@+id/home_plan_to_watch_btt"
+                        style="@style/ChipFilled"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:nextFocusLeft="@id/home_type_watching_btt"
+                        android:nextFocusRight="@id/home_type_on_hold_btt"
+
+                        android:nextFocusUp="@id/home_watch_child_recyclerview"
+                        android:nextFocusDown="@id/home_bookmarked_child_recyclerview"
+                        android:text="@string/type_plan_to_watch" />
+
+                    <com.google.android.material.chip.Chip
+                        android:id="@+id/home_type_on_hold_btt"
+                        style="@style/ChipFilled"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:nextFocusLeft="@id/home_plan_to_watch_btt"
+                        android:nextFocusRight="@id/home_type_dropped_btt"
+
+                        android:nextFocusUp="@id/home_watch_child_recyclerview"
+                        android:nextFocusDown="@id/home_bookmarked_child_recyclerview"
+                        android:text="@string/type_on_hold" />
+
+                    <com.google.android.material.chip.Chip
+                        android:id="@+id/home_type_dropped_btt"
+                        style="@style/ChipFilled"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:nextFocusLeft="@id/home_type_on_hold_btt"
+                        android:nextFocusRight="@id/home_type_completed_btt"
+
+                        android:nextFocusUp="@id/home_watch_child_recyclerview"
+                        android:nextFocusDown="@id/home_bookmarked_child_recyclerview"
+                        android:text="@string/type_dropped" />
+
+                    <com.google.android.material.chip.Chip
+                        android:id="@+id/home_type_completed_btt"
+                        style="@style/ChipFilled"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:nextFocusLeft="@id/home_type_dropped_btt"
+
+                        android:nextFocusUp="@id/home_watch_child_recyclerview"
+                        android:nextFocusDown="@id/home_bookmarked_child_recyclerview"
+                        android:text="@string/type_completed" />
+                </com.google.android.material.chip.ChipGroup>
+            </HorizontalScrollView>
 
-        <ImageView
-            android:id="@+id/home_bookmark_parent_item_more_info"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_gravity="end"
-            android:layout_marginEnd="12dp"
-            android:contentDescription="@string/home_more_info"
-            android:src="@drawable/ic_baseline_arrow_forward_24"
-            android:visibility="gone"
-            app:drawableTint="?attr/white" />
+            <ImageView
+                android:id="@+id/home_bookmark_parent_item_more_info"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_gravity="end"
+                android:layout_marginEnd="12dp"
+                android:contentDescription="@string/home_more_info"
+                android:src="@drawable/ic_baseline_arrow_forward_24"
+                android:visibility="gone"
+                app:drawableTint="?attr/white" />
         </FrameLayout>
 
         <androidx.recyclerview.widget.RecyclerView
@@ -377,12 +468,12 @@
             android:clipToPadding="false"
 
             android:descendantFocusability="afterDescendants"
-            android:nextFocusLeft="@id/nav_rail_view"
+            android:nextFocusLeft="@id/navigation_home"
             android:nextFocusUp="@id/home_type_holder"
 
             android:nextFocusDown="@id/home_child_recyclerview"
             android:orientation="horizontal"
-            android:paddingStart="@dimen/navbar_width"
+            android:paddingStart="8dp"
             android:paddingEnd="5dp"
             app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
             tools:listitem="@layout/home_result_grid" />
diff --git a/app/src/main/res/layout/fragment_home_tv.xml b/app/src/main/res/layout/fragment_home_tv.xml
index cb27a75eb19..d1d5c9e3bd9 100644
--- a/app/src/main/res/layout/fragment_home_tv.xml
+++ b/app/src/main/res/layout/fragment_home_tv.xml
@@ -93,66 +93,6 @@
                 </LinearLayout>
             </LinearLayout>
         </com.facebook.shimmer.ShimmerFrameLayout>
-
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="40dp"
-            android:layout_gravity="end"
-            android:layout_margin="10dp"
-            android:background="@drawable/player_button_tv_attr"
-            android:orientation="horizontal">
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/home_change_api"
-                style="@style/RegularButtonTV"
-                android:layout_width="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_marginStart="0dp"
-                android:layout_marginEnd="0dp"
-                android:background="@drawable/player_button_tv_attr_no_bg"
-                android:gravity="center_vertical"
-                android:nextFocusLeft="@id/nav_rail_view"
-                android:nextFocusRight="@id/home_preview_search_button"
-                android:nextFocusDown="@id/home_preview_play_btt" >
-            <requestFocus />
-            </com.google.android.material.button.MaterialButton>
-
-            <ImageView
-                android:id="@+id/home_preview_search_button"
-                android:layout_width="50dp"
-                android:layout_height="match_parent"
-                android:layout_gravity="end"
-                android:background="@drawable/player_button_tv_attr_no_bg"
-                android:clickable="true"
-                android:contentDescription="@string/search"
-                android:focusable="true"
-                android:nextFocusLeft="@id/home_change_api"
-                android:nextFocusRight="@id/home_switch_account"
-                android:nextFocusDown="@id/home_preview_info_btt"
-                android:padding="10dp"
-                android:src="@drawable/search_icon"
-                android:tag="@string/tv_no_focus_tag"
-                app:tint="@color/player_on_button_tv_attr" />
-
-            <ImageView
-                android:visibility="gone"
-                android:id="@+id/home_switch_account"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_gravity="end"
-                android:background="@drawable/player_button_tv_attr_no_bg"
-                android:contentDescription="@string/account"
-                android:focusable="true"
-                android:nextFocusLeft="@id/home_preview_search_button"
-                android:nextFocusRight="@id/home_switch_account"
-                android:nextFocusDown="@id/home_change_api"
-
-                android:padding="10dp"
-                android:src="@drawable/ic_outline_account_circle_24"
-                android:tag="@string/tv_no_focus_tag"
-                app:tint="@color/player_on_button_tv_attr" />
-        </LinearLayout>
     </FrameLayout>
 
     <LinearLayout
@@ -217,12 +157,110 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:descendantFocusability="afterDescendants"
-        android:nextFocusLeft="@id/nav_rail_view"
+        android:nextFocusLeft="@id/navigation_home"
         android:nextFocusUp="@id/home_bookmarked_child_recyclerview"
         app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
         tools:listitem="@layout/homepage_parent_tv"
         tools:visibility="gone" />
 
+    <LinearLayout
+        android:id="@+id/home_api_holder"
+        android:layout_width="wrap_content"
+        android:layout_height="40dp"
+        android:layout_gravity="end"
+        android:layout_margin="10dp"
+        android:background="@drawable/player_button_tv_attr"
+        android:orientation="horizontal">
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/home_change_api"
+            style="@style/RegularButtonTV"
+            android:layout_width="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="0dp"
+            android:layout_marginEnd="0dp"
+            android:background="@drawable/player_button_tv_attr_no_bg"
+            android:gravity="center"
+            android:nextFocusLeft="@id/navigation_home"
+            tools:text="Hello!"
+            android:nextFocusRight="@id/home_preview_reload_provider"
+            android:nextFocusDown="@id/home_preview_info_btt" >
+            <requestFocus />
+        </com.google.android.material.button.MaterialButton>
+
+        <ImageView
+            android:id="@+id/home_preview_reload_provider"
+            android:layout_width="50dp"
+            android:layout_height="match_parent"
+            android:layout_gravity="end"
+            android:background="@drawable/player_button_tv_attr_no_bg"
+            android:contentDescription="@string/reload_provider"
+            android:focusable="true"
+            android:nextFocusLeft="@id/home_change_api"
+            android:nextFocusRight="@id/home_preview_search_button"
+            android:nextFocusUp="@id/home_preview_reload_provider"
+            android:nextFocusDown="@id/home_preview_info_btt"
+            android:padding="10dp"
+            tools:visibility="visible"
+            android:src="@drawable/ic_refresh"
+            android:tag="@string/tv_no_focus_tag"
+            android:visibility="gone"
+            app:tint="@color/player_on_button_tv_attr" />
+
+        <ImageView
+            android:id="@+id/home_preview_search_button"
+            android:layout_width="50dp"
+            android:layout_height="match_parent"
+            android:layout_gravity="end"
+            android:background="@drawable/player_button_tv_attr_no_bg"
+            android:clickable="true"
+            android:contentDescription="@string/search"
+            android:focusable="true"
+            android:nextFocusLeft="@id/home_preview_reload_provider"
+            android:nextFocusRight="@id/home_switch_account"
+            android:nextFocusDown="@id/home_preview_info_btt"
+            android:padding="10dp"
+            android:src="@drawable/search_icon"
+            android:tag="@string/tv_no_focus_tag"
+            app:tint="@color/player_on_button_tv_attr" />
+
+        <ImageView
+            android:id="@+id/home_random_button_tv"
+            android:layout_width="50dp"
+            android:layout_height="match_parent"
+            android:layout_gravity="end"
+            android:background="@drawable/player_button_tv_attr_no_bg"
+            android:clickable="true"
+            android:contentDescription="@string/home_random"
+            android:focusable="true"
+            android:nextFocusLeft="@id/home_preview_search_button"
+            android:nextFocusRight="@id/home_switch_account"
+            android:nextFocusDown="@id/home_preview_info_btt"
+            android:padding="10dp"
+            android:src="@drawable/ic_baseline_play_arrow_24"
+            android:tag="@string/tv_no_focus_tag"
+            android:visibility="gone"
+            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"
+            android:layout_gravity="end"
+            android:background="@drawable/player_button_tv_attr_no_bg"
+            android:contentDescription="@string/account"
+            android:focusable="true"
+            android:nextFocusLeft="@id/home_preview_search_button"
+            android:nextFocusRight="@id/home_switch_account"
+            android:nextFocusDown="@id/home_change_api"
+
+            android:padding="10dp"
+            android:src="@drawable/ic_outline_account_circle_24"
+            android:tag="@string/tv_no_focus_tag"
+            app:tint="@color/player_on_button_tv_attr" />
+    </LinearLayout>
+
     <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
         android:id="@+id/home_api_fab"
         style="@style/ExtendedFloatingActionButton"
diff --git a/app/src/main/res/layout/fragment_library.xml b/app/src/main/res/layout/fragment_library.xml
index d49e3d1e7df..1b0f3412173 100644
--- a/app/src/main/res/layout/fragment_library.xml
+++ b/app/src/main/res/layout/fragment_library.xml
@@ -4,6 +4,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/library_root"
+    android:background="?attr/primaryGrayBackground"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -24,7 +25,6 @@
         android:background="?attr/primaryGrayBackground">
 
         <LinearLayout
-            android:id="@+id/search_status_bar_padding"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
@@ -50,10 +50,10 @@
                 android:background="?selectableItemBackgroundBorderless"
                 android:contentDescription="@string/change_providers_img_des"
                 android:padding="5dp"
-                android:visibility="gone"
-                tools:visibility="visible"
                 android:src="@drawable/ic_baseline_sort_24"
-                app:tint="?attr/textColor" />
+                android:visibility="gone"
+                app:tint="?attr/textColor"
+                tools:visibility="visible" />
 
             <FrameLayout
                 android:layout_width="match_parent"
@@ -78,11 +78,11 @@
 
                     android:nextFocusRight="@id/search_filter"
                     android:paddingStart="-10dp"
+                    app:closeIcon="@drawable/ic_baseline_close_24"
                     app:iconifiedByDefault="false"
                     app:queryBackground="@color/transparent"
                     app:queryHint="@string/search_hint"
                     app:searchIcon="@drawable/search_icon"
-                    app:closeIcon="@drawable/ic_baseline_close_24"
                     tools:ignore="RtlSymmetry">
 
                 </androidx.appcompat.widget.SearchView>
@@ -110,6 +110,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:animateLayoutChanges="true"
+        android:background="?attr/primaryBlackBackground"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
         <androidx.viewpager2.widget.ViewPager2
@@ -159,6 +160,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginBottom="40dp">
+
         <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
             android:id="@+id/library_random"
             style="@style/ExtendedFloatingActionButton"
@@ -170,6 +172,13 @@
             tools:ignore="ContentDescription"
             tools:visibility="visible" />
 
+        <!-- Placeholder for TV layout random button - always hidden on phone -->
+        <ImageView
+            android:id="@+id/library_random_button_tv"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:visibility="gone" />
+
         <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
             android:id="@+id/sort_fab"
             style="@style/ExtendedFloatingActionButton"
@@ -195,6 +204,7 @@
         app:tabIndicatorGravity="center"
         app:tabIndicatorHeight="30dp"
         app:tabMode="scrollable"
+        app:tabRippleColor="?attr/textColor"
         app:tabSelectedTextColor="?attr/primaryBlackBackground"
         app:tabTextAppearance="@style/TabNoCaps"
         app:tabTextColor="?attr/textColor" />
diff --git a/app/src/main/res/layout/fragment_library_tv.xml b/app/src/main/res/layout/fragment_library_tv.xml
index 3269167afd1..6d737cab39f 100644
--- a/app/src/main/res/layout/fragment_library_tv.xml
+++ b/app/src/main/res/layout/fragment_library_tv.xml
@@ -4,6 +4,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/library_root"
+    android:background="?attr/primaryGrayBackground"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -24,7 +25,6 @@
         android:background="?attr/primaryGrayBackground">
 
         <LinearLayout
-            android:id="@+id/search_status_bar_padding"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
@@ -36,14 +36,14 @@
                 android:layout_height="25dp"
                 android:layout_gravity="end|center_vertical"
                 android:layout_marginStart="10dp"
-                android:padding="2dp"
                 android:background="?selectableItemBackgroundBorderless"
                 android:contentDescription="@string/change_providers_img_des"
                 android:focusable="true"
-                android:nextFocusLeft="@id/nav_rail_view"
+                android:nextFocusLeft="@id/navigation_library"
                 android:nextFocusRight="@id/library_sort"
-                android:tag="@string/tv_no_focus_tag"
+                android:padding="2dp"
                 android:src="@drawable/ic_baseline_extension_24"
+                android:tag="@string/tv_no_focus_tag"
                 app:tint="?attr/textColor" />
 
             <ImageView
@@ -57,8 +57,8 @@
                 android:focusable="true"
                 android:nextFocusLeft="@id/provider_selector"
                 android:nextFocusRight="@id/list_selector"
-                android:tag="@string/tv_no_focus_tag"
                 android:src="@drawable/ic_baseline_sort_24"
+                android:tag="@string/tv_no_focus_tag"
                 app:tint="?attr/textColor" />
 
             <ImageView
@@ -66,21 +66,22 @@
                 android:layout_width="25dp"
                 android:layout_height="25dp"
                 android:layout_gravity="end|center_vertical"
-                android:padding="1dp"
                 android:layout_marginStart="10dp"
                 android:background="?selectableItemBackgroundBorderless"
                 android:contentDescription="@string/change_providers_img_des"
                 android:focusable="true"
                 android:nextFocusLeft="@id/library_sort"
                 android:nextFocusRight="@id/main_search"
-                android:tag="@string/tv_no_focus_tag"
+                android:padding="1dp"
                 android:src="@drawable/ic_baseline_filter_list_24"
+                android:tag="@string/tv_no_focus_tag"
                 app:tint="?attr/textColor" />
 
             <FrameLayout
-                android:layout_width="match_parent"
+                android:layout_width="0dp"
                 android:layout_height="40dp"
                 android:layout_margin="10dp"
+                android:layout_weight="1"
                 android:background="@drawable/search_background"
                 android:visibility="visible"
                 app:layout_scrollFlags="scroll|enterAlways">
@@ -91,23 +92,40 @@
                     android:layout_height="match_parent"
                     android:layout_gravity="end"
 
+                    android:focusable="true"
                     android:iconifiedByDefault="false"
                     android:imeOptions="actionSearch"
                     android:inputType="text"
-                    android:focusable="true"
-                    android:tag="tv_no_focus_tag"
                     android:nextFocusLeft="@id/list_selector"
                     android:nextFocusDown="@id/search_result_root"
                     android:paddingStart="-10dp"
+                    android:tag="tv_no_focus_tag"
+                    app:closeIcon="@drawable/ic_baseline_close_24"
                     app:iconifiedByDefault="false"
                     app:queryBackground="@color/transparent"
                     app:queryHint="@string/search_hint"
                     app:searchIcon="@drawable/search_icon"
-                    app:closeIcon="@drawable/ic_baseline_close_24"
                     tools:ignore="RtlSymmetry">
 
                 </androidx.appcompat.widget.SearchView>
             </FrameLayout>
+
+            <ImageView
+                android:id="@+id/library_random_button_tv"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:layout_gravity="end|center_vertical"
+                android:layout_marginEnd="10dp"
+                android:background="?selectableItemBackgroundBorderless"
+                android:contentDescription="@string/home_random"
+                android:focusable="true"
+                android:nextFocusLeft="@id/main_search"
+                android:nextFocusDown="@id/search_result_root"
+                android:padding="8dp"
+                android:src="@drawable/ic_baseline_play_arrow_24"
+                android:tag="@string/tv_no_focus_tag"
+                android:visibility="gone"
+                app:tint="?attr/textColor" />
         </LinearLayout>
 
         <com.google.android.material.tabs.TabLayout
@@ -116,16 +134,17 @@
             android:layout_width="match_parent"
             android:layout_height="40dp"
             android:layout_gravity="top"
-            android:nextFocusDown="@id/search_result_root"
             android:background="?attr/primaryGrayBackground"
-            android:paddingHorizontal="5dp"
             android:focusable="true"
+            android:nextFocusDown="@id/search_result_root"
+            android:paddingHorizontal="5dp"
             app:tabGravity="center"
             app:tabIndicator="@drawable/indicator_background"
             app:tabIndicatorColor="?attr/white"
             app:tabIndicatorGravity="center"
             app:tabIndicatorHeight="30dp"
             app:tabMode="scrollable"
+            app:tabRippleColor="?attr/textColor"
             app:tabSelectedTextColor="?attr/primaryBlackBackground"
             app:tabTextAppearance="@style/TabNoCaps"
             app:tabTextColor="?attr/textColor" />
@@ -134,25 +153,26 @@
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:background="?attr/primaryBlackBackground"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-            <androidx.viewpager2.widget.ViewPager2
-                android:id="@+id/viewpager"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:clipToPadding="false"
-                android:paddingBottom="40dp"
-                android:focusable="true"
-                android:tag="@string/tv_no_focus_tag"
-                tools:listitem="@layout/library_viewpager_page" />
+        <androidx.viewpager2.widget.ViewPager2
+            android:id="@+id/viewpager"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:clipToPadding="false"
+            android:focusable="true"
+            android:paddingBottom="40dp"
+            android:tag="@string/tv_no_focus_tag"
+            tools:listitem="@layout/library_viewpager_page" />
 
         <LinearLayout
             android:id="@+id/library_loading_overlay"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:background="?attr/primaryBlackBackground"
             android:focusable="false"
             android:tag="@string/tv_no_focus_tag"
-            android:background="?attr/primaryBlackBackground"
             android:visibility="gone"
             tools:visibility="visible">
 
@@ -162,10 +182,10 @@
                 android:layout_height="match_parent"
                 android:layout_gravity="center"
                 android:layout_margin="2dp"
-                app:shimmer_auto_start="true"
-                app:shimmer_base_alpha="0.2"
                 android:focusable="false"
                 android:tag="@string/tv_no_focus_tag"
+                app:shimmer_auto_start="true"
+                app:shimmer_base_alpha="0.2"
                 app:shimmer_duration="@integer/loading_time"
                 app:shimmer_highlight_alpha="0.3">
 
@@ -174,11 +194,11 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:clipToPadding="false"
+                    android:focusable="false"
                     android:gravity="center"
                     android:horizontalSpacing="10dp"
                     android:numColumns="3"
                     android:paddingBottom="120dp"
-                    android:focusable="false"
                     android:tag="@string/tv_no_focus_tag"
                     android:verticalSpacing="10dp"
                     tools:listitem="@layout/loading_poster_dynamic" />
@@ -190,6 +210,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginBottom="40dp">
+
         <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
             android:id="@+id/library_random"
             style="@style/ExtendedFloatingActionButton"
@@ -207,9 +228,9 @@
             android:text="@string/sort"
             android:textColor="?attr/textColor"
             android:visibility="gone"
-            tools:visibility="visible"
             app:icon="@drawable/ic_baseline_sort_24"
-            tools:ignore="ContentDescription" />
+            tools:ignore="ContentDescription"
+            tools:visibility="visible" />
     </FrameLayout>
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_player.xml b/app/src/main/res/layout/fragment_player.xml
index a620b6aee84..c6f598ebba4 100644
--- a/app/src/main/res/layout/fragment_player.xml
+++ b/app/src/main/res/layout/fragment_player.xml
@@ -7,7 +7,6 @@
     android:layout_height="match_parent"
     android:background="@android:color/black"
     android:orientation="horizontal"
-    android:screenOrientation="sensorLandscape"
     app:backgroundTint="@android:color/black"
     app:surface_type="texture_view">
     <!--
@@ -51,11 +50,11 @@
 
             android:text="@string/skip_loading"
             android:textAllCaps="false"
-            android:textColor="?attr/textColor"
+            android:textColor="@color/textColor"
             android:visibility="gone"
             app:cornerRadius="4dp"
             app:icon="@drawable/ic_baseline_skip_next_24"
-            app:iconTint="?attr/textColor"
+            app:iconTint="@color/textColor"
             app:rippleColor="?attr/colorPrimary"
             tools:visibility="visible" />
 
diff --git a/app/src/main/res/layout/fragment_player_tv.xml b/app/src/main/res/layout/fragment_player_tv.xml
index 3c0ac05e35e..3c04cb8f3dc 100644
--- a/app/src/main/res/layout/fragment_player_tv.xml
+++ b/app/src/main/res/layout/fragment_player_tv.xml
@@ -7,7 +7,6 @@
     android:layout_height="match_parent"
     android:background="@android:color/black"
     android:orientation="horizontal"
-    android:screenOrientation="sensorLandscape"
     app:backgroundTint="@android:color/black"
     app:surface_type="texture_view">
     <!--
diff --git a/app/src/main/res/layout/fragment_plugin_details.xml b/app/src/main/res/layout/fragment_plugin_details.xml
index 79013d9f5c8..8a180b2bee5 100644
--- a/app/src/main/res/layout/fragment_plugin_details.xml
+++ b/app/src/main/res/layout/fragment_plugin_details.xml
@@ -31,7 +31,7 @@
 
         <TextView
             android:id="@+id/plugin_name"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_weight="1"
diff --git a/app/src/main/res/layout/fragment_plugins.xml b/app/src/main/res/layout/fragment_plugins.xml
index ee86f12bc31..c5fa115713f 100644
--- a/app/src/main/res/layout/fragment_plugins.xml
+++ b/app/src/main/res/layout/fragment_plugins.xml
@@ -6,6 +6,7 @@
     android:id="@+id/extensions_root"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="?attr/primaryGrayBackground"
     android:orientation="vertical">
 
     <com.google.android.material.appbar.AppBarLayout
@@ -25,19 +26,28 @@
             app:titleTextColor="?attr/textColor"
             tools:title="Overlord" />
 
-        <include
-            android:id="@+id/tvtypes_chips_scroll"
-            layout="@layout/tvtypes_chips_scroll" />
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="?attr/primaryGrayBackground"
+            android:paddingBottom="10dp"
+            app:layout_scrollFlags="scroll|enterAlways">
+
+            <include
+                android:id="@+id/tvtypes_chips_scroll"
+                layout="@layout/tvtypes_chips_scroll" />
+        </FrameLayout>
     </com.google.android.material.appbar.AppBarLayout>
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/plugin_recycler_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:background="?attr/primaryBlackBackground"
+        android:clipToPadding="false"
+
         android:nextFocusLeft="@id/nav_rail_view"
         android:nextFocusUp="@id/tvtypes_chips"
-
-        android:clipToPadding="false"
         app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"
         tools:listitem="@layout/repository_item" />
diff --git a/app/src/main/res/layout/fragment_result.xml b/app/src/main/res/layout/fragment_result.xml
index 623131111fa..a5c933d6a03 100644
--- a/app/src/main/res/layout/fragment_result.xml
+++ b/app/src/main/res/layout/fragment_result.xml
@@ -298,6 +298,21 @@
                             android:layout_height="60dp"
                             android:layout_gravity="bottom"
                             android:background="@drawable/background_shadow" />
+
+                        <ImageView
+                            android:id="@+id/background_poster_watermark_badge"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:maxWidth="220dp"
+                            android:maxHeight="64dp"
+                            android:layout_gravity="bottom|start"
+                            android:layout_marginStart="@dimen/result_padding"
+                            android:layout_marginBottom="12dp"
+                            android:paddingBottom="4dp"
+                            android:adjustViewBounds="true"
+                            android:scaleType="fitStart"
+                            android:contentDescription="@null" />
+
                     </FrameLayout>
                 </FrameLayout>
 
@@ -563,34 +578,145 @@
                             android:visibility="gone"
                             app:icon="@drawable/ic_baseline_add_24" />
 
+                        <FrameLayout
+                            android:id="@+id/result_resume_progress_holder"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:orientation="horizontal"
+                            android:paddingVertical="5dp"
+                            android:visibility="gone"
+                            tools:visibility="visible">
+
+                            <com.google.android.material.button.MaterialButton
+                                android:id="@+id/result_resume_series_button"
+                                style="@style/WhiteButton"
+                                android:layout_width="match_parent"
+                                android:layout_margin="0dp"
+                                android:visibility="visible" />
+
+                            <LinearLayout
+                                android:id="@+id/progress_group"
+                                android:layout_width="match_parent"
+                                android:layout_height="match_parent"
+                                android:gravity="center"
+                                android:orientation="horizontal">
+
+                                <FrameLayout
+                                    android:id="@+id/watch_progress_container"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_gravity="center">
+
+                                    <ImageView
+                                        android:id="@+id/episode_play_icon"
+                                        style="@style/ContinueWatchingPlayUnderlayProgress"
+                                        app:tint="?attr/black" />
+
+                                    <com.google.android.material.progressindicator.CircularProgressIndicator
+                                        android:id="@+id/result_resume_series_progress"
+                                        style="@style/ContinueWatchingCircularProgress"
+                                        app:indicatorColor="?attr/iconGrayBackground"
+                                        app:trackColor="@color/skipOpTransparent"
+                                        tools:progress="50" />
+                                </FrameLayout>
+
+                                <TextView
+                                    android:id="@+id/result_resume_series_title"
+                                    style="@style/Widget.MaterialComponents.Button.TextButton"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="match_parent"
+                                    android:clickable="false"
+                                    android:ellipsize="end"
+                                    android:focusable="false"
+                                    android:gravity="center_vertical"
+                                    android:maxLines="1"
+                                    android:paddingStart="5dp"
+                                    android:textAllCaps="false"
+                                    android:textColor="?attr/iconGrayBackground"
+                                    android:textSize="15sp"
+                                    android:textStyle="bold"
+                                    android:visibility="visible"
+                                    tools:ignore="RtlSymmetry"
+                                    tools:text="S1E1 Episode 1"
+                                    tools:visibility="visible" />
+
+                                <TextView
+                                    android:id="@+id/result_resume_series_progress_text"
+                                    style="@style/Widget.MaterialComponents.Button.TextButton"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="match_parent"
+                                    android:clickable="false"
+                                    android:focusable="false"
+                                    android:gravity="center"
+                                    android:maxLines="1"
+                                    android:paddingStart="5dp"
+                                    android:textAllCaps="false"
+                                    android:textColor="?attr/iconGrayBackground"
+                                    android:textSize="15sp"
+                                    android:textStyle="bold"
+                                    android:visibility="gone"
+                                    tools:ignore="RtlSymmetry"
+                                    tools:text="69m remaining"
+                                    tools:visibility="visible" />
+                            </LinearLayout>
+                        </FrameLayout>
+
                         <LinearLayout
-                            android:id="@+id/result_movie_parent"
+                            android:id="@+id/result_resume_parent"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_marginTop="5dp"
                             android:orientation="vertical"
+                            android:visibility="gone"
                             tools:visibility="visible">
 
                             <com.google.android.material.button.MaterialButton
-                                android:id="@+id/result_play_movie"
+                                android:id="@+id/result_next_series_button"
                                 style="@style/WhiteButton"
                                 android:layout_width="match_parent"
-
                                 android:layout_gravity="center_vertical"
+                                android:layout_marginVertical="5dp"
                                 android:layout_marginStart="0dp"
                                 android:layout_marginEnd="0dp"
-                                android:layout_marginBottom="10dp"
+                                android:ellipsize="end"
+                                android:maxLines="1"
                                 android:nextFocusUp="@id/result_bookmark_Button"
                                 android:nextFocusDown="@id/result_download_movie"
-                                android:text="@string/play_movie_button"
-                                android:visibility="visible"
-                                app:icon="@drawable/ic_baseline_play_arrow_24">
+                                android:text="S1E2 Episode 2"
+                                android:visibility="gone"
+                                app:icon="@drawable/cast_ic_mini_controller_skip_next"
+                                tools:visibility="visible" />
+                        </LinearLayout>
 
-                                <requestFocus />
+                        <LinearLayout
+                            android:id="@+id/result_movie_parent"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:orientation="vertical"
+                            tools:visibility="visible">
 
-                            </com.google.android.material.button.MaterialButton>
+                            <LinearLayout
+                                android:id="@+id/result_play_parent"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginVertical="5dp">
+
+                                <com.google.android.material.button.MaterialButton
+                                    android:id="@+id/result_play_movie"
+                                    style="@style/WhiteButton"
+                                    android:layout_width="match_parent"
+                                    android:layout_gravity="center_vertical"
+                                    android:layout_marginStart="0dp"
+                                    android:layout_marginEnd="0dp"
+                                    android:nextFocusUp="@id/result_bookmark_Button"
+                                    android:nextFocusDown="@id/result_download_movie"
+                                    android:text="@string/play_movie_button"
+                                    android:visibility="visible"
+                                    app:icon="@drawable/ic_baseline_play_arrow_24">
 
+                                    <requestFocus />
 
+                                </com.google.android.material.button.MaterialButton>
+                            </LinearLayout>
                             <!--<com.google.android.material.button.MaterialButton
                                     android:nextFocusUp="@id/result_play_movie"
                                     android:nextFocusDown="@id/result_season_button"
@@ -613,6 +739,7 @@
                                 android:id="@+id/download_button"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
+                                android:layout_marginTop="5dp"
                                 app:download_layout="@layout/download_button_layout" />
 
                             <!--<androidx.core.widget.ContentLoadingProgressBar
@@ -639,95 +766,6 @@
                                       android:layout_height="match_parent" />-->
                         </LinearLayout>
 
-                        <LinearLayout
-                            android:id="@+id/result_resume_parent"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="5dp"
-                            android:orientation="vertical"
-                            android:visibility="gone"
-                            tools:visibility="visible">
-
-
-                            <com.google.android.material.button.MaterialButton
-                                android:id="@+id/result_resume_series_button"
-                                style="@style/WhiteButton"
-                                android:layout_width="match_parent"
-
-                                android:layout_gravity="center_vertical"
-                                android:layout_marginStart="0dp"
-                                android:layout_marginEnd="0dp"
-                                android:layout_marginBottom="10dp"
-                                android:nextFocusUp="@id/result_bookmark_Button"
-                                android:nextFocusDown="@id/result_download_movie"
-                                android:text="@string/resume"
-                                android:visibility="visible"
-                                app:icon="@drawable/ic_baseline_play_arrow_24"
-                                tools:visibility="visible" />
-
-                            <com.google.android.material.button.MaterialButton
-                                android:id="@+id/result_next_series_button"
-                                style="@style/WhiteButton"
-                                android:layout_width="match_parent"
-
-                                android:layout_gravity="center_vertical"
-                                android:layout_marginStart="0dp"
-                                android:layout_marginEnd="0dp"
-                                android:layout_marginBottom="10dp"
-                                android:nextFocusUp="@id/result_bookmark_Button"
-                                android:nextFocusDown="@id/result_download_movie"
-                                android:text="@string/next_episode"
-                                android:visibility="gone"
-                                app:icon="@drawable/cast_ic_mini_controller_skip_next" />
-
-                            <TextView
-                                android:id="@+id/result_resume_series_title"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:textColor="?attr/textColor"
-                                android:textSize="17sp"
-                                android:textStyle="bold"
-                                tools:text="S1E1 Episode 1" />
-                        </LinearLayout>
-
-                        <LinearLayout
-                            android:id="@+id/result_resume_progress_holder"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:orientation="horizontal"
-                            android:paddingTop="10dp"
-                            android:visibility="gone"
-                            tools:visibility="visible">
-
-                            <androidx.core.widget.ContentLoadingProgressBar
-                                android:id="@+id/result_resume_series_progress"
-                                style="?android:attr/progressBarStyleHorizontal"
-                                android:layout_width="match_parent"
-                                android:layout_height="20dp"
-                                android:layout_gravity="end|center_vertical"
-                                android:layout_weight="1"
-                                android:indeterminate="false"
-                                android:max="100"
-                                android:progress="0"
-                                android:progressBackgroundTint="?attr/colorPrimary"
-                                android:visibility="visible"
-                                tools:progress="50"
-                                tools:visibility="visible" />
-
-                            <TextView
-                                android:id="@+id/result_resume_series_progress_text"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="center"
-                                android:layout_weight="0"
-                                android:gravity="center"
-                                android:paddingStart="10dp"
-                                android:textColor="?attr/grayTextColor"
-                                tools:ignore="RtlSymmetry"
-                                tools:text="69m\nremaining" />
-                        </LinearLayout>
-
-
                         <LinearLayout
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
@@ -808,6 +846,21 @@
                                     android:visibility="gone"
                                     tools:visibility="visible" />
 
+                                <ImageView
+                                    android:background="?selectableItemBackgroundBorderless"
+                                    android:id="@+id/result_batch_download_button"
+                                    android:layout_width="36dp"
+                                    android:layout_height="36dp"
+                                    android:layout_margin="2dp"
+                                    android:contentDescription="@string/download_all"
+                                    android:nextFocusLeft="@id/result_dub_select"
+                                    android:nextFocusUp="@id/result_description"
+                                    android:nextFocusDown="@id/result_episodes"
+                                    android:src="@drawable/netflix_download_batch"
+                                    android:visibility="gone"
+                                    tools:visibility="visible">
+
+                                </ImageView>
                                 <TextView
                                     android:id="@+id/result_episodes_text"
                                     android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/fragment_result_swipe.xml b/app/src/main/res/layout/fragment_result_swipe.xml
index 6ef95681185..7963ef24b2e 100644
--- a/app/src/main/res/layout/fragment_result_swipe.xml
+++ b/app/src/main/res/layout/fragment_result_swipe.xml
@@ -20,7 +20,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
             <ImageView
-                    android:nextFocusRight="@id/result_share"
+                    android:nextFocusRight="@id/result_mini_sync"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
 
                     android:id="@+id/result_back"
@@ -33,22 +33,22 @@
                     android:src="@drawable/ic_baseline_arrow_back_24"
                     android:contentDescription="@string/go_back"
                     app:tint="?attr/white" />
-            <androidx.recyclerview.widget.RecyclerView
-                    android:paddingStart="10dp"
-                    android:paddingEnd="10dp"
-                    android:id="@+id/result_mini_sync"
-                    android:layout_width="match_parent"
-                    android:descendantFocusability="afterDescendants"
-                    android:layout_height="wrap_content"
-                    android:fadingEdge="horizontal"
-                    android:focusableInTouchMode="false"
-                    android:focusable="false"
-                    android:layout_gravity="center"
-                    android:orientation="horizontal"
-                    android:requiresFadingEdge="horizontal"
-                    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-                    tools:itemCount="2"
-                    tools:listitem="@layout/result_mini_image" />
+
+            <ImageView
+                android:visibility="gone"
+                android:nextFocusRight="@id/result_subscribe"
+                android:background="?android:attr/selectableItemBackgroundBorderless"
+
+                android:id="@+id/result_mini_sync"
+                android:clickable="true"
+                android:focusable="true"
+
+                android:layout_width="30dp"
+                android:layout_height="30dp"
+                android:layout_marginStart="5dp"
+                android:layout_gravity="center_vertical|start"
+                android:src="@drawable/bookmark_star_24px"
+                app:tint="?attr/white" />
         </LinearLayout>
 
         <LinearLayout
diff --git a/app/src/main/res/layout/fragment_result_tv.xml b/app/src/main/res/layout/fragment_result_tv.xml
index a40b1db8369..3dff8f0d535 100644
--- a/app/src/main/res/layout/fragment_result_tv.xml
+++ b/app/src/main/res/layout/fragment_result_tv.xml
@@ -26,6 +26,7 @@ https://developer.android.com/design/ui/tv/samples/jet-fit
         android:layout_height="275dp"
         android:visibility="visible">
 
+
         <com.lagradost.cloudstream3.utils.PercentageCropImageView
             android:id="@+id/background_poster"
             android:layout_width="match_parent"
@@ -33,13 +34,29 @@ https://developer.android.com/design/ui/tv/samples/jet-fit
             android:layout_gravity="center"
             android:alpha="0.8"
             android:scaleType="matrix"
+            app:cropYCenterOffsetPct="0.20"
             tools:src="@drawable/profile_bg_dark_blue" />
 
         <ImageView
+            android:layout_marginBottom="-1dp"
             android:layout_width="match_parent"
             android:layout_height="120dp"
             android:layout_gravity="bottom"
             android:src="@drawable/background_shadow" />
+
+        <ImageView
+            android:id="@+id/background_poster_watermark_badge_holder"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:maxWidth="220dp"
+            android:maxHeight="72dp"
+            android:layout_gravity="bottom|start"
+            android:layout_marginStart="@dimen/result_padding"
+            android:layout_marginBottom="56dp"
+            android:adjustViewBounds="true"
+            android:scaleType="fitStart"
+            android:contentDescription="@null" />
+
     </FrameLayout>
 
     <com.facebook.shimmer.ShimmerFrameLayout
@@ -223,37 +240,67 @@ https://developer.android.com/design/ui/tv/samples/jet-fit
                     android:layout_height="wrap_content"
                     android:layout_marginBottom="10dp"
                     android:orientation="horizontal"
+                    android:layout_marginTop="10dp"
                     android:visibility="gone"
                     tools:visibility="visible">
-
+                    <TextView
+                        android:id="@+id/result_resume_series_title"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="2"
+                        android:textColor="?attr/textColor"
+                        android:layout_gravity="center_vertical"
+                        android:textSize="17sp"
+                        android:textStyle="bold"
+                        tools:text="S1E1 Episode 1"
+                        android:visibility="visible"
+                        tools:visibility="visible"
+                        android:paddingEnd="10dp"/>
                     <!--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"
+<!--                    <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" />-->
+                    <FrameLayout
+                        android:id="@+id/watch_progress_container"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center">
 
-                        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"
+                        <ImageView
+                            android:id="@+id/episode_play_icon"
+                            style="@style/ContinueWatchingPlayUnderlayProgress"/>
 
-                        android:scrollbarStyle="outsideInset"
-                        tools:ignore="RtlSymmetry"
-                        tools:progress="25"
-                        tools:visibility="visible" />
+                        <com.google.android.material.progressindicator.CircularProgressIndicator
+                            android:id="@+id/result_resume_series_progress"
+                            style="@style/ContinueWatchingCircularProgress"
+                            tools:progress="50" />
+                    </FrameLayout>
 
                     <TextView
                         android:id="@+id/result_resume_series_progress_text"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:maxLines="1"
+                        android:maxLines="2"
                         android:textColor="?attr/grayTextColor"
                         tools:ignore="RtlSymmetry"
-                        tools:text="69m remaining" />
+                        android:gravity="center"
+                        android:layout_gravity="center_vertical"
+                        tools:text="69m\nremaining" />
                 </LinearLayout>
             </LinearLayout>
 
@@ -715,7 +762,7 @@ https://developer.android.com/design/ui/tv/samples/jet-fit
         <LinearLayout
             android:id="@+id/episode_holder_tv"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:layout_gravity="end"
             android:orientation="horizontal"
             android:paddingStart="@dimen/result_padding"
@@ -865,6 +912,7 @@ https://developer.android.com/design/ui/tv/samples/jet-fit
                             android:visibility="gone"
                             app:cardCornerRadius="@dimen/rounded_image_radius">
 
+
                             <ImageView
                                 android:id="@+id/result_poster"
                                 android:layout_width="100dp"
@@ -1017,7 +1065,7 @@ https://developer.android.com/design/ui/tv/samples/jet-fit
 
             <LinearLayout
                 android:layout_width="250dp"
-                android:layout_height="wrap_content"
+                android:layout_height="0dp"
                 android:layout_marginEnd="10dp"
                 android:layout_weight="0"
                 android:orientation="vertical">
diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
index aeffc67395b..408460d41d3 100644
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/fragment_search.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/searchRoot"
@@ -7,14 +7,19 @@
     android:layout_height="match_parent"
     android:layout_marginTop="@dimen/navbar_height"
     android:background="?attr/primaryGrayBackground"
-    android:orientation="vertical"
     tools:context=".ui.search.SearchFragment">
 
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:paddingBottom="10dp">
+        android:paddingBottom="10dp"
+        android:background="?attr/primaryGrayBackground">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -140,42 +145,30 @@
 
         android:nextFocusLeft="@id/nav_rail_view"
         android:nextFocusUp="@id/tvtypes_chips"
-        android:nextFocusDown="@id/search_clear_call_history"
         android:visibility="gone"
         tools:listitem="@layout/homepage_parent" />
 
-    <FrameLayout
-        android:id="@+id/search_history_holder"
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/search_history_recycler"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/search_history_recycler"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-
-            android:background="?attr/primaryBlackBackground"
-            android:descendantFocusability="afterDescendants"
-            android:nextFocusLeft="@id/nav_rail_view"
-            android:nextFocusUp="@id/tvtypes_chips"
-            android:nextFocusDown="@id/search_clear_call_history"
+        android:layout_height="match_parent"
+        android:background="?attr/primaryBlackBackground"
+        android:descendantFocusability="afterDescendants"
+        android:nextFocusLeft="@id/nav_rail_view"
+        android:nextFocusUp="@id/tvtypes_chips"
+        android:visibility="visible"
+        tools:listitem="@layout/search_history_item" />
+    </LinearLayout>
 
-            android:paddingBottom="50dp"
-            android:visibility="visible"
-            tools:listitem="@layout/search_history_item" />
+    <!-- Suggestions overlay - appears on top of content -->
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/search_suggestions_recycler"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="100dp"
+        android:background="?attr/primaryGrayBackground"
+        android:elevation="8dp"
+        android:visibility="gone"
+        tools:listitem="@layout/search_suggestion_item" />
 
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/search_clear_call_history"
-            style="@style/BlackButton"
-            android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:layout_gravity="bottom"
-            android:layout_margin="0dp"
-            android:nextFocusUp="@id/search_history_recycler"
-            android:padding="0dp"
-            android:text="@string/clear_history"
-            app:cornerRadius="0dp"
-            app:icon="@drawable/delete_all" />
-    </FrameLayout>
-</LinearLayout>
\ No newline at end of file
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_search_tv.xml b/app/src/main/res/layout/fragment_search_tv.xml
index 2b8503cfbc4..ed2f3b63991 100644
--- a/app/src/main/res/layout/fragment_search_tv.xml
+++ b/app/src/main/res/layout/fragment_search_tv.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/searchRoot"
@@ -7,15 +7,20 @@
     android:layout_height="match_parent"
     android:layout_marginTop="@dimen/navbar_height"
     android:background="?attr/primaryGrayBackground"
-    android:orientation="vertical"
     tools:context=".ui.search.SearchFragment">
 
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/navbar_width"
         android:orientation="vertical"
-        android:paddingBottom="10dp">
+        android:paddingBottom="10dp"
+        android:background="?attr/primaryGrayBackground">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -57,10 +62,10 @@
                         android:imeOptions="actionSearch"
 
                         android:inputType="text"
-                        android:nextFocusLeft="@id/nav_rail_view"
+                        android:nextFocusLeft="@id/navigation_search"
 
                         android:nextFocusRight="@id/search_filter"
-                        android:nextFocusUp="@id/nav_rail_view"
+                        android:nextFocusUp="@id/navigation_search"
                         android:nextFocusDown="@id/search_autofit_results"
                         android:paddingStart="-10dp"
                         app:iconifiedByDefault="false"
@@ -101,7 +106,7 @@
                     android:contentDescription="@string/change_providers_img_des"
                     android:nextFocusLeft="@id/main_search"
                     android:nextFocusRight="@id/main_search"
-                    android:nextFocusUp="@id/nav_rail_view"
+                    android:nextFocusUp="@id/navigation_search"
                     android:nextFocusDown="@id/tvtypes_chips_scroll"
                     android:tag = "@string/tv_no_focus_tag"
                     android:src="@drawable/ic_baseline_tune_24"
@@ -123,7 +128,7 @@
         android:background="?attr/primaryBlackBackground"
         android:clipToPadding="false"
         android:descendantFocusability="afterDescendants"
-        android:nextFocusLeft="@id/nav_rail_view"
+        android:nextFocusLeft="@id/navigation_search"
         android:orientation="vertical"
         android:paddingStart="8dp"
         android:paddingTop="5dp"
@@ -139,45 +144,38 @@
 
         android:background="?attr/primaryBlackBackground"
         android:descendantFocusability="afterDescendants"
-        android:nextFocusLeft="@id/nav_rail_view"
+        android:nextFocusLeft="@id/navigation_search"
         android:nextFocusUp="@id/tvtypes_chips"
-        android:nextFocusDown="@id/search_clear_call_history"
         android:visibility="gone"
         tools:listitem="@layout/homepage_parent" />
 
-    <FrameLayout
-        android:id="@+id/search_history_holder"
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/search_history_recycler"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="?attr/primaryBlackBackground">
+        android:layout_marginStart="@dimen/navbar_width"
+        android:background="?attr/primaryBlackBackground"
+        android:descendantFocusability="afterDescendants"
+        android:nextFocusLeft="@id/navigation_search"
+        android:nextFocusUp="@id/tvtypes_chips"
+        android:tag = "@string/tv_no_focus_tag"
+        android:visibility="visible"
+        tools:listitem="@layout/search_history_item" />
+    </LinearLayout>
 
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/search_history_recycler"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginStart="@dimen/navbar_width"
-
-            android:descendantFocusability="afterDescendants"
-            android:nextFocusLeft="@id/nav_rail_view"
-            android:nextFocusUp="@id/tvtypes_chips"
-            android:nextFocusDown="@id/search_clear_call_history"
-            android:tag = "@string/tv_no_focus_tag"
-            android:paddingBottom="50dp"
-            android:visibility="visible"
-            tools:listitem="@layout/search_history_item" />
-
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/search_clear_call_history"
-            style="@style/BlackButton"
-            android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:layout_gravity="bottom"
-            android:layout_margin="0dp"
-            android:layout_marginStart="@dimen/navbar_width"
-            android:nextFocusUp="@id/search_history_recycler"
-            android:padding="0dp"
-            android:text="@string/clear_history"
-            app:cornerRadius="0dp"
-            app:icon="@drawable/delete_all" />
-    </FrameLayout>
-</LinearLayout>
\ No newline at end of file
+    <!-- Suggestions overlay - appears on top of content -->
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/search_suggestions_recycler"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="100dp"
+        android:layout_marginStart="@dimen/navbar_width"
+        android:background="?attr/primaryGrayBackground"
+        android:elevation="8dp"
+        android:descendantFocusability="afterDescendants"
+        android:nextFocusLeft="@id/navigation_search"
+        android:nextFocusUp="@id/tvtypes_chips"
+        android:visibility="gone"
+        tools:listitem="@layout/search_suggestion_item" />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_setup_layout.xml b/app/src/main/res/layout/fragment_setup_layout.xml
index a742c27b5b7..18815ced353 100644
--- a/app/src/main/res/layout/fragment_setup_layout.xml
+++ b/app/src/main/res/layout/fragment_setup_layout.xml
@@ -6,47 +6,6 @@
     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
-                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:layout_gravity="end|center_vertical"
-                android:checked="true">
-
-            </androidx.appcompat.widget.SwitchCompat>
-        </FrameLayout>-->
-
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_testing.xml b/app/src/main/res/layout/fragment_testing.xml
index 1426f59e55e..59405bbb8ee 100644
--- a/app/src/main/res/layout/fragment_testing.xml
+++ b/app/src/main/res/layout/fragment_testing.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:backgroundTint="?attr/primaryBlackBackground"
+    android:background="?attr/primaryGrayBackground"
     android:orientation="vertical">
 
     <com.google.android.material.appbar.AppBarLayout
@@ -36,8 +36,9 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:orientation="vertical"
+        android:background="?attr/primaryBlackBackground"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
         <androidx.recyclerview.widget.RecyclerView
diff --git a/app/src/main/res/layout/fragment_trailer.xml b/app/src/main/res/layout/fragment_trailer.xml
index 977198cf3de..c4d2e179f7d 100644
--- a/app/src/main/res/layout/fragment_trailer.xml
+++ b/app/src/main/res/layout/fragment_trailer.xml
@@ -9,7 +9,6 @@
         android:id="@+id/player_background"
         app:backgroundTint="@android:color/black"
         android:background="@android:color/black"
-        android:screenOrientation="sensorLandscape"
         app:surface_type="texture_view">
     <!--
           app:fastforward_increment="10000"
diff --git a/app/src/main/res/layout/home_result_grid.xml b/app/src/main/res/layout/home_result_grid.xml
index 9a69e962f47..ff07d9a954f 100644
--- a/app/src/main/res/layout/home_result_grid.xml
+++ b/app/src/main/res/layout/home_result_grid.xml
@@ -35,39 +35,35 @@
         android:src="@drawable/title_shadow"
         tools:ignore="ContentDescription" />
 
-    <TextView
-        android:id="@+id/imageText"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom"
-        android:ellipsize="end"
-        android:gravity="center"
-        android:maxLines="2"
-        android:paddingStart="5dp"
-        android:paddingTop="5dp"
-        android:paddingEnd="5dp"
-        android:paddingBottom="5dp"
-        android:textColor="@color/textColor"
-        android:textStyle="bold"
-        tools:text="The Perfect Run" />
+        android:orientation="vertical"
+        android:paddingBottom="5dp">
+        <TextView
+            android:id="@+id/episode_text"
+            android:layout_width="wrap_content"
+            style="@style/EpisodeTextButton"
+            android:layout_gravity="center"/>
+        <TextView
+            android:id="@+id/imageText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom"
+            android:ellipsize="end"
+            android:gravity="center"
+            android:maxLines="1"
+            android:paddingStart="5dp"
+            android:paddingEnd="5dp"
+            android:textColor="@color/textColor"
+            android:textStyle="bold"
+            tools:text="The Perfect Run" />
+    </LinearLayout>
+
+
+
 
-    <ImageView
-        android:id="@+id/search_item_download_play"
-        android:layout_width="60dp"
-        android:layout_height="60dp"
-        android:layout_gravity="center"
-        android:src="@drawable/play_button" />
-
-    <androidx.core.widget.ContentLoadingProgressBar
-        android:id="@+id/watchProgress"
-        style="@android:style/Widget.Material.ProgressBar.Horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="5dp"
-        android:layout_gravity="bottom"
-        android:layout_marginBottom="-1.5dp"
-        android:progressBackgroundTint="?attr/colorPrimary"
-        android:progressTint="?attr/colorPrimary"
-        tools:progress="50" />
 
     <!--<View
             android:id="@+id/search_result_lang"
@@ -89,17 +85,11 @@
     <TextView android:id="@+id/text_quality" style="@style/TypeButton" />
 
     <LinearLayout
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_gravity="end"
         android:orientation="vertical">
 
-        <!--
-                    <ImageView android:id="@+id/text_is_dub" android:tint="?attr/colorPrimary"
-                               android:src="@drawable/ic_baseline_subtitles_24" android:layout_width="wrap_content"
-                               android:layout_height="20dp">
-
-                    </ImageView>-->
         <TextView
             android:id="@+id/text_is_dub"
             style="@style/DubButton"
@@ -110,6 +100,12 @@
             style="@style/SubButton"
             android:layout_gravity="end" />
 
+        <TextView
+            android:id="@+id/text_rating"
+            style="@style/RatingButton"
+            android:layout_gravity="end"
+            tools:text="7.7" />
+
         <TextView
             android:id="@+id/text_flag"
             style="@style/SearchBox"
@@ -120,4 +116,21 @@
             tools:text="🇸🇪"
             tools:visibility="visible" />
     </LinearLayout>
+
+    <FrameLayout
+        android:id="@+id/watch_progress_container"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center">
+
+        <com.google.android.material.imageview.ShapeableImageView
+            android:id="@+id/search_item_download_play"
+            style="@style/HomePlayUnderlayProgress"
+            />
+        <com.google.android.material.progressindicator.CircularProgressIndicator
+            android:id="@+id/watchProgress"
+            style="@style/HomeCircularProgress"
+            tools:progress="50" />
+
+    </FrameLayout>
 </androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/layout/home_result_grid_expanded.xml b/app/src/main/res/layout/home_result_grid_expanded.xml
index 3169629404e..2726ad33e15 100644
--- a/app/src/main/res/layout/home_result_grid_expanded.xml
+++ b/app/src/main/res/layout/home_result_grid_expanded.xml
@@ -48,23 +48,71 @@
                 tools:src="@drawable/example_poster" />
 
 
-            <ImageView
-                android:id="@+id/search_item_download_play"
-                android:layout_width="60dp"
-                android:layout_height="60dp"
-                android:layout_gravity="center"
-                android:src="@drawable/play_button" />
-
-            <androidx.core.widget.ContentLoadingProgressBar
-                android:id="@+id/watchProgress"
-                style="@android:style/Widget.Material.ProgressBar.Horizontal"
-                android:layout_width="match_parent"
-                android:layout_height="5dp"
-                android:layout_gravity="bottom"
-                android:layout_marginBottom="-1.5dp"
-                android:progressBackgroundTint="?attr/colorPrimary"
-                android:progressTint="?attr/colorPrimary"
-                tools:progress="50" />
+            <FrameLayout
+                android:id="@+id/watch_progress_container"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center">
+
+                <com.google.android.material.imageview.ShapeableImageView
+                    android:id="@+id/search_item_download_play"
+                    style="@style/HomePlayUnderlayProgress"
+                    />
+                <com.google.android.material.progressindicator.CircularProgressIndicator
+                    android:id="@+id/watchProgress"
+                    style="@style/HomeCircularProgress"
+                    tools:progress="50" />
+
+            </FrameLayout>
+<!--            <FrameLayout-->
+<!--                android:id="@+id/small_watch_progress_container"-->
+<!--                android:layout_width="wrap_content"-->
+<!--                android:layout_height="wrap_content"-->
+<!--                android:layout_gravity="bottom|end"-->
+<!--                android:visibility="gone"-->
+<!--                tools:visibility="visible"-->
+<!--                >-->
+
+<!--                <ImageView-->
+<!--                    android:id="@+id/small_episode_play_icon"-->
+<!--                    android:layout_width="30dp"-->
+<!--                    android:layout_height="30dp"-->
+<!--                    android:src="@drawable/play_button"-->
+<!--                    android:layout_gravity="center" />-->
+
+<!--                <com.google.android.material.progressindicator.CircularProgressIndicator-->
+<!--                    android:id="@+id/small_episode_progress"-->
+<!--                    android:layout_width="30dp"-->
+<!--                    android:layout_height="30dp"-->
+<!--                    app:indicatorSize="28.75dp"-->
+<!--                    app:trackThickness="2.5dp"-->
+<!--                    android:progressBackgroundTint="?attr/colorPrimary"-->
+<!--                    android:progressTint="?attr/colorPrimary"-->
+<!--                    tools:progress="50" />-->
+<!--            </FrameLayout>-->
+<!--            <FrameLayout-->
+<!--                android:id="@+id/playProgressContainer"-->
+<!--                android:layout_width="wrap_content"-->
+<!--                android:layout_height="wrap_content"-->
+<!--                android:layout_gravity="bottom|end">-->
+
+<!--                <ImageView-->
+<!--                    android:id="@+id/search_item_download_play"-->
+<!--                    android:layout_width="50dp"-->
+<!--                    android:layout_height="50dp"-->
+<!--                    android:src="@drawable/play_button"-->
+<!--                    android:layout_gravity="center" />-->
+
+<!--                <com.google.android.material.progressindicator.CircularProgressIndicator-->
+<!--                    android:id="@+id/watchProgress"-->
+<!--                    android:layout_width="25dp"-->
+<!--                    android:layout_height="25dp"-->
+<!--                    app:indicatorSize="23.75dp"-->
+<!--                    app:trackThickness="2.5dp"-->
+<!--                    android:progressBackgroundTint="?attr/colorPrimary"-->
+<!--                    android:progressTint="?attr/colorPrimary"-->
+<!--                    tools:progress="50" />-->
+<!--            </FrameLayout>-->
 
             <!--<View
                     android:id="@+id/search_result_lang"
@@ -88,17 +136,11 @@
                 style="@style/TypeButton" />
 
             <LinearLayout
-                android:layout_width="match_parent"
+                android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:layout_gravity="end"
                 android:orientation="vertical">
 
-                <!--
-                            <ImageView android:id="@+id/text_is_dub" android:tint="?attr/colorPrimary"
-                                       android:src="@drawable/ic_baseline_subtitles_24" android:layout_width="wrap_content"
-                                       android:layout_height="20dp">
-
-                            </ImageView>-->
                 <TextView
                     android:id="@+id/text_is_dub"
                     style="@style/DubButton"
@@ -109,6 +151,12 @@
                     style="@style/SubButton"
                     android:layout_gravity="end" />
 
+                <TextView
+                    android:id="@+id/text_rating"
+                    style="@style/RatingButton"
+                    android:layout_gravity="end"
+                    tools:text="7.7" />
+
                 <TextView
                     android:id="@+id/text_flag"
                     style="@style/SearchBox"
@@ -119,6 +167,18 @@
                     tools:text="🇸🇪"
                     tools:visibility="visible" />
             </LinearLayout>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom"
+                android:orientation="vertical"
+                android:paddingBottom="3dp">
+                <TextView
+                    android:id="@+id/episode_text"
+                    android:layout_width="wrap_content"
+                    style="@style/EpisodeTextButton"
+                    android:layout_gravity="center"/>
+            </LinearLayout>
         </androidx.cardview.widget.CardView>
 
         <TextView
diff --git a/app/src/main/res/layout/home_scroll_view.xml b/app/src/main/res/layout/home_scroll_view.xml
index c106bee0036..3291b9b7b56 100644
--- a/app/src/main/res/layout/home_scroll_view.xml
+++ b/app/src/main/res/layout/home_scroll_view.xml
@@ -36,6 +36,15 @@
         android:layout_marginBottom="100dp"
         android:orientation="vertical">
 
+        <ImageView
+            android:id="@+id/home_preview_logo"
+            android:layout_width="260dp"
+            android:layout_height="80dp"
+            android:layout_gravity="center_horizontal|bottom"
+            android:scaleType="fitCenter"
+            android:paddingBottom="10dp"
+            android:contentDescription="@null" />
+
         <TextView
             android:id="@+id/home_scroll_preview_title"
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/home_scroll_view_tv.xml b/app/src/main/res/layout/home_scroll_view_tv.xml
index e0da81975ca..bb282b2dd14 100644
--- a/app/src/main/res/layout/home_scroll_view_tv.xml
+++ b/app/src/main/res/layout/home_scroll_view_tv.xml
@@ -2,20 +2,23 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="?attr/primaryGrayBackground"
     android:layout_height="match_parent">
 
-    <ImageView
+    <com.lagradost.cloudstream3.utils.PercentageCropImageView
         android:id="@+id/home_scroll_preview"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:scaleType="centerCrop"
+        android:scaleType="matrix"
+        app:cropYCenterOffsetPct="0.20"
         tools:src="@drawable/example_poster" />
 
     <View
         android:id="@+id/title_shadow"
         android:layout_width="match_parent"
-        android:layout_height="300dp"
+        android:layout_height="250dp"
         android:layout_gravity="bottom"
         android:background="@drawable/background_shadow" />
+
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/home_select_mainpage.xml b/app/src/main/res/layout/home_select_mainpage.xml
index 1d2d1780975..dc47b786e88 100644
--- a/app/src/main/res/layout/home_select_mainpage.xml
+++ b/app/src/main/res/layout/home_select_mainpage.xml
@@ -19,7 +19,7 @@
         android:nextFocusLeft="@id/apply_btt"
         android:nextFocusRight="@id/cancel_btt"
         android:requiresFadingEdge="vertical"
-        tools:listitem="@layout/sort_bottom_single_choice" />
+        tools:listitem="@layout/sort_bottom_single_provider_choice" />
 
     <LinearLayout
         android:orientation="vertical"
diff --git a/app/src/main/res/layout/homepage_parent_emulator.xml b/app/src/main/res/layout/homepage_parent_emulator.xml
index b3e1f2dacb0..a38766c47fa 100644
--- a/app/src/main/res/layout/homepage_parent_emulator.xml
+++ b/app/src/main/res/layout/homepage_parent_emulator.xml
@@ -28,7 +28,7 @@
         android:descendantFocusability="afterDescendants"
         android:nextFocusUp="@id/home_child_more_info"
         android:orientation="horizontal"
-        android:paddingStart="@dimen/navbar_width"
+        android:paddingStart="8dp"
         android:paddingEnd="5dp"
         app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
         tools:listitem="@layout/home_result_grid" />
diff --git a/app/src/main/res/layout/homepage_parent_tv.xml b/app/src/main/res/layout/homepage_parent_tv.xml
index 9dcf0bae3b2..d97b5191729 100644
--- a/app/src/main/res/layout/homepage_parent_tv.xml
+++ b/app/src/main/res/layout/homepage_parent_tv.xml
@@ -24,7 +24,7 @@
         android:descendantFocusability="afterDescendants"
         android:nextFocusUp="@id/home_child_more_info"
         android:orientation="horizontal"
-        android:paddingStart="@dimen/navbar_width"
+        android:paddingStart="8dp"
         android:paddingEnd="5dp"
         app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
         tools:listitem="@layout/home_result_grid" />
diff --git a/app/src/main/res/layout/lock_pin_dialog.xml b/app/src/main/res/layout/lock_pin_dialog.xml
index db2af48e062..9bc2e66bb60 100644
--- a/app/src/main/res/layout/lock_pin_dialog.xml
+++ b/app/src/main/res/layout/lock_pin_dialog.xml
@@ -11,6 +11,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
+        android:autofillHints="no"
         android:hint="@string/pin"
         android:inputType="numberPassword"
         android:maxLength="4" />
diff --git a/app/src/main/res/layout/main_settings.xml b/app/src/main/res/layout/main_settings.xml
index 0b931843dd1..5c05599e828 100644
--- a/app/src/main/res/layout/main_settings.xml
+++ b/app/src/main/res/layout/main_settings.xml
@@ -29,16 +29,16 @@
                 <androidx.cardview.widget.CardView
                     android:layout_width="50dp"
                     android:layout_height="50dp"
+                    android:foreground="@drawable/outline_big_25_gray"
                     app:cardCornerRadius="25dp">
 
                     <ImageView
                         android:id="@+id/settings_profile_pic"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
+                        android:contentDescription="@string/account"
                         android:scaleType="centerCrop"
-                        android:foreground="@drawable/rounded_outline"
-                        tools:src="@drawable/profile_bg_orange"
-                        android:contentDescription="@string/account"/>
+                        tools:src="@drawable/profile_bg_orange" />
 
                 </androidx.cardview.widget.CardView>
 
@@ -115,12 +115,12 @@
                 android:orientation="horizontal">
 
                 <TextView
-                    android:id="@+id/version_info"
+                    android:id="@+id/app_version"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:padding="10dp"
-                    android:text="@string/app_version"
-                    android:textColor="?attr/textColor" />
+                    android:textColor="?attr/textColor"
+                    tools:text="0.0.0" />
 
                 <TextView
                     android:id="@+id/delimiter0"
@@ -134,8 +134,8 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:padding="10dp"
-                    android:text="@string/commit_hash"
-                    android:textColor="?attr/textColor" />
+                    android:textColor="?attr/textColor"
+                    tools:text="1234567" />
 
                 <TextView
                     android:id="@+id/delimiter1"
@@ -150,9 +150,8 @@
                     android:layout_height="wrap_content"
                     android:padding="10dp"
                     android:textColor="?attr/textColor"
-                    tools:text="21/03/2024 09:02 pm"/>
+                    tools:text="21/03/2024 09:02 pm" />
             </LinearLayout>
-
         </LinearLayout>
     </ScrollView>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/options_popup_tv.xml b/app/src/main/res/layout/options_popup_tv.xml
index 022e40b06a3..3c17d743421 100644
--- a/app/src/main/res/layout/options_popup_tv.xml
+++ b/app/src/main/res/layout/options_popup_tv.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
         xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="horizontal">
 
-    <androidx.cardview.widget.CardView xmlns:app="http://schemas.android.com/apk/res-auto"
-            xmlns:tools="http://schemas.android.com/tools"
+    <androidx.cardview.widget.CardView
             android:foreground="@drawable/outline_drawable"
             android:layout_margin="2dp"
             android:layout_width="114dp"
diff --git a/app/src/main/res/layout/player_custom_layout.xml b/app/src/main/res/layout/player_custom_layout.xml
index f671b42bca0..407de4a3f1b 100644
--- a/app/src/main/res/layout/player_custom_layout.xml
+++ b/app/src/main/res/layout/player_custom_layout.xml
@@ -5,9 +5,88 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:screenOrientation="landscape"
     tools:orientation="vertical">
 
+    <FrameLayout
+        android:id="@+id/player_metadata_scrim"
+        android:layout_width="640dp"
+        android:layout_height="match_parent"
+        android:background="@drawable/bg_player_metadata_scrim_netflix"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent">
+
+        <LinearLayout
+            android:id="@+id/player_metadata_overlay"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:layout_gravity="center_vertical"
+            android:paddingStart="64dp"
+            android:paddingEnd="32dp"
+            android:paddingBottom="32dp">
+
+            <!-- TITLE / LOGO -->
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="88dp">
+
+                <ImageView
+                    android:id="@+id/player_movie_logo"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:adjustViewBounds="true"
+                    android:scaleType="fitStart"
+                    android:visibility="gone"
+                    tools:visibility="visible"/>
+
+                <TextView
+                    android:id="@+id/player_movie_title"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:textColor="@android:color/white"
+                    android:textSize="30sp"
+                    android:textStyle="bold"
+                    android:maxLines="2"
+                    android:ellipsize="end"
+                    tools:text="Zootopia 2"/>
+            </FrameLayout>
+
+            <!-- GENRES / YEAR / RATING -->
+            <TextView
+                android:id="@+id/player_movie_meta"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="12dp"
+                android:textColor="#B3FFFFFF"
+                android:textSize="14sp"
+                android:maxLines="2"
+                tools:text="Animation • Action • Adventure • 2025 • ⭐ 7.6"/>
+
+            <!-- SYNOPSIS -->
+            <TextView
+                android:id="@+id/player_movie_overview"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="20dp"
+                android:textColor="#E6FFFFFF"
+                android:textSize="16sp"
+                android:lineSpacingExtra="8dp"
+                android:maxLines="5"
+                tools:text="Brave rabbit cop Judy Hopps and her friend, the fox Nick Wilde, team up again to crack a new case."/>
+
+        </LinearLayout>
+    </FrameLayout>
+
+    <ImageView
+        android:visibility="gone"
+        android:id="@+id/video_outline"
+        android:src="@drawable/video_outline"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+    </ImageView>
+
 
     <!--
         <LinearLayout android:layout_width="match_parent"
@@ -148,17 +227,42 @@
                         android:textColor="@color/white"
                         tools:text="1920x1080" />
 
+
                     <TextView
-                        android:id="@+id/player_video_title"
+                        android:id="@+id/player_video_info"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:gravity="center"
+                        android:layout_marginBottom="2.5dp"
                         android:textColor="@color/white"
-                        android:textStyle="bold"
-                        android:visibility="visible"
-                        tools:text="Hello world" />
-
+                        android:visibility="gone"
+                        tools:text="HEVC" />
 
+                    <LinearLayout
+                        android:id="@+id/player_video_title_holder"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:gravity="center">
+                        <TextView
+                            android:maxLines="2"
+                            android:id="@+id/player_video_title"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:gravity="center"
+                            android:textColor="@color/white"
+                            android:textStyle="bold"
+                            android:visibility="visible"
+                            tools:text="Hello world " />
+                        <ImageView
+                            android:id="@+id/offline_pin"
+                            android:layout_width="16dp"
+                            android:layout_height="16dp"
+                            android:layout_marginStart="2dp"
+                            android:src="@drawable/ic_offline_pin_24"
+                            android:visibility="gone"
+                            tools:visibility="visible"
+                            android:layout_gravity="center"/>
+                    </LinearLayout>
                 </LinearLayout>
 
                 <!-- Removed as it has no use anymore-->
@@ -180,6 +284,7 @@
                     android:layout_width="70dp"
                     android:layout_height="70dp"
                     android:layout_margin="5dp"
+                    android:orientation="horizontal"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent">
 
@@ -445,8 +550,8 @@
                             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:layout_gravity="center_vertical|start"
+                            android:layout_marginStart="60dp"
                             android:background="@drawable/video_tap_button_always_white"
                             android:padding="10dp"
                             android:src="@drawable/baseline_downloading_24"
@@ -458,7 +563,7 @@
                             android:id="@+id/download_header"
                             android:layout_width="200dp"
                             android:layout_height="80dp"
-                            android:layout_gravity="end|center_vertical"
+                            android:layout_gravity="start|center_vertical"
                             android:layout_margin="10dp"
                             android:elevation="10dp"
                             app:cardBackgroundColor="@color/darkBar"
@@ -654,7 +759,7 @@
                             android:scaleType="centerCrop" />
                     </FrameLayout>
 
-                    <com.github.rubensousa.previewseekbar.media3.PreviewTimeBar
+                    <com.lagradost.cloudstream3.ui.player.live.LivePreviewTimeBar
                         android:id="@id/exo_progress"
                         android:layout_width="0dp"
                         android:layout_height="30dp"
@@ -688,6 +793,24 @@
                         app:layout_constraintEnd_toEndOf="parent"
                         tools:text="23:20" />
 
+                    <TextView
+                        android:id="@+id/time_live"
+                        android:layout_width="wrap_content"
+                        android:layout_height="30dp"
+                        android:layout_gravity="center|center_vertical"
+                        android:layout_marginEnd="20dp"
+                        android:includeFontPadding="false"
+                        android:minWidth="50dp"
+                        android:paddingLeft="4dp"
+                        android:paddingRight="4dp"
+                        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"
+                        android:text="@string/player_is_live" />
+
                     <TextView
                         android:id="@+id/time_left"
                         android:layout_width="wrap_content"
@@ -710,6 +833,7 @@
                 </androidx.constraintlayout.widget.ConstraintLayout>
 
                 <HorizontalScrollView
+                    android:id="@+id/player_controls_scroll"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center">
@@ -913,7 +1037,7 @@
                 </ImageView>
 
                 <ProgressBar
-                    android:id="@+id/player_progressbar_right"
+                    android:id="@+id/player_progressbar_right_level1"
                     style="@android:style/Widget.Material.ProgressBar.Horizontal"
                     android:layout_width="5dp"
                     android:layout_height="150dp"
@@ -923,52 +1047,29 @@
                     android:indeterminate="false"
                     android:max="100"
                     android:progress="100"
-                    android:progressDrawable="@drawable/progress_drawable_vertical" />
-            </RelativeLayout>
-        </LinearLayout>
-
+                    android:progressDrawable="@drawable/progress_drawable_vertical"
+                    android:progressTint="@color/white"
+                    android:progressTintMode="src_in" />
 
-        <!--
-            <ImageView
-                    android:padding="15dp"
-                    android:id="@+id/player_episodes_button"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                <ProgressBar
+                    android:id="@+id/player_progressbar_right_level2"
+                    style="@android:style/Widget.Material.ProgressBar.Horizontal"
+                    android:layout_width="5dp"
+                    android:layout_height="150dp"
+                    android:layout_centerInParent="true"
                     android:layout_gravity="end|center_vertical"
-                    android:src="@drawable/ic_baseline_arrow_back_ios_24"
-                    android:background="@drawable/video_tap_button_always_white"
-
-                    app:tint="@android:color/white"
-                    tools:ignore="ContentDescription"></ImageView>
-
-            <LinearLayout
-                    android:visibility="gone"
-                    android:background="?attr/primaryBlackBackground"
-                    android:orientation="vertical"
-                    android:layout_gravity="end"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent">
+                    android:layout_marginEnd="40dp"
+                    android:indeterminate="false"
+                    android:max="100"
+                    android:progress="0"
+                    android:progressDrawable="@drawable/progress_drawable_vertical"
+                    android:progressTint="@color/colorPrimaryOrange"
+                    android:progressTintMode="src_in" />
+            </RelativeLayout>
+        </LinearLayout>
 
-                <TextView
-                        android:padding="10dp"
-                        style="@style/WatchHeaderText"
-                        android:textSize="15sp"
-                        android:layout_marginEnd="0dp"
-                        android:text="@string/episodes"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content" />
 
-                <androidx.recyclerview.widget.RecyclerView
-                        android:requiresFadingEdge="vertical"
-                        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-                        android:id="@+id/player_episode_list"
-                        tools:listitem="@layout/player_episodes"
-                        android:layout_width="200dp"
-                        android:layout_height="match_parent">
 
-                </androidx.recyclerview.widget.RecyclerView>
-            </LinearLayout>
-            -->
 
     </FrameLayout>
 
@@ -982,15 +1083,76 @@
         android:id="@+id/player_speedup_button"
         style="@style/Widget.MaterialComponents.Button.OutlinedButton"
         android:layout_width="45dp"
-        android:layout_height="44dp"
+        android:layout_height="45dp"
         android:layout_gravity="center_horizontal"
-        android:layout_marginTop="70dp"
-        app:iconGravity="top"
+        android:layout_marginTop="30dp"
+        app:iconPadding="0dp"
+        app:iconGravity="textStart"
         android:clickable="false"
+        android:focusable="false"
         android:textAllCaps="false"
         android:visibility="gone"
         app:icon="@drawable/speedup"
-        app:iconTint="?attr/textColor"
-        app:rippleColor="?attr/colorPrimary"
+        app:iconTint="@color/textColor"
+        android:foreground="@null"
+        android:backgroundTint="@color/skipOpTransparent"
         tools:visibility="visible" />
+    <LinearLayout
+        android:id="@+id/player_episodes_button_root"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:layout_gravity="end|center_vertical"
+        >
+        <ImageView
+            android:padding="15dp"
+            android:id="@+id/player_episodes_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:foregroundGravity="center"
+            android:src="@drawable/ic_baseline_arrow_back_ios_24"
+            android:background="@drawable/video_tap_button_always_white"
+            app:tint="@android:color/white"
+            tools:ignore="ContentDescription" />
+        <TextView
+            android:id="@+id/player_episodes_button_text"
+            style="@style/ResultMarqueeButtonText"
+            android:layout_marginTop="5dp"
+            android:text="@string/episodes"
+            android:visibility="gone" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/player_episode_overlay"
+        android:visibility="gone"
+        android:padding="5dp"
+        android:background="?attr/primaryBlackBackground"
+        android:orientation="vertical"
+        android:layout_gravity="end"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent">
+
+        <TextView
+            android:id="@+id/player_episode_overlay_title"
+            android:padding="10dp"
+            style="@style/WatchHeaderText"
+            android:textSize="15sp"
+            android:layout_marginEnd="0dp"
+            android:text="@string/episodes"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:requiresFadingEdge="vertical"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+            android:id="@+id/player_episode_list"
+            tools:listitem="@layout/player_episodes"
+            android:nextFocusLeft="@id/player_episodes_button"
+            android:layout_width="350dp"
+            android:layout_height="match_parent"
+            android:clipToPadding="false"
+            android:descendantFocusability="afterDescendants">
+
+        </androidx.recyclerview.widget.RecyclerView>
+    </LinearLayout>
 </FrameLayout>
\ No newline at end of file
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 0b4ac71d0dc..3a3076943a8 100644
--- a/app/src/main/res/layout/player_custom_layout_tv.xml
+++ b/app/src/main/res/layout/player_custom_layout_tv.xml
@@ -5,10 +5,95 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:screenOrientation="landscape"
     android:tag="television"
     tools:orientation="vertical">
 
+    <FrameLayout
+        android:id="@+id/player_metadata_scrim"
+        android:layout_width="680dp"
+        android:layout_height="match_parent"
+        android:background="@drawable/bg_player_metadata_scrim_netflix"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <LinearLayout
+            android:id="@+id/player_metadata_overlay"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:orientation="vertical"
+            android:paddingStart="64dp"
+            android:paddingEnd="32dp"
+            android:paddingBottom="32dp">
+
+            <!-- TITLE / LOGO -->
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="88dp">
+
+                <ImageView
+                    android:id="@+id/player_movie_logo"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:adjustViewBounds="true"
+                    android:scaleType="fitStart"
+                    android:visibility="gone"
+                    tools:visibility="visible" />
+
+                <TextView
+                    android:id="@+id/player_movie_title"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:ellipsize="end"
+                    android:maxLines="2"
+                    android:shadowColor="@android:color/black"
+                    android:shadowDx="2"
+                    android:shadowDy="2"
+                    android:shadowRadius="4"
+                    android:textColor="@android:color/white"
+                    android:textSize="30sp"
+                    android:textStyle="bold"
+                    tools:text="Zootopia 2" />
+            </FrameLayout>
+
+            <!-- GENRES / YEAR / RATING -->
+            <TextView
+                android:id="@+id/player_movie_meta"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="12dp"
+                android:maxLines="2"
+                android:textColor="#B3FFFFFF"
+                android:textSize="14sp"
+                tools:text="Animation • Action • Adventure • 2025 • ⭐ 7.6" />
+
+            <!-- SYNOPSIS -->
+            <TextView
+                android:id="@+id/player_movie_overview"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="20dp"
+                android:lineSpacingExtra="8dp"
+                android:maxLines="5"
+                android:shadowColor="@android:color/black"
+                android:shadowDx="2"
+                android:shadowDy="2"
+                android:shadowRadius="4"
+                android:textColor="#E6FFFFFF"
+                android:textSize="16sp"
+                tools:text="Brave rabbit cop Judy Hopps..." />
+
+        </LinearLayout>
+
+        <ImageView
+            android:id="@+id/video_outline"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:src="@drawable/video_outline"
+            android:visibility="gone" />
+    </FrameLayout>
 
     <FrameLayout
         android:id="@+id/piphide"
@@ -88,6 +173,7 @@
 
                 <ProgressBar
                     android:id="@+id/player_progressbar_left_level1"
+                    style="@android:style/Widget.Material.ProgressBar.Horizontal"
                     android:layout_width="5dp"
                     android:layout_height="150dp"
                     android:layout_centerInParent="true"
@@ -99,11 +185,11 @@
                     android:progressDrawable="@drawable/progress_drawable_vertical"
                     android:progressTint="@color/white"
                     android:progressTintMode="src_in"
-                    tools:progress="30"
-                    style="@android:style/Widget.Material.ProgressBar.Horizontal" />
+                    tools:progress="30" />
 
                 <ProgressBar
                     android:id="@+id/player_progressbar_left_level2"
+                    style="@android:style/Widget.Material.ProgressBar.Horizontal"
                     android:layout_width="5dp"
                     android:layout_height="150dp"
                     android:layout_centerInParent="true"
@@ -115,8 +201,7 @@
                     android:progressDrawable="@drawable/progress_drawable_vertical"
                     android:progressTint="@color/colorPrimaryOrange"
                     android:progressTintMode="src_in"
-                    tools:progress="0"
-                    style="@android:style/Widget.Material.ProgressBar.Horizontal" />
+                    tools:progress="0" />
             </RelativeLayout>
 
             <RelativeLayout
@@ -147,7 +232,7 @@
                 </ImageView>
 
                 <ProgressBar
-                    android:id="@+id/player_progressbar_right"
+                    android:id="@+id/player_progressbar_right_level1"
                     style="@android:style/Widget.Material.ProgressBar.Horizontal"
                     android:layout_width="5dp"
                     android:layout_height="150dp"
@@ -157,7 +242,24 @@
                     android:indeterminate="false"
                     android:max="100"
                     android:progress="100"
-                    android:progressDrawable="@drawable/progress_drawable_vertical" />
+                    android:progressDrawable="@drawable/progress_drawable_vertical"
+                    android:progressTint="@color/white"
+                    android:progressTintMode="src_in" />
+
+                <ProgressBar
+                    android:id="@+id/player_progressbar_right_level2"
+                    style="@android:style/Widget.Material.ProgressBar.Horizontal"
+                    android:layout_width="5dp"
+                    android:layout_height="150dp"
+                    android:layout_centerInParent="true"
+                    android:layout_gravity="end|center_vertical"
+                    android:layout_marginEnd="40dp"
+                    android:indeterminate="false"
+                    android:max="100"
+                    android:progress="0"
+                    android:progressDrawable="@drawable/progress_drawable_vertical"
+                    android:progressTint="@color/colorPrimaryOrange"
+                    android:progressTintMode="src_in" />
             </RelativeLayout>
         </LinearLayout>
 
@@ -221,23 +323,18 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/skip_chapter_button"
-                style="@style/NiceButton"
+                style="@style/VideoButtonTV"
                 android:layout_width="150dp"
                 android:layout_height="40dp"
                 android:layout_marginEnd="100dp"
-                android:backgroundTint="@color/skipOpTransparent"
                 android:maxLines="1"
                 android:nextFocusLeft="@id/player_pause_play"
                 android:nextFocusUp="@id/player_restart"
                 android:nextFocusDown="@id/player_pause_play"
-                android:padding="10dp"
-                android:textColor="@color/white"
+                android:textSize="15sp"
                 android:visibility="gone"
-                app:cornerRadius="@dimen/rounded_button_radius"
                 app:layout_constraintBottom_toTopOf="@+id/bottom_player_bar"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:strokeColor="@color/white"
-                app:strokeWidth="1dp"
                 tools:text="Skip Opening"
                 tools:visibility="visible" />
 
@@ -254,9 +351,39 @@
                     android:layout_marginEnd="32dp"
                     android:orientation="vertical">
 
+                    <LinearLayout
+                        android:id="@+id/player_video_title_holder"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="end">
+
+                        <TextView
+                            android:id="@+id/player_video_title"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="end"
+                            android:gravity="end"
+                            android:maxWidth="600dp"
+                            android:maxLines="2"
+                            android:textAlignment="viewEnd"
+                            android:textColor="@color/white"
+                            android:textSize="16sp"
+                            android:textStyle="bold"
+                            tools:text="Hello world" />
+
+                        <ImageView
+                            android:id="@+id/offline_pin"
+                            android:layout_width="18dp"
+                            android:layout_height="18dp"
+                            android:layout_gravity="start"
+                            android:layout_marginStart="2dp"
+                            android:src="@drawable/ic_offline_pin_24"
+                            android:visibility="gone"
+                            tools:visibility="visible" />
+                    </LinearLayout>
+
                     <TextView
-                        android:maxLines="2"
-                        android:id="@+id/player_video_title"
+                        android:id="@+id/player_video_title_rez"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="end"
@@ -265,20 +392,20 @@
                         android:textAlignment="viewEnd"
                         android:textColor="@color/white"
                         android:textSize="16sp"
-                        android:textStyle="bold"
-                        tools:text="Hello world" />
+                        tools:text="1920x1080" />
 
                     <TextView
-                        android:id="@+id/player_video_title_rez"
+                        android:id="@+id/player_video_info"
                         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:layout_marginStart="6dp"
+                        android:layout_marginBottom="2.5dp"
+                        android:textColor="#B3FFFFFF"
                         android:textSize="16sp"
-                        tools:text="1920x1080" />
+                        android:visibility="gone"
+                        tools:text="HEVC • English • 5.1 • E-AC3" />
+
 
                     <FrameLayout
                         android:id="@+id/player_episode_filler_holder"
@@ -418,7 +545,6 @@
 
                     </LinearLayout>
 
-
                     <LinearLayout
                         android:id="@+id/download_both_header"
                         android:layout_width="60dp"
@@ -437,7 +563,7 @@
                             android:contentDescription="@string/torrent_singular"
                             android:focusable="true"
                             android:nextFocusLeft="@id/player_go_forward"
-                            android:nextFocusRight="@id/download_header_toggle"
+                            android:nextFocusRight="@id/player_episodes_button"
                             android:nextFocusUp="@id/download_header_toggle"
                             android:nextFocusDown="@id/player_pause_play"
                             android:src="@drawable/baseline_downloading_24"
@@ -454,6 +580,40 @@
 
                     </LinearLayout>
 
+                    <LinearLayout
+                        android:id="@+id/player_episodes_button_root"
+                        android:layout_width="60dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="20dp"
+                        android:orientation="vertical">
+
+                        <ImageView
+                            android:id="@+id/player_episodes_button"
+                            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/episodes"
+                            android:focusable="true"
+                            android:nextFocusLeft="@id/download_header_toggle"
+                            android:nextFocusRight="@id/player_episode_overlay"
+                            android:nextFocusUp="@id/player_episodes_button"
+                            android:nextFocusDown="@id/player_pause_play"
+                            android:src="@drawable/ic_baseline_sort_24"
+                            android:tag="@string/tv_no_focus_tag"
+                            app:tint="@android:color/white" />
+
+                        <TextView
+                            android:id="@+id/player_episodes_button_text"
+                            style="@style/ResultMarqueeButtonText"
+                            android:layout_marginTop="5dp"
+                            android:text="@string/episodes"
+                            android:visibility="invisible"
+                            tools:visibility="visible" />
+
+                    </LinearLayout>
+
                     <androidx.cardview.widget.CardView
                         android:id="@+id/download_header"
                         android:layout_width="200dp"
@@ -764,7 +924,7 @@
                             android:scaleType="centerCrop" />
                     </FrameLayout>
 
-                    <com.github.rubensousa.previewseekbar.media3.PreviewTimeBar
+                    <com.lagradost.cloudstream3.ui.player.live.LivePreviewTimeBar
                         android:id="@id/exo_progress"
                         android:layout_width="0dp"
                         android:layout_height="30dp"
@@ -798,6 +958,24 @@
                         app:layout_constraintEnd_toEndOf="parent"
                         tools:text="23:20" />
 
+                    <TextView
+                        android:id="@+id/time_live"
+                        android:layout_width="wrap_content"
+                        android:layout_height="30dp"
+                        android:layout_gravity="center|center_vertical"
+                        android:layout_marginEnd="20dp"
+                        android:includeFontPadding="false"
+                        android:minWidth="50dp"
+                        android:paddingLeft="4dp"
+                        android:paddingRight="4dp"
+                        android:text="@string/player_is_live"
+                        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" />
+
                     <TextView
                         android:id="@+id/time_left"
                         android:layout_width="wrap_content"
@@ -820,6 +998,7 @@
 
 
                 <HorizontalScrollView
+                    android:id="@+id/player_controls_scroll"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center">
@@ -940,19 +1119,56 @@
         android:layout_height="match_parent">
 
     </FrameLayout>
+
     <com.google.android.material.button.MaterialButton
         android:id="@+id/player_speedup_button"
         style="@style/Widget.MaterialComponents.Button.OutlinedButton"
         android:layout_width="45dp"
-        android:layout_height="44dp"
+        android:layout_height="45dp"
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="70dp"
-        app:iconGravity="top"
         android:clickable="false"
         android:textAllCaps="false"
         android:visibility="gone"
         app:icon="@drawable/speedup"
-        app:iconTint="?attr/textColor"
+        app:iconGravity="top"
+        app:iconTint="@color/textColor"
         app:rippleColor="?attr/colorPrimary"
         tools:visibility="visible" />
+
+
+    <LinearLayout
+        android:id="@+id/player_episode_overlay"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_gravity="end"
+        android:background="?attr/primaryBlackBackground"
+        android:orientation="vertical"
+        android:padding="5dp"
+        android:visibility="gone">
+
+        <TextView
+            android:id="@+id/player_episode_overlay_title"
+            style="@style/WatchHeaderText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="0dp"
+            android:padding="10dp"
+            android:text="@string/episodes"
+            android:textSize="15sp" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/player_episode_list"
+            android:layout_width="400dp"
+            android:layout_height="match_parent"
+            android:clipToPadding="false"
+            android:descendantFocusability="afterDescendants"
+            android:nextFocusLeft="@id/player_episodes_button"
+            android:requiresFadingEdge="vertical"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+            tools:listitem="@layout/player_episodes">
+
+        </androidx.recyclerview.widget.RecyclerView>
+    </LinearLayout>
+
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/player_episodes.xml b/app/src/main/res/layout/player_episodes.xml
deleted file mode 100644
index a491bc0961f..00000000000
--- a/app/src/main/res/layout/player_episodes.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-    <include android:visibility="gone" layout="@layout/player_episodes_small" />
-    <include android:visibility="gone" layout="@layout/player_episodes_large" />
-</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/player_episodes_large.xml b/app/src/main/res/layout/player_episodes_large.xml
deleted file mode 100644
index 476965635c3..00000000000
--- a/app/src/main/res/layout/player_episodes_large.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools"
-
-        android:id="@+id/episode_holder_large"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-
-        app:cardCornerRadius="@dimen/rounded_image_radius"
-        app:cardBackgroundColor="@color/transparent"
-        app:cardElevation="0dp"
-        android:foreground="@drawable/outline_drawable"
-        android:layout_marginBottom="5dp">
-    <!-- IDK BUT THIS DOES NOT SEAM LIKE A GOOD WAY OF DOING IT -->
-    <!--<LinearLayout
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:orientation="horizontal">
-        <View
-                android:layout_weight="0.5"
-                android:id="@+id/episode_view_procentage"
-                android:alpha="0.2"
-                android:background="?attr/colorPrimary"
-                android:layout_width="0dp"
-                android:layout_height="match_parent">
-        </View>
-        <View
-                android:id="@+id/episode_view_procentage_off"
-                android:layout_weight="0.10"
-                android:alpha="0"
-                android:background="@color/transparent"
-                android:layout_width="0dp"
-                android:layout_height="match_parent">
-        </View>
-    </LinearLayout>-->
-    <androidx.cardview.widget.CardView
-            android:layout_width="200dp"
-            android:layout_height="114dp"
-            android:foreground="@drawable/outline_drawable">
-
-        <ImageView
-                android:nextFocusRight="@id/episode_holder"
-
-                android:id="@+id/episode_poster"
-                tools:src="@drawable/example_poster"
-                android:foreground="?android:attr/selectableItemBackgroundBorderless"
-
-                android:scaleType="centerCrop"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:contentDescription="@string/episode_poster_img_des" />
-
-        <ImageView
-                android:src="@drawable/play_button"
-                android:layout_gravity="center"
-                android:layout_width="57dp"
-                android:layout_height="57dp"
-                android:contentDescription="@string/play_episode" />
-
-        <androidx.core.widget.ContentLoadingProgressBar
-                android:layout_marginBottom="-1.5dp"
-                android:id="@+id/episode_progress"
-                android:progressTint="?attr/colorPrimary"
-                android:progressBackgroundTint="?attr/colorPrimary"
-                style="@android:style/Widget.Material.ProgressBar.Horizontal"
-                android:layout_width="match_parent"
-                tools:progress="50"
-                android:layout_gravity="bottom"
-                android:layout_height="5dp" />
-    </androidx.cardview.widget.CardView>
-
-
-  <!--  <LinearLayout
-            android:foreground="?android:attr/selectableItemBackgroundBorderless"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-        <com.google.android.material.button.MaterialButton
-                android:layout_marginStart="10dp"
-
-                android:layout_gravity="center"
-                style="@style/SmallBlackButton"
-                android:text="@string/filler"
-                android:id="@+id/episode_filler" />
-
-        <TextView
-                android:id="@+id/episode_text"
-                android:layout_marginStart="10dp"
-                android:layout_marginEnd="50dp"
-                android:layout_gravity="center_vertical"
-                android:gravity="center_vertical"
-                tools:text="Episode 1"
-                android:textColor="?attr/textColor"
-
-                android:scrollHorizontally="true"
-                android:ellipsize="marquee"
-
-                android:marqueeRepeatLimit="0"
-                android:singleLine="true"
-
-                android:layout_width="match_parent"
-                android:layout_height="match_parent" />
-    </LinearLayout>-->
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/player_episodes_small.xml b/app/src/main/res/layout/player_episodes_small.xml
deleted file mode 100644
index 62dd4bca1b0..00000000000
--- a/app/src/main/res/layout/player_episodes_small.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools"
-
-        android:id="@+id/episode_holder"
-        android:layout_width="match_parent"
-        android:layout_height="50dp"
-
-        app:cardBackgroundColor="@color/transparent"
-        app:cardElevation="0dp"
-        android:foreground="@drawable/outline_drawable">
-
-    <androidx.core.widget.ContentLoadingProgressBar
-            android:layout_marginBottom="-1.5dp"
-            android:id="@+id/episode_progress"
-            android:progressTint="?attr/colorPrimary"
-            android:progressBackgroundTint="?attr/colorPrimary"
-            style="@android:style/Widget.Material.ProgressBar.Horizontal"
-            android:layout_width="match_parent"
-            tools:progress="50"
-            android:layout_gravity="bottom"
-            android:layout_height="5dp" />
-
-    <LinearLayout
-            android:foreground="?android:attr/selectableItemBackgroundBorderless"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-        <!--marquee_forever-->
-        <com.google.android.material.button.MaterialButton
-                android:layout_marginStart="10dp"
-
-                android:layout_gravity="center"
-                style="@style/SmallBlackButton"
-                android:text="@string/filler"
-                android:id="@+id/episode_filler" />
-
-        <TextView
-                android:id="@+id/episode_text"
-                android:layout_marginStart="10dp"
-                android:layout_gravity="center_vertical"
-                android:gravity="center_vertical"
-                tools:text="Episode 1"
-                android:textColor="?attr/textColor"
-
-                android:scrollHorizontally="true"
-                android:ellipsize="marquee"
-
-                android:marqueeRepeatLimit="0"
-                android:singleLine="true"
-
-                android:layout_width="match_parent"
-                android:layout_height="match_parent" />
-    </LinearLayout>
-</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/player_quality_profile_dialog.xml b/app/src/main/res/layout/player_quality_profile_dialog.xml
index 7bd7a680237..c01118b5134 100644
--- a/app/src/main/res/layout/player_quality_profile_dialog.xml
+++ b/app/src/main/res/layout/player_quality_profile_dialog.xml
@@ -22,7 +22,7 @@
             android:paddingTop="10dp"
             android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
             android:paddingBottom="10dp"
-            android:text="@string/profiles"
+            android:text="@string/source_priority"
             android:textColor="?attr/textColor"
             android:textSize="20sp"
             android:textStyle="bold" />
@@ -94,6 +94,12 @@
             </LinearLayout>
         </LinearLayout>
 
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/apply_btt"
+            style="@style/WhiteButton"
+            android:layout_width="wrap_content"
+            android:text="@string/sort_apply" />
+
         <com.google.android.material.button.MaterialButton
             android:id="@+id/cancel_btt"
             style="@style/BlackButton"
diff --git a/app/src/main/res/layout/player_quality_profile_item.xml b/app/src/main/res/layout/player_quality_profile_item.xml
index 5178a12f3ab..deb70b0d0f5 100644
--- a/app/src/main/res/layout/player_quality_profile_item.xml
+++ b/app/src/main/res/layout/player_quality_profile_item.xml
@@ -10,14 +10,17 @@
         android:id="@+id/card_view"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:focusable="true"
-        app:layout_constraintDimensionRatio="1"
-        android:layout_marginStart="10dp"
+        android:layout_marginStart="5dp"
+        android:layout_marginEnd="5dp"
         android:animateLayoutChanges="true"
-        android:backgroundTint="?attr/primaryGrayBackground"
+        android:backgroundTint="@color/primaryGrayBackground"
+        android:focusable="true"
         android:foreground="?attr/selectableItemBackgroundBorderless"
+        android:maxWidth="220dp"
+        android:maxHeight="220dp"
         app:cardCornerRadius="@dimen/rounded_image_radius"
         app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintDimensionRatio="1"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHeight_percent="0.4"
         app:layout_constraintStart_toStartOf="parent"
@@ -29,7 +32,8 @@
             android:layout_height="match_parent"
             android:alpha="0.4"
             android:contentDescription="@string/profile_background_des"
-            android:scaleType="centerCrop" />
+            android:scaleType="centerCrop"
+            tools:src="@drawable/profile_bg_teal" />
 
         <View
             android:id="@+id/outline"
@@ -39,29 +43,79 @@
             android:visibility="gone"
             tools:visibility="visible" />
 
-        <TextView
-            android:id="@+id/profile_text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:gravity="center"
-            android:padding="10dp"
-            android:textSize="16sp"
-            tools:text="@string/mobile_data" />
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/text_is_wifi"
+                style="@style/DubButton"
+                android:layout_height="0dp"
+                android:layout_gravity="end"
+                android:layout_margin="2dp"
+                android:autoSizeMaxTextSize="20sp"
+                android:autoSizeTextType="uniform"
+                android:minHeight="30dp"
+                android:text="@string/wifi"
+                android:textColor="@color/textColor"
+                android:textStyle="normal"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHeight_percent="0.2"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
 
-        <TextView
-            android:id="@+id/text_is_wifi"
-            style="@style/DubButton"
-            android:layout_gravity="end"
-            android:text="@string/wifi"
-            android:textColor="@color/textColor" />
+            <TextView
+                android:id="@+id/text_is_mobile_data"
+                style="@style/DubButton"
+                android:layout_height="0dp"
+                android:layout_gravity="end"
+                android:layout_margin="2dp"
+                android:autoSizeMaxTextSize="20sp"
+                android:autoSizeTextType="uniform"
+                android:minHeight="30dp"
+                android:text="@string/mobile_data"
+                android:textColor="@color/textColor"
+                android:textStyle="normal"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHeight_percent="0.2"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/text_is_wifi" />
+
+            <TextView
+                android:id="@+id/text_is_download_data"
+                style="@style/DubButton"
+                android:layout_height="0dp"
+                android:layout_gravity="end"
+                android:layout_margin="2dp"
+                android:autoSizeMaxTextSize="20sp"
+                android:autoSizeTextType="uniform"
+                android:minHeight="30dp"
+                android:text="@string/download"
+                android:textColor="@color/textColor"
+                android:textStyle="normal"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHeight_percent="0.2"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/text_is_mobile_data" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
-        <TextView
-            android:id="@+id/text_is_mobile_data"
-            style="@style/DubButton"
-            android:layout_gravity="end"
-            android:text="@string/mobile_data"
-            android:textColor="@color/textColor" />
 
     </androidx.cardview.widget.CardView>
+
+    <TextView
+        android:id="@+id/profile_text"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:ellipsize="end"
+        android:gravity="center"
+        android:lines="2"
+        android:padding="10dp"
+        android:textColor="@color/textColor"
+        android:textSize="16sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/card_view"
+        tools:text="@string/mobile_data" />
 </androidx.constraintlayout.widget.ConstraintLayout>
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 f277aee73ab..15a0a9bd94c 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
@@ -155,6 +155,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
+                android:baselineAligned="false"
                 android:orientation="horizontal">
 
                 <ListView
diff --git a/app/src/main/res/layout/player_select_source_priority.xml b/app/src/main/res/layout/player_select_source_priority.xml
index 2af3c339ac9..182cd186141 100644
--- a/app/src/main/res/layout/player_select_source_priority.xml
+++ b/app/src/main/res/layout/player_select_source_priority.xml
@@ -91,11 +91,11 @@
                         android:layout_width="50dp"
                         android:layout_height="50dp"
                         android:background="?attr/selectableItemBackgroundBorderless"
-                        android:padding="12dp"
+                        android:contentDescription="@string/help"
                         android:focusable="true"
                         android:nextFocusLeft="@id/sort_sources"
-                        android:src="@drawable/baseline_help_outline_24"
-                        android:contentDescription="@string/help" />
+                        android:padding="12dp"
+                        android:src="@drawable/baseline_help_outline_24" />
 
                 </LinearLayout>
 
@@ -142,16 +142,17 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
+            android:layout_marginHorizontal="?android:attr/listPreferredItemPaddingStart"
+            android:autofillHints="username"
             android:inputType="text"
             android:maxLength="32"
-            android:layout_marginHorizontal="?android:attr/listPreferredItemPaddingStart"
             android:paddingStart="?android:attr/listPreferredItemPaddingStart"
             android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
             android:textColor="?attr/textColor"
             android:textSize="20sp"
             android:textStyle="bold"
-            tools:text="@string/profile_number"
-            android:autofillHints="username" />
+            tools:ignore="LabelFor"
+            tools:text="@string/profile_number" />
         <!--        <ImageView-->
         <!--            android:layout_width="50dp"-->
         <!--            android:layout_height="50dp"-->
diff --git a/app/src/main/res/layout/quick_search.xml b/app/src/main/res/layout/quick_search.xml
index 84f2c548cae..492eab78a74 100644
--- a/app/src/main/res/layout/quick_search.xml
+++ b/app/src/main/res/layout/quick_search.xml
@@ -1,73 +1,72 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        style="@style/DarkFragment"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
 
-        xmlns:tools="http://schemas.android.com/tools"
-        android:id="@+id/quick_search_root"
-        android:background="?attr/primaryGrayBackground"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
+    android:id="@+id/quick_search_root"
+    style="@style/DarkFragment"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?attr/primaryGrayBackground"
+    android:orientation="vertical">
 
     <LinearLayout
-            android:visibility="visible"
-            android:layout_margin="10dp"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="10dp"
+        android:visibility="visible">
 
         <ImageView
             android:id="@+id/quick_search_back"
+            android:layout_width="25dp"
+            android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:foregroundGravity="center"
             android:background="?android:attr/selectableItemBackgroundBorderless"
+            android:foregroundGravity="center"
             android:src="@drawable/ic_baseline_arrow_back_24"
-            app:tint="@android:color/white"
             android:visibility="gone"
-            android:layout_width="25dp"
-            android:layout_height="wrap_content"
-            tools:visibility="visible">
-        </ImageView>
+            app:tint="?attr/white"
+            tools:visibility="visible" />
 
         <FrameLayout
-                android:layout_marginStart="10dp"
-                android:background="@drawable/search_background"
-                android:layout_gravity="center_vertical"
-                android:layout_width="match_parent"
-                android:layout_height="40dp">
+            android:layout_width="match_parent"
+            android:layout_height="40dp"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="10dp"
+            android:background="@drawable/search_background">
 
             <androidx.appcompat.widget.SearchView
-                    android:nextFocusRight="@id/search_filter"
-                    android:nextFocusLeft="@id/search_filter"
-                    android:nextFocusDown="@id/search_autofit_results"
+                android:id="@+id/quick_search"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
 
-                    android:imeOptions="actionSearch"
-                    android:inputType="text"
+                android:layout_gravity="center_vertical"
+                android:iconifiedByDefault="false"
 
-                    android:id="@+id/quick_search"
-                    app:queryBackground="@color/transparent"
+                android:imeOptions="actionSearch"
+                android:inputType="text"
 
-                    app:searchIcon="@drawable/search_icon"
-                    app:closeIcon="@drawable/ic_baseline_close_24"
+                android:nextFocusLeft="@id/search_filter"
+                android:nextFocusRight="@id/search_filter"
 
-                    android:paddingStart="-10dp"
-                    android:iconifiedByDefault="false"
-                    app:queryHint="@string/search_hint"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_gravity="center_vertical"
-                    app:iconifiedByDefault="false"
-                    tools:ignore="RtlSymmetry">
+                android:nextFocusDown="@id/search_autofit_results"
+                android:paddingStart="-10dp"
+                app:closeIcon="@drawable/ic_baseline_close_24"
+                app:iconifiedByDefault="false"
+                app:queryBackground="@color/transparent"
+                app:queryHint="@string/search_hint"
+                app:searchIcon="@drawable/search_icon"
+                tools:ignore="RtlSymmetry">
 
                 <androidx.core.widget.ContentLoadingProgressBar
-                        android:id="@+id/quick_search_loading_bar"
-                        android:layout_width="20dp"
-                        android:layout_height="20dp"
-                        android:layout_marginStart="-35dp"
-                        style="@style/Widget.AppCompat.ProgressBar"
-                        android:foregroundTint="@color/white"
-                        android:progressTint="@color/white"
-                        android:layout_gravity="center">
+                    android:id="@+id/quick_search_loading_bar"
+                    style="@style/Widget.AppCompat.ProgressBar"
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:layout_gravity="center"
+                    android:layout_marginStart="-35dp"
+                    android:foregroundTint="@color/white"
+                    android:progressTint="@color/white">
 
                 </androidx.core.widget.ContentLoadingProgressBar>
                 <!--app:queryHint="@string/search_hint"
@@ -79,28 +78,28 @@
     </LinearLayout>
 
     <androidx.recyclerview.widget.RecyclerView
-            android:descendantFocusability="afterDescendants"
+        android:id="@+id/quick_search_master_recycler"
 
-            android:background="?attr/primaryBlackBackground"
-            android:id="@+id/quick_search_master_recycler"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            tools:listitem="@layout/homepage_parent" />
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="?attr/primaryBlackBackground"
+        android:descendantFocusability="afterDescendants"
+        tools:listitem="@layout/homepage_parent" />
 
     <com.lagradost.cloudstream3.ui.AutofitRecyclerView
-            android:visibility="gone"
-            android:nextFocusLeft="@id/nav_rail_view"
-            android:descendantFocusability="afterDescendants"
+        android:id="@+id/quick_search_autofit_results"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
 
-            android:background="?attr/primaryBlackBackground"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:clipToPadding="false"
-            android:paddingStart="8dp"
-            android:paddingTop="5dp"
-            app:spanCount="3"
-            android:paddingEnd="8dp"
-            android:id="@+id/quick_search_autofit_results"
-            tools:listitem="@layout/search_result_grid"
-            android:orientation="vertical" />
+        android:background="?attr/primaryBlackBackground"
+        android:clipToPadding="false"
+        android:descendantFocusability="afterDescendants"
+        android:nextFocusLeft="@id/nav_rail_view"
+        android:orientation="vertical"
+        android:paddingStart="8dp"
+        android:paddingTop="5dp"
+        android:paddingEnd="8dp"
+        android:visibility="gone"
+        app:spanCount="3"
+        tools:listitem="@layout/search_result_grid" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/rail_footer.xml b/app/src/main/res/layout/rail_footer.xml
index 137d126929c..e1d604266e2 100644
--- a/app/src/main/res/layout/rail_footer.xml
+++ b/app/src/main/res/layout/rail_footer.xml
@@ -1,33 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/nav_footer_root"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:padding="1dp"
+    android:layout_gravity="bottom|center_horizontal"
     android:layout_marginBottom="10dp"
+    android:padding="1dp"
     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">
+    tools:visibility="visible">
 
     <androidx.cardview.widget.CardView
         android:id="@+id/nav_footer_profile_card"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
+        android:layout_width="36dp"
+        android:layout_height="36dp"
         android:background="@color/transparent"
-        app:cardCornerRadius="20dp"
         android:focusable="true"
-        android:foreground="@drawable/outline_drawable_round_20">
+        android:foreground="@drawable/outline_drawable_round_20"
+        android:nextFocusUp="@id/navigation_settings"
+        android:nextFocusDown="@id/nav_footer_profile_card"
+        app:cardCornerRadius="18dp">
 
         <ImageView
+            android:foreground="@drawable/outline_big_20_gray"
             android:id="@+id/nav_footer_profile_pic"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:contentDescription="@string/account"
             android:scaleType="centerCrop"
-            tools:src="@drawable/profile_bg_orange"
-            android:contentDescription="@string/account"/>
+            tools:src="@drawable/profile_bg_orange" />
 
     </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
index 8868b57befe..16ccd6c399a 100644
--- a/app/src/main/res/layout/rail_header.xml
+++ b/app/src/main/res/layout/rail_header.xml
@@ -13,7 +13,7 @@
             android:layout_height="24dp"
             app:itemIconTint="@color/item_select_color"
             android:focusable="true"
-            android:nextFocusRight="@id/home_preview_play_btt"
+            android:nextFocusRight="@id/home_preview_info_btt"
             android:src="@drawable/notifications_icon_selector"
             android:contentDescription="@string/account"
             app:tint="@color/item_select_color" />
diff --git a/app/src/main/res/layout/result_episode.xml b/app/src/main/res/layout/result_episode.xml
index 36d60bd65ca..19f6688899b 100644
--- a/app/src/main/res/layout/result_episode.xml
+++ b/app/src/main/res/layout/result_episode.xml
@@ -40,32 +40,39 @@
                 android:layout_height="match_parent">
         </View>
     </LinearLayout>-->
-    <androidx.core.widget.ContentLoadingProgressBar
-        android:id="@+id/episode_progress"
-        style="@android:style/Widget.Material.ProgressBar.Horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="5dp"
-        android:layout_gravity="bottom"
-        android:layout_marginBottom="-1.5dp"
-        android:progressBackgroundTint="?attr/colorPrimary"
-        android:progressTint="?attr/colorPrimary"
-        tools:progress="50" />
+<!--    <androidx.core.widget.ContentLoadingProgressBar-->
+<!--        android:id="@+id/episode_progress"-->
+<!--        style="@android:style/Widget.Material.ProgressBar.Horizontal"-->
+<!--        android:layout_width="match_parent"-->
+<!--        android:layout_height="5dp"-->
+<!--        android:layout_gravity="bottom"-->
+<!--        android:layout_marginBottom="-1.5dp"-->
+<!--        android:progressBackgroundTint="?attr/colorPrimary"-->
+<!--        android:progressTint="?attr/colorPrimary"-->
+<!--        tools:progress="50" />-->
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:foreground="?android:attr/selectableItemBackgroundBorderless">
+        android:foreground="?android:attr/selectableItemBackgroundBorderless"
+        android:orientation="horizontal">
 
-        <ImageView
-            android:id="@+id/episode_play"
+        <FrameLayout
+            android:id="@+id/watch_progress_container"
             android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_gravity="center_vertical"
-            android:layout_marginStart="10dp"
-            android:layout_marginEnd="10dp"
-            android:contentDescription="@string/episode_play_img_des"
-            android:src="@drawable/ic_baseline_play_arrow_24"
-            app:tint="?attr/textColor" />
+            android:layout_height="wrap_content"
+            android:layout_marginStart="5dp"
+            android:layout_gravity="center">
+
+            <ImageView
+                android:id="@+id/episode_play_icon"
+                style="@style/ContinueWatchingPlayUnderlayProgress"
+                android:layout_margin="4dp"/>
+
+            <com.google.android.material.progressindicator.CircularProgressIndicator
+                android:id="@+id/episode_progress"
+                style="@style/ContinueWatchingCircularProgress" />
+        </FrameLayout>
         <!--marquee_forever-->
         <com.google.android.material.button.MaterialButton
             android:id="@+id/episode_filler"
diff --git a/app/src/main/res/layout/result_episode_both_old.xml b/app/src/main/res/layout/result_episode_both_old.xml
deleted file mode 100644
index 6472ecc1002..00000000000
--- a/app/src/main/res/layout/result_episode_both_old.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:foreground="@drawable/outline_drawable">
-
-    <include
-        layout="@layout/result_episode"
-        android:visibility="gone" />
-
-    <include
-        layout="@layout/result_episode_large"
-        android:visibility="visible" />
-</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/result_episode_both_tv_old.xml b/app/src/main/res/layout/result_episode_both_tv_old.xml
deleted file mode 100644
index f273a118078..00000000000
--- a/app/src/main/res/layout/result_episode_both_tv_old.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:foreground="@drawable/outline_drawable">
-
-    <include
-        layout="@layout/result_episode_tv_old"
-        android:layout_width="wrap_content"
-        android:layout_height="50dp"
-        android:visibility="gone"
-        tools:visibility="visible" />
-
-    <include
-        layout="@layout/result_episode_large_tv_old"
-        android:layout_width="450dp"
-        android:layout_height="wrap_content"
-        android:visibility="gone"
-        tools:visibility="gone" />
-</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/result_episode_large.xml b/app/src/main/res/layout/result_episode_large.xml
index 935beac1a7e..5e003de3075 100644
--- a/app/src/main/res/layout/result_episode_large.xml
+++ b/app/src/main/res/layout/result_episode_large.xml
@@ -46,14 +46,14 @@
                     tools:src="@drawable/example_poster"
                     tools:visibility="invisible" />
 
-                <ImageView
-                    android:id="@+id/episode_play_icon"
-                    android:layout_width="36dp"
-                    android:layout_height="36dp"
-                    android:layout_gravity="center"
-                    android:contentDescription="@string/play_episode"
-                    android:src="@drawable/play_button"
-                    tools:visibility="invisible" />
+<!--                <ImageView-->
+<!--                    android:id="@+id/episode_play_icon"-->
+<!--                    android:layout_width="36dp"-->
+<!--                    android:layout_height="36dp"-->
+<!--                    android:layout_gravity="center"-->
+<!--                    android:contentDescription="@string/play_episode"-->
+<!--                    android:src="@drawable/play_button"-->
+<!--                    tools:visibility="invisible" />-->
 
                 <ImageView
                     android:id="@+id/episode_upcoming_icon"
@@ -64,16 +64,21 @@
                     android:visibility="gone"
                     tools:visibility="visible" />
 
-                <androidx.core.widget.ContentLoadingProgressBar
-                    android:id="@+id/episode_progress"
-                    style="@android:style/Widget.Material.ProgressBar.Horizontal"
-                    android:layout_width="match_parent"
-                    android:layout_height="5dp"
-                    android:layout_gravity="bottom"
-                    android:layout_marginBottom="-1.5dp"
-                    android:progressBackgroundTint="?attr/colorPrimary"
-                    android:progressTint="?attr/colorPrimary"
-                    tools:progress="50" />
+                <FrameLayout
+                    android:id="@+id/watch_progress_container"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center">
+
+                    <com.google.android.material.imageview.ShapeableImageView
+                        android:id="@+id/episode_play_icon"
+                        style="@style/EpisodePlayUnderlayProgress"
+                        />
+                    <com.google.android.material.progressindicator.CircularProgressIndicator
+                        android:id="@+id/episode_progress"
+                        style="@style/EpisodeCircularProgress"
+                        tools:progress="100" />
+                </FrameLayout>
             </androidx.cardview.widget.CardView>
 
             <LinearLayout
diff --git a/app/src/main/res/layout/result_episode_large_tv_old.xml b/app/src/main/res/layout/result_episode_large_tv_old.xml
deleted file mode 100644
index 3a7cef3ca98..00000000000
--- a/app/src/main/res/layout/result_episode_large_tv_old.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-
-    android:id="@+id/episode_holder_large"
-
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_marginBottom="10dp"
-    android:background="@drawable/outline_drawable"
-    app:cardBackgroundColor="?attr/boxItemBackground"
-
-    app:cardCornerRadius="@dimen/rounded_image_radius">
-
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="@drawable/outline_drawable"
-        android:orientation="vertical"
-        android:padding="10dp">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-            <!--app:cardCornerRadius="@dimen/roundedImageRadius"-->
-            <androidx.cardview.widget.CardView
-                android:layout_width="126dp"
-                android:layout_height="72dp"
-                android:foreground="@drawable/outline_drawable">
-
-                <ImageView
-                    android:id="@+id/episode_poster"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-
-                    android:contentDescription="@string/episode_poster_img_des"
-                    android:foreground="?android:attr/selectableItemBackgroundBorderless"
-                    android:scaleType="centerCrop"
-                    tools:src="@drawable/example_poster" />
-
-                <ImageView
-                    android:layout_width="36dp"
-                    android:layout_height="36dp"
-                    android:layout_gravity="center"
-                    android:contentDescription="@string/play_episode"
-                    android:src="@drawable/play_button" />
-
-                <androidx.core.widget.ContentLoadingProgressBar
-                    android:id="@+id/episode_progress"
-                    style="@android:style/Widget.Material.ProgressBar.Horizontal"
-                    android:layout_width="match_parent"
-                    android:layout_height="5dp"
-                    android:layout_gravity="bottom"
-                    android:layout_marginBottom="-1.5dp"
-                    android:progressBackgroundTint="?attr/colorPrimary"
-                    android:progressTint="?attr/colorPrimary"
-                    tools:progress="50" />
-            </androidx.cardview.widget.CardView>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_marginStart="15dp"
-                android:layout_marginEnd="50dp"
-                android:orientation="vertical">
-
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal">
-
-                    <com.google.android.material.button.MaterialButton
-                        android:id="@+id/episode_filler"
-                        style="@style/SmallWhiteButton"
-                        android:layout_gravity="start"
-                        android:layout_marginEnd="10dp"
-                        android:text="@string/filler" />
-
-                    <TextView
-                        android:id="@+id/episode_text"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:textColor="?attr/textColor"
-                        android:textStyle="bold"
-                        tools:text="1. Jobless" />
-                </LinearLayout>
-
-                <TextView
-                    android:id="@+id/episode_rating"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textColor="?attr/grayTextColor"
-                    tools:text="Rated: 8.8" />
-            </LinearLayout>
-        </LinearLayout>
-
-        <TextView
-            android:id="@+id/episode_descript"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:ellipsize="end"
-            android:maxLines="4"
-            android:paddingTop="10dp"
-            android:paddingBottom="10dp"
-            android:textColor="?attr/grayTextColor"
-            tools:text="Jon and Daenerys arrive in Winterfell and are met with skepticism. Sam learns about the fate of his family. Cersei gives Euron the reward he aims for. Theon follows his heart. Jon and Daenerys arrive in Winterfell and are met with skepticism. Sam learns about the fate of his family. Cersei gives Euron the reward he aims for. Theon follows his heart." />
-    </LinearLayout>
-</androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/result_episode_tv_old.xml b/app/src/main/res/layout/result_episode_tv_old.xml
deleted file mode 100644
index 62546cf9475..00000000000
--- a/app/src/main/res/layout/result_episode_tv_old.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-
-    android:id="@+id/episode_holder"
-    android:layout_width="wrap_content"
-    android:layout_height="50dp"
-
-    android:layout_marginBottom="5dp"
-    app:cardBackgroundColor="@color/transparent"
-    app:cardCornerRadius="@dimen/rounded_image_radius"
-    app:cardElevation="0dp">
-
-    <androidx.core.widget.ContentLoadingProgressBar
-        android:id="@+id/episode_progress"
-        style="@android:style/Widget.Material.ProgressBar.Horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="5dp"
-        android:layout_gravity="bottom"
-        android:layout_marginBottom="-1.5dp"
-        android:progressBackgroundTint="?attr/colorPrimary"
-        android:progressTint="?attr/colorPrimary"
-        tools:progress="50" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:paddingStart="20dp"
-        android:paddingEnd="20dp">
-
-        <!--marquee_forever-->
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/episode_filler"
-            style="@style/SmallWhiteButton"
-            android:layout_gravity="center"
-            android:layout_marginEnd="10dp"
-            android:gravity="center"
-            android:text="@string/filler"
-            tools:visibility="visible" />
-
-        <TextView
-            android:id="@+id/episode_text"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_gravity="center_vertical"
-            android:ellipsize="marquee"
-
-            android:gravity="center"
-            android:marqueeRepeatLimit="0"
-
-            android:scrollHorizontally="true"
-            android:singleLine="true"
-
-            android:textColor="?attr/textColor"
-            tools:text="Episode 1" />
-    </LinearLayout>
-</androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/result_sync.xml b/app/src/main/res/layout/result_sync.xml
index 8b7b33c08c6..af883633b1c 100644
--- a/app/src/main/res/layout/result_sync.xml
+++ b/app/src/main/res/layout/result_sync.xml
@@ -49,6 +49,7 @@
                     style="@style/AppEditStyle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:autofillHints="no"
                     android:inputType="number"
                     android:textColorHint="?attr/grayTextColor"
                     android:textSize="20sp"
diff --git a/app/src/main/res/layout/search_history_footer.xml b/app/src/main/res/layout/search_history_footer.xml
new file mode 100644
index 00000000000..d8f0d933b9e
--- /dev/null
+++ b/app/src/main/res/layout/search_history_footer.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.button.MaterialButton 
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/search_clear_call_history"
+    style="@style/BlackButton"
+    android:layout_width="match_parent"
+    android:layout_height="50dp"
+    android:layout_gravity="bottom"
+    android:layout_margin="0dp"
+    android:padding="0dp"
+    android:text="@string/clear_history"
+    app:cornerRadius="0dp"
+    app:icon="@drawable/delete_all" />
diff --git a/app/src/main/res/layout/search_history_item.xml b/app/src/main/res/layout/search_history_item.xml
index 4c50d0c0ca3..e72b484e858 100644
--- a/app/src/main/res/layout/search_history_item.xml
+++ b/app/src/main/res/layout/search_history_item.xml
@@ -13,7 +13,7 @@
       -->
     <TextView
         android:id="@+id/home_history_title"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:padding="10dp"
         android:textColor="?attr/textColor"
@@ -21,6 +21,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/home_history_remove"
         tools:text="Hello World" />
 
     <ImageView
diff --git a/app/src/main/res/layout/search_result_grid.xml b/app/src/main/res/layout/search_result_grid.xml
index cec7d4ced12..155803b7c9a 100644
--- a/app/src/main/res/layout/search_result_grid.xml
+++ b/app/src/main/res/layout/search_result_grid.xml
@@ -14,7 +14,7 @@
     <androidx.cardview.widget.CardView
         android:id="@+id/background_card"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:layout_margin="2dp"
         android:layout_marginBottom="2dp"
         android:elevation="10dp"
@@ -41,26 +41,10 @@
             android:src="@drawable/title_shadow"
             tools:ignore="ContentDescription" />
 
-        <TextView
-            android:id="@+id/imageText"
-
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="bottom"
-            android:ellipsize="end"
-            android:gravity="center"
-            android:maxLines="2"
-            android:paddingStart="5dp"
-            android:paddingTop="5dp"
-            android:paddingEnd="5dp"
-            android:paddingBottom="5dp"
-            android:textColor="@color/textColor"
-            android:textStyle="bold" />
-
         <TextView android:id="@+id/text_quality" style="@style/TypeButton" />
 
         <LinearLayout
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_gravity="end"
             android:orientation="vertical">
@@ -98,11 +82,36 @@
             android:layout_height="5dp"
             android:layout_gravity="bottom"
             android:layout_marginBottom="-1.5dp"
-            android:progressBackgroundTint="?attr/colorPrimary"
-            android:progressTint="?attr/colorPrimary"
+            android:progressBackgroundTint="?attr/white"
+            android:progressTint="?attr/white"
             android:visibility="gone"
             tools:progress="50"
             tools:visibility="visible" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom"
+            android:orientation="vertical"
+            android:paddingBottom="5dp">
+            <TextView
+                android:id="@+id/episode_text"
+                android:layout_width="wrap_content"
+                style="@style/EpisodeTextButton"
+                android:layout_gravity="center"/>
+            <TextView
+                android:id="@+id/imageText"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom"
+                android:ellipsize="end"
+                android:gravity="center"
+                android:maxLines="1"
+                android:paddingStart="5dp"
+                android:paddingEnd="5dp"
+                android:textColor="@color/textColor"
+                android:textStyle="bold"
+                tools:text="The Perfect Run" />
+        </LinearLayout>
     </androidx.cardview.widget.CardView>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/search_result_grid_expanded.xml b/app/src/main/res/layout/search_result_grid_expanded.xml
index c64486b4a22..b43d3b85268 100644
--- a/app/src/main/res/layout/search_result_grid_expanded.xml
+++ b/app/src/main/res/layout/search_result_grid_expanded.xml
@@ -17,7 +17,7 @@
         <androidx.cardview.widget.CardView
             android:id="@+id/background_card"
             android:layout_width="match_parent"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:layout_margin="2dp"
             android:layout_marginBottom="2dp"
             android:elevation="10dp"
@@ -43,7 +43,7 @@
                 style="@style/TypeButton" />
 
             <LinearLayout
-                android:layout_width="match_parent"
+                android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:layout_gravity="end"
                 android:orientation="vertical">
@@ -93,11 +93,23 @@
                 android:layout_height="5dp"
                 android:layout_gravity="bottom"
                 android:layout_marginBottom="-1.5dp"
-                android:progressBackgroundTint="?attr/colorPrimary"
-                android:progressTint="?attr/colorPrimary"
+                android:progressBackgroundTint="?attr/white"
+                android:progressTint="?attr/white"
                 android:visibility="gone"
                 tools:progress="50"
                 tools:visibility="visible" />
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom"
+                android:orientation="vertical"
+                android:paddingBottom="7dp">
+                <TextView
+                    android:id="@+id/episode_text"
+                    android:layout_width="wrap_content"
+                    style="@style/EpisodeTextButton"
+                    android:layout_gravity="center"/>
+            </LinearLayout>
         </androidx.cardview.widget.CardView>
     </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -117,4 +129,5 @@
         android:textColor="?attr/textColor"
         android:textSize="13sp"
         tools:text="The Perfect Run\nThe Perfect Run" />
+
 </LinearLayout>
diff --git a/app/src/main/res/layout/search_suggestion_footer.xml b/app/src/main/res/layout/search_suggestion_footer.xml
new file mode 100644
index 00000000000..929fd3b04c0
--- /dev/null
+++ b/app/src/main/res/layout/search_suggestion_footer.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.button.MaterialButton 
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/clear_suggestions_button"
+    style="@style/BlackButton"
+    android:layout_width="match_parent"
+    android:layout_height="50dp"
+    android:layout_gravity="bottom"
+    android:layout_margin="0dp"
+    android:padding="0dp"
+    android:text="@string/clear_suggestions"
+    app:cornerRadius="0dp"
+    app:icon="@drawable/ic_baseline_close_24" />
diff --git a/app/src/main/res/layout/search_suggestion_item.xml b/app/src/main/res/layout/search_suggestion_item.xml
new file mode 100644
index 00000000000..d07f7b06db2
--- /dev/null
+++ b/app/src/main/res/layout/search_suggestion_item.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/suggestion_item"
+    android:layout_width="match_parent"
+    android:layout_height="48dp"
+    android:background="?attr/selectableItemBackground"
+    android:gravity="center_vertical"
+    android:orientation="horizontal"
+    android:paddingStart="16dp"
+    android:paddingEnd="8dp">
+
+    <ImageView
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:contentDescription="@string/search_hint"
+        android:src="@drawable/search_icon"
+        app:tint="?attr/textColor" />
+
+    <TextView
+        android:id="@+id/suggestion_text"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_weight="1"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textColor="?attr/textColor"
+        android:textSize="18sp"
+        tools:text="Search suggestion" />
+
+    <ImageView
+        android:id="@+id/suggestion_fill"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:background="?attr/selectableItemBackgroundBorderless"
+        android:contentDescription="@string/search_hint"
+        android:padding="8dp"
+        android:src="@drawable/ic_baseline_north_west_24"
+        app:tint="?attr/textColor" />
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/settings_title_top.xml b/app/src/main/res/layout/settings_title_top.xml
index 1e3671a6fdc..64637140551 100644
--- a/app/src/main/res/layout/settings_title_top.xml
+++ b/app/src/main/res/layout/settings_title_top.xml
@@ -1,22 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:background="?attr/primaryGrayBackground"
-        android:id="@+id/settings_top_root"
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+    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/settings_top_root"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?attr/primaryGrayBackground"
+    android:orientation="vertical">
 
     <include layout="@layout/standard_toolbar" />
 
     <!-- Required ViewGroup for PreferenceFragmentCompat -->
     <FrameLayout
-            app:layout_behavior="@string/appbar_scrolling_view_behavior"
-            android:background="?attr/primaryBlackBackground"
-            android:id="@android:id/list_container"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
+        android:id="@android:id/list_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="?attr/primaryBlackBackground"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior"
+        tools:targetApi="n" />
+        <!-- list_container is actually defined by the support library, but lint doesn't know that it exists before API 24. -->
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/sort_bottom_single_choice.xml b/app/src/main/res/layout/sort_bottom_single_choice.xml
index 3d0a70ff32e..df2857e1483 100644
--- a/app/src/main/res/layout/sort_bottom_single_choice.xml
+++ b/app/src/main/res/layout/sort_bottom_single_choice.xml
@@ -17,4 +17,4 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@android:id/text1"
     style="@style/CheckLabel"
-    tools:text="hello" />
+    tools:text="hello" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/sort_bottom_single_provider_choice.xml b/app/src/main/res/layout/sort_bottom_single_provider_choice.xml
new file mode 100644
index 00000000000..657e2f2b87c
--- /dev/null
+++ b/app/src/main/res/layout/sort_bottom_single_provider_choice.xml
@@ -0,0 +1,22 @@
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+     >
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        style="@style/CheckLabel"
+        android:layout_gravity="center"
+        tools:text="hello" />
+    <ImageView
+        android:id="@+id/pinicon"
+        android:layout_width="50dp"
+        android:layout_height="24dp"
+        android:layout_gravity="end|center_vertical"
+        android:src="@drawable/pin_ic"
+        android:visibility="gone"
+        tools:visibility="visible"
+        tools:ignore="RtlHardcoded" />
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/speed_dialog.xml b/app/src/main/res/layout/speed_dialog.xml
new file mode 100644
index 00000000000..bb97914f1c8
--- /dev/null
+++ b/app/src/main/res/layout/speed_dialog.xml
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="500dp"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/speed_text"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_margin="20dp"
+        android:gravity="center_horizontal"
+        android:text="1.00x"
+        android:textSize="20sp"
+        tools:ignore="HardcodedText" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
+            android:id="@+id/speed_minus"
+            style="@style/ExtendedFloatingActionButton"
+            android:layout_gravity="center_vertical"
+
+            android:foreground="@drawable/outline_drawable"
+            android:nextFocusLeft="@id/speed_plus"
+            android:nextFocusRight="@id/speed_bar"
+            android:nextFocusUp="@id/speed_minus"
+            android:nextFocusDown="@id/speed_25"
+            android:src="@drawable/media3_icon_minus"
+            app:tint="?attr/textColor" />
+
+        <com.google.android.material.slider.Slider
+            android:id="@+id/speed_bar"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_weight="1"
+            android:nextFocusLeft="@id/speed_minus"
+            android:nextFocusRight="@id/speed_plus"
+            android:nextFocusUp="@id/speed_bar"
+            android:nextFocusDown="@id/speed_125"
+            android:progressTint="?attr/white"
+            android:stepSize="0.05"
+            android:thumbTint="?attr/white"
+            android:value="1.0"
+            android:valueFrom="0.1"
+            android:valueTo="2.0"
+            app:labelStyle="@style/BlackLabel"
+            app:thumbColor="?attr/white"
+            app:tickVisible="false"
+            app:trackColorActive="?attr/white"
+            app:trackColorInactive="?attr/primaryGrayBackground">
+
+            <requestFocus />
+        </com.google.android.material.slider.Slider>
+
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
+            android:id="@+id/speed_plus"
+            style="@style/ExtendedFloatingActionButton"
+            android:layout_gravity="center_vertical"
+            android:foreground="@drawable/outline_drawable"
+            android:nextFocusLeft="@id/speed_bar"
+            android:nextFocusRight="@id/speed_minus"
+            android:nextFocusDown="@id/speed_200"
+            android:src="@drawable/media3_icon_plus"
+            app:tint="?attr/textColor" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="14dp">
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/speed_25"
+            style="@style/BlackButton"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:nextFocusLeft="@id/speed_200"
+            android:nextFocusRight="@id/speed_100"
+            android:nextFocusUp="@id/speed_minus"
+            android:nextFocusDown="@id/speed_25"
+            android:text="0.25x"
+            tools:ignore="HardcodedText" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/speed_100"
+            style="@style/BlackButton"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:nextFocusLeft="@id/speed_25"
+            android:nextFocusRight="@id/speed_125"
+            android:nextFocusUp="@id/speed_bar"
+            android:nextFocusDown="@id/speed_100"
+            android:text="1.0x"
+            tools:ignore="HardcodedText" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/speed_125"
+            style="@style/BlackButton"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:nextFocusLeft="@id/speed_100"
+            android:nextFocusRight="@id/speed_150"
+            android:nextFocusUp="@id/speed_bar"
+            android:nextFocusDown="@id/speed_125"
+            android:text="1.25x"
+            tools:ignore="HardcodedText" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/speed_150"
+            style="@style/BlackButton"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:nextFocusLeft="@id/speed_125"
+            android:nextFocusRight="@id/speed_200"
+            android:nextFocusUp="@id/speed_bar"
+            android:nextFocusDown="@id/speed_150"
+            android:text="1.5x"
+            tools:ignore="HardcodedText" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/speed_200"
+            style="@style/BlackButton"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:nextFocusLeft="@id/speed_150"
+            android:nextFocusRight="@id/speed_25"
+            android:nextFocusUp="@id/speed_plus"
+            android:nextFocusDown="@id/speed_200"
+            android:text="2.0x"
+            tools:ignore="HardcodedText" />
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/stream_input.xml b/app/src/main/res/layout/stream_input.xml
index 83605ce32c8..95a6eedd7fc 100644
--- a/app/src/main/res/layout/stream_input.xml
+++ b/app/src/main/res/layout/stream_input.xml
@@ -29,6 +29,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="20"
+            android:autofillHints="no"
             android:hint="@string/network_adress_example"
             android:inputType="textUri"
             tools:ignore="LabelFor" />
@@ -38,6 +39,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="20"
+            android:autofillHints="no"
             android:hint="@string/referer"
             android:inputType="textUri"
             tools:ignore="LabelFor" />
diff --git a/app/src/main/res/layout/subtitle_offset.xml b/app/src/main/res/layout/subtitle_offset.xml
index 6741de807cb..8570e9a266b 100644
--- a/app/src/main/res/layout/subtitle_offset.xml
+++ b/app/src/main/res/layout/subtitle_offset.xml
@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:baselineAligned="false"
     android:orientation="horizontal">
 
     <FrameLayout
diff --git a/app/src/main/res/layout/subtitle_settings.xml b/app/src/main/res/layout/subtitle_settings.xml
index ec670924197..7fd40c48004 100644
--- a/app/src/main/res/layout/subtitle_settings.xml
+++ b/app/src/main/res/layout/subtitle_settings.xml
@@ -1,304 +1,315 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/subs_root"
+    android:background="?attr/primaryBlackBackground"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/primaryBlackBackground">
+    android:orientation="vertical">
 
-    <LinearLayout
+    <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
+        android:layout_height="match_parent">
 
-        <TextView
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_rowWeight="1"
-            android:layout_marginTop="20dp"
-            android:layout_marginBottom="10dp"
-            android:paddingStart="20dp"
-            android:paddingEnd="20dp"
-            android:text="@string/subtitles_settings"
-            android:textColor="?attr/textColor"
-            android:textSize="20sp"
-            android:textStyle="bold" />
-
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="75sp">
+            android:orientation="vertical">
 
-            <ImageView
+            <TextView
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:contentDescription="@string/preview_background_img_des"
-                android:scaleType="centerCrop"
-                android:src="@drawable/subtitles_preview_background" />
-
-            <androidx.media3.ui.SubtitleView
-                android:id="@+id/subtitle_text"
+                android:layout_height="wrap_content"
+                android:layout_rowWeight="1"
+                android:layout_marginTop="20dp"
+                android:layout_marginBottom="10dp"
+                android:paddingStart="20dp"
+                android:paddingEnd="20dp"
+                android:text="@string/subtitles_settings"
+                android:textColor="?attr/textColor"
+                android:textSize="20sp"
+                android:textStyle="bold" />
+
+            <FrameLayout
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_gravity="center"
-                android:foregroundGravity="center" />
-        </FrameLayout>
-
-        <TextView
-            android:id="@+id/subs_font"
-            style="@style/SettingsItem"
-            android:nextFocusLeft="@id/apply_btt"
-
-            android:nextFocusRight="@id/cancel_btt"
-            android:nextFocusDown="@id/subs_font_size"
-            android:text="@string/subs_font" />
-
-        <TextView
-            android:id="@+id/subs_font_size"
-            style="@style/SettingsItem"
-            android:nextFocusLeft="@id/apply_btt"
-            android:nextFocusRight="@id/cancel_btt"
-
-            android:nextFocusUp="@id/subs_font"
-            android:nextFocusDown="@id/subs_text_color"
-            android:text="@string/subs_font_size" />
-
-        <TextView
-            android:id="@+id/subs_text_color"
-            style="@style/SettingsItem"
-            android:nextFocusLeft="@id/apply_btt"
-            android:nextFocusRight="@id/cancel_btt"
-
-            android:nextFocusUp="@id/subs_font_size"
-            android:nextFocusDown="@id/subs_outline_color"
-            android:text="@string/subs_text_color" />
-
-        <TextView
-            android:id="@+id/subs_outline_color"
-            style="@style/SettingsItem"
-            android:nextFocusLeft="@id/apply_btt"
-            android:nextFocusRight="@id/cancel_btt"
-
-            android:nextFocusUp="@id/subs_text_color"
-            android:nextFocusDown="@id/subs_background_color"
-            android:text="@string/subs_outline_color" />
-
-        <TextView
-            android:id="@+id/subs_background_color"
-            style="@style/SettingsItem"
-            android:nextFocusLeft="@id/apply_btt"
-            android:nextFocusRight="@id/cancel_btt"
-
-            android:nextFocusUp="@id/subs_outline_color"
-            android:nextFocusDown="@id/subs_background_radius"
-            android:text="@string/subs_background_color" />
-
-        <TextView
-            android:id="@+id/subs_background_radius"
-            style="@style/SettingsItem"
-            android:nextFocusLeft="@id/apply_btt"
-            android:nextFocusRight="@id/cancel_btt"
-
-            android:nextFocusUp="@id/subs_background_color"
-            android:nextFocusDown="@id/subs_window_color"
-            android:text="@string/background_radius" />
-
-        <TextView
-            android:id="@+id/subs_window_color"
-            style="@style/SettingsItem"
-            android:nextFocusLeft="@id/apply_btt"
-            android:nextFocusRight="@id/cancel_btt"
-
-            android:nextFocusUp="@id/subs_background_radius"
-            android:nextFocusDown="@id/subs_edge_type"
-            android:text="@string/subs_window_color" />
-
-        <TextView
-            android:id="@+id/subs_edge_type"
-            style="@style/SettingsItem"
-            android:nextFocusLeft="@id/apply_btt"
-            android:nextFocusRight="@id/cancel_btt"
-
-            android:nextFocusUp="@id/subs_window_color"
-            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"
-            android:nextFocusLeft="@id/apply_btt"
-            android:nextFocusRight="@id/cancel_btt"
-
-            android:nextFocusUp="@id/subs_edge_type"
-            android:nextFocusDown="@id/subs_auto_select_language"
-            android:text="@string/subs_subtitle_elevation" />
-
-        <TextView
-            android:id="@+id/subs_auto_select_language"
-            style="@style/SettingsItem"
-            android:nextFocusLeft="@id/apply_btt"
-            android:nextFocusRight="@id/cancel_btt"
-
-            android:nextFocusUp="@id/subs_subtitle_elevation"
-            android:nextFocusDown="@id/subs_download_languages"
-            android:text="@string/subs_auto_select_language" />
-
-        <TextView
-            android:id="@+id/subs_download_languages"
-            style="@style/SettingsItem"
-            android:nextFocusLeft="@id/apply_btt"
-            android:nextFocusRight="@id/cancel_btt"
-
-            android:nextFocusUp="@id/subs_auto_select_language"
-            android:nextFocusDown="@id/subtitles_remove_bloat"
-            android:text="@string/subs_download_languages" />
-
-        <com.google.android.material.switchmaterial.SwitchMaterial
-            android:id="@+id/subtitles_remove_bloat"
-            style="@style/SettingsItem"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:fontFamily="@font/google_sans"
-            android:nextFocusLeft="@id/apply_btt"
-            android:nextFocusRight="@id/cancel_btt"
-            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
-            android:id="@+id/subtitles_remove_captions"
-            style="@style/SettingsItem"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:fontFamily="@font/google_sans"
-            android:nextFocusLeft="@id/apply_btt"
-            android:nextFocusRight="@id/cancel_btt"
-            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
-            android:id="@+id/subtitles_filter_sub_lang"
-            style="@style/SettingsItem"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:fontFamily="@font/google_sans"
-            android:nextFocusLeft="@id/apply_btt"
-            android:nextFocusRight="@id/cancel_btt"
-            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
-            android:id="@+id/subtitles_uppercase"
-            style="@style/SettingsItem"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:fontFamily="@font/google_sans"
-            android:nextFocusLeft="@id/apply_btt"
-            android:nextFocusRight="@id/cancel_btt"
-            android:nextFocusUp="@id/subtitles_filter_sub_lang"
-            android:nextFocusDown="@id/subtitles_bold"
-            android:text="@string/uppercase_all_subtitles"
-            app:trackTint="@color/toggle_selector"
-            app:drawableEndCompat="@null" />
+                android:layout_height="75sp">
+
+                <ImageView
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:contentDescription="@string/preview_background_img_des"
+                    android:scaleType="centerCrop"
+                    android:src="@drawable/subtitles_preview_background" />
+
+                <androidx.media3.ui.SubtitleView
+                    android:id="@+id/subtitle_text"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_gravity="center"
+                    android:foregroundGravity="center" />
+            </FrameLayout>
+
+            <TextView
+                android:id="@+id/subs_font"
+                style="@style/SettingsItem"
+                android:nextFocusLeft="@id/apply_btt"
 
+                android:nextFocusRight="@id/cancel_btt"
+                android:nextFocusDown="@id/subs_font_size"
+                android:text="@string/subs_font" />
 
+            <TextView
+                android:id="@+id/subs_font_size"
+                style="@style/SettingsItem"
+                android:nextFocusLeft="@id/apply_btt"
+                android:nextFocusRight="@id/cancel_btt"
 
-        <com.google.android.material.switchmaterial.SwitchMaterial
-            android:id="@+id/subtitles_bold"
-            style="@style/SettingsItem"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:fontFamily="@font/google_sans"
-            android:nextFocusLeft="@id/apply_btt"
-            android:nextFocusRight="@id/cancel_btt"
-            android:nextFocusUp="@id/subtitles_uppercase"
-            android:nextFocusDown="@id/subtitles_italic"
-            android:text="@string/all_subtitles_bold"
-            app:trackTint="@color/toggle_selector"
-            app:drawableEndCompat="@null" />
+                android:nextFocusUp="@id/subs_font"
+                android:nextFocusDown="@id/subs_text_color"
+                android:text="@string/subs_font_size" />
 
+            <TextView
+                android:id="@+id/subs_text_color"
+                style="@style/SettingsItem"
+                android:nextFocusLeft="@id/apply_btt"
+                android:nextFocusRight="@id/cancel_btt"
 
+                android:nextFocusUp="@id/subs_font_size"
+                android:nextFocusDown="@id/subs_outline_color"
+                android:text="@string/subs_text_color" />
 
-        <com.google.android.material.switchmaterial.SwitchMaterial
-            android:id="@+id/subtitles_italic"
-            style="@style/SettingsItem"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:fontFamily="@font/google_sans"
-            android:nextFocusLeft="@id/apply_btt"
-            android:nextFocusRight="@id/cancel_btt"
-            android:nextFocusUp="@id/subtitles_bold"
-            android:nextFocusDown="@id/apply_btt"
-            android:text="@string/all_subtitles_italic"
-            app:trackTint="@color/toggle_selector"
-            app:drawableEndCompat="@null" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_rowWeight="1"
+            <TextView
+                android:id="@+id/subs_outline_color"
+                style="@style/SettingsItem"
+                android:nextFocusLeft="@id/apply_btt"
+                android:nextFocusRight="@id/cancel_btt"
 
-            android:gravity="center"
-            android:text="@string/subs_hold_to_reset_to_default"
-            android:textColor="?attr/textColor"
-            android:textSize="14sp" />
+                android:nextFocusUp="@id/subs_text_color"
+                android:nextFocusDown="@id/subs_background_color"
+                android:text="@string/subs_outline_color" />
 
-        <TextView
-            android:id="@+id/subs_import_text"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_rowWeight="1"
-            android:gravity="center"
-            android:text="@string/subs_import_text"
-            android:textColor="?attr/textColor"
-            android:textSize="14sp" />
+            <TextView
+                android:id="@+id/subs_background_color"
+                style="@style/SettingsItem"
+                android:nextFocusLeft="@id/apply_btt"
+                android:nextFocusRight="@id/cancel_btt"
 
-        <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:nextFocusUp="@id/subs_outline_color"
+                android:nextFocusDown="@id/subs_background_radius"
+                android:text="@string/subs_background_color" />
+
+            <TextView
+                android:id="@+id/subs_background_radius"
+                style="@style/SettingsItem"
+                android:nextFocusLeft="@id/apply_btt"
+                android:nextFocusRight="@id/cancel_btt"
+
+                android:nextFocusUp="@id/subs_background_color"
+                android:nextFocusDown="@id/subs_window_color"
+                android:text="@string/background_radius" />
+
+            <TextView
+                android:id="@+id/subs_window_color"
+                style="@style/SettingsItem"
+                android:nextFocusLeft="@id/apply_btt"
+                android:nextFocusRight="@id/cancel_btt"
+
+                android:nextFocusUp="@id/subs_background_radius"
+                android:nextFocusDown="@id/subs_edge_type"
+                android:text="@string/subs_window_color" />
+
+            <TextView
+                android:id="@+id/subs_edge_type"
+                style="@style/SettingsItem"
+                android:nextFocusLeft="@id/apply_btt"
+                android:nextFocusRight="@id/cancel_btt"
+
+                android:nextFocusUp="@id/subs_window_color"
+                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_alignment"
+                android:text="@string/subs_edge_size" />
+
+            <TextView
+                android:id="@+id/subs_subtitle_alignment"
+                style="@style/SettingsItem"
+                android:nextFocusLeft="@id/apply_btt"
+                android:nextFocusRight="@id/cancel_btt"
+
+                android:nextFocusUp="@id/subs_edge_size"
+                android:nextFocusDown="@id/subs_subtitle_elevation"
+                android:text="@string/subs_subtitle_alignment" />
+
+            <TextView
+                android:id="@+id/subs_subtitle_elevation"
+                style="@style/SettingsItem"
+                android:nextFocusLeft="@id/apply_btt"
+                android:nextFocusRight="@id/cancel_btt"
+
+                android:nextFocusUp="@id/subs_subtitle_alignment"
+                android:nextFocusDown="@id/subs_auto_select_language"
+                android:text="@string/subs_subtitle_elevation" />
+
+            <TextView
+                android:id="@+id/subs_auto_select_language"
+                style="@style/SettingsItem"
+                android:nextFocusLeft="@id/apply_btt"
+                android:nextFocusRight="@id/cancel_btt"
+
+                android:nextFocusUp="@id/subs_subtitle_elevation"
+                android:nextFocusDown="@id/subs_download_languages"
+                android:text="@string/subs_auto_select_language" />
+
+            <TextView
+                android:id="@+id/subs_download_languages"
+                style="@style/SettingsItem"
+                android:nextFocusLeft="@id/apply_btt"
+                android:nextFocusRight="@id/cancel_btt"
+
+                android:nextFocusUp="@id/subs_auto_select_language"
+                android:nextFocusDown="@id/subtitles_remove_bloat"
+                android:text="@string/subs_download_languages" />
+
+            <com.google.android.material.switchmaterial.SwitchMaterial
+                android:id="@+id/subtitles_remove_bloat"
+                style="@style/SettingsItem"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:fontFamily="@font/google_sans"
+                android:nextFocusLeft="@id/apply_btt"
+                android:nextFocusRight="@id/cancel_btt"
+                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
+                android:id="@+id/subtitles_remove_captions"
+                style="@style/SettingsItem"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:fontFamily="@font/google_sans"
+                android:nextFocusLeft="@id/apply_btt"
                 android:nextFocusRight="@id/cancel_btt"
-                android:nextFocusUp="@id/subtitles_italic"
-                android:text="@string/sort_apply"
-                android:visibility="visible">
-
-                <requestFocus />
-            </com.google.android.material.button.MaterialButton>
-
-            <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: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
+                android:id="@+id/subtitles_filter_sub_lang"
+                style="@style/SettingsItem"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:fontFamily="@font/google_sans"
                 android:nextFocusLeft="@id/apply_btt"
+                android:nextFocusRight="@id/cancel_btt"
                 android:nextFocusUp="@id/subtitles_remove_captions"
-                android:text="@string/sort_cancel" />
+                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
+                android:id="@+id/subtitles_uppercase"
+                style="@style/SettingsItem"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:fontFamily="@font/google_sans"
+                android:nextFocusLeft="@id/apply_btt"
+                android:nextFocusRight="@id/cancel_btt"
+                android:nextFocusUp="@id/subtitles_filter_sub_lang"
+                android:nextFocusDown="@id/subtitles_bold"
+                android:text="@string/uppercase_all_subtitles"
+                app:trackTint="@color/toggle_selector"
+                app:drawableEndCompat="@null" />
+
+            <com.google.android.material.switchmaterial.SwitchMaterial
+                android:id="@+id/subtitles_bold"
+                style="@style/SettingsItem"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:fontFamily="@font/google_sans"
+                android:nextFocusLeft="@id/apply_btt"
+                android:nextFocusRight="@id/cancel_btt"
+                android:nextFocusUp="@id/subtitles_uppercase"
+                android:nextFocusDown="@id/subtitles_italic"
+                android:text="@string/all_subtitles_bold"
+                app:trackTint="@color/toggle_selector"
+                app:drawableEndCompat="@null" />
+
+            <com.google.android.material.switchmaterial.SwitchMaterial
+                android:id="@+id/subtitles_italic"
+                style="@style/SettingsItem"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:fontFamily="@font/google_sans"
+                android:nextFocusLeft="@id/apply_btt"
+                android:nextFocusRight="@id/cancel_btt"
+                android:nextFocusUp="@id/subtitles_bold"
+                android:nextFocusDown="@id/apply_btt"
+                android:text="@string/all_subtitles_italic"
+                app:trackTint="@color/toggle_selector"
+                app:drawableEndCompat="@null" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_rowWeight="1"
+
+                android:gravity="center"
+                android:text="@string/subs_hold_to_reset_to_default"
+                android:textColor="?attr/textColor"
+                android:textSize="14sp" />
+
+            <TextView
+                android:id="@+id/subs_import_text"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_rowWeight="1"
+                android:gravity="center"
+                android:text="@string/subs_import_text"
+                android:textColor="?attr/textColor"
+                android:textSize="14sp" />
+
+            <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:nextFocusRight="@id/cancel_btt"
+                    android:nextFocusUp="@id/subtitles_italic"
+                    android:text="@string/sort_apply"
+                    android:visibility="visible">
+
+                    <requestFocus />
+                </com.google.android.material.button.MaterialButton>
+
+                <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:nextFocusLeft="@id/apply_btt"
+                    android:nextFocusUp="@id/subtitles_remove_captions"
+                    android:text="@string/sort_cancel" />
+            </LinearLayout>
         </LinearLayout>
-    </LinearLayout>
-</ScrollView>
\ No newline at end of file
+    </ScrollView>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/trailer_custom_layout.xml b/app/src/main/res/layout/trailer_custom_layout.xml
index 0da7d170e33..76231a2d3a0 100644
--- a/app/src/main/res/layout/trailer_custom_layout.xml
+++ b/app/src/main/res/layout/trailer_custom_layout.xml
@@ -5,9 +5,88 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:screenOrientation="landscape"
     tools:orientation="vertical">
 
+    <FrameLayout
+        android:id="@+id/player_metadata_scrim"
+        android:layout_width="640dp"
+        android:layout_height="match_parent"
+        android:background="@drawable/bg_player_metadata_scrim_netflix"
+        android:visibility="gone"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent">
+
+        <LinearLayout
+            android:id="@+id/player_metadata_overlay"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:layout_gravity="center_vertical"
+            android:paddingStart="64dp"
+            android:paddingEnd="32dp"
+            android:paddingBottom="32dp">
+
+            <!-- TITLE / LOGO -->
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="88dp">
+
+                <ImageView
+                    android:id="@+id/player_movie_logo"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:adjustViewBounds="true"
+                    android:scaleType="fitStart"
+                    android:visibility="gone"
+                    tools:visibility="visible"/>
+
+                <TextView
+                    android:id="@+id/player_movie_title"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:textColor="@android:color/white"
+                    android:textSize="30sp"
+                    android:textStyle="bold"
+                    android:maxLines="2"
+                    android:ellipsize="end"
+                    tools:text="Zootopia 2"/>
+            </FrameLayout>
+
+            <!-- GENRES / YEAR / RATING -->
+            <TextView
+                android:id="@+id/player_movie_meta"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="12dp"
+                android:textColor="#B3FFFFFF"
+                android:textSize="14sp"
+                android:maxLines="2"
+                tools:text="Animation • Action • Adventure • 2025 • ⭐ 7.6"/>
+
+            <!-- SYNOPSIS -->
+            <TextView
+                android:id="@+id/player_movie_overview"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="20dp"
+                android:textColor="#E6FFFFFF"
+                android:textSize="16sp"
+                android:lineSpacingExtra="8dp"
+                android:maxLines="5"
+                tools:text="Brave rabbit cop Judy Hopps and her friend, the fox Nick Wilde, team up again to crack a new case."/>
+
+        </LinearLayout>
+    </FrameLayout>
+
+    <ImageView
+        android:visibility="gone"
+        android:id="@+id/video_outline"
+        android:src="@drawable/video_outline"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+    </ImageView>
 
     <TextView
         android:id="@+id/player_time_text"
@@ -89,16 +168,41 @@
             android:layout_marginEnd="32dp"
             android:orientation="vertical">
 
-            <TextView
-                android:id="@+id/player_video_title"
+            <LinearLayout
+                android:id="@+id/player_video_title_holder"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:gravity="end"
-                android:textColor="@color/white"
-                android:textSize="16sp"
-                android:textStyle="bold"
-                tools:text="Hello world" />
-
+                android:gravity="center">
+                <TextView
+                    android:maxLines="2"
+                    android:id="@+id/player_video_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="end"
+                    android:textColor="@color/white"
+                    android:textSize="16sp"
+                    android:textStyle="bold"
+                    tools:text="Hello world" />
+                <TextView
+                    android:id="@+id/player_video_info"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="6dp"
+                    android:layout_marginBottom="2.5dp"
+                    android:textColor="@color/white"
+                    android:textSize="10sp"
+                    android:visibility="gone"
+                    tools:text="HDR10 • HEVC" />
+                <ImageView
+                    android:id="@+id/offline_pin"
+                    android:layout_width="16dp"
+                    android:layout_height="16dp"
+                    android:layout_marginStart="2dp"
+                    android:src="@drawable/ic_offline_pin_24"
+                    android:visibility="gone"
+                    tools:visibility="visible"
+                    android:layout_gravity="center"/>
+            </LinearLayout>
             <TextView
                 android:id="@+id/player_video_title_rez"
                 android:layout_width="match_parent"
@@ -629,7 +733,7 @@
                         android:scaleType="centerCrop" />
                 </FrameLayout>
 
-                <com.github.rubensousa.previewseekbar.media3.PreviewTimeBar
+                <com.lagradost.cloudstream3.ui.player.live.LivePreviewTimeBar
                     android:id="@id/exo_progress"
                     android:layout_width="0dp"
                     android:layout_height="30dp"
@@ -662,6 +766,23 @@
                     app:layout_constraintBaseline_toBaselineOf="@id/exo_position"
                     app:layout_constraintEnd_toEndOf="@id/player_fullscreen"
                     tools:text="23:20" />
+                <TextView
+                    android:id="@+id/time_live"
+                    android:layout_width="wrap_content"
+                    android:layout_height="30dp"
+                    android:layout_gravity="center|center_vertical"
+                    android:text="@string/player_is_live"
+                    android:layout_marginEnd="30dp"
+                    android:includeFontPadding="false"
+                    android:minWidth="50dp"
+                    android:paddingLeft="4dp"
+                    android:paddingRight="4dp"
+                    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" />
 
                 <TextView
                     android:id="@+id/time_left"
@@ -697,6 +818,7 @@
 
 
             <HorizontalScrollView
+                android:id="@+id/player_controls_scroll"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
@@ -897,7 +1019,7 @@
             </ImageView>
 
             <ProgressBar
-                android:id="@+id/player_progressbar_right"
+                android:id="@+id/player_progressbar_right_level1"
                 style="@android:style/Widget.Material.ProgressBar.Horizontal"
                 android:layout_width="4dp"
                 android:layout_height="150dp"
@@ -908,22 +1030,104 @@
                 android:indeterminate="false"
                 android:max="100"
                 android:progress="100"
-                android:progressDrawable="@drawable/progress_drawable_vertical" />
+                android:progressDrawable="@drawable/progress_drawable_vertical"
+                android:progressTint="@color/white"
+                android:progressTintMode="src_in" />
+
+            <ProgressBar
+                android:id="@+id/player_progressbar_right_level2"
+                style="@android:style/Widget.Material.ProgressBar.Horizontal"
+                android:layout_width="4dp"
+                android:layout_height="150dp"
+                android:layout_centerHorizontal="true"
+                android:layout_centerVertical="true"
+                android:layout_gravity="end|center_vertical"
+                android:layout_marginEnd="40dp"
+                android:indeterminate="false"
+                android:max="100"
+                android:progress="0"
+                android:progressDrawable="@drawable/progress_drawable_vertical"
+                android:progressTint="@color/colorPrimaryOrange"
+                android:progressTintMode="src_in" />
         </RelativeLayout>
     </LinearLayout>
     <com.google.android.material.button.MaterialButton
         android:id="@+id/player_speedup_button"
         style="@style/Widget.MaterialComponents.Button.OutlinedButton"
         android:layout_width="45dp"
-        android:layout_height="44dp"
+        android:layout_height="45dp"
         android:layout_gravity="center_horizontal"
-        android:layout_marginTop="70dp"
-        app:iconGravity="top"
+        android:layout_marginTop="30dp"
+        app:iconPadding="0dp"
+        app:iconGravity="textStart"
         android:clickable="false"
+        android:focusable="false"
         android:textAllCaps="false"
         android:visibility="gone"
         app:icon="@drawable/speedup"
-        app:iconTint="?attr/textColor"
-        app:rippleColor="?attr/colorPrimary"
+        app:iconTint="@color/textColor"
+        android:foreground="@null"
+        android:backgroundTint="@color/skipOpTransparent"
         tools:visibility="visible" />
-</FrameLayout>
\ No newline at end of file
+
+    <LinearLayout
+        android:id="@+id/player_episodes_button_root"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:layout_gravity="end|center_vertical"
+        android:visibility="gone"
+        >
+        <ImageView
+            android:padding="15dp"
+            android:id="@+id/player_episodes_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:foregroundGravity="center"
+            android:src="@drawable/ic_baseline_arrow_back_ios_24"
+            android:background="@drawable/video_tap_button_always_white"
+            app:tint="@android:color/white"
+            tools:ignore="ContentDescription" />
+        <TextView
+            android:id="@+id/player_episodes_button_text"
+            style="@style/ResultMarqueeButtonText"
+            android:layout_marginTop="5dp"
+            android:text="@string/episodes"
+            android:visibility="invisible"
+            tools:visibility="visible" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/player_episode_overlay"
+        android:visibility="gone"
+        android:padding="5dp"
+        android:background="?attr/primaryBlackBackground"
+        android:orientation="vertical"
+        android:layout_gravity="end"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent">
+
+        <TextView
+            android:id="@+id/player_episode_overlay_title"
+            android:padding="10dp"
+            style="@style/WatchHeaderText"
+            android:textSize="15sp"
+            android:layout_marginEnd="0dp"
+            android:text="@string/episodes"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:requiresFadingEdge="vertical"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+            android:id="@+id/player_episode_list"
+            tools:listitem="@layout/player_episodes"
+            android:nextFocusLeft="@id/player_episodes_button"
+            android:layout_width="400dp"
+            android:layout_height="match_parent"
+            android:clipToPadding="false"
+            android:descendantFocusability="afterDescendants">
+
+        </androidx.recyclerview.widget.RecyclerView>
+    </LinearLayout>
+</FrameLayout>
diff --git a/app/src/main/res/menu/download_queue.xml b/app/src/main/res/menu/download_queue.xml
new file mode 100644
index 00000000000..7406a455503
--- /dev/null
+++ b/app/src/main/res/menu/download_queue.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/cancel_all"
+        android:icon="@drawable/clear_all_24px"
+        android:title="@string/cancel_all"
+        app:showAsAction="always" />
+</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 784fc515e8f..27f186a0074 100644
--- a/app/src/main/res/navigation/mobile_navigation.xml
+++ b/app/src/main/res/navigation/mobile_navigation.xml
@@ -184,7 +184,7 @@
         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"
@@ -465,6 +465,25 @@
             app:popExitAnim="@anim/exit_anim" />
     </fragment>
 
+    <fragment
+        android:id="@+id/navigation_download_queue"
+        android:name="com.lagradost.cloudstream3.ui.download.queue.DownloadQueueFragment"
+        android:layout_height="match_parent"
+        app:enterAnim="@anim/enter_anim"
+        app:exitAnim="@anim/exit_anim"
+        app:popEnterAnim="@anim/enter_anim"
+        app:popExitAnim="@anim/exit_anim"
+        tools:layout="@layout/fragment_download_queue" />
+
+    <action
+        android:id="@+id/action_navigation_global_to_navigation_download_queue"
+        app:destination="@id/navigation_download_queue"
+        app:enterAnim="@anim/enter_anim"
+        app:exitAnim="@anim/exit_anim"
+        app:popEnterAnim="@anim/enter_anim"
+        app:popExitAnim="@anim/exit_anim">
+    </action>
+
     <fragment
         android:id="@+id/navigation_results_phone"
         android:name="com.lagradost.cloudstream3.ui.result.ResultTrailerPlayer"
@@ -679,6 +698,6 @@
     <fragment
         android:id="@+id/easterEggMonkeFragment"
         android:name="com.lagradost.cloudstream3.ui.EasterEggMonkeFragment"
-        tools:layout="@layout/fragment_easter_egg_monke"
-        android:label="EasterEggMonkeFragment" />
+        android:label="EasterEggMonkeFragment"
+        tools:layout="@layout/fragment_easter_egg_monke" />
 </navigation>
diff --git a/app/src/main/res/values-arz/strings.xml b/app/src/main/res/values-arz/strings.xml
new file mode 100644
index 00000000000..4a4cb755f15
--- /dev/null
+++ b/app/src/main/res/values-arz/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    </resources>
diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-b+af/strings.xml
similarity index 95%
rename from app/src/main/res/values-af/strings.xml
rename to app/src/main/res/values-b+af/strings.xml
index b6616182057..b81848db650 100644
--- a/app/src/main/res/values-af/strings.xml
+++ b/app/src/main/res/values-b+af/strings.xml
@@ -8,7 +8,6 @@
     <string name="preview_background_img_des">Voorskou Agtergrond</string>
     <string name="play_movie_button">Speel Fliek</string>
     <string name="subs_hold_to_reset_to_default">Hou in om terug te stel na standaard</string>
-    <string name="pref_disable_acra">Deaktiveer outomatiese foutrapportering</string>
     <string name="next_episode_time_hour_format" formatted="true">%1$dh %2$dm</string>
     <string name="sort_clear">Maak leeg</string>
     <string name="subs_outline_color">Omtrek kleur</string>
@@ -25,8 +24,7 @@
     <string name="subs_edge_type">Rand tipe</string>
     <string name="download_done">Klaar Afgelaai</string>
     <string name="continue_watching">Kyk verder</string>
-    <string name="new_update_format" formatted="true">Nuwe opdatering gevind!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">Nuwe opdatering gevind! \n%1$s -&gt; %2$s</string>
     <string name="subs_download_languages">Laai Tale af</string>
     <string name="search_provider_text_providers">Soek deur verskaffers te gebruik</string>
     <string name="go_back_img_des">Gaan terug</string>
@@ -106,8 +104,6 @@
     <string name="subs_import_text" formatted="true">Voer lettertipes in deur dit in %s te plaas</string>
     <string name="cast_format" formatted="true">Rolverdeling: %s</string>
     <string name="subscribe_tooltip">Nuwe episode notifikasie</string>
-    <string name="hide_player_control_names_key" translatable="false">hide_player_control_names_key</string>
-    <string name="next_season_episode_format" formatted="true">"Season 000 Episode  000 will be released in"</string>
     <string name="free_storage">Gratis</string>
     <string name="use">Gebruik</string>
     <string name="delete">Wis Uit</string>
@@ -123,4 +119,4 @@
     <string name="pin_error_length">PIN moet 4 karakters bevat</string>
     <string name="pin_error_incorrect">Verkeerde PIN. Probeer weer.</string>
     <string name="category_providers">Verskaffers</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-am/strings.xml b/app/src/main/res/values-b+am/strings.xml
similarity index 96%
rename from app/src/main/res/values-am/strings.xml
rename to app/src/main/res/values-b+am/strings.xml
index f1b82c0bdc2..56b71f5a0c0 100644
--- a/app/src/main/res/values-am/strings.xml
+++ b/app/src/main/res/values-b+am/strings.xml
@@ -8,8 +8,7 @@
     <string name="next_episode_time_hour_format" formatted="true">%1$dሰዓት %2$dደቂቃ</string>
     <string name="search_poster_img_des">ፖስተር</string>
     <string name="title_downloads">የወረዱ</string>
-    <string name="new_update_format" formatted="true">አዲስ ማሻሻያ ተገኝቷል!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">አዲስ ማሻሻያ ተገኝቷል! \n%1$s -&gt; %2$s</string>
     <string name="go_back_img_des">ተመለስ</string>
     <string name="episode_more_options_des">ተጨማሪ አማራጮች</string>
     <string name="type_watching">በማየት ላይ</string>
@@ -108,6 +107,4 @@
     <string name="action_open_watching">ተጨማሪ መረጃ</string>
     <string name="search_provider_text_types">ዓይነቶችን በመጠቀም ይፈልጉ</string>
     <string name="subs_import_text" formatted="true">ቅርጸ-ቁምፊዎችን በ%s ውስጥ በማስቀመጥ ያጫኑ</string>
-    <string name="hide_player_control_names_key" translatable="false">hide_player_control_names_key</string>
-    <string name="pref_disable_acra">አውቶማቲክ የሳንካ ሪፖርት ማድረግን አሰናክል</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-ajp/strings.xml b/app/src/main/res/values-b+apc/strings.xml
similarity index 85%
rename from app/src/main/res/values-ajp/strings.xml
rename to app/src/main/res/values-b+apc/strings.xml
index 3c2d18037d4..10ba0a88c38 100644
--- a/app/src/main/res/values-ajp/strings.xml
+++ b/app/src/main/res/values-b+apc/strings.xml
@@ -6,15 +6,12 @@
     <string name="title_downloads">التنزيلات</string>
     <string name="app_dub_sub_episode_text_format" formatted="true">%1$sالحلقة %2$d</string>
     <string name="delete_file">محي الملف</string>
-    <string name="acra_report_toast">سوري، الآپ تعطل. رح ينبعت تقرير عن المشكلة للمطورين</string>
     <string name="episode_format" formatted="true">%1$d %2$s</string>
-    <string name="bug_report_settings_off">بس بعات البيانات وقت ما يتعطل الآپ</string>
     <string name="preview_background_img_des">شوف الخلفية</string>
     <string name="play_movie_button">مشّي الفيلم</string>
     <string name="subs_hold_to_reset_to_default">ضلّ كابس لترجع السَتِنگز كيف كانة أول ما نزلتو الآپ</string>
     <string name="season_format">%1$s%2$d%3$s</string>
     <string name="subs_default_reset_toast">رجِعت السَتِنگز ل كيف كانت أساسًا</string>
-    <string name="uprereleases_settings_des">نبش على تجديدات بال نسخة التجريبية كمان</string>
     <string name="subs_outline_color">لون حدود الكتيبة</string>
     <string name="search_poster_img_des">پوستر</string>
     <string name="backup_frequency">كلّ قديش بيعمل الآپ نسخة إحتياطية</string>
@@ -32,15 +29,14 @@
     <string name="show_log_cat">فرجي الـLogcat 🐈</string>
     <string name="go_forward_30">+30</string>
     <string name="continue_watching">كفي حضر</string>
-    <string name="new_update_format" formatted="true">في أپدايت جديدة!
-\n%1$s ← %2$s</string>
+    <string name="new_update_format" formatted="true">في أپدايت جديدة! \n%1$s ← %2$s</string>
     <string name="subs_download_languages">نزل الترجمات مع الڤيديو</string>
     <string name="search_provider_text_providers">عوزو المصادر لَ تنبّشو</string>
     <string name="go_back_img_des">رجاع</string>
     <string name="discord">انضم لگروپ \"كلود ستريم\" ع الـ\"ديسكورد\"</string>
     <string name="episode_more_options_des">بعد خيارات</string>
     <string name="backup_success">تسيّڤة النسخة الإحتياطية</string>
-    <string name="benene_count_text">صرتو عاطين %d موزززة للمطورين!</string>
+    <string name="benene_count_text">صرتو عاطين %d موزززة للمطورين</string>
     <string name="swipe_to_seek_settings">سحابو لتقدمو وترجعو</string>
     <string name="backup_failed">إذن الوصول لذاكرة التخزين مفقود. پليز جرب بعد مرّة.</string>
     <string name="type_watching">عم إحضر</string>
@@ -63,7 +59,6 @@
     <string name="subs_subtitle_languages">لغة الترجمة</string>
     <string name="subs_background_color">لون الخلفية</string>
     <string name="episode_sync_settings_des">بتسيّڤ تاريخ المشاهدة و لوين وصلت بال ڤيديو</string>
-    <string name="bug_report_settings_on">م بتبعت بيانات</string>
     <string name="search_hint">نبّش…</string>
     <string name="provider_info_meta">هيدا المصدر مش عاطي \"ميتا داتا\". إزا مش موجودة بال مصدر، م رح يمشي الڤيديو.</string>
     <string name="no_season">مافي أجزاء</string>
@@ -79,7 +74,7 @@
     <string name="automatic_plugin_download_summary">تلقائيًا نَزِل كل الإضافات من الريپويات يللي نزادِت.</string>
     <string name="delete">محي</string>
     <string name="start">بلش</string>
-    <string name="apk_installer_settings_des">فيه تِلِفونات م فيها تعوز الطريقة الجديدة لتجديد الآپات. جربو \"الطريقة القديمة\" إزا م عم تنزل التجديدات.</string>
+    <string name="apk_installer_settings_des">فيه أجهزة م فيها تعوز الطريقة الجديدة لتجديد الآپات. جربو \"الطريقة القديمة\" إزا م عم تنزل التجديدات.</string>
     <string name="picture_in_picture_des">بعد ما تسكر \"كلود ستريم\"، بكفي الڤيديو بشِباك زغير فوق غير آپ</string>
     <string name="no_chromecast_support_toast">هيدا المصدر م بيدعم \"كروم كاست\"</string>
     <string name="advanced_search">تنبيش منظّم</string>
@@ -100,8 +95,7 @@
     <string name="subs_text_color">لون الكتيبة</string>
     <string name="type_completed">مخلص</string>
     <string name="use_system_brightness_settings_des">عوز قوة ضوّ الشاشة تبع السيستام بدل من تغميئ الڤيديو</string>
-    <string name="restore_failed_format" formatted="true">فشل ترجيع النسخة الإحتياطية من ملف
-\n%s</string>
+    <string name="restore_failed_format" formatted="true">فشل ترجيع النسخة الإحتياطية من ملف \n%s</string>
     <string name="play_trailer_button">مشّي المقطع الدعائي</string>
     <string name="play_livestream_button">مشّي البث المباشر</string>
     <string name="no_episodes_found">م لقينا ولا حلقة</string>
@@ -115,7 +109,6 @@
     <string name="result_open_in_browser">فتحو بمتصفح الوَب</string>
     <string name="use_system_brightness_settings">عوز ضوّ السيستام</string>
     <string name="double_tap_to_pause_settings_des">كبوس مرتين بال نُصّ حتى توقف الڤيديو</string>
-    <string name="uprereleases_settings">جدد الآب وعوز النسخة التجريبية</string>
     <string name="no_data">مافي بيانات</string>
     <string name="player_subtitles_settings">الترجمة</string>
     <string name="subs_font">الخط</string>
@@ -171,8 +164,7 @@
     <string name="no_subtitles">طفي الترجمة</string>
     <string name="synopsis">القصة</string>
     <string name="used_storage">مستعمل</string>
-    <string name="resume_time_left" formatted="true">%dد
-\nباقي</string>
+    <string name="resume_time_left" formatted="true">%dد \nباقي</string>
     <string name="status_ongoing">عم ينعرض حاليًا</string>
     <string name="queued">بلايحة النَطر</string>
     <string name="status">حالة</string>
@@ -199,7 +191,7 @@
     <string name="render_error">في مشكلة بجهاز العرض (Renderer error)</string>
     <string name="show_title">العِنوان</string>
     <string name="jsdelivr_proxy">پروكسي \"گِت هَب\"</string>
-    <string name="limit_title_rez">جودة مشغل الڤيديو</string>
+    <string name="limit_title_rez">فرجي معلومات مشغل الڤيديو</string>
     <string name="show_sub">ملصق الترجمة</string>
     <string name="ova_singular">أوڤا</string>
     <string name="episode_action_download_mirror">نَزِل من مصادر وجودات مختلفة</string>
@@ -281,7 +273,6 @@
     <string name="error_bookmarks_text">إشارات المرجعية</string>
     <string name="download_started">التنزيل بَلَش</string>
     <string name="logged_account" formatted="true">فتّو على الأكونت \"%s\"</string>
-    <string name="pref_disable_acra">وقِف الإعلان الأتوماتيكي عن المشاكل يللي بال آپ</string>
     <string name="bottom_title_settings">محل عنوان الپوستر</string>
     <string name="category_ui">الشكل</string>
     <string name="next_episode_time_hour_format" formatted="true">%1$d ساعة %2$d ديقة</string>
@@ -367,11 +358,7 @@
     <string name="home_next_random_img_des">العشوائي يللي بعده</string>
     <string name="subtitles_shadow">خيال</string>
     <string name="subscription_in_progress_notification">عم نجدِد المثلثلات يللي مشتركينلها</string>
-    <string name="duplicate_message_multiple" formatted="true">مبين إنو فيه عنصر متل هيدا موجود بال مكتبة عندكن:
-\n
-\n%s
-\n
-\nبدكن تزيدو هيدا العنصر بأيّ حال، أو تستبدلوه مع العنصر الموجود، أو تلغو الإجراء؟</string>
+    <string name="duplicate_message_multiple" formatted="true">مبين إنو فيه عنصر متل هيدا موجود بال مكتبة عندكن: \n \n%s \n \nبدكن تزيدو هيدا العنصر بأيّ حال، أو تستبدلوه مع العنصر الموجود، أو تلغو الإجراء؟</string>
     <string name="batch_download_finish_format" formatted="true">نزلت %1$d %2$s</string>
     <string name="error_invalid_id">معرف مش صالح</string>
     <string name="skip_type_format" formatted="true">أفّي %s</string>
@@ -379,9 +366,7 @@
     <string name="enter_pin_with_name" formatted="true">حطو الأرقام السرية لـ\"%s\"</string>
     <string name="apk_installer_legacy">الطريقة القديمة</string>
     <string name="subtitles_raised">معلى</string>
-    <string name="blank_repo_message">\"كلود ستريم\" م بتجي مع مصادر ڤيديوات. لازم تنزلو المصادر من ريپويات.
-\n
-\nفيه معلومات على الـ\"ديسكورد\" تبعنا، أو فيكن تنبشو ع معلومات على الإنترنت.</string>
+    <string name="blank_repo_message">\"كلود ستريم\" م بتجي مع مصادر ڤيديوات. لازم تنزلو المصادر من ريپويات. \n \nفيه معلومات على الـ\"ديسكورد\" تبعنا، أو فيكن تنبشو ع معلومات على الإنترنت.</string>
     <string name="add_sync">زبد تتبع</string>
     <string name="mobile_data">3G/4G…</string>
     <string name="player_loaded_subtitles" formatted="true">نفَتح %s</string>
@@ -394,8 +379,7 @@
     <string name="uppercase_all_subtitles">دايمًا كتوب ب أحرف كاپيتال، A بدل a</string>
     <string name="player_pref">مشغل الڤيديو المفضل</string>
     <string name="quality_4k">4K</string>
-    <string name="batch_download_start_format" formatted="true">بَلَش تنزيل %1$d %2$s
-\n…</string>
+    <string name="batch_download_start_format" formatted="true">بَلَش تنزيل %1$d %2$s \n…</string>
     <string name="extension_description">الوصف</string>
     <string name="view_public_repositories_button">شوف الريپويات تبع مجتمع \"كلاود ستريم\"</string>
     <string name="safe_mode_title">إنت هلّق بال وضع الآمن</string>
@@ -425,9 +409,7 @@
     <string name="skip_setup">أفّى الإعداد</string>
     <string name="authenticated_user" formatted="true">فتت ع أكونت \"%s\" تبعك</string>
     <string name="subtitles_outline">حدود خطية</string>
-    <string name="unable_to_inflate">في مشكلة بطعمير الـUI. هيدي مشكبة كبيرة. پليز بَلِغ عنّا
-\n(UI was unable to be created correctly)
-\n%s</string>
+    <string name="unable_to_inflate">في مشكلة بطعمير الـUI. هيدي مشكبة كبيرة. پليز بَلِغ عنّا \n(UI was unable to be created correctly) \n%s</string>
     <string name="edit">عَدِل</string>
     <string name="sort_updated_new">تجَدَد (من الجديد للقديم)</string>
     <string name="quality_tc">TC</string>
@@ -462,7 +444,6 @@
     <string name="skip_type_op">الإفتتاح</string>
     <string name="resolution_and_title">الجودة وال عنوان</string>
     <string name="action_unsubscribe">شيل الإشتراك</string>
-    <string name="crash_reporting_title">بَلِغ عن الأعطال</string>
     <string name="tracks">جودة وصوت</string>
     <string name="duplicate_replace">ستبدل</string>
     <string name="sync_total_episodes_none">/؟؟</string>
@@ -484,8 +465,7 @@
     <string name="quality_sd">SD</string>
     <string name="extensions">الإضافات</string>
     <string name="subtitles_remove_bloat">شيل الإعلانات من الترجمة</string>
-    <string name="empty_library_no_accounts_message">رفّكن فاضي ☹
-\nفوتو على أكونت فيها رفّ الڤيديوات يللي حضرينها أو زيدو ڤيديوات بال رفّ المحلي.</string>
+    <string name="empty_library_no_accounts_message">رفّكن فاضي ☹ \nفوتو على أكونت فيها رفّ الڤيديوات يللي حضرينها أو زيدو ڤيديوات بال رفّ المحلي.</string>
     <string name="repository_name_hint">اسم الريپو (مش ضروري)</string>
     <string name="qualities">الجودات</string>
     <string name="error_invalid_data">بيانات مش صالحة</string>
@@ -512,8 +492,7 @@
     <string name="sort_rating_asc">رايتينگ (من الواطي للعالي)</string>
     <string name="player_load_subtitles">فتاح من ملف</string>
     <string name="disable">طفي</string>
-    <string name="safe_mode_file">لقينا ملف الوضع الآمن!
-\nمش رح نعوز إضافيات وقت ما ينفَتَح الآپ حتّى ينشال الملف.</string>
+    <string name="safe_mode_file">لقينا ملف الوضع الآمن! \nمش رح نعوز إضافيات وقت ما ينفَتَح الآپ حتّى ينشال الملف.</string>
     <string name="subtitle_offset_extra_hint_none_format">مش مغير وقت الترجمة</string>
     <string name="error">مشكلة</string>
     <string name="home_source">مصدر</string>
@@ -538,7 +517,7 @@
     <string name="plugin">إضافات</string>
     <string name="plugin_load_fail" formatted="true">م قدرنا نفتح %s</string>
     <string name="extension_rating" formatted="true">رايتينگ: %s</string>
-    <string name="download_all_plugins_from_repo">تحزير: \"كلاود ستريم 3\" مش مسؤولة عن الإضافات المش رسمية، و م بتدعمن أبدًا!</string>
+    <string name="download_all_plugins_from_repo">تحزير: \"كلاود ستريم\" مش مسؤولة عن الإضافات المش رسمية، و م بتدعمن أبدًا!</string>
     <string name="extension_status">الحالة</string>
     <string name="delete_repository">محي الريپو</string>
     <string name="category_player">مشغل الڤيديو</string>
@@ -547,10 +526,7 @@
     <string name="already_voted">إنتو أصلًا مصوتين</string>
     <string name="quality_cam">كاميرا</string>
     <string name="no_plugins_found_error">م لقينا ولا إضافة بال ريپو</string>
-    <string name="duplicate_message_single" formatted="true">مبين إنو في عنصر متل هيدا موجود بالمكتبة عندكن:
-\n\"%s\"
-\n
-\nبدكن تزيدو هيدا العنصر بأيّ حال، أو تستبدلوّ مع العنصر الموجود، أو تلغو الإجراء؟</string>
+    <string name="duplicate_message_single" formatted="true">مبين إنو في عنصر متل هيدا موجود بالمكتبة عندكن: \n\"%s\" \n \nبدكن تزيدو هيدا العنصر بأيّ حال، أو تستبدلوّ مع العنصر الموجود، أو تلغو الإجراء؟</string>
     <string name="error_invalid_url">رايط مش صالح</string>
     <string name="subtitle_offset_hint">1000 مللي ثانية</string>
     <string name="extension_version">إصدار</string>
@@ -569,19 +545,11 @@
     <string name="sync_total_episodes_some" formatted="true">/%d</string>
     <string name="action_open_play">@string/home_play</string>
     <string name="action_remove_from_watched">شيلو من لايحة المحتوى الحاضرينو</string>
-    <string name="skip_type_creddits">الإعتمادات</string>
-    <string name="quality_profile_help">فيكُن هون تغيرو طريقة ترتيب المصادر. المصدر يللي عنده أولوية أكتر بينحط أعلى بلايحت تنقايت المصدر. إنتو بتنقو الأولوية يإستعمال الأرقام. حطو الرقم الأعلى للمصادر والجودات يللي بتفضلوها.
-\n
-\nمتلًا:
-\nإزا المصدر \"أ\" بتفضلوه، بتعطوه كتير نقات (متلًا 8).
-\nإزا الجودة 480 ما بتحبوها، بتعطوها نقات قليلة (متلًا 1).
-\n
-\nعلامت المصدر وال جودة تبعه بينجمعو مع بعض (8 + 1 = 9). يللي علامته 10 أو أعلى، بينحط تلقائيًا، من دون ما ينعمل لود لكل المصادر!</string>
+    <string name="skip_type_credits">الإعتمادات</string>
+    <string name="quality_profile_help">فيكُن هون تغيرو طريقة ترتيب المصادر. المصدر يللي عنده أولوية أكتر بينحط أعلى بلايحت تنقايت المصدر. إنتو بتنقو الأولوية يإستعمال الأرقام. حطو الرقم الأعلى للمصادر والجودات يللي بتفضلوها. \n \nمتلًا: \nإزا المصدر \"أ\" بتفضلوه، بتعطوه كتير نقات (متلًا 8). \nإزا الجودة 480 ما بتحبوها، بتعطوها نقات قليلة (متلًا 1). \n \nعلامت المصدر وال جودة تبعه بينجمعو مع بعض (8 + 1 = 9). يللي علامته 10 أو أعلى، بينحط تلقائيًا، من دون ما ينعمل لود لكل المصادر!</string>
     <string name="enter_current_pin">حطو الأرقام السرية الحالية</string>
     <string name="audio_tracks">صوت</string>
     <string name="rotate_video_desc">حط كبسة لبرم إتجاه الشاشة</string>
-    <string name="rotate_video_key">rotate_video_key</string>
-    <string name="auto_rotate_video_key">auto_rotate_video_key</string>
     <string name="auto_rotate_video">برم الشاشة أوتوماتيكيًا</string>
     <string name="rotate_video">برومو</string>
     <string name="auto_rotate_video_desc">غير إتجاه الشاشة أوتوماتيكيًا حسب شكل الڤيديو</string>
@@ -598,23 +566,21 @@
     <string name="password_pin_authentication_title">رمز/كلمة مرور للمصادقة</string>
     <string name="biometric_setting_summary">فتاح التطبيق باستعمال البصمة، آي دي الوج، پِن، النمط، أو الپاسورد.</string>
     <string name="biometric_prompt_description">بعد كذا محاولة فاشلة، هيدا الشباك رح يسكر. بكل بساطة، سكر الآپ ورجاع فتحه حتى تجرب بعد مرة.</string>
-    <string name="resume_remaining" formatted="true">%s
-\nباقي</string>
+    <string name="resume_remaining" formatted="true">%s \nباقي</string>
     <string name="biometric_unsupported">المصادقة البيومترية مش مدعومة ع هالجهاز</string>
     <string name="unfavorite">شيله من المفضل</string>
     <string name="repo_copy_label">اسم وعنوان الريپو</string>
     <string name="toast_copied">نتسخ!</string>
     <string name="clipboard_permission_error">فيه ارور بال وصول ل الكليپ-بورد. پليز جرب مرة أخرى.</string>
     <string name="clipboard_unknown_error">فيه ارور بال نسخ. پليز نسوخ الـLogcat 🐈 وبعته ل المسؤولين عن دعم الآپ.</string>
-    <string name="biometric_warning">هلّق نعمل نسخة احتياطية للداتا تبع \"كلود ستريم\". إذا مابق ينفتح ويمشي الآپ، فيك تعمل كلير للداتا تبعه وترَجع الداتا من النسخة الاحتياطية اللي هلّق عملنالك ياها.
-\nالاحتمال انو مابق ينفتح الآپ احتمالية زغيرة كتير، بس كل جهاز بيتصرف بشكل مختلف، ونحنا منعتذر إذا سببنا أي إزعاج.</string>
+    <string name="biometric_warning">هلّق نعمل نسخة احتياطية للداتا تبع \"كلود ستريم\". إذا مابق ينفتح ويمشي الآپ، فيك تعمل كلير للداتا تبعه وترَجع الداتا من النسخة الاحتياطية اللي هلّق عملنالك ياها. \nالاحتمال انو مابق ينفتح الآپ احتمالية زغيرة كتير، بس كل جهاز بيتصرف بشكل مختلف، ونحنا منعتذر إذا سببنا أي إزعاج.</string>
     <string name="ok">أوكي</string>
     <string name="battery_dialog_title">وقف اپتميزايشن بطارية جهازك</string>
     <string name="app_unrestricted_toast">بطارية الآپ اصلًا محطوطة ع «غير مقيد» \"Unrestricted\"</string>
     <string name="app_info_intent_error">م قدرنا نفتح معلومات الآپ تبع \"كلود ستريم\".</string>
-    <string name="music_singlar">موسيقى</string>
+    <string name="music_singular">موسيقى</string>
     <string name="audio_book_singular">أوديو بوك</string>
-    <string name="custom_media_singluar">الميديا</string>
+    <string name="custom_media_singular">الميديا</string>
     <string name="battery_dialog_message">ت تضمن عدم انقطاع التنزيلات والنوتيفيكايشنات للبرامج التلفزيونية يللي مشتركلها، الآپ \"كلود ستريم\" بده إذن ليمشي ب الباكگراوند. ازا كبست أوكي، رح يفتح شباك إذن زغير، كبوس «سماح».\n\nملاحظة إنو هيدا الإذن ما بيعني إنو \"كلود ستريم 3\" رح تستنزف البطارية. ومش رح يشتغل الآپ بال باكگراوند إلّا عند الضرورة، متل لمّا تتلقا نوتيفيكايشن أو تنزل ڤيديو من الريپو الاصلي.</string>
     <string name="reset_btn">ريسات</string>
     <string name="episode_upcoming_format" formatted="true">رح ينزل ب %s</string>
@@ -632,7 +598,6 @@
     <string name="dismiss">تجاهل</string>
     <string name="open_downloaded_repo">فتاح الريپو</string>
     <string name="device_pin_url_message">فتاح <b>%s</b> ع تلفونك أو كمپيوترك، وحط الكود اللي فوق</string>
-    <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="open_local_video">فتاح الڤيديو اللي ع جهازك</string>
@@ -644,21 +609,13 @@
     <string name="downloads_delete_select">نقي الإشيا اللي بدك تمحيها</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_section" formatted="true">رح كمان تمحي ل الأبد كل الحلقات اللي ب هيدا المسلسل؟
-\n
-\n%s</string>
+    <string name="delete_message_multiple" formatted="true">متأكد إنو بدك تمحي هيدي الإشيا ل الأبد؟ \n \n%s</string>
+    <string name="delete_message_series_section" formatted="true">رح كمان تمحي ل الأبد كل الحلقات اللي ب هيدا المسلسل؟ \n \n%s</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_only" formatted="true">متأكد إنو بدك تمحي كل الحلقات اللي بهيدا المسلسل؟
-\n
-\n%s</string>
+    <string name="delete_message_series_episodes" formatted="true">متأكد إنو بدك تمحي هيدي الحلقات من %1$s؟ \n \n%2$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>
@@ -670,14 +627,14 @@
     <string name="custom">حدد غير محل</string>
     <string name="torrent_info">هيدا الڤيديو تورينت. هيدا بيعني إنه فيه ينعمله تراك، يعني بينعرف شو عم تحضر.\nإزا م بتعرف شو التورينت، م تستعمله.</string>
     <string name="subs_edge_size">حجم الحفّة</string>
-    <string name="podcast_singluar">پودكاست</string>
-    <string name="audio_singluar">صوت</string>
+    <string name="podcast_singular">پودكاست</string>
+    <string name="audio_singular">صوت</string>
     <string name="unsupported_error">أرور، مش مدعوم</string>
     <string name="encoding_error">أرور بال إنكودينگ</string>
     <string name="player_load_one_subtitle_online">أفّي اللودينگ تلقائيًا</string>
     <string name="torrent_preferred_media">سماح ب إستعمال الـTorrent بال سَتِنگز/المصادر/المحتوى المفضل</string>
     <string name="torrent_not_accepted">سكر الآپ و رجاع فتحه، و قبال دعم التورنت ت تكفي.</string>
-    <string name="software_decoding_desc">السوفتوار ديكودينگ بخلي مشغل الڤيديو يمشّي أنواع فيلات ڤيديو م بيدعمها جهازك، بس هال شي معقول يخلي الڤيديو يعلق، خاصتًا إزا كانت الجودة عالية</string>
+    <string name="software_decoding_desc">السوفتوار ديكودينگ بخلي مشغل الڤيديو يمشّي أنواع فيلات ڤيديو م بيدعمها جهازك، بس هال شي معقول يخلي الڤيديو يعلق، خاصتًا إزا كانت الجودة عالية.</string>
     <string name="software_decoding">سوفتوار ديكودينگ</string>
     <string name="sort_episodes_rating_low_high">رايتينگ (أوطا)</string>
     <string name="sort_episodes_date_newest">نهار اللي نزل (أجدد)</string>
@@ -704,4 +661,78 @@
     <string name="all_subtitles_bold">عمول خط الترجمة بولد</string>
     <string name="all_subtitles_italic">عمول خط الترجمة أيتاليك</string>
     <string name="background_radius">قوة برمة الخلفية</string>
-</resources>
\ No newline at end of file
+    <string name="download_parallel_settings_des">كم شغلة مختلفة فيها تتنزل ب نفس الوقت</string>
+    <string name="parallel_downloads">تنزيل ب نفس الوقت</string>
+    <string name="concurrent_connections">كم إتصال ب نفص الوقت</string>
+    <string name="concurrent_connections_settings_des">كم إتصال ب نفس الوقت فيه يستعمل كل تنزيل</string>
+    <string name="go_to_downloads">فتاح التنزيلات</string>
+    <string name="no_internet_connection">مافي إنترنت.\n\nپليز جرب مرّة تانية لمّا يكون عندك إنترنت، أو حضار الإشيا اللي منزلها إنت و أفلاين.</string>
+    <string name="overscan_settings_des">بت غير حدود الشاشة</string>
+    <string name="overscan_settings">أوڤر سكان</string>
+    <string name="poster_size_settings_des">بت غيّر حجم الپوستر</string>
+    <string name="poster_size_settings">حجم الپوستر</string>
+    <string name="player_settings_always_ask">دايمًا سئالوني</string>
+    <string name="speedup_title">خليك كابس حتى تسرع</string>
+    <string name="speedup_summary">خليك كابس كرمال سرعة الـ2x</string>
+    <string name="download_time_left_hour_min_sec_format" formatted="true">%1$dساعة %2$dد %3$dث</string>
+    <string name="download_time_left_min_sec_format" formatted="true">%1$dد %2$dث</string>
+    <string name="download_time_left_sec_format" formatted="true">%1$dث</string>
+    <string name="show_rating">لايبل الرايتينگ</string>
+    <string name="no_account">لا يوجد حساب</string>
+    <string name="edit_profile_image_title">عدّل صورة الملف</string>
+    <string name="edit_profile_image_hint">ادخل لينك ( عنوان ال URL ) تبع صورة الملف</string>
+    <string name="edit_profile_image_success">تم تعديل الصورة بنجاح</string>
+    <string name="play_full_series_button">بلّش كل المسلسل</string>
+    <string name="install_prerelease">نزل النسخة التجريبية من الآپ</string>
+    <string name="prerelease_already_installed">أصلًا عندك النسخة التجريبية.</string>
+    <string name="prerelease_install_failed">فشل تنزيل النسخة التجريبية.</string>
+    <string name="episode_action_play_mirror">ستعمل مصدر بديل</string>"
+    <string name="show_episode_text">كتيبة الحلقة</string>
+    <string name="edit_profile_image_error_empty">م لقينا الرابط</string>
+    <string name="edit_profile_image_error_invalid">الرابط أو الصورة مش صالحة</string>
+    <string name="action_mark_watched_up_to_this_episode">عتبر الحلقات محدورة لحد هون</string>
+    <string name="action_remove_mark_watched_up_to_this_episode">وقف إعتبار الحلقات محدورة لحد هون</string>
+    <string name="action_reload">عملنا ري-لوود</string>
+    <string name="reload_provider">عمول ري-لوود للمصدر</string>
+    <string name="name">اسم</string>
+    <string name="resolution_and_name">الجودة وال اسم</string>
+    <string name="subs_subtitle_alignment">ميلة الترجمة</string>
+    <string name="bottom_left">تحت، عال شمال</string>
+    <string name="bottom_center">تحت، بال نُص</string>
+    <string name="bottom_right">تحت، عال يمين</string>
+    <string name="middle_left">نُص، شمال</string>
+    <string name="middle_center">نُص النُص</string>
+    <string name="middle_right">نُص، عال يمين</string>
+    <string name="top_left">فوق، عال شمال</string>
+    <string name="top_center">فوق، بال نُص</string>
+    <string name="top_right">فوق، عال يمين</string>
+    <string name="download_queue">ليستة التنزيلات</string>
+    <string name="queue_empty_message">مافي شي عم يتنزّل هلّق.</string>
+    <string name="extra_brightness_settings">قوة ضو إضافية</string>
+    <string name="extra_brightness_settings_des">بت حط فلتر للبرايتنس لمّا تعلي قوة الضو ل أكتر من 100%</string>
+    <string name="extra_brightness_key">extra_brightness_enabled</string>
+    <string name="search_suggestions">اقتراحات التنبيش</string>
+    <string name="search_suggestions_des">بت فرجي اقتراحات إنتا و عم بت نَبّش</string>
+    <string name="clear_suggestions">مساح الاقتراحات</string>
+    <string name="show_player_metadata_overlay">فرجي ميتا-ديتا فوق الڤيديو</string>
+    <string name="show_cast_in_details">فرجي ليستة الممثلين</string>
+    <string name="video_singular">ڤيديو</string>
+    <string name="video_info">معلومات الڤيديو</string>
+    <string name="source_priority">أولوية المصدر</string>
+    <string name="source_priority_help">حدد ترتيب المصادر بال مشغل</string>
+    <string name="source_name">اسم المصدر</string>
+    <string name="download_all">نزلن كلن</string>
+    <string name="cancel_all">لغين كلن</string>
+    <string name="download_episode_range">بدك تنزل الحلقة %s؟</string>
+    <string name="cancel_queue_message">بدك تلغي كل شي عم يتنَزَّل؟</string>
+    <plurals name="downloads_active">
+        <item quantity="one">م شي عم يتنزل</item>
+        <item quantity="other">شي واحد عم يتنزل</item>
+    </plurals>
+    <plurals name="downloads_queued">
+        <item quantity="one">مافي شي بعد بده يبلش يتنزل</item>
+        <item quantity="other">فيه شي واحد بعد بده يبلش يتنزل</item>
+    </plurals>
+    <string name="player_is_live">لايڤ</string>
+    <string name="skip_type_preview">پريڤيو</string>
+</resources>
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-b+ar/strings.xml
similarity index 85%
rename from app/src/main/res/values-ar/strings.xml
rename to app/src/main/res/values-b+ar/strings.xml
index a20132c89a8..57b2bb62875 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-b+ar/strings.xml
@@ -12,8 +12,7 @@
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">سرعة (%.2fx)</string>
     <string name="rated_format" formatted="true">تقييم: %.1f</string>
-    <string name="new_update_format" formatted="true">يوجد تحديث جديد!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">يوجد تحديث جديد! \n%1$s -&gt; %2$s</string>
     <string name="duration_format" formatted="true">%d دقيقة</string>
     <string name="app_name">CloudStream</string>
     <string name="play_with_app_name">تشغيل بواسطة CloudStream</string>
@@ -63,7 +62,6 @@
     <string name="popup_play_file">تشغيل الملف</string>
     <string name="popup_resume_download">متابعة التنزيل</string>
     <string name="popup_pause_download">إيقاف التنزيل مؤقتًا</string>
-    <string name="pref_disable_acra">قم بتعطيل الإبلاغ عن الأخطاء تلقائيًا</string>
     <string name="home_more_info">مزيد من المعلومات</string>
     <string name="home_expanded_hide">إخفاء</string>
     <string name="home_play">تشغيل</string>
@@ -143,8 +141,6 @@
     <string name="settings_info">معلومات</string>
     <string name="advanced_search">البحث المتقدم</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>
     <string name="show_trailers_settings">عرض المقاطع الدعائية</string>
     <string name="kitsu_settings">عرض ملصقات من كيتسو</string>
@@ -153,8 +149,6 @@
     <string name="automatic_plugin_download">تنزيل الإضافات تلقائيًا</string>
     <string name="updates_settings">التحديث التلقائي</string>
     <string name="updates_settings_des">ابحث تلقائيا عن التحديثات الجديدة بعد بدء التطبيق.</string>
-    <string name="uprereleases_settings">التحديث إلى الاصدارات التجريبية (بيتا)</string>
-    <string name="uprereleases_settings_des">البحث عن التحديثات التجريبية بدلاً من الإصدارات الكاملة فقط</string>
     <string name="github">غيت هاب</string>
     <string name="lightnovel">تطبيق روايات خفيف من نفس المطورين</string>
     <string name="anim">تطبيق أنمي من نفس المطورين</string>
@@ -167,7 +161,6 @@
     <string name="copy_link_toast">تم نسخ الرابط إلى الحافظة</string>
     <string name="play_episode_toast">تشغيل الحلقة</string>
     <string name="subs_default_reset_toast">إعادة التعيين إلى القيمة الافتراضية</string>
-    <string name="acra_report_toast">عذرا، تعطل التطبيق. سيتم إرسال تقرير خطأ مجهول إلى المطورين</string>
     <string name="season">موسم</string>
     <string name="no_season">لا موسم</string>
     <string name="episode">حلقة</string>
@@ -182,10 +175,8 @@
     <string name="resume">إستئناف</string>
     <string name="go_back_30">-٣٠</string>
     <string name="go_forward_30">+٣٠</string>
-    <string name="delete_message">سوف يتم الحذف نهائيا %s
-\nهل أنت متأكد?</string>
-    <string name="resume_time_left" formatted="true">%dm
-\nمتبقية</string>
+    <string name="delete_message">سوف يتم الحذف نهائيا %s \nهل أنت متأكد?</string>
+    <string name="resume_time_left" formatted="true">%dm \nمتبقية</string>
     <string name="status_ongoing">جاري التنفيذ</string>
     <string name="status_completed">اكتمل</string>
     <string name="status">الحالة</string>
@@ -241,10 +232,6 @@
     <string name="show_dub">ملصق مدبلج</string>
     <string name="show_sub">ملصق مترجم</string>
     <string name="show_title">العنوان</string>
-    <string name="show_hd_key" translatable="false">show_hd_key</string>
-    <string name="show_dub_key" translatable="false">show_dub_key</string>
-    <string name="show_sub_key" translatable="false">show_sub_key</string>
-    <string name="show_title_key" translatable="false">show_title_key</string>
     <string name="poster_ui_settings">التحكم في عناصر الواجهة على الملصق</string>
     <string name="no_update_found">لم يتم العثور على تحديثات</string>
     <string name="check_for_update">تحقق من التحديثات</string>
@@ -257,7 +244,7 @@
     <string name="update">تحديث</string>
     <string name="watch_quality_pref">جودة المشاهدة المفضلة (WiFi)</string>
     <string name="limit_title">أقصى عدد لحروف عنوان مُشغل الفيديو</string>
-    <string name="limit_title_rez">أبعاد مُشغل الفيديو</string>
+    <string name="limit_title_rez">عرض معلومات المشغل</string>
     <string name="video_buffer_size_settings">حجم ذاكرة التخزين المؤقت للفيديو</string>
     <string name="video_buffer_length_settings">طول التخزين المؤقت</string>
     <string name="video_buffer_disk_settings">التخزين المؤقت للفيديو على القرص</string>
@@ -276,8 +263,6 @@
     <string name="resize_fill">امتداد</string>
     <string name="resize_zoom">تكبير</string>
     <string name="legal_notice">إخلاء مسؤولية</string>
-    <string name="legal_notice_key" translatable="false">legal_notice_key</string>
-    <string name="legal_notice_text" translatable="false">Any legal issues regarding the content on this application should be taken up with the actual file hosts and providers themselves as we are not affiliated with them. In case of copyright infringement, please directly contact the responsible parties or the streaming websites. The app is purely for educational and personal use. CloudStream 3 does not host any content on the app, and has no control over what media is put up or taken down. CloudStream 3 functions like any other search engine, such as Google. CloudStream 3 does not host, upload or manage any videos, films or content. It simply crawls, aggregates and displayes links in a convenient, user-friendly interface. It merely scrapes 3rd-party websites that are publicly accessable via any regular web browser. It is the responsibility of user to avoid any actions that might violate the laws governing his/her locality. Use CloudStream 3 at your own risk.</string>
     <string name="category_general">عام</string>
     <string name="random_button_settings">زر العشوائي</string>
     <string name="random_button_settings_desc">إظهار زر عشوائي على الصفحة الرئيسية والمكتبة</string>
@@ -297,10 +282,6 @@
     <string name="bottom_title_settings">مكان عنوان الملصق</string>
     <string name="bottom_title_settings_des">وضع العنوان تحت الملصق</string>
     <!-- account stuff -->
-    <string name="anilist_key" translatable="false">anilist_key</string>
-    <string name="mal_key" translatable="false">mal_key</string>
-    <string name="opensubtitles_key" translatable="false">opensubtitles_key</string>
-    <string name="nginx_key" translatable="false">nginx_key</string>
     <string name="example_password">كلمة المرور</string>
     <string name="example_username">إسم المستخدم</string>
     <string name="example_email">البريد الإلكتروني</string>
@@ -308,14 +289,6 @@
     <string name="example_site_name">إسم الموقع الجديد</string>
     <string name="example_site_url">رابط الموقع مثلا : https://example.com</string>
     <string name="example_lang_name">اللغة (الإنجليزية)</string>
-    <!--
-    <string name="mal_account_settings" translatable="false">MAL</string>
-    <string name="anilist_account_settings" translatable="false">AniList</string>
-    <string name="tmdb_account_settings" translatable="false">TMDB</string>
-    <string name="imdb_account_settings" translatable="false">IMDB</string>
-    <string name="kitsu_account_settings" translatable="false">Kitsu</string>
-    <string name="trakt_account_settings" translatable="false">Trakt</string>
-    -->
     <string name="login_format" formatted="true">%1$s %2$s</string>
     <string name="account">حساب</string>
     <string name="logout">تسجيل الخروج</string>
@@ -338,7 +311,6 @@
     <string name="all">الكل</string>
     <string name="max">الحد الاقصي</string>
     <string name="min">الحد الأدنى</string>
-    <string name="subtitles_none" translatable="false">@string/none</string>
     <string name="subtitles_outline">الخطوط المحيطة</string>
     <string name="subtitles_depressed">النمط المنخفض</string>
     <string name="subtitles_shadow">ظل</string>
@@ -404,7 +376,6 @@
     <string name="previous">السابق</string>
     <string name="skip_setup">تخطي الإعداد</string>
     <string name="app_layout_subtext">قم بتغيير مظهر التطبيق ليناسب جهازك</string>
-    <string name="crash_reporting_title">إبلاغ الأعطال</string>
     <string name="preferred_media_subtext">ماذا تريد ان تري</string>
     <string name="setup_done">تم</string>
     <string name="extensions">الإضافات</string>
@@ -427,9 +398,7 @@
     <string name="plugins_downloaded" formatted="true">تم تحميل: %d</string>
     <string name="plugins_disabled" formatted="true">مُعطل %d</string>
     <string name="plugins_not_downloaded" formatted="true">غير مُحمل: %d</string>
-    <string name="blank_repo_message">لا يحتوي CloudStream على مواقع مثبتة افتراضيًا. تحتاج إلى تثبيت المواقع من المستودعات.
-\n
-\nانضم إلى ديسكورد أو ابحث عبر الإنترنت.</string>
+    <string name="blank_repo_message">لا يحتوي CloudStream على مواقع مثبتة افتراضيًا. تحتاج إلى تثبيت المواقع من المستودعات. \n \nانضم إلى ديسكورد أو ابحث عبر الإنترنت.</string>
     <string name="view_public_repositories_button">عرض مستودعات المجتمع</string>
     <string name="view_public_repositories_button_short">قائمة عامة</string>
     <string name="uppercase_all_subtitles">جميع الترجمات حروف كبيرة</string>
@@ -480,7 +449,7 @@
     <string name="player_settings_play_in_app">مشغل داخلي</string>
     <string name="app_not_found_error">لم يتم العثور على التطبيق</string>
     <string name="all_languages_preference">جميع اللغات</string>
-    <string name="skip_type_creddits">الإعتمادات</string>
+    <string name="skip_type_credits">الإعتمادات</string>
     <string name="update_notification_downloading">‌تنزيل تحديث التطبيق…</string>
     <string name="update_notification_installing">‏تثبيت تحديث التطبيق…</string>
     <string name="next_episode_time_min_format" formatted="true">%d دقيقة</string>
@@ -489,7 +458,7 @@
     <string name="confirm_exit_dialog">هل أنت متأكد أنك تريد الخروج؟</string>
     <string name="automatic_plugin_download_summary">قم بتثبيت جميع المكونات الإضافية التي لم يتم تثبيتها بعد تلقائيا من المستودعات المضافة.</string>
     <string name="apk_installer_settings">مثبت الحزم</string>
-    <string name="apk_installer_settings_des">بعض الهواتف لا تدعم مثبت الحزمة الجديد. جرب الخيار القديم إذا لم يتم تثبيت التحديثات.</string>
+    <string name="apk_installer_settings_des">بعض الاجهزة لا تدعم مثبت الحزمة الجديد. جرب الخيار القديم إذا لم يتم تثبيت التحديثات.</string>
     <string name="apk_installer_legacy">قياسي</string>
     <string name="apk_installer_package_installer">مثبت الحزمة</string>
     <string name="pref_category_player_layout">التخطيط</string>
@@ -519,15 +488,13 @@
     <string name="sort_rating_desc">التقييم (من الأعلى إلى الأدنى)</string>
     <string name="sort_rating_asc">التقييم (من الأدنى إلى الأعلى)</string>
     <string name="sort_alphabetical_z">الترتيب الأبجدي (من ي إلى أ)</string>
-    <string name="empty_library_no_accounts_message">مكتبتك فارغة :(
-\nقم بتسجيل الدخول على حساب مكتبة أو أضف عروضا إلى مكتبتك المحلية.</string>
+    <string name="empty_library_no_accounts_message">مكتبتك فارغة :( \nقم بتسجيل الدخول على حساب مكتبة أو أضف عروضا إلى مكتبتك المحلية.</string>
     <string name="sort_updated_old">محدث (من القديم إلى الجديد)</string>
     <string name="sort_by">فرز حسب</string>
     <string name="sort">افرز</string>
     <string name="open_with">فتح بواسطة</string>
     <string name="library">المكتبة</string>
-    <string name="safe_mode_file">تم العثور على ملف الوضع الآمن!
-\nلا يتم تحميل أي ملحقات عند بدء التشغيل حتى تتم إزالة الملف.</string>
+    <string name="safe_mode_file">تم العثور على ملف الوضع الآمن! \nلا يتم تحميل أي ملحقات عند بدء التشغيل حتى تتم إزالة الملف.</string>
     <string name="android_tv_interface_off_seek_settings_summary">مدة التقديم عنما يكون المشغل مخفيا</string>
     <string name="android_tv_interface_off_seek_settings">مدة التقديم - المشغل مخفي</string>
     <string name="pref_category_android_tv">تلفزيون أندرويد</string>
@@ -559,13 +526,7 @@
     <string name="edit">تعديل</string>
     <string name="profiles">الملفات التعريفية</string>
     <string name="help">مساعدة</string>
-    <string name="quality_profile_help">‎‎هنا يمكنك تغيير طريقة ترتيب المصادر. إذا كان للفيديو أولوية أعلى ، فسيظهر في الأعلى في اختيار المصدر. يمثل مجموع أولوية المصدر وأولوية الجودة أولوية الفيديو.
-\n
-\nالمصدر أ: 3
-\nالجودة ب: 7
-\nسيكون لها أولوية فيديو مجمعة تبلغ 10.
-\n
-\nملاحظة: إذا كان المجموع 10 أو أكثر ، فسيتخطى المشغل التحميل تلقائيًا عند تحميل هذا الرابط!</string>
+    <string name="quality_profile_help">‎‎هنا يمكنك تغيير طريقة ترتيب المصادر. إذا كان للفيديو أولوية أعلى ، فسيظهر في الأعلى في اختيار المصدر. يمثل مجموع أولوية المصدر وأولوية الجودة أولوية الفيديو. \n \nالمصدر أ: 3 \nالجودة ب: 7 \nسيكون لها أولوية فيديو مجمعة تبلغ 10. \n \nملاحظة: إذا كان المجموع 10 أو أكثر ، فسيتخطى المشغل التحميل تلقائيًا عند تحميل هذا الرابط!</string>
     <string name="qualities">النوعيات</string>
     <string name="profile_background_des">خلفية الملف الشخصي</string>
     <string name="unable_to_inflate">تعذر إنشاء واجهة المستخدم بشكل صحيح ، وهذا خطأ كبير ويجب الإبلاغ عنه على الفور %s</string>
@@ -578,11 +539,7 @@
     <string name="favorite_removed">تمت إزالة %s من المفضلة</string>
     <string name="favorites_list_name">المفضلة</string>
     <string name="favorite_added">تمت إضافة %s إلى المفضلة</string>
-    <string name="duplicate_message_multiple" formatted="true">احتمال وجود تكرارات في مكتبتك.
-\n
-\n%s
-\n
-\nهل تريد الاضافة على اي حال مستبدلاً النسخة الموجودة بالفعل, أم تفضل إلغاء العملية؟</string>
+    <string name="duplicate_message_multiple" formatted="true">احتمال وجود تكرارات في مكتبتك. \n \n%s \n \nهل تريد الاضافة على اي حال مستبدلاً النسخة الموجودة بالفعل, أم تفضل إلغاء العملية؟</string>
     <string name="duplicate_title">احتمال أن يكون موجود بالفعل</string>
     <string name="lock_profile">قفل الحساب</string>
     <string name="action_add_to_favorites">اضافة الى المفضلة</string>
@@ -595,9 +552,7 @@
     <string name="action_subscribe">إشترك</string>
     <string name="action_remove_from_favorites">إزالة من المفضلة</string>
     <string name="select_an_account">اختار حساب</string>
-    <string name="duplicate_message_single">يبدو أن هناك عنصرًا مكررًا موجود بالفعل في مكتبتك: \'%s\'.
-\n
-\nهل ترغب في إضافة هذا العنصر على أية حال، أو استبدال العنصر الموجود، أو إلغاء الإجراء؟</string>
+    <string name="duplicate_message_single">يبدو أن هناك عنصرًا مكررًا موجود بالفعل في مكتبتك: \'%s\'. \n \nهل ترغب في إضافة هذا العنصر على أية حال، أو استبدال العنصر الموجود، أو إلغاء الإجراء؟</string>
     <string name="enter_pin">ادخال ال PIN</string>
     <string name="pin">PIN</string>
     <string name="enter_current_pin">أدخل ال PIN الحالي</string>
@@ -609,8 +564,6 @@
     <string name="edit_account">تعديل الحساب</string>
     <string name="links_reloaded_toast">تم إعادة تحميل الروابط</string>
     <string name="rotate_video_desc">عرض زر تبديل لاتجاه الشاشة</string>
-    <string name="rotate_video_key">تدوير الفيديو</string>
-    <string name="auto_rotate_video_key">مفتاح تدوير الفيديو التلقائي</string>
     <string name="auto_rotate_video">الدوران التلقائي</string>
     <string name="rotate_video">تدوير</string>
     <string name="auto_rotate_video_desc">تمكين التبديل التلقائي لاتجاه الشاشة بناءً على اتجاه الفيديو</string>
@@ -627,8 +580,7 @@
     <string name="password_pin_authentication_title">مصادقة كلمة المرور/رقم التعريف الشخصي</string>
     <string name="biometric_prompt_description">بعد عدة محاولات فاشلة، سيتم إغلاق المطالبة. ما عليك سوى إعادة تشغيل التطبيق للمحاولة مرة أخرى.</string>
     <string name="biometric_warning">لقد تم الآن نسخ بيانات CloudStream احتياطيًا. على الرغم من أن احتمال حدوث ذلك منخفض جدًا، إلا أن جميع الأجهزة يمكن أن تتصرف بشكل مختلف. في الحالات النادرة، التي يتم فيها منعك من الوصول إلى التطبيق، قم بمسح بيانات التطبيق بالكامل واستعادتها من نسخة احتياطية. نحن نأسف جدًا لأي إزعاج ناتج عن هذا.</string>
-    <string name="resume_remaining" formatted="true">%s
-\nمتبقي</string>
+    <string name="resume_remaining" formatted="true">%s \nمتبقي</string>
     <string name="favorite">المفضلة</string>
     <string name="unfavorite">إزالة من المفضلة</string>
     <string name="repo_copy_label">اسم و عنوان المخزن</string>
@@ -641,8 +593,8 @@
     <string name="audio_book_singular">كتاب صوتي</string>
     <string name="ok">حسناً</string>
     <string name="battery_dialog_message">لضمان عدم انقطاع التنزيلات والإشعارات للعروض التلفزيونية التي اشتركت بها ، يحتاج CloudStream إلى إذن للتشغيل في الخلفية. بالضغط على \"موافق\"، سيظهر لك مربع حوار طلب. يُرجى الضغط على \"السماح\".\n\nيرجى ملاحظة أن هذا الإذن لا يعني أن CS3 سيستنزف بطاريتك. سيعمل في الخلفية فقط عند الضرورة، مثلا عند تلقي الإشعارات أو تنزيل مقاطع الفيديو من الإضافات الرسمية.</string>
-    <string name="music_singlar">موسيقى</string>
-    <string name="custom_media_singluar">الوسائط</string>
+    <string name="music_singular">موسيقى</string>
+    <string name="custom_media_singular">الوسائط</string>
     <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>
@@ -659,7 +611,6 @@
     <string name="device_pin_url_message">قم بزيارة <b>%s</b> على هاتفك الذكي أو جهاز الكمبيوتر وأدخل الرمز أعلاه</string>
     <string name="device_pin_error_message">لا يمكن الحصول على رمز PIN للجهاز، حاول المصادقة المحلية</string>
     <string name="device_pin_counter_text">تنتهي صلاحية الرمز خلال %1$dm %2$ds</string>
-    <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="open_local_video">فتح فيديو محلي</string>
     <string name="test_warning">تحذير</string>
@@ -671,21 +622,13 @@
     <string name="downloads_delete_select">الرجاء تحديد العناصر للحذف</string>
     <string name="select_all">تحديد الكل</string>
     <string name="delete_files">حذف الملفات</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="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="delete_format" formatted="true">حذف (%1$d | %2$s)</string>
     <string name="offline_file">متاح للمشاهدة في وضع عدم الاتصال</string>
     <string name="deselect_all">إلغاء تحديد الكل</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="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>
@@ -697,14 +640,14 @@
     <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="audio_singular">صوت</string>
+    <string name="podcast_singular">بودكاست</string>
     <string name="encoding_error">خطأ في التكويد</string>
     <string name="unsupported_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_desc">يمكّن فك تشفير البرمجي المشغل من تشغيل ملفات الفيديو التي لا يدعمها هاتفك، ولكنه قد يتسبب في بطء أو عدم استقرار التشغيل على الدقة العالية</string>
+    <string name="software_decoding_desc">يمكّن فك تشفير البرمجي المشغل من تشغيل ملفات الفيديو التي لا يدعمها جهازك، ولكنه قد يتسبب في بطء أو عدم استقرار التشغيل على الدقة العالية.</string>
     <string name="software_decoding">فك الترميز البرمجي</string>
     <string name="sort_episodes_rating_high_low">تقييم (الأعلى)</string>
     <string name="sort_episodes_rating_low_high">تقييم (الأقل)</string>
@@ -727,4 +670,87 @@
     <string name="subtitles_from_online">اونلاين</string>
     <string name="subtitles_from_embedded">داخلياً</string>
     <string name="volume_exceeded_100">لقد تجاوز مستوى الصوت 100٪</string>
-</resources>
\ No newline at end of file
+    <string name="all_subtitles_bold">جعل جميع العناوين الفرعية عريضة</string>
+    <string name="slide_up_again_to_exceed_100">اسحب لأعلى مرة أخرى لتتجاوز 100%</string>
+    <string name="all_subtitles_italic">جعل كل العناوين الفرعية مائلة</string>
+    <string name="background_radius">نصف قطر الخلفية</string>
+    <string name="download_time_left_hour_min_sec_format" formatted="true">%1$dh %2$dm %3$d</string>
+    <string name="download_time_left_min_sec_format" formatted="true">%1$dm %2$d</string>
+    <string name="download_time_left_sec_format" formatted="true">%1$dث</string>
+    <string name="show_rating">ملصق التصنيف</string>
+    <string name="player_settings_always_ask">أسال دائما</string>
+    <string name="download_parallel_settings_des">عدد الأصناف المختلفة التي يمكن تنزيلها بالتوازي</string>
+    <string name="parallel_downloads">تحميلات موازية</string>
+    <string name="concurrent_connections">الاتصالات الجارية</string>
+    <string name="concurrent_connections_settings_des">كم عدد الاتصالات المتزامنة التي يمكن أن يستخدمها كل تحميل</string>
+    <string name="go_to_downloads">الذهاب إلى تحميل</string>
+    <string name="no_internet_connection">لا يوجد اتصال بالإنترنت.\n\nيُرجى الاتصال بالإنترنت والمحاولة مرة أخرى، أو مشاهدة التنزيلات أثناء عدم الاتصال بالإنترنت.</string>
+    <string name="overscan_settings_des">تغير حدود الشاشة</string>
+    <string name="overscan_settings">مسح زائد</string>
+    <string name="poster_size_settings_des">تغيير حجم الملصقات</string>
+    <string name="poster_size_settings">حجم الملصقات</string>
+    <string name="speedup_title">تبديل سرعة الضغط لفترة طويلة</string>
+    <string name="speedup_summary">اضغط مع الاستمرار للحصول على سرعة 2x</string>
+    <string name="no_account">لا يوجد حساب</string>
+    <string name="edit_profile_image_title">تعديل صورة الملف الشخصي</string>
+    <string name="edit_profile_image_hint">ادخل رابط صورة الملف الشخصي</string>
+    <string name="edit_profile_image_error_empty">لم يتم العثور على الرابط</string>
+    <string name="edit_profile_image_error_invalid">رابط او صورة غير صالحة للاستخدام</string>
+    <string name="edit_profile_image_success">تم رفع الصورة</string>
+    <string name="action_mark_watched_up_to_this_episode">ضع علامة تمت المشاهدة لهذه الحلقة</string>
+    <string name="action_remove_mark_watched_up_to_this_episode">ازالة علامة تمت المشاهدة لهذه الحلقة</string>
+    <string name="action_reload">تم تحديث الصفحة</string>
+    <string name="reload_provider">تحديث المزود</string>
+    <string name="episode_action_play_mirror">تشغيل مصدر بديل</string>"
+    <string name="name">اسم</string>
+    <string name="resolution_and_name">الدقة و الاسم</string>
+    <string name="subs_subtitle_alignment">محاذاة الترجمة</string>
+    <string name="bottom_left">أسفل اليسار</string>
+    <string name="bottom_center">اسفل وسط</string>
+    <string name="bottom_right">أسفل اليمين</string>
+    <string name="middle_left">منتصف اليسار</string>
+    <string name="middle_center">منتصف وسط</string>
+    <string name="middle_right">منتصف يمين</string>
+    <string name="top_left">اعلى يسار</string>
+    <string name="top_center">اعلى وسط</string>
+    <string name="top_right">اعلى يمين</string>
+    <string name="play_full_series_button">شاهد المسلسل كاملاً</string>
+    <string name="extra_brightness_settings">سطوع إضافي</string>
+    <string name="extra_brightness_settings_des">تفعيل فلتر السطوع عند تجاوز سطوع الشاشة 100%</string>
+    <string name="extra_brightness_key">تفعيل فلتر السطوع الإضافي</string>
+    <string name="search_suggestions">اقتراحات البحث</string>
+    <string name="search_suggestions_des">عرض اقتراحات البحث أثناء الكتابة</string>
+    <string name="clear_suggestions">مسح الاقتراحات</string>
+    <string name="show_cast_in_details">عرض لوحة فريق التمثيل</string>
+    <string name="install_prerelease">تثبيت الإصدار التجريبي</string>
+    <string name="prerelease_already_installed">تم تثبيت الإصدار التجريبي بالفعل.</string>
+    <string name="prerelease_install_failed">فشل تثبيت الإصدار التجريبي.</string>
+    <string name="show_episode_text">نص الحلقة</string>
+    <string name="video_info">معلومات الوسائط</string>
+    <string name="source_name">اسم المصدر</string>
+    <string name="download_queue">شريط التنزيلات</string>
+    <string name="queue_empty_message">لا يوجد تنزيلات قيد الانتظار حاليا.</string>
+    <string name="source_priority">أولوية المصدر</string>
+    <string name="source_priority_help">حَدِّد كيف يجب ترتيب مصادر الفيديو في المُشَّغِل</string>
+    <string name="download_all">تنزيل الكل</string>
+    <string name="cancel_all">إلغاء الكل</string>
+    <string name="download_episode_range">هل ترغب في تنزيل الحلقة %s ؟</string>
+    <string name="cancel_queue_message">هل ترغب في إلغاء جميع التنزيلات قيد الانتظار؟</string>
+    <plurals name="downloads_active">
+        <item quantity="zero">%d لا يوجد تنزيل نشط</item>
+        <item quantity="one">%d تنزيل واحد نشط</item>
+        <item quantity="two">%d تنزيلان نشطان</item>
+        <item quantity="few">%d تنزيلات نشطة</item>
+        <item quantity="many">%d تنزيل نشط</item>
+        <item quantity="other">%d تنزيل نشط</item>
+    </plurals>
+    <plurals name="downloads_queued">
+        <item quantity="zero">%d لا يوجد تنزيلات في قائمة الانتظار</item>
+        <item quantity="one">%d تنزيل واحد قيد الانتظار</item>
+        <item quantity="two">%d تنزيلان قيد الانتظار</item>
+        <item quantity="few">%d تنزيلات قيد الانتظار</item>
+        <item quantity="many">%d تنزيل قيد الانتظار</item>
+        <item quantity="other">%d تنزيل قيد الانتظار</item>
+    </plurals>
+    <string name="show_player_metadata_overlay">عرض واجهة منبثقة للبيانات الوصفية للمشغِّل</string>
+</resources>
diff --git a/app/src/main/res/values-ars/strings.xml b/app/src/main/res/values-b+ars/strings.xml
similarity index 94%
rename from app/src/main/res/values-ars/strings.xml
rename to app/src/main/res/values-b+ars/strings.xml
index d1efdbbc536..cd3830a019a 100644
--- a/app/src/main/res/values-ars/strings.xml
+++ b/app/src/main/res/values-b+ars/strings.xml
@@ -35,8 +35,7 @@
     <string name="download_paused">توقف التنزيل</string>
     <string name="type_plan_to_watch">خطط للمشاهدة</string>
     <string name="type_re_watching">إعادة المشاهدة</string>
-    <string name="new_update_format" formatted="true">!تم العثور على تحديث جديد
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">!تم العثور على تحديث جديد \n%1$s -&gt; %2$s</string>
     <string name="rated_format" formatted="true">%.1f:قدر</string>
     <string name="duration_format" formatted="true">%dاقل</string>
     <string name="app_name">كلاودستريم</string>
@@ -85,19 +84,15 @@
     <string name="settings_info">معلومات</string>
     <string name="category_updates">التحديثات والنسخ الاحتياطي</string>
     <string name="advanced_search_des">يعطيك نتائج البحث مفصولة حسب المزود</string>
-    <string name="bug_report_settings_off">يرسل فقط البيانات عن الأعطال</string>
     <string name="show_trailers_settings">عرض المقطورات</string>
     <string name="kitsu_settings">عرض الملصقات من كيتسو</string>
     <string name="category_account">حسابات</string>
-    <string name="bug_report_settings_on">لا يرسل أي بيانات</string>
     <string name="show_fillers_settings">عرض حلقة حشو للأنمي</string>
     <string name="pref_filter_search_quality">إخفاء جودة الفيديو المحددة في نتائج البحث</string>
     <string name="automatic_plugin_updates">تحديثات البرنامج المساعد التلقائي</string>
     <string name="updates_settings_des">البحث تلقائيًا عن التحديثات الجديدة بعد بدء تشغيل التطبيق.</string>
-    <string name="uprereleases_settings">التحديث إلى الإصداراالمسبق</string>
     <string name="automatic_plugin_download">تنزيل المكونات الإضافية تلقائيًا</string>
     <string name="redo_setup_process">إعادة عملية الإعداد</string>
-    <string name="uprereleases_settings_des">ابحث عن تحديثات الإصدار التجريبي بدلاً من الإصدارات الكاملة فقط</string>
     <string name="automatic_plugin_download_mode_title">حدد الوضع لتصفية تنزيل المكونات الإضافية</string>
     <string name="automatic_plugin_download_summary">قم تلقائيًا بتثبيت جميع المكونات الإضافية التي لم يتم تثبيتها بعد من المستودعات المضافة.</string>
     <string name="chromecast_subtitles_settings_des">إعدادات ترجمات كرومكاست</string>
@@ -132,7 +127,6 @@
     <string name="no_chromecast_support_toast">لا يتمتع هذا المزود بدعم كرومكاست</string>
     <string name="no_links_found_toast">لم يتم العثور على أي روابط</string>
     <string name="play_episode_toast">تشغيل الحلقة</string>
-    <string name="acra_report_toast">عذرًا، تعطل التطبيق. سيتم إرسال تقرير خطأ مجهول إلى المطورين</string>
     <string name="season_format">%1$s%2$d%3$s</string>
     <string name="no_season">لا يوجد موسم</string>
     <string name="episode">حلقة</string>
@@ -162,23 +156,15 @@
     <string name="sort_updated_new">تم التحديث (من الجديد إلى القديم)</string>
     <string name="sort_updated_old">تم التحديث (القديم إلى الجديد)</string>
     <string name="sort_alphabetical_a">أبجديًا (من الألف إلى الياء)</string>
-    <string name="empty_library_no_accounts_message">مكتبتك فارغة :(
-\nقم بتسجيل الدخول إلى حساب المكتبة أو قم بإضافة العروض إلى مكتبتك المحلية.</string>
-    <string name="safe_mode_file">!تم العثور على ملف الوضع الآمن
-\n.عدم تحميل أي ملحقات عند بدء التشغيل حتى تتم إزالة الملف</string>
+    <string name="empty_library_no_accounts_message">مكتبتك فارغة :( \nقم بتسجيل الدخول إلى حساب المكتبة أو قم بإضافة العروض إلى مكتبتك المحلية.</string>
+    <string name="safe_mode_file">!تم العثور على ملف الوضع الآمن \n.عدم تحميل أي ملحقات عند بدء التشغيل حتى تتم إزالة الملف</string>
     <string name="revert">ارجع</string>
     <string name="subscription_in_progress_notification">تحديث العروض المشتركة</string>
     <string name="set_default">الوضع العادي</string>
     <string name="edit">حرر</string>
     <string name="profiles">ملفات تعريفية</string>
     <string name="help">مساعدة</string>
-    <string name="quality_profile_help">.هنا يمكنك تغيير كيفية ترتيب المصادر. إذا كان للفيديو أولوية أعلى، فسيظهر في مكان أعلى في تحديد المصدر. مجموع أولوية المصدر وأولوية الجودة هو أولوية الفيديو
-\n
-\nالمصدر أ: 3
-\nالجودة ب: 7
-\nستكون أولوية الفيديو المدمجة .10
-\n
-\n!ملاحظة: إذا كان المجموع 10 أو أكثر، فسيقوم اللاعب تلقائيًا بتخطي التحميل عند تحميل هذا الرابط</string>
+    <string name="quality_profile_help">.هنا يمكنك تغيير كيفية ترتيب المصادر. إذا كان للفيديو أولوية أعلى، فسيظهر في مكان أعلى في تحديد المصدر. مجموع أولوية المصدر وأولوية الجودة هو أولوية الفيديو \n \nالمصدر أ: 3 \nالجودة ب: 7 \nستكون أولوية الفيديو المدمجة .10 \n \n!ملاحظة: إذا كان المجموع 10 أو أكثر، فسيقوم اللاعب تلقائيًا بتخطي التحميل عند تحميل هذا الرابط</string>
     <string name="already_voted">لقد صوت بالفعل</string>
     <string name="sort_alphabetical_z">أبجديًا (ياء إلى ألف)</string>
     <string name="sort_by">ترتيب حسب</string>
@@ -218,7 +204,6 @@
     <string name="subs_window_color">لون النافذة</string>
     <string name="subs_subtitle_elevation">ارتفاع الترجمة</string>
     <string name="popup_delete_file">حذف ملف</string>
-    <string name="pref_disable_acra">تعطيل الإبلاغ التلقائي عن الأخطاء</string>
     <string name="update_started">بدأ التحديث</string>
     <string name="sort_copy">انسخ</string>
     <string name="stream">بث</string>
@@ -233,8 +218,7 @@
     <string name="sort_apply">قدم</string>
     <string name="torrent_plot">وصف</string>
     <string name="picture_in_picture_des">يستمر التشغيل في مشغل مصغر فوق التطبيقات الأخرى</string>
-    <string name="delete_message" formatted="true">نهائيا %sسيؤدي هذا الى حذف
-\nهل أنت متأكد؟</string>
+    <string name="delete_message" formatted="true">نهائيا %sسيؤدي هذا الى حذف \nهل أنت متأكد؟</string>
     <string name="subs_font">الخط</string>
     <string name="subs_font_size">حجم الخط</string>
     <string name="action_remove_watching">زيل</string>
@@ -261,8 +245,7 @@
     <string name="show_log_cat">🐈عرض لوجكات</string>
     <string name="test_log">سجل</string>
     <string name="picture_in_picture">صور في صور</string>
-    <string name="resume_time_left" formatted="true">%d
-\nباقي</string>
+    <string name="resume_time_left" formatted="true">%d \nباقي</string>
     <string name="video_source">مصدر</string>
     <string name="android_tv_interface_off_seek_settings">اللاعب مخفي - ابحث عن المبلغ</string>
     <string name="backup_frequency">تكرار النسخ الاحتياطي</string>
@@ -350,6 +333,5 @@
     <string name="documentaries_singular">وثائقي</string>
     <string name="site">موقع</string>
     <string name="limit_title">عنوان مشغل الفيديو بحد أقصى لعدد الأحرف</string>
-    <string name="hide_player_control_names_key" translatable="false">hide_player_control_names_key</string>
     <string name="dns_pref">DNS عبر HTTPS</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-as/strings.xml b/app/src/main/res/values-b+as/strings.xml
similarity index 94%
rename from app/src/main/res/values-as/strings.xml
rename to app/src/main/res/values-b+as/strings.xml
index 26d47be69b1..b7efb334148 100644
--- a/app/src/main/res/values-as/strings.xml
+++ b/app/src/main/res/values-b+as/strings.xml
@@ -76,7 +76,7 @@
     <string name="profile_number">প্ৰ\'ফাইল %d</string>
     <string name="enter_pin">পিন সন্নিবিষ্ট কৰক</string>
     <string name="edit_account">একাউণ্ট সম্পাদনা কৰক</string>
-    <string name="custom_media_singluar">মিডিয়া</string>
+    <string name="custom_media_singular">মিডিয়া</string>
     <string name="reset_btn">ৰিচেট কৰক</string>
     <string name="cast_format" formatted="true">Cast: %s</string>
     <string name="type_watching">দেখি আছে</string>
@@ -97,7 +97,7 @@
     <string name="biometric_authentication_title">CloudStream আনলক কৰক</string>
     <string name="biometric_setting">বায়\'মেট্ৰিক্সৰ সৈতে লক কৰক</string>
     <string name="password_pin_authentication_title">পাছৱাৰ্ড/পিন প্ৰমাণীকৰণ</string>
-    <string name="music_singlar">সংগীত</string>
+    <string name="music_singular">সংগীত</string>
     <string name="audio_book_singular">অডিঅ\' বুক</string>
     <string name="next_episode_format" formatted="true">Episode %d will be released in</string>
     <string name="next_season_episode_format" formatted="true">Season %1$d Episode %2$d will be released in</string>
@@ -138,7 +138,6 @@
     <string name="app_subbed_text">চাব</string>
     <string name="popup_delete_file">ফাইল মচক</string>
     <string name="popup_play_file">ফাইল প্লে কৰক</string>
-    <string name="pref_disable_acra">স্বয়ংক্ৰিয় বাগ ৰিপ’ৰ্টিং নিষ্ক্ৰিয় কৰক</string>
     <string name="popup_resume_download">ডাউনলোড পুনৰ আৰম্ভ কৰক</string>
     <string name="popup_pause_download">ডাউনলোড ৰখা</string>
     <string name="home_more_info">অধিক তথ্য</string>
@@ -212,8 +211,6 @@
     <string name="restore_success">ব্যাকআপ ফাইল ল\'ড কৰা হৈছে</string>
     <string name="advanced_search">উন্নত সন্ধান</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>
     <string name="show_trailers_settings">ট্ৰেইলাৰ দেখুৱাওক</string>
     <string name="kitsu_settings">কিৎসুৰ পৰা প\'ষ্টাৰ দেখুৱাওক</string>
@@ -221,7 +218,6 @@
     <string name="automatic_plugin_updates">স্বয়ংক্ৰিয় প্লাগইন আপডেট</string>
     <string name="updates_settings">এপ্‌ আপডেট দেখুৱাওক</string>
     <string name="redo_setup_process">পুনৰ চেটআপ প্ৰক্ৰিয়া কৰক</string>
-    <string name="uprereleases_settings">প্ৰাকমুক্তিৰ বাবে আপডেট কৰক</string>
     <string name="apk_installer_settings">APK ইনষ্টলাৰ</string>
     <string name="apk_installer_settings_des">কিছুমান ফোনে নতুন পেকেজ ইনষ্টলাৰ সমৰ্থন নকৰে। আপডেটসমূহ ইনষ্টল নকৰিলে লিগেচি বিকল্প পৰীক্ষা কৰক।</string>
     <string name="github">Github</string>
@@ -234,7 +230,6 @@
     <string name="no_chromecast_support_toast">এই প্ৰদানকাৰীৰ ক্ৰোমকাষ্ট সমৰ্থন নাই</string>
     <string name="copy_link_toast">লিংক ক্লিপব\'ৰ্ডত কপিকৰ কৰা হ’ল</string>
     <string name="play_episode_toast">এপিচ’ড প্লে কৰক</string>
-    <string name="acra_report_toast">দুখিত, এপ্পটোৰ এক্সিডেণ্ট হৈছে। এজনামবাগ বাগ ৰিপ’ৰ্ট ডেভেলপাৰক পঠোৱা হ’ব</string>
     <string name="season">চিজন</string>
     <string name="subs_default_reset_toast">ডিফল্ট মানলৈ পুনৰছেট কৰক</string>
     <string name="season_format">%1$s %2$d%3$s</string>
@@ -257,12 +252,9 @@
     <string name="resume">পুনৰ আৰম্ভ কৰক</string>
     <string name="go_back_30">-৩০</string>
     <string name="go_forward_30">+৩০</string>
-    <string name="delete_message" formatted="true">এইটো স্থায়ীভাৱে %s ডিলিট কৰিব।
-\nআপুনি নিশ্চিত নেকি?</string>
-    <string name="resume_time_left" formatted="true">%dm
-\nবাকী</string>
-    <string name="resume_remaining" formatted="true">%s
-\nবাকী</string>
+    <string name="delete_message" formatted="true">এইটো স্থায়ীভাৱে %s ডিলিট কৰিব। \nআপুনি নিশ্চিত নেকি?</string>
+    <string name="resume_time_left" formatted="true">%dm \nবাকী</string>
+    <string name="resume_remaining" formatted="true">%s \nবাকী</string>
     <string name="status_ongoing">চলমান</string>
     <string name="status_completed">সম্পূৰ্ণ</string>
     <string name="status">স্থিতি</string>
@@ -435,7 +427,6 @@
     <string name="subtitles_remove_bloat">অপ্রয়োজনীয়তাবোৰ সাবটাইটেলৰ পৰা আঁতৰাওক</string>
     <string name="extras">অতিৰিক্ত</string>
     <string name="trailer">ট্ৰেইলাৰ</string>
-    <string name="crash_reporting_title">ক্ৰেছৰ ৰিপৰ্টিং</string>
     <string name="network_adress_example">https://example.com/example.mp4</string>
     <string name="previous">পূৰ্বৰ</string>
     <string name="skip_setup">ছেটআপ এৰি দিয়া</string>
@@ -462,9 +453,7 @@
     <string name="plugins_updated" formatted="true">%d প্লাগইন আপডেট কৰা হ\'ল</string>
     <string name="plugins_disabled" formatted="true">নিষ্ক্ৰিয় কৰা: %d</string>
     <string name="plugins_not_downloaded" formatted="true">ডাউনলোড কৰা নহয়: %d</string>
-    <string name="blank_repo_message">CloudStreamত কোনো চাইট ডিফল্টভাৱে ইনষ্টল হোৱা নাই। আপুনিয়ে ৰিপ\'জিট\'ৰিবোৰৰ পৰা চাইটসমূহ ইনষ্টল কৰিব লাগিব।
-\n
-\nআমাৰ Discordত যোগদান কৰক বা অনলাইন বিচাৰক।</string>
+    <string name="blank_repo_message">CloudStreamত কোনো চাইট ডিফল্টভাৱে ইনষ্টল হোৱা নাই। আপুনিয়ে ৰিপ\'জিট\'ৰিবোৰৰ পৰা চাইটসমূহ ইনষ্টল কৰিব লাগিব। \n \nআমাৰ Discordত যোগদান কৰক বা অনলাইন বিচাৰক।</string>
     <string name="view_public_repositories_button">সম্প্ৰদায়ৰ ৰিপ\'জিট\'ৰিসমূহ চাওক</string>
     <string name="uppercase_all_subtitles">সকলো চাবটাইটল মুকলি আখৰত</string>
     <string name="download_all_plugins_from_repo">সতর্কতা: CloudStream 3 কোৱা নাই যে তৃতীয় পক্ষৰ বৃদ্ধিসমূহ ব্যৱহাৰ কৰিবলৈ আপুনি সম্পূৰ্ণ দায়িত্ব ল\'ব আৰু কোনো সহায় নাপাব!</string>
@@ -499,7 +488,7 @@
     <string name="skip_type_mixed_ed">মিশ্ৰিত সমাপ্তি</string>
     <string name="skip_type_mixed_op">মিশ্ৰিত উদ্‌ঘাটনী</string>
     <string name="clear_history">ইতিহাস পৰিস্কাৰ কৰক</string>
-    <string name="skip_type_creddits">স্বীকৃতি</string>
+    <string name="skip_type_credits">স্বীকৃতি</string>
     <string name="skip_type_intro">ভূমিকা</string>
     <string name="history">ইতিহাস</string>
     <string name="enable_skip_op_from_database_des">উদ্‌ঘাটনী/সমাপ্তিৰ বাবে এৰি দিয়াৰ পপআপ দেখুৱাওক</string>
@@ -529,11 +518,9 @@
     <string name="sort_alphabetical_a">বৰ্ণানুক্ৰমিক (A ৰ পৰা Z)</string>
     <string name="select_library">পুথিভঁৰালী বাছক</string>
     <string name="open_with">ইয়াৰ সহায়ত খুলক</string>
-    <string name="empty_library_no_accounts_message">আপোনাৰ পুথিভঁৰালী খালি আছে :(
-\nএখন পুথিভঁৰালী একাউণ্টত লগ ইন কৰক বা স্থানীয় পুথিভঁৰালীত শ্ব\'সমূহ যোগ কৰক।</string>
+    <string name="empty_library_no_accounts_message">আপোনাৰ পুথিভঁৰালী খালি আছে :( \nএখন পুথিভঁৰালী একাউণ্টত লগ ইন কৰক বা স্থানীয় পুথিভঁৰালীত শ্ব\'সমূহ যোগ কৰক।</string>
     <string name="empty_library_logged_in_message">এই তালিকা খালি। অন্য এটি তালিকালৈ সলনি কৰি চাওক।</string>
-    <string name="safe_mode_file">নিরাপদ ম\'ড ফাইল পোৱা গৈছে!
-\nফাইল আঁতৰোৱা নোহোৱালৈকে কোনো এক্সটেনশ্যন আৰম্ভ নকৰা হৈছে।</string>
+    <string name="safe_mode_file">নিরাপদ ম\'ড ফাইল পোৱা গৈছে! \nফাইল আঁতৰোৱা নোহোৱালৈকে কোনো এক্সটেনশ্যন আৰম্ভ নকৰা হৈছে।</string>
     <string name="revert">ঘূৰাই দিয়া</string>
     <string name="subscription_in_progress_notification">সদস্যতা গ্ৰহণ কৰা শ্ব\'সমূহ আপডেট কৰিছে</string>
     <string name="subscription_new">%s-ত সদস্যতা গ্ৰহণ কৰা হৈছে</string>
@@ -545,13 +532,7 @@
     <string name="edit">সম্পাদনা কৰক</string>
     <string name="profiles">প্ৰ\'ফাইলসমূহ</string>
     <string name="help">সহায়</string>
-    <string name="quality_profile_help">ইয়াত আপুনি উৎসসমূহ কেনেকৈ ক্ৰম অনুযায়ী চিহ্নিত কৰিব সেই বিষয়ে সলনি কৰিব পাৰে। যদি এখন ভিডিঅ\'ৰ উচ্চ অগ্ৰাধিকাৰ থাকে তেন্তে সেইটো উৎস নিৰ্বাচনৰ সময়ত ওপৰত দেখা যাব। উৎস অগ্ৰাধিকাৰ আৰু গুণ অগ্ৰাধিকাৰৰ মুঠ যোগফল হৈছে ভিডিঅ\'ৰ অগ্ৰাধিকাৰ।
-\n
-\nউৎস A: 3
-\nগুণ B: 7
-\nসৰহযোগে ভিডিঅ\'ৰ অগ্ৰাধিকাৰ হ\'ব 10।
-\n
-\nদ্ৰষ্টব্য: যদি যোগফল 10 বা তাৰ ওপৰত থাকে তেন্তে প্লেয়াৰটো নিজেই লিংক ল\'ড কৰাৰ সময়ত ল\'ডিং এড়াই যাব!</string>
+    <string name="quality_profile_help">ইয়াত আপুনি উৎসসমূহ কেনেকৈ ক্ৰম অনুযায়ী চিহ্নিত কৰিব সেই বিষয়ে সলনি কৰিব পাৰে। যদি এখন ভিডিঅ\'ৰ উচ্চ অগ্ৰাধিকাৰ থাকে তেন্তে সেইটো উৎস নিৰ্বাচনৰ সময়ত ওপৰত দেখা যাব। উৎস অগ্ৰাধিকাৰ আৰু গুণ অগ্ৰাধিকাৰৰ মুঠ যোগফল হৈছে ভিডিঅ\'ৰ অগ্ৰাধিকাৰ। \n \nউৎস A: 3 \nগুণ B: 7 \nসৰহযোগে ভিডিঅ\'ৰ অগ্ৰাধিকাৰ হ\'ব 10। \n \nদ্ৰষ্টব্য: যদি যোগফল 10 বা তাৰ ওপৰত থাকে তেন্তে প্লেয়াৰটো নিজেই লিংক ল\'ড কৰাৰ সময়ত ল\'ডিং এড়াই যাব!</string>
     <string name="profile_background_des">প্ৰ\'ফাইলৰ পটভূমি</string>
     <string name="unable_to_inflate">UI সঠিকভাৱে সৃষ্টি কৰিব পৰা নগ\'ল, ই এটা গুৰুত্বপূৰ্ণ সমস্যা আৰু তাক অবিলম্বে জনোৱা উচিত %s</string>
     <string name="already_voted">আপুনি ইতিমধ্যে ভোট দিছে</string>
@@ -562,14 +543,8 @@
     <string name="action_remove_from_favorites">প্ৰিয় তালিকাৰ পৰা আঁতৰ কৰক</string>
     <string name="duplicate_title">সম্ভাৱ্য নকল বস্ত্ত পোৱা গৈছে</string>
     <string name="duplicate_replace_all">সকলো প্ৰতিস্থাপন কৰক</string>
-    <string name="duplicate_message_single" formatted="true">আপোনাৰ পুথিভঁৰালীতে সম্ভাৱ্য নকল বস্তু পোৱা গৈছে: \'%s.\'
-\n
-\nআপুনি এই বস্তু যিকোনো হ\'লে যোগ কৰিব বিচাৰেনে, বিদ্যমান বস্তু প্ৰতিস্থাপন কৰিব, বা কাৰ্য বাতিল কৰিব বিচাৰেনে?</string>
-    <string name="duplicate_message_multiple" formatted="true">আপোনাৰ পুথিভঁৰালীতে সম্ভাৱ্য নকল বস্তুসমূহ পোৱা গৈছে:
-\n
-\n%s
-\n
-\nআপুনি এই বস্তু যিকোনো হ\'লে যোগ কৰিব বিচাৰেনে, বিদ্যমানবোৰ প্ৰতিস্থাপন কৰিব, বা কাৰ্য বাতিল কৰিব বিচাৰেনে?</string>
+    <string name="duplicate_message_single" formatted="true">আপোনাৰ পুথিভঁৰালীতে সম্ভাৱ্য নকল বস্তু পোৱা গৈছে: \'%s.\' \n \nআপুনি এই বস্তু যিকোনো হ\'লে যোগ কৰিব বিচাৰেনে, বিদ্যমান বস্তু প্ৰতিস্থাপন কৰিব, বা কাৰ্য বাতিল কৰিব বিচাৰেনে?</string>
+    <string name="duplicate_message_multiple" formatted="true">আপোনাৰ পুথিভঁৰালীতে সম্ভাৱ্য নকল বস্তুসমূহ পোৱা গৈছে: \n \n%s \n \nআপুনি এই বস্তু যিকোনো হ\'লে যোগ কৰিব বিচাৰেনে, বিদ্যমানবোৰ প্ৰতিস্থাপন কৰিব, বা কাৰ্য বাতিল কৰিব বিচাৰেনে?</string>
     <string name="enter_pin_with_name" formatted="true">%s ৰ বাবে পিন সন্নিবিষ্ট কৰক</string>
     <string name="enter_current_pin">বৰ্তমান পিন সন্নিবিষ্ট কৰক</string>
     <string name="lock_profile">প্ৰফাইল লক কৰক</string>
@@ -593,10 +568,8 @@
     <string name="biometric_warning">আপোনাৰ CloudStream ডেটা এতিয়া সংৰক্ষণ কৰা হৈছে। এইৰ সম্ভাৱনা অত্যন্ত কম, কিন্তু সকলো ডিভাইচৰ ব্যৱহাৰ ভিন্ন হ\'ব পাৰে। যদি এপ্লিকেচনটোত প্রবেশ কৰিব নোৱাৰা অৱস্থাত পৰাৰ কম সম্ভাৱনাৰ ঘটনা ঘটে, তেন্তে সম্পূৰ্ণভাবে এপ্প ডেটা মচি দিয়ক আৰু সংৰক্ষণৰ পৰা পুনৰুদ্ধাৰ কৰক। কোনো অশান্তিৰ বাবে আমাৰ দুখিত হওক।</string>
     <string name="download">ডাউনলোড</string>
     <string name="updates_settings_des">এপ্‌ আৰম্ভণিৰ পিছত নতুন আপডেটৰ সন্ধান কৰক।</string>
-    <string name="uprereleases_settings_des">কেৱল সম্পূৰ্ণ মুক্তিৰ সলনি প্ৰাকমুক্তিৰ আপডেটৰ সন্ধান কৰক</string>
     <string name="anim">একেই ডেভেলপাৰৰ দ্বাৰা এনিম এপ্‌</string>
-    <string name="new_update_format" formatted="true">নতুন আপডেট পোৱা গ’ল!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">নতুন আপডেট পোৱা গ’ল! \n%1$s -&gt; %2$s</string>
     <string name="filler" formatted="true">ফিলাৰ</string>
     <string name="play_with_app_name">CloudStreamৰে প্লে কৰক</string>
     <string name="title_search">সন্ধান</string>
@@ -614,21 +587,12 @@
     <string name="pick_subtitle">চাবটাইটলসমূহ</string>
     <string name="play_episode">এপিচ\'ড প্লে কৰক</string>
     <string name="sort_apply">প্ৰয়োগ কৰক</string>
-    <string name="hide_player_control_names_key" translatable="false">hide_player_control_names_key</string>
     <string name="delete_files">ফাইলসমূহ ডিলিট কৰক</string>
     <string name="delete_format" formatted="true">ডিলিট (%1$d | %2$s)</string>
-    <string name="delete_message_multiple" formatted="true">আপুনি স্থায়ীভাৱে তলত দিয়া আইটেমসমূহ ডিলিট কৰিবলৈ নিশ্চিত নেকি?
-\n
-\n%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="delete_message_series_only" formatted="true">আপুনি দিয়া ছিৰিজৰ সকলো এপিচ’ড স্থায়ীভাৱে ডিলিট কৰিবলৈ নিশ্চিত নেকি?
-\n
-\n%s</string>
+    <string name="delete_message_multiple" formatted="true">আপুনি স্থায়ীভাৱে তলত দিয়া আইটেমসমূহ ডিলিট কৰিবলৈ নিশ্চিত নেকি? \n \n%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="delete_message_series_only" formatted="true">আপুনি দিয়া ছিৰিজৰ সকলো এপিচ’ড স্থায়ীভাৱে ডিলিট কৰিবলৈ নিশ্চিত নেকি? \n \n%s</string>
     <string name="sort_release_date_old">মুক্তিৰ তাৰিখ (পুৰণাৰ পৰা নতুন)</string>
     <string name="test_warning">সতৰ্কবাৰ্তা</string>
     <string name="auth_locally">স্থানীয়ভাৱে প্ৰমাণীকৰণ কৰক</string>
@@ -664,12 +628,12 @@
     <string name="torrent_info">এই ভিডিওটো টৰেন্ট। এই অৰ্থ হৈছে যে আপোনাৰ ভিডিও কাৰ্যকলাপ ট্ৰেক কৰা হ\'ব পাৰে।\nআগবঢ়িবলৈ আগতে টৰেণ্টিং বুজি পোৱা নিশ্চিত কৰক।</string>
     <string name="subs_edge_size">চুকৰ মাপ</string>
     <string name="player_load_one_subtitle_online">প্ৰথম উপলব্ধটো লোড কৰক</string>
-    <string name="audio_singluar">অডিঅ\'</string>
-    <string name="podcast_singluar">প’ডকাষ্ট</string>
+    <string name="audio_singular">অডিঅ\'</string>
+    <string name="podcast_singular">প’ডকাষ্ট</string>
     <string name="encoding_error">এনকোডিং ত্ৰুটি</string>
     <string name="unsupported_error">সমৰ্থিত ত্ৰুটি</string>
     <string name="torrent_not_accepted">গ্ৰহণ কৰা হোৱা নাই টৰেণ্ট</string>
     <string name="torrent_preferred_media">সংহতিসমূহ/প্ৰদানকাৰী/পছন্দৰ মাধ্যমত টৰেণ্ট সামৰ্থবান কৰক</string>
     <string name="software_decoding">চফ্টৱেৰ ডিকোডিং</string>
     <string name="software_decoding_desc">চফ্টৱেৰ ডিকোডিঙে প্লেয়াৰক আপোনাৰ ফোন দ্বাৰা সমৰ্থিত নোহোৱা ভিডিঅ\' ফাইলসমূহ চলাবলৈ সামৰ্থবান কৰে, কিন্তু উচ্চ ৰিজ\'লিউচনত লেগি বা অস্থিৰ প্লেবেকৰ সৃষ্টি কৰিব পাৰে</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-b+az/strings.xml
similarity index 95%
rename from app/src/main/res/values-az/strings.xml
rename to app/src/main/res/values-b+az/strings.xml
index 17ac40a07fb..b8a1f9e2e41 100644
--- a/app/src/main/res/values-az/strings.xml
+++ b/app/src/main/res/values-b+az/strings.xml
@@ -87,12 +87,10 @@
     <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>
     <string name="pause">Dayandır</string>
     <string name="start">Başlat</string>
@@ -120,7 +118,7 @@
     <string name="torrent_singular">Torrent</string>
     <string name="documentaries_singular">Sənədli film</string>
     <string name="storage_error">Yükləmə xətası, yaddaş icazələrini yoxlayın</string>
-    <string name="custom_media_singluar">Media</string>
+    <string name="custom_media_singular">Media</string>
     <string name="encoding_error">Kodlama xətası</string>
     <string name="cartoons">Cizgi filmləri</string>
     <string name="anime">Anime-lər</string>
@@ -137,13 +135,13 @@
     <string name="live_singular">Canlı yayım</string>
     <string name="nsfw_singular">+18 məzmun</string>
     <string name="other_singular">Video</string>
-    <string name="music_singlar">Musiqi</string>
+    <string name="music_singular">Musiqi</string>
     <string name="audio_book_singular">Səsli Kitab</string>
-    <string name="audio_singluar">Səs</string>
-    <string name="podcast_singluar">Podkast</string>
+    <string name="audio_singular">Səs</string>
+    <string name="podcast_singular">Podkast</string>
     <string name="source_error">Mənbə xətası</string>
     <string name="remote_error">Server xətası</string>
     <string name="unsupported_error">Dəstəklənməyən xəta</string>
     <string name="unexpected_error">Gözlənilməyən oynadıcı xətası</string>
     <string name="episode_action_cast_mirror">Ekran yansıtma</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-b+bg/strings.xml
similarity index 87%
rename from app/src/main/res/values-bg/strings.xml
rename to app/src/main/res/values-b+bg/strings.xml
index a7f7f9d8759..4fb7757fd6f 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-b+bg/strings.xml
@@ -16,8 +16,7 @@
     <string name="preview_background_img_des">Визуализация на фона</string>
     <string formatted="true" name="player_speed_text_format">Скорост (%.2fx)</string>
     <string formatted="true" name="rated_format">Оценка: %.1f</string>
-    <string formatted="true" name="new_update_format">Намерена е нова актуализация!
-\n%1$s -&gt; %2$s</string>
+    <string formatted="true" name="new_update_format">Намерена е нова актуализация! \n%1$s -&gt; %2$s</string>
     <string formatted="true" name="filler">Шаблон</string>
     <string formatted="true" name="duration_format">%d мин</string>
     <string name="app_name">CloudStream</string>
@@ -67,7 +66,6 @@
     <string name="popup_play_file">Възпроизвеждане на файл</string>
     <string name="popup_resume_download">Възобновете изтеглянето</string>
     <string name="popup_pause_download">Пауза на изтеглянето</string>
-    <string name="pref_disable_acra">Деактивирайте автоматичното докладване на грешки</string>
     <string name="home_more_info">Повече информация</string>
     <string name="home_expanded_hide">Скрий</string>
     <string name="home_play">Пусни</string>
@@ -148,8 +146,6 @@
     <string name="settings_info">Информация</string>
     <string name="advanced_search">Подробно търсене</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>
     <string name="show_trailers_settings">Показване на трейлъри</string>
     <string name="kitsu_settings">Покажете плакати от Kitsu</string>
@@ -157,8 +153,6 @@
     <string name="automatic_plugin_updates">Автоматични актуализации на плъгини</string>
     <string name="updates_settings">Показвай актуализации на приложението</string>
     <string name="updates_settings_des">Автоматично търси нови актуализации при стартиране на приложението.</string>
-    <string name="uprereleases_settings">Актуализация до експериментални версии</string>
-    <string name="uprereleases_settings_des">Търсете експериментални актуализации вместо само пълни версии</string>
     <string name="github">Github</string>
     <string name="lightnovel">Light novel - приложение от същите разработчици</string>
     <string name="anim">Приложение за аниме от същите разработчици</string>
@@ -171,7 +165,6 @@
     <string name="copy_link_toast">Връзката е копирана в клипборда</string>
     <string name="play_episode_toast">Пусни епизода</string>
     <string name="subs_default_reset_toast">Възстановяване на стойността по подразбиране</string>
-    <string name="acra_report_toast">За съжаление приложението се срина. Анонимен доклад за грешка ще бъде изпратен до разработчиците</string>
     <string name="season">Сезон</string>
     <string name="season_format">%1$s %2$d%3$s</string>
     <string name="no_season">Без сезон</string>
@@ -189,10 +182,8 @@
     <string name="resume">Продължи</string>
     <string name="go_back_30">-30</string>
     <string name="go_forward_30">30</string>
-    <string formatted="true" name="delete_message">Това ще изтрие за постоянно %s
-\nСигурни ли сте?</string>
-    <string formatted="true" name="resume_time_left">%dm
-\nостава</string>
+    <string formatted="true" name="delete_message">Това ще изтрие за постоянно %s \nСигурни ли сте?</string>
+    <string formatted="true" name="resume_time_left">%dm \nостава</string>
     <string name="status_ongoing">Продължава</string>
     <string name="status_completed">Завършен</string>
     <string name="status">Статус</string>
@@ -258,7 +249,7 @@
     <string name="update">Актуализация</string>
     <string name="watch_quality_pref">Предпочитано качество за гледане (през WiFi)</string>
     <string name="limit_title">Максимален брой знаци за заглавие във видеоплейъра</string>
-    <string name="limit_title_rez">Разделителна способност на видео плейъра</string>
+    <string name="limit_title_rez">Покажи информация за плейъра</string>
     <string name="video_buffer_size_settings">Размер на видео буфера</string>
     <string name="video_buffer_length_settings">Дължина на видео буфера</string>
     <string name="video_buffer_disk_settings">Видео кеш на диск</string>
@@ -302,8 +293,6 @@
     <string name="example_site_name">НовоИмеНаСайт</string>
     <string name="example_site_url">example.com</string>
     <string name="example_lang_name">Езиков код (en)</string>
-    <!--
-    -->
     <string name="login_format" formatted="true">%1$s %2$s</string>
     <string name="account">Акаунт</string>
     <string name="logout">Излизане</string>
@@ -390,7 +379,6 @@
     <string name="previous">Предишен</string>
     <string name="skip_setup">Пропуснете настройката</string>
     <string name="app_layout_subtext">Променете външния вид на приложението, за да отговаря на вашето устройство</string>
-    <string name="crash_reporting_title">Докладване за сривове</string>
     <string name="preferred_media_subtext">Какво искате да видите</string>
     <string name="setup_done">Край</string>
     <string name="extensions">Разширения</string>
@@ -414,13 +402,11 @@
     <string formatted="true" name="plugins_disabled">Деактивирано: %d</string>
     <string formatted="true" name="plugins_not_downloaded">Не е изтеглено: %d</string>
     <string formatted="true" name="plugins_updated">Актуализирани %d плъгини</string>
-    <string name="blank_repo_message">CloudStream няма инсталирани сайтове по подразбиране. Трябва да инсталирате сайтовете от хранилища.
-\n
-\nПрисъединете се към нашия Дискорд или потърсете онлайн.</string>
+    <string name="blank_repo_message">CloudStream няма инсталирани сайтове по подразбиране. Трябва да инсталирате сайтовете от хранилища. \n \nПрисъединете се към нашия Дискорд или потърсете онлайн.</string>
     <string name="view_public_repositories_button">Вижте хранилищата на общността</string>
     <string name="view_public_repositories_button_short">Публичен списък</string>
     <string name="uppercase_all_subtitles">Всички субтитри с главни букви</string>
-    <string name="download_all_plugins_from_repo">Предупреждение: CloudStream 3 не носи отговорност за използването на трети страни разширения и не предоставя поддръжка за тях!</string>
+    <string name="download_all_plugins_from_repo">Предупреждение: CloudStream не носи отговорност за използването на трети страни разширения и не предоставя поддръжка за тях!</string>
     <string name="single_plugin_disabled" formatted="true">%s (Деактивиран)</string>
     <string name="tracks">Потоци</string>
     <string name="audio_tracks">Аудио потоци</string>
@@ -460,12 +446,12 @@
     <string name="update_notification_downloading">Изтегля се актуализация на приложението…</string>
     <string name="skip_type_mixed_op">Смесено отваряне</string>
     <string name="skip_type_mixed_ed">Смесено затваряне</string>
-    <string name="skip_type_creddits">Кредити</string>
+    <string name="skip_type_credits">Кредити</string>
     <string name="skip_type_intro">въведение</string>
     <string name="clear_history">Изчистване на историята</string>
     <string name="automatic_plugin_download_summary">Автоматично инсталиране на всички все още неинсталирани добавки от добавени хранилища.</string>
     <string name="apk_installer_settings">APK Инсталатор</string>
-    <string name="apk_installer_settings_des">Някои телефони не поддържат новия пакет за инсталиране. Опитайте предпоследената опция, ако актуализациите не се инсталират.</string>
+    <string name="apk_installer_settings_des">Някои устройства не поддържат новия пакет за инсталиране. Опитайте предпоследената опция, ако актуализациите не се инсталират.</string>
     <string name="play_trailer_button">Пусни трейлър</string>
     <string name="pref_category_links">Връзки</string>
     <string name="pref_category_app_updates">Актуализации на приложението</string>
@@ -528,12 +514,10 @@
     <string name="profile_number">Профил %d</string>
     <string name="sort_alphabetical_a">По азбучен ред (A до Z)</string>
     <string name="open_with">Отваряне с</string>
-    <string name="empty_library_no_accounts_message">Вашата библиотека е празна :(
-\nВпишете се в акаунт с библиотеки или добавете сериали в локалната Ви библиотека.</string>
+    <string name="empty_library_no_accounts_message">Вашата библиотека е празна :( \nВпишете се в акаунт с библиотеки или добавете сериали в локалната Ви библиотека.</string>
     <string name="use">Използване</string>
     <string name="subscription_episode_released">Епизод %d е публикуван!</string>
-    <string name="safe_mode_file">Намерен е файл за безопасен режим!
-\nНяма да се зареждат никакви разширения при стартиране, докато файлът не бъде премахнат.</string>
+    <string name="safe_mode_file">Намерен е файл за безопасен режим! \nНяма да се зареждат никакви разширения при стартиране, докато файлът не бъде премахнат.</string>
     <string name="already_voted">Вече сте гласували</string>
     <string name="set_default">Задаване по подразбиране</string>
     <string name="pin_error_length">ПИН трябва да е 4 символа</string>
@@ -560,23 +544,11 @@
     <string name="android_tv_interface_off_seek_settings">Скрит играч - сума за търсене</string>
     <string name="android_tv_interface_off_seek_settings_summary">Сумата за търсене, използвана, когато играчът е скрит</string>
     <string name="sort_updated_new">Актуализирано (от ново към старо)</string>
-    <string name="quality_profile_help">Тук можете да промените начина на подреждане на източниците. Ако даден видеоклип има по-висок приоритет, той ще се показва по-високо в избора на източник. Сборът от приоритета на източника и приоритета на качеството е приоритетът на видеото.
-\n
-\nИзточник A: 3
-\nКачество B: 7
-\nЩе има комбиниран видео приоритет от 10.
-\n
-\nЗАБЕЛЕЖКА: Ако сумата е 10 или повече, играчът автоматично ще пропусне зареждането, когато тази връзка се зареди!</string>
+    <string name="quality_profile_help">Тук можете да промените начина на подреждане на източниците. Ако даден видеоклип има по-висок приоритет, той ще се показва по-високо в избора на източник. Сборът от приоритета на източника и приоритета на качеството е приоритетът на видеото. \n \nИзточник A: 3 \nКачество B: 7 \nЩе има комбиниран видео приоритет от 10. \n \nЗАБЕЛЕЖКА: Ако сумата е 10 или повече, играчът автоматично ще пропусне зареждането, когато тази връзка се зареди!</string>
     <string name="duplicate_replace">Замени</string>
     <string name="duplicate_replace_all">Замени Всички</string>
-    <string name="duplicate_message_single" formatted="true">Изглежда, че потенциално дублиран елемент вече съществува във вашата библиотека: „%s“.
-\n
-\nИскате ли все пак да добавите този елемент, да замените съществуващия или да отмените действието?</string>
-    <string name="duplicate_message_multiple" formatted="true">Във вашата библиотека са намерени потенциални дублиращи се елементи:
-\n
-\n%s
-\n
-\nИскате ли все пак да добавите този елемент, да замените съществуващите или да отмените действието?</string>
+    <string name="duplicate_message_single" formatted="true">Изглежда, че потенциално дублиран елемент вече съществува във вашата библиотека: „%s“. \n \nИскате ли все пак да добавите този елемент, да замените съществуващия или да отмените действието?</string>
+    <string name="duplicate_message_multiple" formatted="true">Във вашата библиотека са намерени потенциални дублиращи се елементи: \n \n%s \n \nИскате ли все пак да добавите този елемент, да замените съществуващите или да отмените действието?</string>
     <string name="lock_profile">Заключи Профил</string>
     <string name="enter_current_pin">Вкарай Сегашен ПИН</string>
     <string name="manage_accounts">Управлявай Профили</string>
@@ -595,7 +567,6 @@
     <string name="recommendations_tooltip">Покажи предложения</string>
     <string name="speed_setting_summary">Добавя опция за промяна на скоростта в плеъра</string>
     <string name="test_extensions_summary">Този тест е направен за програмисти и не проверява работата на никакви добавки.</string>
-    <string name="hide_player_control_names_key" translatable="false">hide_player_control_names_key</string>
     <string name="episode_upcoming_format" formatted="true">Предстоящо в %s</string>
     <string name="repo_copy_label">Име на хранилището и URL адрес</string>
     <string name="toast_copied">копирани!</string>
@@ -649,14 +620,14 @@
     <string name="no_plugins_updated_manually">Няма актуализирани плъгини.</string>
     <string name="delete_message_series_only" formatted="true">Are you sure you wСигурни ли сте, че искате трайно да изтриете всички епизоди от тази поредица?\n\n%s</string>
     <string name="torrent_not_accepted">Рестартирайте приложението и приемете изскачащото съобщение за Stream Torrent, за да продължите.</string>
-    <string name="software_decoding_desc">Софтуерното декодиране позволява на плейъра да възпроизвежда видео файлове, които не се поддържат от телефона ви, но може да причини забавяне или нестабилно възпроизвеждане при висока резолюция</string>
+    <string name="software_decoding_desc">Софтуерното декодиране позволява на плейъра да възпроизвежда видео файлове, които не се поддържат от устройството ви, но може да причини забавяне или нестабилно възпроизвеждане при висока резолюция</string>
     <string name="player_notification_channel_name">Известия на плейъра</string>
     <string name="sort_episodes_number_desc">Епизод (низходящо)</string>
     <string name="starting_plugin_update_manually">Започва процесът на актуализация на плъгините!</string>
     <string name="player_load_one_subtitle_online">Зареди първия наличен</string>
     <string name="no_subtitles_loaded">Няма заредени субтитри още</string>
-    <string name="audio_singluar">Звук</string>
-    <string name="podcast_singluar">Подкаст</string>
+    <string name="audio_singular">Звук</string>
+    <string name="podcast_singular">Подкаст</string>
     <string name="auth_locally">Автентикация локално</string>
     <string name="biometric_setting">Заключване с биометрия</string>
     <string name="open_downloaded_repo">Отвори хранилище</string>
@@ -664,7 +635,7 @@
     <string name="device_pin_expired_message">PIN кодът е изтекъл !</string>
     <string name="cs3wiki">CloudStream Уики</string>
     <string name="password_pin_authentication_title">Удостоверяване с парола/PIN</string>
-    <string name="custom_media_singluar">Медия</string>
+    <string name="custom_media_singular">Медия</string>
     <string name="audio_book_singular">Аудиокнига</string>
     <string name="dismiss">Отхвърли</string>
     <string name="biometric_setting_summary">Отключете приложението с отпечатък, Face ID, PIN, шаблон или парола.</string>
@@ -692,9 +663,74 @@
     <string name="device_pin_url_message">Посетете <b>%s</b> на вашия смартфон или компютър и въведете горния код</string>
     <string name="device_pin_counter_text">Кодът изтича след %1$dm %2$ds</string>
     <string name="player_settings_select_cast_device">Изберете устройство за излъчване</string>
-    <string name="music_singlar">Музика</string>
+    <string name="music_singular">Музика</string>
     <string name="favorite">Любим</string>
     <string name="battery_dialog_message">За да гарантираме непрекъснати изтегляния и известия за абонирани телевизионни шоута, CloudStream се нуждае от разрешение да работи в фонов режим. Като натиснете ДОБРЕ, ще видите диалогов прозорец с искане. Моля, натиснете \"Позволи\".\n\nМоля, имайте предвид, че това разрешение не означава, че CS3 ще изтощава батерията ви. То ще работи във фонов режим само когато е необходимо, като например при получаване на известия или изтегляне на видеоклипове от официални разширения.</string>
     <string name="qr_image">Изображение на QR код</string>
     <string name="unfavorite">Премахни от любими</string>
-</resources>
\ No newline at end of file
+    <string name="download_parallel_settings_des">Колко различни елемента могат да бъдат изтеглени паралелно</string>
+    <string name="parallel_downloads">Паралелни изтегляния</string>
+    <string name="concurrent_connections">Едновременни връзки</string>
+    <string name="concurrent_connections_settings_des">Колко едновременни връзки може да използва всяко изтегляне по време на самото изтегляне</string>
+    <string name="go_to_downloads">Сваляния</string>
+    <string name="no_internet_connection">Няма интернет връзка.\n\nМоля, свържете се с интернет и опитайте отново, или гледайте вашите изтегляния, докато сте офлайн.</string>
+    <string name="overscan_settings_des">Променя границите на екрана</string>
+    <string name="overscan_settings">Overscan</string>
+    <string name="poster_size_settings_des">Променя размера на плакатите</string>
+    <string name="poster_size_settings">Размер на плаката</string>
+    <string name="player_settings_always_ask">Винаги изпращай запитване</string>
+    <string name="speedup_summary">Задръжте, за да удвоите скоростта</string>
+    <string name="speedup_title">Дълго задържане за смяна на скоростта</string>
+    <string name="download_queue">Опашка за изтегляне</string>
+    <string name="play_full_series_button">Пусни цялата поредица</string>
+    <string name="queue_empty_message">В момента няма изтегляния в опашката.</string>
+    <string name="extra_brightness_settings">Допълнителна яркост</string>
+    <string name="extra_brightness_settings_des">Активирай филтъра за яркост, когато яркостта на екрана надвиши 100%</string>
+    <string name="search_suggestions">Предложения за търсене</string>
+    <string name="search_suggestions_des">Показвай предложения за търсене по време на писане</string>
+    <string name="clear_suggestions">Изтрий предложения</string>
+    <string name="show_cast_in_details">Покажи панела за излъчване</string>
+    <string name="install_prerelease">Инсталирай предварителна версия</string>
+    <string name="prerelease_already_installed">Предварителна версия вече е изтеглена.</string>
+    <string name="prerelease_install_failed">Неуспешна инсталация на предварителната версия.</string>
+    <string name="show_rating">Етикет за рейтинг</string>
+    <string name="show_episode_text">Текст на епизода</string>
+    <string name="video_info">Информация за медията</string>
+    <string name="source_priority">Приоритет на източника</string>
+    <string name="source_priority_help">Определи как източниците на видеото да се сортират в плейъра</string>
+    <string name="no_account">Няма акаунт</string>
+    <string name="edit_profile_image_title">Редактирай профилната снимка</string>
+    <string name="edit_profile_image_hint">Въведи линк за профилна снимка</string>
+    <string name="edit_profile_image_error_empty">Няма намерен URL</string>
+    <string name="edit_profile_image_error_invalid">Невалиден URL или снимка</string>
+    <string name="edit_profile_image_success">Успешно актуализирана снимка</string>
+    <string name="action_mark_watched_up_to_this_episode">Маркирай като гледано до този епизод</string>
+    <string name="action_remove_mark_watched_up_to_this_episode">Премахни маркирането като гледано до този епизод</string>
+    <string name="action_reload">Презаредено</string>
+    <string name="reload_provider">Презареди доставчика</string>
+    <string name="name">Име</string>
+    <string name="source_name">Име на източника</string>
+    <string name="resolution_and_name">Резолюция и име</string>
+    <string name="download_all">Изтегли всички</string>
+    <string name="cancel_all">Откажи всички</string>
+    <string name="download_episode_range">Искаш ли да изтеглиш епизод %s?</string>
+    <string name="cancel_queue_message">Искаш ли да отмениш всички изтегляния в опашката?</string>
+    <string name="subs_subtitle_alignment">Подравняване на субтитрите</string>
+    <string name="bottom_left">Долу вляво</string>
+    <string name="bottom_center">Долу в центъра</string>
+    <string name="bottom_right">Долу вдясно</string>
+    <string name="middle_left">В средата вляво</string>
+    <string name="middle_center">В средата в центъра</string>
+    <string name="middle_right">В средата вдясно</string>
+    <string name="top_left">Горе вляво</string>
+    <string name="top_center">Горе в центъра</string>
+    <string name="top_right">Горе вдясно</string>
+    <plurals name="downloads_active">
+        <item quantity="one">%d активно изтегляне</item>
+        <item quantity="other">%d активни изтегляния</item>
+    </plurals>
+    <plurals name="downloads_queued">
+        <item quantity="one">%d изтегляне в опашката</item>
+        <item quantity="other">%d изтегляния в опашката</item>
+    </plurals>
+</resources>
diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-b+bn/strings.xml
similarity index 94%
rename from app/src/main/res/values-bn/strings.xml
rename to app/src/main/res/values-b+bn/strings.xml
index f1bc8f82ac1..adc1b3f19f8 100644
--- a/app/src/main/res/values-bn/strings.xml
+++ b/app/src/main/res/values-b+bn/strings.xml
@@ -15,8 +15,7 @@
     <string name="preview_background_img_des">ব্যাকগ্রাউন্ড দেখান</string>
     <string name="player_speed_text_format" formatted="true">গতি (%.2f গুণ)</string>
     <string name="rated_format" formatted="true">মূল্যায়নঃ %.1f</string>
-    <string name="new_update_format" formatted="true">নতুন আপডেট এসেছে!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">নতুন আপডেট এসেছে! \n%1$s -&gt; %2$s</string>
     <string name="filler" formatted="true">ফিলার</string>
     <string name="duration_format" formatted="true">%d মিনিট</string>
     <string name="app_name">ক্লাউডস্ট্রিম</string>
@@ -62,7 +61,6 @@
     <string name="app_subbed_text">সাব</string>
     <string name="popup_play_file">ফাইল চালান</string>
     <string name="popup_pause_download">ডাউনলোড থামান</string>
-    <string name="pref_disable_acra">আটো বাগ রিপোর্ট বন্ধ করুন</string>
     <string name="home_more_info">আরো তথ্য</string>
     <string name="home_expanded_hide">বন্ধ করুন</string>
     <string name="home_play">চালান</string>
@@ -120,7 +118,6 @@
     <string name="player_size_settings_des">কালো প্রান্ত অপসারণ করুন</string>
     <string name="search">অনুসন্ধান করুন</string>
     <string name="category_account">অ্যাকাউন্টসমূহ এবং নিরাপত্তা</string>
-    <string name="bug_report_settings_on">কোনো উপাত্ত পাঠাবে না</string>
     <string name="double_tap_to_pause_settings_des">বিরতি দিতে মাঝে দুইবার চাপুন</string>
     <string name="use_system_brightness_settings">সিস্টেম এর উজ্জ্বলতা ব্যবহার করুন</string>
     <string name="play_trailer_button">ট্রেইলার চালু করুন</string>
@@ -150,10 +147,7 @@
     <string name="double_tap_to_seek_amount_settings">প্লেয়ারে এগিয়ে যাওয়ার পরিমাণ (সেকেন্ডে)</string>
     <string name="double_tap_to_seek_settings_des">সামনে বা পিছনের দিকে যেতে ডান বা বাম দিকে দুবার আলতো চাপুন</string>
     <string name="delete_file">ফাইল ডিলিট</string>
-    <string name="acra_report_toast">দুঃখিত, অ্যাপ্লিকেশন ক্র্যাশ হয়েছে। ডেভেলপারদের কাছে একটি বেনামী বাগ রিপোর্ট পাঠানো হবে</string>
-    <string name="bug_report_settings_off">শুধুমাত্র ক্র্যাশ এর তথ্য পাঠায়</string>
     <string name="subs_default_reset_toast">মান ডিফল্ট এ রিসেট করুন</string>
-    <string name="uprereleases_settings_des">ফুল রিলিজের পরিবর্তে শুধুমাত্র প্রি-রিলিজ আপডেটের জন্য অনুসন্ধান করুন</string>
     <string name="updates_settings_des">স্টার্টআপে নতুন আপডেটের জন্য স্বয়ংক্রিয়ভাবে অনুসন্ধান করুন</string>
     <string name="movies_singular">সিনেমা</string>
     <string name="show_fillers_settings">এনিমে এর ফিলার পর্ব দেখায়</string>
@@ -164,8 +158,7 @@
     <string name="movies">সিনেমা</string>
     <string name="discord">ডিসকর্ডে যোগ দিন</string>
     <string name="torrent">টরেন্টস</string>
-    <string name="delete_message" formatted="true">এটি স্থায়ীভাবে মুছে ফেলা হবে %s
-\nআপনি কি নিশ্চিত?</string>
+    <string name="delete_message" formatted="true">এটি স্থায়ীভাবে মুছে ফেলা হবে %s \nআপনি কি নিশ্চিত?</string>
     <string name="pause">থামুন</string>
     <string name="go_back_30">-৩০</string>
     <string name="github">গিটহাব</string>
@@ -189,8 +182,7 @@
     <string name="used_storage">ব্যবহৃত</string>
     <string name="library">লাইব্রেরী</string>
     <string name="lightnovel">আমাদের তৈরি ছোট উপন্যাস পড়ার অ্যাপ্লিকেশন</string>
-    <string name="resume_time_left" formatted="true">%d মি
-\nবাকি</string>
+    <string name="resume_time_left" formatted="true">%d মি \nবাকি</string>
     <string name="others">অন্যান্য</string>
     <string name="status_ongoing">চলমান</string>
     <string name="asian_drama">এশিয়ান নাটক</string>
@@ -204,7 +196,6 @@
     <string name="advanced_search_des">প্রোভাইডার অনুযায়ী আপনাকে পৃথক অনুসন্ধান ফলাফল দেয়</string>
     <string name="tv_series_singular">সিরিজ</string>
     <string name="rating">রেটিং</string>
-    <string name="uprereleases_settings">প্রি-রিলিজে আপডেট করুন</string>
     <string name="redo_setup_process">সেটআপ প্রক্রিয়া পুনরায় করুন</string>
     <string name="benene">ভাই এক কাপ চা খাওয়াও ☕</string>
     <string name="restore_settings">ব্যাকআপ থেকে ডেটা পুনরুদ্ধার করুন</string>
@@ -244,7 +235,6 @@
     <string name="video_disk_description">অ্যান্ড্রয়েড টিভির মতো, কম মেমরির ডিভাইসে খুব বেশি সেট করা হলে সমস্যা করবে।</string>
     <string name="add_site_pref">ক্লোন সাইট</string>
     <string name="pref_category_player_features">প্লেয়ারের ফিচার</string>
-    <string name="login_format" formatted="true"><string name="mal_account_settings" translatable="false">MAL</string> <string name="anilist_account_settings" translatable="false">AniList</string> <string name="tmdb_account_settings" translatable="false">TMDB</string> <string name="imdb_account_settings" translatable="false">IMDB</string> <string name="kitsu_account_settings" translatable="false">Kitsu</string> <string name="trakt_account_settings" translatable="false">Trakt</string> %1$s%2$s</string>
     <string name="app_theme_settings">অ্যাপ থিম</string>
     <string name="recommendations_tooltip">রিকমেন্ডেশনগুলো দেখাও</string>
     <string name="speed_setting_summary">প্লেয়ারে গতির বিকল্প যোগ কর</string>
@@ -315,8 +305,7 @@
     <string name="example_password">password123</string>
     <string name="episode_upcoming_format" formatted="true">আসছে %s সময়ের মধ্যে</string>
     <string name="cancel">বাতিল করুন</string>
-    <string name="resume_remaining" formatted="true">%s
-\nঅবশিষ্ট</string>
+    <string name="resume_remaining" formatted="true">%s \nঅবশিষ্ট</string>
     <string name="live_singular">লাইভ স্ট্রিম</string>
     <string name="source_error">সোর্স সমস্যা</string>
     <string name="remote_error">রিমোট সমস্যা</string>
@@ -357,5 +346,11 @@
     <string name="account">অ্যাকাউন্ট</string>
     <string name="logout">প্রস্থান</string>
     <string name="episode_format" formatted="true">%1$d%2$s</string>
-    <string name="hide_player_control_names_key" translatable="false">hide_player_control_names_key</string>
-</resources>
\ No newline at end of file
+    <string name="next_season_episode_format" formatted="true">সিজন %1$d পর্ব %2$d প্রকাশিত হবে</string>
+    <string name="download_time_left_hour_min_sec_format" formatted="true">%1$dঘন্টা %2$dমিনিট %3$dসেকেন্ড</string>
+    <string name="download_time_left_min_sec_format" formatted="true">%1$dমিনিট %2$dসেকেন্ড</string>
+    <string name="download_time_left_sec_format" formatted="true">%1$dসেকেন্ড</string>
+    <string name="play_from_beginning_img_des">শুরু থেকে চালু করুন</string>
+    <string name="speech_recognition_unavailable">স্পিচ রিকগনিশন উপলব্ধ নেই</string>
+    <string name="begin_speaking">কথা বলা শুরু করুন…</string>
+</resources>
diff --git a/app/src/main/res/values-b+ckb/strings.xml b/app/src/main/res/values-b+ckb/strings.xml
new file mode 100644
index 00000000000..b38a7956c25
--- /dev/null
+++ b/app/src/main/res/values-b+ckb/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_dub_sub_episode_text_format" formatted="true">%1$sئەڵقەى%2$d</string>
+    <string name="cast_format" formatted="true">تیم:%s</string>
+    <string name="next_episode_format" formatted="true">ئەڵقەی %d لە</string>
+    <string name="next_season_episode_format" formatted="true">وەرزی %1$d ئەڵقەی %2$d لە</string>
+    <string name="next_episode_time_day_format" formatted="true">%1$dd %2$dh %3$dm</string>
+    <string name="next_episode_time_hour_format" formatted="true">%1$dh %2$dm</string>
+    <string name="next_episode_time_min_format" formatted="true">%dm</string>
+    <string name="download_time_left_hour_min_sec_format" formatted="true">%1$dh %2$dm %3$ds</string>
+    <string name="download_time_left_min_sec_format" formatted="true">%1$dm %2$ds</string>
+    <string name="download_time_left_sec_format" formatted="true">%1$ds</string>
+    <string name="search_poster_img_des">پۆستەر</string>
+    <string name="episode_poster_img_des">پۆستەری ئەڵقە</string>
+    <string name="home_main_poster_img_des">پۆستەری سەرەکی</string>
+    <string name="home_next_random_img_des">داهاتوو بە هەڕەمەکی</string>
+    <string name="go_back_img_des">گەڕانەوە</string>
+    <string name="play_from_beginning_img_des">لە سەرەتاوە دەست پێ بکە</string>
+    <string name="home_change_provider_img_des">گۆڕینی دابینکەر</string>
+    <string name="preview_background_img_des">پێشبینی پاشبنەما</string>
+    <string name="player_speed_text_format" formatted="true">خێرای(x%.2f)</string>
+    <string name="rated_format" formatted="true">هەڵسەنگاندن:%.1f</string>
+    <string name="new_update_format" formatted="true">نوێکاری نوێ دۆزرایەوە!\n%1$s-&gt;%2$s</string>
+    <string name="filler" formatted="true">فیلەر</string>
+    <string name="duration_format" formatted="true">min%d</string>
+    <string name="app_name">کلاود ستریم</string>
+    <string name="title_home">سەرەکی</string>
+    <string name="title_search">گەڕان</string>
+    <string name="title_downloads">داونڵۆد</string>
+    <string name="title_settings">ڕێکخستن</string>
+    <string name="search_hint">گەڕان…</string>
+    <string name="search_hint_site" formatted="true">بگەڕێ بۆ%s…</string>
+    <string name="speech_recognition_unavailable">ناسینەوەی قسەکردن بەردەست نییە</string>
+    <string name="begin_speaking">دەست بکە بە قسەکردن…</string>
+    <string name="no_data">هیچ داتایەک نییە</string>
+    <string name="episode_more_options_des">هەڵبژاردنی زیاتر</string>
+    <string name="next_episode">ئەڵقەی داهاتوو</string>
+    <string name="result_tags">ژانرەکان</string>
+    <string name="result_share">شەیر</string>
+    <string name="result_open_in_browser">بکەرەوە لە براوزەر</string>
+    <string name="browser">براوزەر</string>
+    <string name="type_watching">تەماشاکردن</string>
+    <string name="type_completed">تەواو بووە</string>
+    <string name="type_dropped">دابەزیووە</string>
+    <string name="type_plan_to_watch">پلان بۆ سەیرکردن</string>
+    <string name="type_re_watching">دووبارە سەیرکردنەوە</string>
+    <string name="play_torrent_button">تۆرێنت ستریم بکە</string>
+    <string name="torrent_info">ئەم ڤیدیۆیە تۆرێنتە، ئەمەش مانای ئەوەیە کە دەتوانرێت شوێنپێی چالاکیی ڤیدیۆکەت بگرێت.\nپێش ئەوەی بەردەوام بیت دڵنیابە لە تۆرێنتینگ تێدەگەیت.</string>
+    <string name="pick_source">سەرچاوەکان</string>
+    <string name="pick_subtitle">ژێرنووسەکان</string>
+    <string name="reload_error">دووبارە هەوڵبدە پەیوەندی…</string>
+    <string name="go_back">گەڕانەوە بۆ دواوە</string>
+    <string name="result_poster_img_des">پۆستەر</string>
+    <string name="download">داونلۆد</string>
+    <string name="downloaded">دابەزێنراوە</string>
+    <string name="downloading">دادەبەزێندرێت</string>
+    <string name="download_paused">دابەزاندن وەستاوە</string>
+    <string name="download_started">داگرتن دەستی پێکرد</string>
+    <string name="download_failed">داونلۆدکردن شکستی هێنا</string>
+    <string name="download_canceled">داونلۆد هەڵوەشایەوە</string>
+    <string name="download_done">داونلۆد تەواو بووە</string>
+    <string name="downloads_delete_select">ئەو شتانە هەڵبژێرە کە دەتەوێت بیسڕیتەوە</string>
+    <string name="downloads_empty">لە ئێستادا هیچ داونلۆدێک نییە.</string>
+    <string name="offline_file">بەردەستە بۆ سەیرکردنی ئۆفلاین</string>
+    <string name="select_all">هەموو هەڵبژێرە</string>
+    <string name="deselect_all">هەمووی لابدە</string>
+    <string name="update_started">نوێکردنەوە دەستی پێکرد</string>
+    <string name="open_local_video">ڤیدیۆی ناوخۆیی بکەرەوە</string>
+    <string name="download_storage_text">کۆگای ناوخۆیی</string>
+    <string name="app_dubbed_text">دۆبلاژ</string>
+    <string name="app_subbed_text">ژێرنووس</string>
+    <string name="popup_delete_file">سڕینەوەی فایل</string>
+    <string name="popup_resume_download">دووبارە دەستپێکردنەوەی دابەزاندن</string>
+    <string name="popup_pause_download">وەستاندنی دابەزاندن</string>
+    <string name="home_more_info">زانیاری زیاتر</string>
+    <string name="home_expanded_hide">شاردنەوە</string>
+    <string name="home_info">زانیاری</string>
+    <string name="filter_bookmarks">فلتەرکردنی ئاماژەکان</string>
+    <string name="error_bookmarks_text">ئاماژەکان</string>
+    <string name="action_remove_from_bookmarks">لابردن</string>
+    <string name="action_add_to_bookmarks">دۆخی تەماشاکردن دابنێ</string>
+    <string name="sort_apply">جێبەجێکردن</string>
+    <string name="sort_copy">کۆپی</string>
+    <string name="sort_close">داخستن</string>
+    <string name="sort_save">سەیڤ</string>
+</resources>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-b+cs/strings.xml
similarity index 86%
rename from app/src/main/res/values-cs/strings.xml
rename to app/src/main/res/values-b+cs/strings.xml
index ffab5531fba..983a03db7e4 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-b+cs/strings.xml
@@ -16,8 +16,7 @@
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">Rychlost (%.2fx)</string>
     <string name="rated_format" formatted="true">Hodnocení: %.1f</string>
-    <string name="new_update_format" formatted="true">Nalezena nová aktualizace!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">Nalezena nová aktualizace! \n%1$s -&gt; %2$s</string>
     <string name="filler" formatted="true">Výplň</string>
     <string name="duration_format" formatted="true">%d min</string>
     <string name="app_name">CloudStream</string>
@@ -65,7 +64,6 @@
     <string name="popup_play_file">Přehrát soubor</string>
     <string name="popup_resume_download">Pokračovat ve stahování</string>
     <string name="popup_pause_download">Pozastavit stahování</string>
-    <string name="pref_disable_acra">Zakázat automatické nahlašování chyb</string>
     <string name="home_more_info">Více informací</string>
     <string name="home_expanded_hide">Skrýt</string>
     <string name="home_play">Přehrát</string>
@@ -144,13 +142,9 @@
     <string name="settings_info">Informace</string>
     <string name="advanced_search">Pokročilé hledání</string>
     <string name="advanced_search_des">Zobrazí vám výsledky hledání oddělené poskytovatelem</string>
-    <string name="bug_report_settings_off">Odešle data pouze při pádech</string>
-    <string name="bug_report_settings_on">Nebude odesílat žádná data</string>
     <string name="show_fillers_settings">Zobrazit výplňové epizody u anime</string>
     <string name="updates_settings">Zobrazit aktualizace aplikace</string>
     <string name="updates_settings_des">Při spuštění aplikace automaticky zkontrolovat nové aktualizace.</string>
-    <string name="uprereleases_settings">Aktualizovat na předběžná vydání</string>
-    <string name="uprereleases_settings_des">Kontrolovat aktualizace předběžných vydání, místo normálních plných vydání</string>
     <string name="github">GitHub</string>
     <string name="lightnovel">Nenáročná aplikace pro romány od stejných vývojářů</string>
     <string name="anim">Anime aplikace od stejných vývojářů</string>
@@ -163,7 +157,6 @@
     <string name="copy_link_toast">Odkaz zkopírován do schránky</string>
     <string name="play_episode_toast">Přehrát epizodu</string>
     <string name="subs_default_reset_toast">Obnovit na výchozí hodnoty</string>
-    <string name="acra_report_toast">Omlouváme se, aplikace spadla. Vývojářům bude odesláno anonymní hlášení o pádu</string>
     <string name="season">Sezóna</string>
     <string name="no_season">Žádná sezóna</string>
     <string name="episode">Epizoda</string>
@@ -178,10 +171,8 @@
     <string name="resume">Pokračovat</string>
     <string name="go_back_30">-30</string>
     <string name="go_forward_30">+30</string>
-    <string name="delete_message" formatted="true">Toto nevratně smaže %s
-\nJste si jisti?</string>
-    <string name="resume_time_left" formatted="true">%dm
-\nzbývá</string>
+    <string name="delete_message" formatted="true">Toto nevratně smaže %s \nJste si jisti?</string>
+    <string name="resume_time_left" formatted="true">%dm \nzbývá</string>
     <string name="status_ongoing">Probíhající</string>
     <string name="status_completed">Dokončena</string>
     <string name="status">Stav</string>
@@ -243,7 +234,7 @@
     <string name="update">Aktualizovat</string>
     <string name="watch_quality_pref">Upřednostněná kvalita sledování (WiFi)</string>
     <string name="limit_title">Maximální počet znaků v názvu přehrávače</string>
-    <string name="limit_title_rez">Rozlišení přehrávače</string>
+    <string name="limit_title_rez">Zobrazit informace o přehrávači</string>
     <string name="video_buffer_size_settings">Velikost vyrovnávací paměti videa</string>
     <string name="video_buffer_length_settings">Délka vyrovnávací paměti videa</string>
     <string name="video_buffer_disk_settings">Mezipaměť videa na disku</string>
@@ -259,7 +250,6 @@
     <string name="resize_fill">Roztáhnout</string>
     <string name="resize_zoom">Přiblížit</string>
     <string name="legal_notice">Odmítnutí odpovědnosti</string>
-    <string name="legal_notice_text" translatable="false">Jakékoli právní otázky týkající se obsahu této aplikace je třeba řešit se samotnými hostiteli a poskytovateli souborů, protože s nimi nejsme nijak spojeni. V případě porušení autorských práv se obraťte přímo na odpovědné strany nebo na webové stránky, na kterých se streamování odehrává. Aplikace je určena výhradně pro vzdělávací a osobní účely. CloudStream 3 v aplikaci nehostuje žádný obsah a nemá žádnou kontrolu nad tím, jaká média jsou v aplikaci umístěna nebo odstraněna. CloudStream 3 funguje jako jakýkoli jiný vyhledávač, například Google. Služba CloudStream 3 nehostuje, nenahrává ani nespravuje žádná videa, filmy ani obsah. Pouze vyhledává, agreguje a zobrazuje odkazy v pohodlném, uživatelsky přívětivém rozhraní. Pouze shromažďuje webové stránky třetích stran, které jsou veřejně přístupné prostřednictvím jakéhokoli běžného webového prohlížeče. Je odpovědností uživatele, aby se vyvaroval jakýchkoli akcí, které by mohly porušovat zákony platné v jeho lokalitě. Použijte CloudStream 3 na vlastní nebezpečí.</string>
     <string name="category_general">Obecné</string>
     <string name="random_button_settings">Náhodné tlačítko</string>
     <string name="random_button_settings_desc">Zobrazit na domovské stránce a v knihovně náhodné tlačítko</string>
@@ -281,14 +271,6 @@
     <string name="example_username">Uživatelské jméno</string>
     <string name="example_email">ahoj@svete.cz</string>
     <string name="example_ip">127.0.0.1</string>
-    <!--
-    <string name="mal_account_settings" translatable="false">MAL</string>
-    <string name="anilist_account_settings" translatable="false">AniList</string>
-    <string name="tmdb_account_settings" translatable="false">TMDB</string>
-    <string name="imdb_account_settings" translatable="false">IMDB</string>
-    <string name="kitsu_account_settings" translatable="false">Kitsu</string>
-    <string name="trakt_account_settings" translatable="false">Trakt</string>
-    -->
     <string name="login_format" formatted="true">%1$s %2$s</string>
     <string name="account">účet</string>
     <string name="logout">Odhlásit se</string>
@@ -412,7 +394,7 @@
     <string name="redo_setup_process">Znovu provést proces nastavení</string>
     <string name="apk_installer_settings">Instalátor APK</string>
     <string name="episode_format" formatted="true">%1$d %2$s</string>
-    <string name="apk_installer_settings_des">Některé telefony nepodporují nový instalátor balíčků. Pokud se aktualizace nenainstalují, zkuste použít starší možnost.</string>
+    <string name="apk_installer_settings_des">Některá zařízení nepodporují nový instalátor balíčků. Pokud se aktualizace nenainstalují, zkuste použít starší možnost.</string>
     <string name="pref_category_cache">Mezipaměť</string>
     <string name="next_episode_format" formatted="true">Epizoda %d bude vydána za</string>
     <string name="next_episode_time_hour_format" formatted="true">%1$dh %2$dm</string>
@@ -425,16 +407,13 @@
     <string name="example_site_name">NovýNázevWebu</string>
     <string name="enable_nsfw_on_providers">Povolit NSFW u podporovaných rozšíření</string>
     <string name="category_providers">Poskytovatelé</string>
-    <string name="crash_reporting_title">Hlášení pádů</string>
     <string name="previous">Předchozí</string>
     <string name="app_layout_subtext">Změnit vzhled aplikace tak, aby vám vyhovoval</string>
     <string name="preferred_media_subtext">Co chcete vidět</string>
     <string name="plugin_downloaded">Doplněk stažen</string>
     <string name="is_adult">18+</string>
     <string name="batch_download_start_format" formatted="true">Spuštěno stahování %1$d %2$s…</string>
-    <string name="blank_repo_message">CloudStream nemá ve výchozím nastavení nainstalované žádné zdroje. Je třeba je nainstalovat z repozitářů.
-\n
-\nPřipojte se na náš Discord nebo hledejte na internetu.</string>
+    <string name="blank_repo_message">CloudStream nemá ve výchozím nastavení nainstalované žádné zdroje. Je třeba je nainstalovat z repozitářů. \n \nPřipojte se na náš Discord nebo hledejte na internetu.</string>
     <string name="plugins_disabled" formatted="true">Zakázáno: %d</string>
     <string name="plugins_updated" formatted="true">Aktualizováno %d doplňků</string>
     <string name="safe_mode_crash_info">Zobrazit informace o pádu</string>
@@ -454,7 +433,7 @@
     <string name="clear_history">Vymazat historii</string>
     <string name="all_languages_preference">Všechny jazyky</string>
     <string name="skip_type_mixed_op">Smíšený úvod</string>
-    <string name="skip_type_creddits">Poděkování</string>
+    <string name="skip_type_credits">Poděkování</string>
     <string name="skip_type_intro">Znělka</string>
     <string name="enable_skip_op_from_database_des">Zobrazit vyskakovací okna pro přeskočení úvodu/konce</string>
     <string name="update_notification_downloading">Stahování aktualizace aplikace…</string>
@@ -462,8 +441,7 @@
     <string name="update_notification_failed">Nepodařilo se nainstalovat novou verzi aplikace</string>
     <string name="apk_installer_legacy">Původní</string>
     <string name="delayed_update_notice">Aplikace bude po ukončení aktualizována</string>
-    <string name="empty_library_no_accounts_message">Vaše knihovna je prázdná :(
-\nPřihlaste se k účtu v knihovně nebo přidejte pořady do místní knihovny.</string>
+    <string name="empty_library_no_accounts_message">Vaše knihovna je prázdná :( \nPřihlaste se k účtu v knihovně nebo přidejte pořady do místní knihovny.</string>
     <string name="select_library">Vybrat knihovnu</string>
     <string name="sort_rating_desc">Hodnocení (od nejvyššího)</string>
     <string name="sort_rating_asc">Hodnocení (od nejnižšího)</string>
@@ -471,8 +449,7 @@
     <string name="sort_by">Seřadit podle</string>
     <string name="sort">Řazení</string>
     <string name="empty_library_logged_in_message">Tento seznam je prázdný. Zkuste přepnout na jiný.</string>
-    <string name="safe_mode_file">Nalezen soubor bezpečného režimu!
-\nDo odebrání souboru nebudeme načítat žádná rozšíření.</string>
+    <string name="safe_mode_file">Nalezen soubor bezpečného režimu! \nDo odebrání souboru nebudeme načítat žádná rozšíření.</string>
     <string name="sort_updated_new">Aktualizováno (od nejnovějšího)</string>
     <string name="sort_updated_old">Aktualizováno (od nejstaršího)</string>
     <string name="sort_alphabetical_a">Abecedně (od A do Z)</string>
@@ -483,7 +460,7 @@
     <string name="add_site_summary">Přidat klon existujícího webu s jinou adresou URL</string>
     <string name="example_site_url">https://example.com</string>
     <string name="example_lang_name">Kód jazyka (cs)</string>
-    <string name="download_all_plugins_from_repo">Varování: CloudStream 3 nenese žádnou zodpovědnost za používání rozšíření třetích stran a neposkytuje pro ně žádnou podporu!</string>
+    <string name="download_all_plugins_from_repo">Varování: CloudStream nenese žádnou zodpovědnost za používání rozšíření třetích stran a neposkytuje pro ně žádnou podporu!</string>
     <string name="single_plugin_disabled" formatted="true">%s (zakázáno)</string>
     <string name="tracks">Stopy</string>
     <string name="nsfw">NSFW</string>
@@ -553,13 +530,7 @@
     <string name="help">Nápověda</string>
     <string name="qualities">Kvality</string>
     <string name="profile_background_des">Pozadí profilu</string>
-    <string name="quality_profile_help">Zde můžete změnit pořadí zdrojů. Pokud má video vyšší prioritu, objeví se ve výběru zdrojů výše. Součet priority zdroje a priority kvality je priorita videa.
-\n
-\nZdroj A: 3
-\nKvalita B: 7
-\nBudou mít celkovou prioritu videa 10.
-\n
-\nPOZNÁMKA: Pokud je součet 10 nebo vyšší, přehrávač automaticky přeskočí načítání při načtení daného odkazu!</string>
+    <string name="quality_profile_help">Zde můžete změnit pořadí zdrojů. Pokud má video vyšší prioritu, objeví se ve výběru zdrojů výše. Součet priority zdroje a priority kvality je priorita videa. \n \nZdroj A: 3 \nKvalita B: 7 \nBudou mít celkovou prioritu videa 10. \n \nPOZNÁMKA: Pokud je součet 10 nebo vyšší, přehrávač automaticky přeskočí načítání při načtení daného odkazu!</string>
     <string name="unable_to_inflate">Nepodařilo se správně vytvořit rozhraní. Toto je VÁŽNÁ CHYBA, kterou je potřeba ihned nahlásit %s</string>
     <string name="disable">Vypnout</string>
     <string name="automatic_plugin_download_mode_title">Výběr režimu pro filtrování stahování doplňků</string>
@@ -569,11 +540,7 @@
     <string name="favorite_removed">%s odebráno z oblíbených</string>
     <string name="favorites_list_name">Oblíbené</string>
     <string name="favorite_added">%s přidáno do oblíbených</string>
-    <string name="duplicate_message_multiple" formatted="true">Ve vaší knihovně byl nalezen potenciální duplikát:
-\n
-\n%s
-\n
-\nChcete přesto přidat tuto položku, nahradit existující nebo zrušit akci?</string>
+    <string name="duplicate_message_multiple" formatted="true">Ve vaší knihovně byl nalezen potenciální duplikát: \n \n%s \n \nChcete přesto přidat tuto položku, nahradit existující nebo zrušit akci?</string>
     <string name="backup_frequency">Frekvence záloh</string>
     <string name="duplicate_title">Nalezena potenciální duplicita</string>
     <string name="lock_profile">Zamknout profil</string>
@@ -587,9 +554,7 @@
     <string name="action_subscribe">Odebírat</string>
     <string name="action_remove_from_favorites">Odebrat z oblíbených</string>
     <string name="select_an_account">Vyberte účet</string>
-    <string name="duplicate_message_single">Vypadá to, že ve vaší knihovně již existuje potenciální duplikát: „%s“.
-\n
-\nChcete přesto přidat tuto položku, nahradit existující nebo zrušit akci?</string>
+    <string name="duplicate_message_single">Vypadá to, že ve vaší knihovně již existuje potenciální duplikát: „%s“. \n \nChcete přesto přidat tuto položku, nahradit existující nebo zrušit akci?</string>
     <string name="enter_pin">Zadejte PIN</string>
     <string name="pin">PIN</string>
     <string name="enter_current_pin">Zadejte současný PIN</string>
@@ -601,8 +566,6 @@
     <string name="edit_account">Upravit účet</string>
     <string name="links_reloaded_toast">Odkazy znovu načteny</string>
     <string name="rotate_video_desc">Zobrazit tlačítko pro přepnutí otočení obrazovky</string>
-    <string name="rotate_video_key">rotate_video_key</string>
-    <string name="auto_rotate_video_key">auto_rotate_video_key</string>
     <string name="auto_rotate_video">Automatické otáčení</string>
     <string name="rotate_video">Otočení</string>
     <string name="auto_rotate_video_desc">Zapnout automatické otáčení obrazovky v závislosti na orientaci videa</string>
@@ -620,8 +583,7 @@
     <string name="biometric_prompt_description">Po několika nezdařilých pokusech se okno zavře. Pro opětovný pokus restartujte aplikaci.</string>
     <string name="biometric_warning">Vaše data z aplikace CloudStream byla nyní zálohována. Ačkoli je tato možnost velmi malá, různá zařízení se mohou chovat různě. Ve výjimečném případě, že se vám přístup k aplikaci zablokuje, data aplikace zcela vymažte a obnovte je ze zálohy. Velmi se omlouváme za případné nepříjemnosti z toho plynoucí.</string>
     <string name="unfavorite">Odebrat z oblíbených</string>
-    <string name="resume_remaining" formatted="true">%s
-\nzbývá</string>
+    <string name="resume_remaining" formatted="true">%s \nzbývá</string>
     <string name="favorite">Přidat do oblíbených</string>
     <string name="repo_copy_label">Název a adresa repozitáře</string>
     <string name="clipboard_unknown_error">Chyba při kopírování, zkopírujte prosím protokol a kontaktujte podporu aplikace.</string>
@@ -630,8 +592,8 @@
     <string name="ok">OK</string>
     <string name="app_unrestricted_toast">Využití baterie aplikací je již nastaveno na neomezené</string>
     <string name="app_info_intent_error">Nepodařilo se otevřít informace o aplikaci CloudStream.</string>
-    <string name="music_singlar">Hudba</string>
-    <string name="custom_media_singluar">Média</string>
+    <string name="music_singular">Hudba</string>
+    <string name="custom_media_singular">Média</string>
     <string name="battery_dialog_title">Zakažte optimalizace baterie</string>
     <string name="battery_dialog_message">Aby bylo zajištěno nepřetržité stahování a upozornění na odebírané seriály, potřebuje aplikace CloudStream povolení ke spuštění na pozadí. Po stisknutí tlačítka OK se vám zobrazí dialog se žádostí. Stiskněte prosím „Povolit“.\n\nUpozorňujeme, že toto oprávnění neznamená, že CS3 bude vybíjet baterii. Na pozadí bude pracovat pouze v případě potřeby, například při přijímání oznámení nebo stahování videí z oficiálních rozšíření.</string>
     <string name="audio_book_singular">Audiokniha</string>
@@ -651,7 +613,6 @@
     <string name="pref_category_accounts">Účty</string>
     <string name="auth_locally">Lokální ověření</string>
     <string name="device_pin_expired_message">PIN kód vypršel!</string>
-    <string name="hide_player_control_names_key" translatable="false">hide_player_control_names_key</string>
     <string name="play_from_beginning_img_des">Přehrát od začátku</string>
     <string name="downloads_empty">Aktuálně neprobíhají žádná stahování.</string>
     <string name="open_local_video">Otevřít místní video</string>
@@ -663,20 +624,12 @@
     <string name="downloads_delete_select">Zvolte položky k odstranění</string>
     <string name="offline_file">Dostupné pro sledování offline</string>
     <string name="select_all">Vybrat vše</string>
-    <string name="delete_message_multiple" formatted="true">Opravdu chcete trvale odstranit následující položky?
-\n
-\n%s</string>
-    <string name="delete_message_series_episodes" formatted="true">Opravdu chcete trvale odstranit následující epizody v %1$s?
-\n
-\n%2$s</string>
-    <string name="delete_message_series_only" formatted="true">Opravdu chcete trvale odstranit všechny epizody v následujících sériích?
-\n
-\n%s</string>
+    <string name="delete_message_multiple" formatted="true">Opravdu chcete trvale odstranit následující položky? \n \n%s</string>
+    <string name="delete_message_series_episodes" formatted="true">Opravdu chcete trvale odstranit následující epizody v %1$s? \n \n%2$s</string>
+    <string name="delete_message_series_only" formatted="true">Opravdu chcete trvale odstranit všechny epizody v následujících sériích? \n \n%s</string>
     <string name="deselect_all">Zrušit výběr všeho</string>
     <string name="delete_files">Odstranit soubory</string>
-    <string name="delete_message_series_section" formatted="true">Také trvale odstraníte všechny epizody v následujících sériích:
-\n
-\n%s</string>
+    <string name="delete_message_series_section" formatted="true">Také trvale odstraníte všechny epizody v následujících sériích: \n \n%s</string>
     <string name="delete_format" formatted="true">Odstranit (%1$d | %2$s)</string>
     <string name="preview_seekbar">Náhled v liště přehrávače</string>
     <string name="preview_seekbar_desc">Povolit náhled miniatur na liště přehrávače</string>
@@ -689,15 +642,15 @@
     <string name="custom">Vlastní</string>
     <string name="torrent_info">Toto video je torrent, což znamená, že lze sledovat vaší aktivitu v něm.\nPřed pokračováním se ujistěte, že chápete, co to je torrentování.</string>
     <string name="subs_edge_size">Velikost okraje</string>
-    <string name="audio_singluar">Zvuk</string>
-    <string name="podcast_singluar">Podcast</string>
+    <string name="audio_singular">Zvuk</string>
+    <string name="podcast_singular">Podcast</string>
     <string name="encoding_error">Chyba kódování</string>
     <string name="unsupported_error">Nepodporovaná chyba</string>
     <string name="player_load_one_subtitle_online">Načíst první dostupné</string>
     <string name="torrent_not_accepted">Pro pokračování restartujte aplikaci a potvrďte dialog o streamování torrentu.</string>
     <string name="torrent_preferred_media">Povolte torrent v Nastavení/Poskytovatelé/Preferovaná média</string>
     <string name="software_decoding">Softwarové dekódování</string>
-    <string name="software_decoding_desc">Softwarové dekódování umožňuje přehrávači přehrávat video soubory, které telefon nepodporuje, ale může způsobit zpoždění nebo nestabilní přehrávání ve vysokém rozlišení</string>
+    <string name="software_decoding_desc">Softwarové dekódování umožňuje přehrávači přehrávat video soubory, které vaše zařízení nepodporuje, ale může způsobit zpoždění nebo nestabilní přehrávání ve vysokém rozlišení.</string>
     <string name="sort_episodes_rating_high_low">Hodnocení (nejvyšší)</string>
     <string name="sort_episodes_date_newest">Datum vysílání (nejnovější)</string>
     <string name="sort_episodes_date_oldest">Datum vysílání (nejstarší)</string>
@@ -723,4 +676,82 @@
     <string name="background_radius">Poloměr pozadí</string>
     <string name="slide_up_again_to_exceed_100">Přejeďte opět nahoru pro pokračování nad 100 %</string>
     <string name="volume_exceeded_100">Hlasitost překročila 100 %</string>
-</resources>
\ No newline at end of file
+    <string name="download_parallel_settings_des">Počet různých položek, které lze stahovat v jednu chvíli</string>
+    <string name="poster_size_settings_des">Změní velikost plakátů</string>
+    <string name="no_internet_connection">Žádné připojení k internetu. \n\nPřipojte se prosím k internetu a zkuste to znovu, nebo sledujte stažené, zatímco jste offline.</string>
+    <string name="poster_size_settings">Velikost plakátů</string>
+    <string name="overscan_settings_des">Změní hranice obrazovky</string>
+    <string name="overscan_settings">Oříznutí</string>
+    <string name="parallel_downloads">Paralelní stahování</string>
+    <string name="concurrent_connections">Souběžná připojení</string>
+    <string name="concurrent_connections_settings_des">Kolik souběžných připojení může každé stahování použít</string>
+    <string name="go_to_downloads">Přejít na stažené</string>
+    <string name="player_settings_always_ask">Vždy se zeptat</string>
+    <string name="speedup_title">Přepínač rychlosti při podržení</string>
+    <string name="speedup_summary">Podržte pro 2x rychlost</string>
+    <string name="download_time_left_hour_min_sec_format" formatted="true">%1$dh %2$dmin %3$ds</string>
+    <string name="download_time_left_min_sec_format" formatted="true">%1$dmin %2$ds</string>
+    <string name="download_time_left_sec_format" formatted="true">%1$ds</string>
+    <string name="show_rating">Štítek hodnocení</string>
+    <string name="no_account">Žádný účet</string>
+    <string name="edit_profile_image_title">Upravit profilový obrázek</string>
+    <string name="edit_profile_image_hint">Zadejte adresu profilového obrázku</string>
+    <string name="edit_profile_image_error_empty">Adresa nenalezena</string>
+    <string name="edit_profile_image_error_invalid">Neplatná adresa nebo obrázek</string>
+    <string name="edit_profile_image_success">Obrázek úspěšně upraven</string>
+    <string name="action_mark_watched_up_to_this_episode">Označit jako zhlédnuté po tuto epizodu</string>
+    <string name="action_remove_mark_watched_up_to_this_episode">Odebrat zhlédnutí po tuto epizodu</string>
+    <string name="action_reload">Znovu načteno</string>
+    <string name="reload_provider">Znovu načíst poskytovatele</string>
+    <string name="episode_action_play_mirror">Přehrát ze zrcadla</string>"
+    <string name="name">Název</string>
+    <string name="resolution_and_name">Rozlišení a název</string>
+    <string name="subs_subtitle_alignment">Zarovnání titulků</string>
+    <string name="bottom_left">Vlevo dole</string>
+    <string name="bottom_center">Uprostřed dole</string>
+    <string name="bottom_right">Vpravo dole</string>
+    <string name="middle_left">Vlevo uprostřed</string>
+    <string name="middle_center">Uprostřed</string>
+    <string name="middle_right">Vpravo uprostřed</string>
+    <string name="top_left">Vlevo nahoře</string>
+    <string name="top_center">Uprostřed nahoře</string>
+    <string name="top_right">Vpravo nahoře</string>
+    <string name="play_full_series_button">Přehrát celý seriál</string>
+    <string name="install_prerelease">Nainstalovat předběžnou verzi</string>
+    <string name="prerelease_already_installed">Předběžné vydání je již nainstalováno.</string>
+    <string name="prerelease_install_failed">Nepodařilo se nainstalovat předběžné vydání.</string>
+    <string name="show_episode_text">Text epizody</string>
+    <string name="search_suggestions">Návrhy vyhledávání</string>
+    <string name="search_suggestions_des">Zobrazit návrhy vyhledávání během psaní</string>
+    <string name="clear_suggestions">Vymazat návrhy</string>
+    <string name="show_cast_in_details">Zobrazit panel vysílání</string>
+    <string name="extra_brightness_settings">Extra jas</string>
+    <string name="extra_brightness_settings_des">Povolit filtr jasu při překročení 100 % jasu obrazovky</string>
+    <string name="extra_brightness_key">extra_brightness_enabled</string>
+    <string name="video_info">Informace o médiu</string>
+    <string name="source_name">Název zdroje</string>
+    <string name="download_queue">Fronta stahování</string>
+    <string name="queue_empty_message">Momentálně nemáte žádná stahování ve frontě.</string>
+    <string name="download_all">Stáhnout vše</string>
+    <string name="cancel_all">Zrušit vše</string>
+    <string name="download_episode_range">Chcete stáhnout epizodu %s?</string>
+    <string name="cancel_queue_message">Chcete zrušit všechna stahování ve frontě?</string>
+    <plurals name="downloads_active">
+        <item quantity="one">%d aktivní stahování</item>
+        <item quantity="few">%d aktivní stahování</item>
+        <item quantity="many">%d aktivních stahování</item>
+        <item quantity="other">%d aktivních stahování</item>
+    </plurals>
+    <plurals name="downloads_queued">
+        <item quantity="one">%d stahování uloženo do fronty</item>
+        <item quantity="few">%d stahování uložena do fronty</item>
+        <item quantity="many">%d stahování uloženo do fronty</item>
+        <item quantity="other">%d stahování uloženo do fronty</item>
+    </plurals>
+    <string name="source_priority">Priorita zdrojů</string>
+    <string name="source_priority_help">Rozhodněte, jak mají být řazeny zdroje videí v přehrávači</string>
+    <string name="show_player_metadata_overlay">Zobrazit překrytí metadat v přehrávači</string>
+    <string name="video_singular">Video</string>
+    <string name="skip_type_preview">Náhled</string>
+    <string name="player_is_live">Živě</string>
+</resources>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-b+de/strings.xml
similarity index 85%
rename from app/src/main/res/values-de/strings.xml
rename to app/src/main/res/values-b+de/strings.xml
index 752ffeb7db5..6ccb9bc69e5 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-b+de/strings.xml
@@ -13,7 +13,7 @@
     <string name="episode_action_chromecast_mirror">Chromecast-Mirror</string>
     <string name="episode_action_play_in_app">In App wiedergeben</string>
     <string name="skip_type_mixed_op">Gemischte Openings</string>
-    <string name="skip_type_creddits">Abspann</string>
+    <string name="skip_type_credits">Abspann</string>
     <string name="skip_type_intro">Intro</string>
     <string name="clear_history">Verlauf löschen</string>
     <string name="history">Verlauf</string>
@@ -27,8 +27,7 @@
     <string name="preview_background_img_des">Hintergrundbildvorschau</string>
     <string name="player_speed_text_format" formatted="true">Geschwindigkeit (%.2fx)</string>
     <string name="rated_format" formatted="true">Bewertung: %.1f</string>
-    <string name="new_update_format" formatted="true">Neues Update gefunden!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">Neues Update gefunden! \n%1$s -&gt; %2$s</string>
     <string name="filler" formatted="true">Füller</string>
     <string name="duration_format" formatted="true">%d Min</string>
     <string name="app_name">CloudStream</string>
@@ -78,7 +77,6 @@
     <string name="popup_play_file">Datei abspielen</string>
     <string name="popup_resume_download">Download fortsetzen</string>
     <string name="popup_pause_download">Download pausieren</string>
-    <string name="pref_disable_acra">Automatische Fehlerberichtserstattung deaktivieren</string>
     <string name="home_more_info">Mehr Infos</string>
     <string name="home_expanded_hide">Verstecken</string>
     <string name="home_play">Abspielen</string>
@@ -155,8 +153,6 @@
     <string name="settings_info">Info</string>
     <string name="advanced_search">Erweiterte Suche</string>
     <string name="advanced_search_des">Liefert die Suchergebnisse getrennt nach Anbietern</string>
-    <string name="bug_report_settings_off">Sendet Daten nur bei Abstürzen</string>
-    <string name="bug_report_settings_on">Sendet keine Daten</string>
     <string name="show_fillers_settings">Füller-Episoden für Animes anzeigen</string>
     <string name="show_trailers_settings">Trailer anzeigen</string>
     <string name="kitsu_settings">Vorschaubilder von Kitsu anzeigen</string>
@@ -164,8 +160,6 @@
     <string name="automatic_plugin_updates">Automatische Plugin-Updates</string>
     <string name="updates_settings">App-Updates anzeigen</string>
     <string name="updates_settings_des">Automatisches Suchen nach neuen Updates nach dem Start.</string>
-    <string name="uprereleases_settings">Auf Vorabversionen updaten</string>
-    <string name="uprereleases_settings_des">Suche nach Vorabversionen statt nur nach Vollversionen</string>
     <string name="github">Github</string>
     <string name="lightnovel">Light Novel App von denselben Entwicklern</string>
     <string name="anim">Anime App von denselben Entwicklern</string>
@@ -177,7 +171,6 @@
     <string name="copy_link_toast">Link in die Zwischenablage kopiert</string>
     <string name="play_episode_toast">Episode abspielen</string>
     <string name="subs_default_reset_toast">Auf Standardwert zurücksetzen</string>
-    <string name="acra_report_toast">Sorry, die Anwendung ist abgestürzt. Ein anonymer Fehlerbericht wird an die Entwickler gesendet</string>
     <string name="season">Staffel</string>
     <string name="no_season">Keine Staffel</string>
     <string name="episode">Episode</string>
@@ -194,10 +187,8 @@
     <string name="resume">Fortsetzen</string>
     <string name="go_back_30">-30</string>
     <string name="go_forward_30">+30</string>
-    <string name="delete_message" formatted="true">Dadurch wird %s permanent gelöscht
-\nBist du dir sicher?</string>
-    <string name="resume_time_left" formatted="true">%dm
-\nverbleibend</string>
+    <string name="delete_message" formatted="true">Dadurch wird %s permanent gelöscht \nBist du dir sicher?</string>
+    <string name="resume_time_left" formatted="true">%dm \nverbleibend</string>
     <string name="status_ongoing">Laufend</string>
     <string name="status_completed">Abgeschlossen</string>
     <string name="status">Status</string>
@@ -261,7 +252,7 @@
     <string name="update">Update</string>
     <string name="watch_quality_pref">Bevorzugte Videoqualität (WLAN)</string>
     <string name="limit_title">Videoplayertitel max. Zeichen</string>
-    <string name="limit_title_rez">Videoplayer Auflösung</string>
+    <string name="limit_title_rez">Playerinformationen anzeigen</string>
     <string name="video_buffer_size_settings">Videopuffergröße</string>
     <string name="video_buffer_length_settings">Videopufferlänge</string>
     <string name="video_buffer_disk_settings">Video-Cache in Speicher</string>
@@ -385,8 +376,7 @@
     <string name="previous">Vorherige</string>
     <string name="skip_setup">Einrichtung überspringen</string>
     <string name="app_layout_subtext">Aussehen der App passend zu dem des Geräts ändern</string>
-    <string name="crash_reporting_title">Absturzmeldung</string>
-    <string name="preferred_media_subtext">Was möchtest du sehen?</string>
+    <string name="preferred_media_subtext">Was möchten Sie sehen</string>
     <string name="setup_done">Fertig</string>
     <string name="extensions">Erweiterungen</string>
     <string name="add_repository">Repository hinzufügen</string>
@@ -408,13 +398,11 @@
     <string name="plugins_downloaded" formatted="true">Heruntergeladen: %d</string>
     <string name="plugins_disabled" formatted="true">Deaktiviert: %d</string>
     <string name="plugins_not_downloaded" formatted="true">Nicht heruntergeladen: %d</string>
-    <string name="blank_repo_message">CloudStream hat standardmäßig keine Websites installiert. Websites müssen aus Repositories installiert werden.
-\n
-\nTrete unserem Discord Server bei oder suche online.</string>
+    <string name="blank_repo_message">CloudStream hat standardmäßig keine Websites installiert. Websites müssen aus Repositories installiert werden. \n \nTrete unserem Discord Server bei oder suche online.</string>
     <string name="view_public_repositories_button">Community-Repositories anzeigen</string>
     <string name="view_public_repositories_button_short">Öffentliche Liste</string>
     <string name="uppercase_all_subtitles">Alle Untertitel in Großbuchstaben</string>
-    <string name="download_all_plugins_from_repo">Alle Plugins aus diesem Repository herunterladen?</string>
+    <string name="download_all_plugins_from_repo">Warnung: CloudStream übernimmt keine Verantwortung für das nutzen von Dritt-Anbieter-Erweiterungen und leistet für sie keine Unterstützung!</string>
     <string name="single_plugin_disabled" formatted="true">%s (Deaktiviert)</string>
     <string name="tracks">Spuren</string>
     <string name="audio_tracks">Audiospuren</string>
@@ -450,7 +438,7 @@
     <string name="automatic_plugin_download_summary">Automatische Installation aller noch nicht installierten Plugins aus hinzugefügten Repositories.</string>
     <string name="redo_setup_process">Einrichtungsvorgang wiederholen</string>
     <string name="apk_installer_settings">APK-Installer</string>
-    <string name="apk_installer_settings_des">Einige Smartphones unterstützen den neuen Package-Installer nicht. Benutze die Legacy-Option, wenn sich die Updates nicht installieren lassen.</string>
+    <string name="apk_installer_settings_des">Einige Geräte unterstützen den neuen Package-Installer nicht. Benutze die Legacy-Option, wenn sich die Updates nicht installieren lassen.</string>
     <string name="season_format">%1$s %2$d%3$s</string>
     <string name="pref_category_links">Links</string>
     <string name="pref_category_app_updates">App-Updates</string>
@@ -491,11 +479,9 @@
     <string name="sort_alphabetical_z">Alphabetisch (Z zu A)</string>
     <string name="select_library">Bibliothek auswählen</string>
     <string name="open_with">Öffnen mit</string>
-    <string name="empty_library_no_accounts_message">Deine Bibliothek ist leer :(
-\nMelde dich mit einem Bibliothekskonto an oder füge Titel zu deiner lokalen Bibliothek hinzu.</string>
+    <string name="empty_library_no_accounts_message">Deine Bibliothek ist leer :( \nMelde dich mit einem Bibliothekskonto an oder füge Titel zu deiner lokalen Bibliothek hinzu.</string>
     <string name="empty_library_logged_in_message">Diese Liste ist leer. Versuch zu einer anderen Liste zu wechseln.</string>
-    <string name="safe_mode_file">Datei für den abgesicherten Modus gefunden!
-\nBeim Start werden keine Erweiterungen geladen, bis die Datei entfernt wird.</string>
+    <string name="safe_mode_file">Datei für den abgesicherten Modus gefunden! \nBeim Start werden keine Erweiterungen geladen, bis die Datei entfernt wird.</string>
     <string name="android_tv_interface_off_seek_settings">Player ausgeblendet - Betrag zum vor- und zurückspulen</string>
     <string name="android_tv_interface_on_seek_settings_summary">Der Betrag, welcher verwendet wird, wenn der Player eingeblendet ist</string>
     <string name="android_tv_interface_off_seek_settings_summary">Der Betrag, welcher verwendet wird, wenn der Player ausgeblendet ist</string>
@@ -529,13 +515,7 @@
     <string name="help">Hilfe</string>
     <string name="qualities">Qualitäten</string>
     <string name="profile_background_des">Profil-Hintergrund</string>
-    <string name="quality_profile_help">Hier kannst du verändern, wie die Quellen geordnet werden. Wenn ein Video eine höhere Priorität hat, wird es höher in der Quellenauswahl erscheinen. Die Summe der Quellenpriorität und der Qualitätspriorität ist die Videopriorität.
-\n
-\nQuelle A: 3
-\nQualität B: 7
-\nWerden eine kombinierte Videopriorität von 10 haben.
-\n
-\nHINWEIS: Wenn die Summe 10 oder mehr beträgt, überspringt der Player automatisch das Laden, wenn der Link geladen wird!</string>
+    <string name="quality_profile_help">Hier kannst du verändern, wie die Quellen geordnet werden. Wenn ein Video eine höhere Priorität hat, wird es höher in der Quellenauswahl erscheinen. Die Summe der Quellenpriorität und der Qualitätspriorität ist die Videopriorität. \n \nQuelle A: 3 \nQualität B: 7 \nWerden eine kombinierte Videopriorität von 10 haben. \n \nHINWEIS: Wenn die Summe 10 oder mehr beträgt, überspringt der Player automatisch das Laden, wenn der Link geladen wird!</string>
     <string name="automatic_plugin_download_mode_title">Filtermodus für Plugin-Downloads auswählen</string>
     <string name="already_voted">Es wurde bereits abgestimmt</string>
     <string name="no_plugins_found_error">Keine Plugins im Repository gefunden</string>
@@ -567,14 +547,8 @@
     <string name="skip_startup_account_select_pref">Kontoauswahl beim Starten überspringen</string>
     <string name="manage_accounts">Konten verwalten</string>
     <string name="edit_account">Konto bearbeiten</string>
-    <string name="duplicate_message_multiple" formatted="true">Es wurden potentielle Duplikate in deiner Bibliothek gefunden:
-\n
-\n%s
-\n
-\nMöchtest du dieses Element dennoch hinzufügen, das existierende ersetzen oder diese Aktion abbrechen?</string>
-    <string name="duplicate_message_single" formatted="true">Deine Bibliothek enthält möglicherweise schon ein Duplikat dieses Elements: \'%s\'
-\n
-\nMöchtest du dieses Element dennoch hinzufügen, das existierende ersetzen oder diese Aktion abbrechen?</string>
+    <string name="duplicate_message_multiple" formatted="true">Es wurden potentielle Duplikate in deiner Bibliothek gefunden: \n \n%s \n \nMöchtest du dieses Element dennoch hinzufügen, das existierende ersetzen oder diese Aktion abbrechen?</string>
+    <string name="duplicate_message_single" formatted="true">Deine Bibliothek enthält möglicherweise schon ein Duplikat dieses Elements: \'%s\' \n \nMöchtest du dieses Element dennoch hinzufügen, das existierende ersetzen oder diese Aktion abbrechen?</string>
     <string name="links_reloaded_toast">Links wurden neu geladen</string>
     <string name="rotate_video">Drehen</string>
     <string name="rotate_video_desc">Zeige einen Umschalter für Bildschirmorientierung an</string>
@@ -594,8 +568,7 @@
     <string name="unfavorite">kein Favorit</string>
     <string name="biometric_prompt_description">Dieser Bildschirm wurde nach einigen Fehlversuchen geschlossen. Starte die App neu.</string>
     <string name="biometric_warning">Ihre CloudStream-Daten wurden gesichert. Obwohl die Wahrscheinlichkeit dieses seltenen Falles sehr gering ist, verhalten sich alle Geräte unterschiedlich. Falls Sie im schlimmsten Fall den Zugriff zur App verlieren, löschen Sie die App-Daten vollständig und stellen Sie die Sicherung wieder her. Jegliche Unannehmlichkeiten, die Ihnen dadurch entstehen, bedauern wir sehr.</string>
-    <string name="resume_remaining" formatted="true">%s
-\nausstehend</string>
+    <string name="resume_remaining" formatted="true">%s \nausstehend</string>
     <string name="favorite">Favorit</string>
     <string name="toast_copied">Kopiert!</string>
     <string name="clipboard_unknown_error">Beim kopieren ist ein Fehler aufgetreten, bitte kopieren sie logical und wenden sich an den Support.</string>
@@ -603,13 +576,12 @@
     <string name="repo_copy_label">Repository Name und URL</string>
     <string name="ok">OK</string>
     <string name="battery_dialog_title">Akku-Optimierung deaktivieren</string>
-    <string name="music_singlar">Musik</string>
+    <string name="music_singular">Musik</string>
     <string name="audio_book_singular">Hörbuch</string>
-    <string name="custom_media_singluar">Medien</string>
+    <string name="custom_media_singular">Medien</string>
     <string name="reset_btn">Zurücksetzen</string>
     <string name="app_unrestricted_toast">Akkuverbrauch der App ist bereits auf unbeschränkt eingestellt</string>
     <string name="app_info_intent_error">CloudStreams App-Info kann nicht geöffnet werden.</string>
-    <string name="hide_player_control_names_key" translatable="false">hide_player_control_names_key</string>
     <string name="next_season_episode_format" formatted="true">Staffel %1$d Episode %2$d wird veröffentlicht in</string>
     <string name="episode_upcoming_format" formatted="true">Wird veröffentlicht in %s</string>
     <string name="pref_category_security">Sicherheit</string>
@@ -630,7 +602,7 @@
     <string name="test_warning">Warnung</string>
     <string name="device_pin_counter_text">Code läuft ab in %1$dm %2$ds</string>
     <string name="cs3wiki">CloudStream-Wiki</string>
-    <string name="battery_dialog_message">Um einen unterbrechungsfreien Download zu gewährleisten und Benachrichtigungen für abonnierte TV-Shows anzuzeigen, benötigt Cloudstream die Berechtigung, im Hintergrund ausgeführt zu werden. Beim drücken auf 𝙊𝙆 wird ein Dialog angezeigt. Bitte drücke ‚Erlauben‘.\n Bitte beachte, dass dies nicht dazu führt, dass CS3 den Akku dauerhaft entlädt. Es läuft nur im Hintergrund, wenn es nötig ist, beispielsweise zum Empfang von Benachrichtigungen oder dem Download von Videos aus offiziellen Erweiterungen.</string>
+    <string name="battery_dialog_message">Um einen unterbrechungsfreien Download zu gewährleisten und Benachrichtigungen für abonnierte TV-Shows anzuzeigen, benötigt Cloudstream die Berechtigung, im Hintergrund ausgeführt zu werden. Beim drücken auf 𝙊𝙆 wird ein Dialog angezeigt. Bitte drücke ‚Erlauben‘.\n\nBitte beachte, dass dies nicht dazu führt, dass CS3 den Akku dauerhaft entlädt. Es läuft nur im Hintergrund, wenn es nötig ist, beispielsweise zum Empfang von Benachrichtigungen oder dem Download von Videos aus offiziellen Erweiterungen.</string>
     <string name="delete_files">Dateien löschen</string>
     <string name="delete_format" formatted="true">Löschen (%1$d | %2$s)</string>
     <string name="select_all">Alle auswählen</string>
@@ -638,18 +610,10 @@
     <string name="play_from_beginning_img_des">Vom Beginn an spielen</string>
     <string name="downloads_delete_select">Elemente zum Löschen auswählen</string>
     <string name="offline_file">Zum Offline-Ansehen verfügbar</string>
-    <string name="delete_message_multiple" formatted="true">Bist du dir sicher, dass du die folgenden Elemente permanent löschen willst?
-\n
-\n%s</string>
-    <string name="delete_message_series_episodes" formatted="true">Bist du dir sicher, dass du die folgenden Episoden in %1$s permanent löschen willst?
-\n
-\n%2$s</string>
-    <string name="delete_message_series_section" formatted="true">Du wirst ebenfalls alle Episoden der folgenden Serien permanent löschen:
-\n
-\n%s</string>
-    <string name="delete_message_series_only" formatted="true">Bist du dir sicher, dass du alle Episoden der folgenden Serien permanent löschen willst?
-\n
-\n%s</string>
+    <string name="delete_message_multiple" formatted="true">Bist du dir sicher, dass du die folgenden Elemente permanent löschen willst? \n \n%s</string>
+    <string name="delete_message_series_episodes" formatted="true">Bist du dir sicher, dass du die folgenden Episoden in %1$s permanent löschen willst? \n \n%2$s</string>
+    <string name="delete_message_series_section" formatted="true">Du wirst ebenfalls alle Episoden der folgenden Serien permanent löschen: \n \n%s</string>
+    <string name="delete_message_series_only" formatted="true">Bist du dir sicher, dass du alle Episoden der folgenden Serien permanent löschen willst? \n \n%s</string>
     <string name="sort_release_date_new">Veröffentlichungsdatum (von neu nach alt)</string>
     <string name="sort_release_date_old">Veröffentlichungsdatum (von alt nach neu)</string>
     <string name="preview_seekbar">Suchleisten Vorschau</string>
@@ -663,7 +627,7 @@
     <string name="dont_show">Nicht anzeigen</string>
     <string name="subs_edge_size">Kantengröße</string>
     <string name="torrent_info">Dieses Video ist ein Torrent, das bedeutet, dass Ihre Videoaktivitäten nachverfolgt werden könen.\nStellen Sie sicher, dass Sie die Grundlagen von Torrents verstehen, bevor Sie fortfahren.</string>
-    <string name="audio_singluar">Ton</string>
+    <string name="audio_singular">Ton</string>
     <string name="sort_episodes_number_desc">Episode (Absteigend)</string>
     <string name="sort_episodes_rating_high_low">Bewertung (Höchste)</string>
     <string name="sort_episodes_rating_low_high">Bewertung (Niedrigste)</string>
@@ -672,12 +636,12 @@
     <string name="sort_episodes_date_oldest">Ausstrahlungsdatum (Erstes)</string>
     <string name="sort_button_date">Datum %s</string>
     <string name="torrent_preferred_media">Torrent in Eintellungen/Anbieter/Bevorzugte Medien aktivieren</string>
-    <string name="software_decoding_desc">Softwaredekodierung erlaubt es dem Player, Videodateien abzuspielen, die von deinem Gerät nicht unterstützt werden, könnte jedoch bei hoher Auflösung zu ruckelnder oder instabiler Wiedergabe führen</string>
+    <string name="software_decoding_desc">Softwaredekodierung ermöglicht es dem Player, Videodateien abzuspielen, die von deinem Gerät nicht unterstützt werden, könnte jedoch bei hoher Auflösung zu ruckelnder oder instabiler Wiedergabe führen.</string>
     <string name="torrent_not_accepted">App neu starten und Stream Torrent Pop-Up akzeptieren, um fortzufahren.</string>
     <string name="update_plugins">Plugins aktualisieren</string>
     <string name="plugins_updated_manually">%d Plugin(s) erfolgreich aktualisiert!</string>
     <string name="update_plugins_manually">Plugins manuell aktualisieren</string>
-    <string name="podcast_singluar">Podcast</string>
+    <string name="podcast_singular">Podcast</string>
     <string name="unsupported_error">Nicht unterstützter Fehler</string>
     <string name="encoding_error">Kodierungsfehler</string>
     <string name="sort_button_episode">Ep %s</string>
@@ -692,9 +656,79 @@
     <string name="speech_recognition_unavailable">Spracherkennung ist nicht verfügbar</string>
     <string name="begin_speaking">Beginne zu sprechen…</string>
     <string name="player_notification_channel_name">Player-Benachrichtigung</string>
-    <string name="all_subtitles_bold">Alle Untertitel fettgedruckt anzeigen</string>
-    <string name="all_subtitles_italic">Alle Untertitel kursiv anzeigen</string>
+    <string name="all_subtitles_bold">Alle Untertitel fett machen</string>
+    <string name="all_subtitles_italic">Alle Untertitel kursiv machen</string>
     <string name="background_radius">Hintergrundsradius</string>
     <string name="volume_exceeded_100">Lautstärke hat 100% überschritten</string>
     <string name="slide_up_again_to_exceed_100">Noch einmal nach oben wischen, um 100% zu überschreiten</string>
-</resources>
\ No newline at end of file
+    <string name="player_settings_always_ask">Immer fragen</string>
+    <string name="download_parallel_settings_des">Wie viele verschiedene Elemente können parallel heruntergeladen werden</string>
+    <string name="parallel_downloads">Parallele Downloads</string>
+    <string name="concurrent_connections">Gleichzeitige Verbindungen</string>
+    <string name="concurrent_connections_settings_des">Wie viele gleichzeitige Verbindungen jeder Download während des Downloads verwenden kann</string>
+    <string name="go_to_downloads">Zu den Downloads</string>
+    <string name="no_internet_connection">Keine Internetverbindung.\n\nBitte verbinden Sie sich mit dem Internet und versuchen Sie es erneut, oder schauen Sie sich Ihre Downloads an, während Sie offline sind.</string>
+    <string name="overscan_settings_des">Ändert die Grenzen des Bildschirms</string>
+    <string name="overscan_settings">Überscannen</string>
+    <string name="poster_size_settings_des">Ändert die Größe von Postern</string>
+    <string name="poster_size_settings">Größe des Posters</string>
+    <string name="speedup_title">LongPress Geschwindigkeitsschalter</string>
+    <string name="speedup_summary">Halten Sie gedrückt, um die 2x Geschwindigkeit zu erhalten</string>
+    <string name="download_time_left_hour_min_sec_format" formatted="true">%1$dstd%2$dm%3$ds</string>
+    <string name="download_time_left_min_sec_format" formatted="true">%1$dm%2$ds</string>
+    <string name="download_time_left_sec_format" formatted="true">%1$ds</string>
+    <string name="show_rating">Bewerungslabel</string>
+    <string name="no_account">Kein Konto</string>
+    <string name="edit_profile_image_title">Profilbild ändern</string>
+    <string name="edit_profile_image_hint">Profilbild URL eingeben</string>
+    <string name="edit_profile_image_error_empty">Keine URL gefunden</string>
+    <string name="edit_profile_image_error_invalid">Ungültige URL oder ungültiges Bild</string>
+    <string name="edit_profile_image_success">Profilbild erfolgreich geändert</string>
+    <string name="action_mark_watched_up_to_this_episode">Označi kao gledano do ove epizode</string>
+    <string name="action_remove_mark_watched_up_to_this_episode">Ukloni epizodu koju sam gledao do sada</string>
+    <string name="action_reload">Ponovo učitano</string>
+    <string name="name">Name</string>
+    <string name="resolution_and_name">Auflösung und Name</string>
+    <string name="reload_provider">Anbieter erneut laden</string>
+    <string name="subs_subtitle_alignment">Untertitelausrichtung</string>
+    <string name="bottom_left">Unten links</string>
+    <string name="bottom_center">Unten Mitte</string>
+    <string name="bottom_right">Unten rechts</string>
+    <string name="middle_left">Mitte links</string>
+    <string name="middle_center">Mitte</string>
+    <string name="middle_right">Mitte rechts</string>
+    <string name="top_left">Oben links</string>
+    <string name="top_center">Oben mitte</string>
+    <string name="top_right">Oben rechts</string>
+    <string name="play_full_series_button">Gesamte Serie abspielen</string>
+    <string name="install_prerelease">Vorabversion installieren</string>
+    <string name="prerelease_already_installed">Vorabversion ist bereits installiert.</string>
+    <string name="prerelease_install_failed">Die Installation der Vorabversion ist fehlgeschlagen.</string>
+    <string name="episode_action_play_mirror">Spiel Mirror ab</string>"
+    <string name="show_episode_text">Episodentext</string>
+    <string name="search_suggestions">Empfehlungen suchen</string>
+    <string name="search_suggestions_des">Beim Tippen Suchempfehlungen anzeigen</string>
+    <string name="clear_suggestions">Empfehlungen löschen</string>
+    <string name="extra_brightness_settings">Zusätzliche Helligkeit</string>
+    <string name="extra_brightness_settings_des">Aktiviere Helligkeitsfilter, wenn 100% Bildschirmhelligkeit überschritten ist</string>
+    <string name="extra_brightness_key">Erhöhte Helligkeit aktiviert</string>
+    <string name="show_cast_in_details">Cast-Panel zeigen</string>
+    <string name="video_info">Medieninfo</string>
+    <string name="source_name">Quellname</string>
+    <string name="download_all">Alle herunterladen</string>
+    <string name="download_episode_range">Möchtest du Episode %s herunter laden?</string>
+    <plurals name="downloads_active">
+        <item quantity="one">%d aktiver Download</item>
+        <item quantity="other">%d aktive Downloads</item>
+    </plurals>
+    <string name="cancel_queue_message">Möchtest du alle Downloads in der Warteschlange abbrechen?</string>
+    <string name="cancel_all">Alles abbrechen</string>
+    <plurals name="downloads_queued">
+        <item quantity="one">%d Download in Warteschlange</item>
+        <item quantity="other">%d Downloads in Warteschlange</item>
+    </plurals>
+    <string name="download_queue">Download in Warteschlange</string>
+    <string name="queue_empty_message">Es befinden sich keine Downloads in der Warteschlange.</string>
+    <string name="source_priority">Quellpriorität</string>
+    <string name="source_priority_help">Entscheide, wie Videoquellen im Player sortiert werden sollen</string>
+</resources>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-b+el/strings.xml
similarity index 95%
rename from app/src/main/res/values-el/strings.xml
rename to app/src/main/res/values-b+el/strings.xml
index 933d8b53c51..a38ee2682d3 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-b+el/strings.xml
@@ -42,8 +42,6 @@
     <string name="popup_play_file">Αναπαραγωγή αρχείου</string>
     <string name="popup_resume_download">Συνέχιση λήψης</string>
     <string name="popup_pause_download">Παύση λήψης</string>
-    <string name="acra_report_toast">Λυπόμαστε, η εφαρμογή κατέρρευσε. Μια ανώνυμη αναφορά σφαλμάτων θα σταλεί στους προγραμματιστές</string>
-    <string name="pref_disable_acra">Απενεργοποιήστε την αυτόματη αναφορά σφαλμάτων</string>
     <string name="show_log_cat">Εμφάνιση Logcat 🐈</string>
     <string name="home_more_info">Περαιτέρω πληροφορίες</string>
     <string name="home_expanded_hide">Απόκρυψη</string>
@@ -102,12 +100,8 @@
     <string name="settings_info">Πληροφορίες</string>
     <string name="advanced_search">Προχωρημένη Αναζήτηση</string>
     <string name="advanced_search_des">Δίνει τα αποτελέσματα αναζήτησης ταξινομημένα ανά πάροχο</string>
-    <string name="bug_report_settings_off">Αποστέλλει δεδομένα μόνο για καταρρεύσεις</string>
-    <string name="bug_report_settings_on">Δεν στέλνει δεδομένα</string>
     <string name="updates_settings">Εμφάνιση ενημερώσεων</string>
     <string name="updates_settings_des">Αυτόματη αναζήτηση νέων ενημερώσεων κατά την εκκίνηση της εφαρμογής.</string>
-    <string name="uprereleases_settings">Ενημέρωση σε προ-εκδόσεις (beta)</string>
-    <string name="uprereleases_settings_des">Αναζητήστε ενημερώσεις προ-εκδόσεων (beta) αντί για σταθερές εκδόσεις (stable)</string>
     <string name="github">GitHub</string>
     <string name="lightnovel">Εφαρμογή βιβλίων από τους ίδιους προγραμματιστές</string>
     <string name="anim">Εφαρμογή άνιμε από τους ίδιους προγραμματιστές</string>
@@ -116,8 +110,7 @@
     <string name="benene_des">Μπανάνα δόθηκε</string>
     <string name="player_speed_text_format" formatted="true">Ταχύτητα (%.2fx)</string>
     <string name="rated_format" formatted="true">Βαθμολογία: %.1f</string>
-    <string name="new_update_format" formatted="true">Νέα διαθέσιμη ενημέρωση!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">Νέα διαθέσιμη ενημέρωση! \n%1$s -&gt; %2$s</string>
     <string name="double_tap_to_pause_settings_des">Πατήστε δύο φορές στη μέση για παύση</string>
     <string name="use_system_brightness_settings">Χρήση φωτεινότητας συστήματος</string>
     <string name="use_system_brightness_settings_des">Χρήση φωτεινότητας συστήματος στο ενσωματωμένο πρόγραμμα αναπαραγωγής, αντί εφαρμογής προεπιλεγμένου σκούρου επικαλύμματος</string>
@@ -155,10 +148,8 @@
     <string name="cancel">Ακύρωση</string>
     <string name="pause">Παύση</string>
     <string name="resume">Συνέχιση</string>
-    <string name="delete_message" formatted="true">Αυτό θα διαγράψει μόνιμα το %s
-\nΕίστε σίγουροι πως θέλετε να προχωρήσετε;</string>
-    <string name="resume_time_left" formatted="true">%dm
-\nαπομένουν</string>
+    <string name="delete_message" formatted="true">Αυτό θα διαγράψει μόνιμα το %s \nΕίστε σίγουροι πως θέλετε να προχωρήσετε;</string>
+    <string name="resume_time_left" formatted="true">%dm \nαπομένουν</string>
     <string name="status_ongoing">Σε εξέλιξη</string>
     <string name="status">Κατάσταση</string>
     <string name="year">Έτος</string>
@@ -307,7 +298,6 @@
     <string name="previous">Προηγούμενο</string>
     <string name="skip_setup">Παράλειψη διαμόρφωσης της εφαρμογής</string>
     <string name="app_layout_subtext">Αλλαγή της εμφάνισης της συσκευής για να ταιριάζει με την συσκευή σας</string>
-    <string name="crash_reporting_title">Αναφορά κατάρρευσης</string>
     <string name="preferred_media_subtext">Τι θα θέλατε να δείτε</string>
     <string name="setup_done">Έγινε</string>
     <string name="extensions">Extensions</string>
@@ -330,9 +320,7 @@
     <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 δεν έχει προεγκατεστημένους ιστότοπους. Πρέπει να εγκαταστήσετε ιστότοπους μέσω ορισμένων αποθετηρίων.
-\n
-\nΒρείτε μας στο Discord ή ψάξτε στο διαδίκτυο.</string>
+    <string name="blank_repo_message">Το CloudStream δεν έχει προεγκατεστημένους ιστότοπους. Πρέπει να εγκαταστήσετε ιστότοπους μέσω ορισμένων αποθετηρίων. \n \nΒρείτε μας στο Discord ή ψάξτε στο διαδίκτυο.</string>
     <string name="view_public_repositories_button">Προβολή αποθετηρίων κοινότητας</string>
     <string name="view_public_repositories_button_short">Δημόσια λίστα</string>
     <string name="uppercase_all_subtitles">Κεφαλοποίηση υποτίτλων</string>
@@ -396,7 +384,7 @@
     <string name="quality_webrip">Web</string>
     <string name="quality_hdr">HDR</string>
     <string name="skip_type_mixed_op">Ανάμεικτοι τίτλοι αρχής</string>
-    <string name="skip_type_creddits">Εύσημα</string>
+    <string name="skip_type_credits">Εύσημα</string>
     <string name="skip_type_intro">Εισαγωγή</string>
     <string name="go_forward_30">+30</string>
     <string name="status_completed">Ολοκληρώθηκε</string>
@@ -494,23 +482,15 @@
     <string name="action_remove_from_watched">Αφαίρεση από παρακολουθημένα</string>
     <string name="browser">Περιηγητής</string>
     <string name="open_with">Άνοιγμα με</string>
-    <string name="empty_library_no_accounts_message">Η βιβλιοθήκη σας είναι άδεια :(
-\nΣυνδεθείτε με έναν λογαριασμό βιβλιοθήκης ή προσθέστε σειρές στην τοπική βιβλιοθήκη σας.</string>
-    <string name="safe_mode_file">Βρέθηκε αρχείο Ασφαλούς Λειτουργίας!
-\nΔεν πρόκειται να φορτωθούν extensions κατά το ξεκίνημα μέχρι να διαγραφεί το αρχείο.</string>
+    <string name="empty_library_no_accounts_message">Η βιβλιοθήκη σας είναι άδεια :( \nΣυνδεθείτε με έναν λογαριασμό βιβλιοθήκης ή προσθέστε σειρές στην τοπική βιβλιοθήκη σας.</string>
+    <string name="safe_mode_file">Βρέθηκε αρχείο Ασφαλούς Λειτουργίας! \nΔεν πρόκειται να φορτωθούν extensions κατά το ξεκίνημα μέχρι να διαγραφεί το αρχείο.</string>
     <string name="test_log">Αρχείο Καταγραφής</string>
     <string name="test_failed">Απέτυχε</string>
     <string name="test_passed">Πέτυχε</string>
     <string name="start">Εκκίνηση</string>
     <string name="no_plugins_found_error">Δε βρέθηκαν επεκτάσεις στο αποθετήριο</string>
     <string name="no_repository_found_error">Δε βρέθηκε αποθετήριο, ελέγξτε την URL και δοκιμάστε VPN</string>
-    <string name="quality_profile_help">Από εδώ μπορείτε να αλλάξετε τον τρόπο σειράς των πηγών. Εάν ένα βίντεο έχει υψηλότερη προτεραιότητα, θα εμφανίζεται ψηλότερα στην επιλογή πηγής. Το άθροισμα της προτεραιότητας πηγής και της ποιότητας, είναι η προτεραιότητα του βίντεο.
-\n
-\nΠηγή Α: 3
-\nΠοιότητα Β: 7
-\nΘα έχει συνδυασμένη προτεραιότητα βίντεο 10.
-\n
-\nΣΗΜΕΙΩΣΗ: Εάν το άθροισμα είναι 10 ή περισσότερο, η συσκευή αναπαραγωγής θα παραλείψει αυτόματα τη φόρτωση όταν φορτωθεί αυτός ο σύνδεσμος!</string>
+    <string name="quality_profile_help">Από εδώ μπορείτε να αλλάξετε τον τρόπο σειράς των πηγών. Εάν ένα βίντεο έχει υψηλότερη προτεραιότητα, θα εμφανίζεται ψηλότερα στην επιλογή πηγής. Το άθροισμα της προτεραιότητας πηγής και της ποιότητας, είναι η προτεραιότητα του βίντεο. \n \nΠηγή Α: 3 \nΠοιότητα Β: 7 \nΘα έχει συνδυασμένη προτεραιότητα βίντεο 10. \n \nΣΗΜΕΙΩΣΗ: Εάν το άθροισμα είναι 10 ή περισσότερο, η συσκευή αναπαραγωγής θα παραλείψει αυτόματα τη φόρτωση όταν φορτωθεί αυτός ο σύνδεσμος!</string>
     <string name="category_provider_test">Δοκιμή παρόχου</string>
     <string name="watch_quality_pref_data">Προτιμώμενη ποιότητας παρακολούθησης (Δεδομένα τηλεφώνου)</string>
     <string name="jsdelivr_proxy">Διακομιστής μεσολάβησης GitHub</string>
@@ -556,9 +536,7 @@
     <string name="ok">Εντάξει</string>
     <string name="battery_dialog_title">Απενεργοποιήση της εξοικονόμησης της μπαταρίας</string>
     <string name="already_voted">Έχετε ήδη ψηφίσει</string>
-    <string name="duplicate_message_single" formatted="true">Φαίνεται πως ένα πιθανό αντίγραφο βρίσκεται στη βιβλιοθήκη σας: \'%s.\'
-\n
-\nΘα επιθυμούσατε να το προσθέσετε, να το αντικαταστήσετε, ή να ακυρώσετε την ενέργεια;</string>
+    <string name="duplicate_message_single" formatted="true">Φαίνεται πως ένα πιθανό αντίγραφο βρίσκεται στη βιβλιοθήκη σας: \'%s.\' \n \nΘα επιθυμούσατε να το προσθέσετε, να το αντικαταστήσετε, ή να ακυρώσετε την ενέργεια;</string>
     <string name="enter_current_pin">Εισαγωγή Τρέχον Κωδικού</string>
     <string name="lock_profile">Κλείδωμα Προφίλ</string>
     <string name="biometric_authentication_title">Ξεκλείδωμα Cloudstream</string>
@@ -585,11 +563,7 @@
     <string name="duplicate_title">Πιθανό αντίγραφο βρέθηκε</string>
     <string name="duplicate_add">Προσθήκη</string>
     <string name="duplicate_replace">Αντικατάσταση</string>
-    <string name="duplicate_message_multiple" formatted="true">Πιθανά διπλά αρχεία βρέθηκαν στην βιβλιοθήκη:
-\n
-\n%s
-\n
-\nΘα επιθυμούσατε να προσθέσετε αυτό το αρχείο ούτως η άλλως, να αντικαταστήσετε τα ήδη υπάρχοντα, ή να ακυρώσετε την ενέργεια?</string>
+    <string name="duplicate_message_multiple" formatted="true">Πιθανά διπλά αρχεία βρέθηκαν στην βιβλιοθήκη: \n \n%s \n \nΘα επιθυμούσατε να προσθέσετε αυτό το αρχείο ούτως η άλλως, να αντικαταστήσετε τα ήδη υπάρχοντα, ή να ακυρώσετε την ενέργεια?</string>
     <string name="enter_pin_with_name" formatted="true">Εισαγωγή Κωδικού για %s</string>
     <string name="pin">Κωδικός</string>
     <string name="pin_error_incorrect">Εσφαλμένος Κωδικός. Προσπαθήστε ξανά.</string>
@@ -602,8 +576,7 @@
     <string name="jsdelivr_proxy_summary">Παράκαμψη απαγόρευσης από raw github URLs χρησιμοποιώντας jsDelivr. Μπορεί να καθυστερήσει τις ενημερώσεις για μερικές μέρες.</string>
     <string name="rotate_video_desc">Εμφάνιση κουμπιού για περιστροφή οθόνης</string>
     <string name="favorite">Αγαπημένο</string>
-    <string name="resume_remaining" formatted="true">%s
-\nαπομένουν</string>
+    <string name="resume_remaining" formatted="true">%s \nαπομένουν</string>
     <string name="biometric_unsupported">Βιομετρική αυθεντικοποίηση δεν υποστηρίζεται από τη συσκευή</string>
     <string name="episode_action_cast_mirror">Καστ ταινίας</string>
     <string name="battery_dialog_message">Για να εξασφαλιστούν αδιάκοπες λήψεις και ειδοποιήσεις για αναγραφόμενες τηλεοπτικές εκπομπές, το CloudStream χρειάζεται άδεια για να τρέξει στο παρασκήνιο. Πατώντας OK, θα εμφανιστεί ένας διάλογος αιτήματος. Παρακαλώ πατήστε \\\"Επιτρέπω\\\".\n\nΠαρακαλώ σημειώστε, αυτή η άδεια δεν σημαίνει ότι το CS3 θα αποστραγγίσει την μπαταρία σας. Θα λειτουργεί στο παρασκήνιο μόνο όταν είναι απαραίτητο, όπως κατά τη λήψη ειδοποιήσεων ή τη λήψη βίντεο από επίσημες επεκτάσεις.</string>
@@ -611,14 +584,13 @@
     <string name="biometric_prompt_description">Μετά από μερικές αποτυχημένες προσπάθειες, η άμεση θα κλείσει. Απλά επανεκκινήστε την εφαρμογή για να δοκιμάσετε ξανά.</string>
     <string name="edit_account">Επεξεργασία λογαριασμού</string>
     <string name="skip_startup_account_select_pref">Παράλειψη επιλογής λογαριασμού στην εκκίνηση της εφαρμογής</string>
-    <string name="music_singlar">Μουσική</string>
+    <string name="music_singular">Μουσική</string>
     <string name="audio_book_singular">Ακουστικό Βιβλίο</string>
-    <string name="custom_media_singluar">Μέσα</string>
+    <string name="custom_media_singular">Μέσα</string>
     <string name="reset_btn">Επαναφορά</string>
     <string name="biometric_warning">Τα δεδομένα σας στο CloudStream έχουν κάνει back up. Αν και η πιθανότητα είναι πολύ χαμηλή, όλες οι συσκευές συμπεριφέρονται διαφορετικά. Στη σπάνια περίπτωση, που απαγορευτεί η πρόσβασή σας από την εφαρμογή, διαγράψτε τα δεδομένα εφαρμογής και επαναφέρετέ τα από ένα ήδη υπάρχον backup. Συγνώμη για οποιαδήποτε ταλαιπωρία.</string>
     <string name="pref_category_accounts">Λογαριασμοί</string>
     <string name="pref_category_security">Ασφάλεια</string>
-    <string name="hide_player_control_names_key" translatable="false">hide_player_control_names_key</string>
     <string name="dismiss">Απόρριψη</string>
     <string name="subtitles_from_embedded">Ενσωματωμένο</string>
     <string name="subtitles_from_online">Συνδεμένοι</string>
@@ -679,8 +651,8 @@
     <string name="open_local_video">Άνοιγμα τοπικού βίντεο</string>
     <string name="no_plugins_updated_manually">Κανένα πρόσθετο δεν ενημερώθηκε.</string>
     <string name="backup_path_title">Τοποθεσία φακέλου αντιγράφων</string>
-    <string name="audio_singluar">Ήχος</string>
-    <string name="podcast_singluar">Ποντκάστ</string>
+    <string name="audio_singular">Ήχος</string>
+    <string name="podcast_singular">Ποντκάστ</string>
     <string name="encoding_error">Σφάλμα κωδικοποίησης</string>
     <string name="unsupported_error">Σφάλμα που δεν υποστηρίζεται</string>
     <string name="player_load_one_subtitle_online">Φορτώστε το πρώτο διαθέσιμο</string>
@@ -691,4 +663,4 @@
     <string name="all_subtitles_italic">Κάντε όλους τους υπότιτλους πλάγιους</string>
     <string name="background_radius">Ακτίνα φόντου</string>
     <string name="slide_up_again_to_exceed_100">Σύρετε ξανά προς τα πάνω για να υπερβείτε το 100%</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-b+eo/strings.xml
similarity index 65%
rename from app/src/main/res/values-eo/strings.xml
rename to app/src/main/res/values-b+eo/strings.xml
index 4a23a93da36..5dea7b24d98 100644
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-b+eo/strings.xml
@@ -49,7 +49,7 @@
     <string name="result_tags">Ĝenroj</string>
     <string name="all_languages_preference">Ĉiuj lingvoj</string>
     <string name="search">Serĉi</string>
-    <string name="category_account">Kontoj</string>
+    <string name="category_account">Kontoj kaj Sekureco</string>
     <string name="github">GitHub</string>
     <string name="season">Sezono</string>
     <string name="episode">Epizodo</string>
@@ -83,8 +83,7 @@
     <string name="next_episode_time_day_format" formatted="true">%1$dt %2$dh %3$dm</string>
     <string name="next_episode_time_hour_format" formatted="true">%1$dh %2$dm</string>
     <string name="next_episode_time_min_format" formatted="true">%dm</string>
-    <string name="new_update_format" formatted="true">Nova ĝisdatigo trovita!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">Nova ĝisdatigo trovita! \n%1$s -&gt; %2$s</string>
     <string name="filler" formatted="true">Speciala epizodo</string>
     <string name="app_name">CloudStream</string>
     <string name="download_started">Elŝuto Komencite</string>
@@ -127,5 +126,59 @@
     <string name="downloaded">Elŝutite</string>
     <string name="downloading">Elŝutante</string>
     <string name="download_failed">Elŝuto Malsukcesite</string>
-    <string name="hide_player_control_names_key" translatable="false">hide_player_control_names_key</string>
-</resources>
\ No newline at end of file
+    <string name="download_time_left_hour_min_sec_format" formatted="true">%1$dh %2$dm %3$ds</string>
+    <string name="download_time_left_min_sec_format" formatted="true">%1$dm %2$ds</string>
+    <string name="download_time_left_sec_format" formatted="true">%1$ds</string>
+    <string name="next_season_episode_format" formatted="true">Sezono %1$d epizodo %2$d publikiĝos en</string>
+    <string name="play_from_beginning_img_des">Legi ekde la komenco</string>
+    <string name="download_queue">Elsûtovico</string>
+    <string name="speech_recognition_unavailable">La parolrekono ne haveblas</string>
+    <string name="begin_speaking">Komencu paroli…</string>
+    <string name="downloads_empty">Ne estas elŝuto ĉimomente.</string>
+    <string name="select_all">Selekti Ĉion</string>
+    <string name="deselect_all">Malselekti Ĉion</string>
+    <string name="open_local_video">Malfermi lokan videon</string>
+    <string name="popup_delete_file">Forigi Dosieron</string>
+    <string name="popup_resume_download">Daŭrigi Elŝuton</string>
+    <string name="popup_pause_download">Paŭzigi Elŝuton</string>
+    <string name="home_more_info">Pli da informoj</string>
+    <string name="home_expanded_hide">Kaŝi</string>
+    <string name="filter_bookmarks">Filtri Legosignojn</string>
+    <string name="error_bookmarks_text">Legosignoj</string>
+    <string name="repo_copy_label">Nomo kaj URL de la deponejo</string>
+    <string name="toast_copied">Kopiita!</string>
+    <string name="subscribe_tooltip">Sciigo de novo epizodo</string>
+    <string name="result_search_tooltip">Serĉi en aliaj kromprogramoj</string>
+    <string name="recommendations_tooltip">Montri la rekomendojn</string>
+    <string name="subtitles_settings">Subtekstaj Agordoj</string>
+    <string name="subs_outline_color">Kontura Koloro</string>
+    <string name="subs_background_color">Fona Koloro</string>
+    <string name="subs_edge_type">Randa Tipo</string>
+    <string name="search_provider_text_providers">Serĉi uzante provizantojn</string>
+    <string name="search_provider_text_types">Serĉi uzante tipojn</string>
+    <string name="subs_subtitle_languages">Subteksta Lingvo</string>
+    <string name="action_open_watching">Pli da informoj</string>
+    <string name="action_open_play">@string/home_play</string>
+    <string name="torrent_plot">Priskribo</string>
+    <string name="torrent_no_plot">Neniu Priskribo Trovita</string>
+    <string name="player_size_settings_des">Forigi nigrajn borderaĵojn</string>
+    <string name="player_subtitles_settings">Subtekstoj</string>
+    <string name="search_suggestions">Serĉaj Sugestoj</string>
+    <string name="discord">Aligi Diskordon</string>
+    <string name="no_links_found_toast">Neniu Ligilo Trovita</string>
+    <string name="season_format">%1$s %2$d%3$s</string>
+    <string name="no_season">Neniu Sezono</string>
+    <string name="episodes_range">%1$d-%2$d</string>
+    <string name="episode_format" formatted="true">%1$d %2$s</string>
+    <string name="no_episodes_found">Neniu Epizodo Trovita</string>
+    <string name="delete">Forigi</string>
+    <string name="delete_file">Forigi Dosieron</string>
+    <string name="delete_files">Forigi Dosierojn</string>
+    <string name="delete_format" formatted="true">Forigi (%1$d | %2$s)</string>
+    <string name="cancel">Nuligi</string>
+    <string name="pause">Paŭzigi</string>
+    <string name="resume">Daŭrigi</string>
+    <string name="duration">Daŭro</string>
+    <string name="synopsis">Sinoptiko</string>
+    <string name="no_subtitles">Neniu Subteksto</string>
+</resources>
diff --git a/app/src/main/res/values-es/array.xml b/app/src/main/res/values-b+es/array.xml
similarity index 83%
rename from app/src/main/res/values-es/array.xml
rename to app/src/main/res/values-b+es/array.xml
index fddd832a583..5456d03e235 100644
--- a/app/src/main/res/values-es/array.xml
+++ b/app/src/main/res/values-b+es/array.xml
@@ -14,20 +14,19 @@
         <item>@id/cast_button_type_forward_30_seconds</item>
     </array>
 
-    <array name="limit_title_rez_pref_names">
-        <item>@string/resolution_and_title</item>
-        <item>@string/title</item>
+    <array name="title_info_pref_names">
+        <item>@string/source_name</item>
         <item>@string/resolution</item>
-        <item>@string/none</item>
+        <item>@string/video_info</item>
     </array>
 
-    <array name="limit_title_rez_pref_values">
-        <item>3</item>
-        <item>2</item>
-        <item>1</item>
-        <item>0</item>
+    <array name="title_info_pref_values">
+        <item>@string/show_name_key</item>
+        <item>@string/show_resolution_key</item>
+        <item>@string/show_media_info_key</item>
     </array>
 
+
     <array name="limit_title_pref_names">
         <item>@string/none</item>
         <item>16 caracteres</item>
@@ -142,14 +141,18 @@
         <item>@string/show_hd</item>
         <item>@string/show_dub</item>
         <item>@string/show_sub</item>
+        <item>@string/show_rating</item>
         <item>@string/show_title</item>
+        <item>@string/show_episode_text</item>
     </array>
 
     <array name="poster_ui_options_values">
         <item>@string/show_hd_key</item>
         <item>@string/show_dub_key</item>
         <item>@string/show_sub_key</item>
+        <item>@string/show_rating_key</item>
         <item>@string/show_title_key</item>
+        <item>@string/show_episode_text_key</item>
     </array>
 
     <array name="app_layout">
@@ -223,6 +226,9 @@
         <item>Destello</item>
         <item>Sistema</item>
         <item>Material You</item>
+        <item>Dracula</item>
+        <item>Sueños De Lavanda</item>
+        <item>Azul Silencioso</item>
     </string-array>
     <string-array name="themes_names_values">
         <item>AmoledLight</item>
@@ -231,6 +237,9 @@
         <item>Light</item>
         <item>System</item>
         <item>Monet</item>
+        <item>Dracula</item>
+        <item>Lavender</item>
+        <item>SilentBlue</item>
     </string-array>
 
     <!--https://github.com/videolan/vlc-android/blob/72ccfb93db027b49855760001d1a930fa657c5a8/application/resources/src/main/res/values/arrays.xml#L266-->
@@ -278,48 +287,4 @@
         <item>Vietnamita (VISCII)</item>
         <item>Vietnamita (Windows-1258)</item>
     </string-array>
-    <string-array name="subtitles_encoding_values" translatable="false" tools:ignore="TypographyDashes">
-        <item></item>
-        <item>UTF-8</item>
-        <item>UTF-16</item>
-        <item>UTF-16BE</item>
-        <item>UTF-16LE</item>
-        <item>GB18030</item>
-        <item>ISO-8859-15</item>
-        <item>Windows-1252</item>
-        <item>IBM850</item>
-        <item>ISO-8859-2</item>
-        <item>Windows-1250</item>
-        <item>ISO-8859-3</item>
-        <item>ISO-8859-10</item>
-        <item>Windows-1251</item>
-        <item>KOI8-R</item>
-        <item>KOI8-U</item>
-        <item>ISO-8859-6</item>
-        <item>Windows-1256</item>
-        <item>ISO-8859-7</item>
-        <item>Windows-1253</item>
-        <item>ISO-8859-8</item>
-        <item>Windows-1255</item>
-        <item>ISO-8859-9</item>
-        <item>Windows-1254</item>
-        <item>ISO-8859-11</item>
-        <item>Windows-874</item>
-        <item>ISO-8859-13</item>
-        <item>Windows-1257</item>
-        <item>ISO-8859-14</item>
-        <item>ISO-8859-16</item>
-        <item>ISO-2022-CN-EXT</item>
-        <item>EUC-CN</item>
-        <item>ISO-2022-JP-2</item>
-        <item>EUC-JP</item>
-        <item>Shift_JIS</item>
-        <item>CP949</item>
-        <item>ISO-2022-KR</item>
-        <item>Big5</item>
-        <item>ISO-2022-TW</item>
-        <item>Big5-HKSCS</item>
-        <item>VISCII</item>
-        <item>Windows-1258</item>
-    </string-array>
 </resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-b+es/strings.xml
similarity index 82%
rename from app/src/main/res/values-es/strings.xml
rename to app/src/main/res/values-b+es/strings.xml
index 23480d80446..167de546d75 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-b+es/strings.xml
@@ -7,9 +7,9 @@
     <string name="batch_download_finish_format" formatted="true">Descargado %1$d %2$s</string>
     <string name="delete_repository">Borrar repositorio</string>
     <string name="next_episode_format" formatted="true">El episodio %d se lanzará en</string>
-    <string name="next_episode_time_hour_format" formatted="true">%1$dh %2$dm</string>
-    <string name="next_episode_time_min_format" formatted="true">%dm</string>
-    <string name="result_poster_img_des">Poster</string>
+    <string name="next_episode_time_hour_format" formatted="true">%1$d h %2$d m</string>
+    <string name="next_episode_time_min_format" formatted="true">%d m</string>
+    <string name="result_poster_img_des">Póster</string>
     <string name="extensions">Extensiones</string>
     <string name="downloaded_file">Archivo descargado</string>
     <string name="safe_mode_description">Todas las extensiones se desactivaron debido a un fallo para ayudarlo a encontrar la que está causando problemas.</string>
@@ -40,7 +40,7 @@
     <string name="episode_action_download_subtitle">Descargar subtítulos</string>
     <string name="pref_category_subtitles">Subtítulos</string>
     <string name="subtitles_depressed">Deprimido</string>
-    <string name="subtitles_example_text">Le gustaba cenar un exquisito sándwich de jamón con zumo de piña y vodka fría</string>
+    <string name="subtitles_example_text">El pingüino Wenceslao hizo kilómetros bajo exhaustiva lluvia y frío; añoraba a su querido cachorro</string>
     <string name="player_load_subtitles">Cargar desde archivo</string>
     <string name="player_load_subtitles_online">Cargar desde Internet</string>
     <string name="autoplay_next_settings">Reproducir automáticamente episodio siguiente</string>
@@ -56,7 +56,7 @@
     <string name="subtitles_remove_captions">Eliminar Closed Captions (CC) de los subtítulos</string>
     <string name="double_tap_to_seek_amount_settings">Cantidad de búsquedas del reproductor (segundos)</string>
     <string name="use_system_brightness_settings_des">Use el brillo del sistema en el reproductor de la app en lugar de una superposición oscura</string>
-    <string name="limit_title_rez">Resolución del reproductor de video</string>
+    <string name="limit_title_rez">Mostrar la información del reproductor de video</string>
     <string name="category_player">Reproductor</string>
     <string name="autoplay_next_settings_des">Iniciar el siguiente episodio cuando el actual termine</string>
     <string name="video_skip_op">Omitir Intro</string>
@@ -66,9 +66,9 @@
     <string name="skip_type_ed">Final</string>
     <string name="skip_type_mixed_op">Apertura mixta</string>
     <string name="skip_type_recap">Resumen</string>
-    <string name="skip_type_creddits">Créditos</string>
+    <string name="skip_type_credits">Créditos</string>
     <string name="skip_type_mixed_ed">Final mixto</string>
-    <string name="episode_poster_img_des">Poster del Episodio</string>
+    <string name="episode_poster_img_des">Póster del episodio</string>
     <string name="next_episode">Siguiente episodio</string>
     <string name="episode_more_options_des">Más opciones</string>
     <string name="episode_sync_settings">Actualizar progreso de lo visto</string>
@@ -80,33 +80,31 @@
     <string name="episode_action_reload_links">Recargar enlaces</string>
     <string name="sync_total_episodes_none">/??</string>
     <string name="sync_total_episodes_some" formatted="true">/%d</string>
-    <string name="delete_message" formatted="true">Esto eliminará %s permanentemente
-\nEstá seguro?</string>
-    <string name="confirm_exit_dialog">Está seguro que quiere salir?</string>
+    <string name="delete_message" formatted="true">Esto eliminará %s permanentemente \nEstá seguro?</string>
+    <string name="confirm_exit_dialog">¿Seguro que quieres salir?</string>
     <string name="popup_resume_download">Continuar Descarga</string>
-    <string name="example_lang_name">Código de idioma (es_LA)</string>
-    <string name="home_main_poster_img_des">Poster Principal</string>
+    <string name="example_lang_name">Código de idioma (es_ES)</string>
+    <string name="home_main_poster_img_des">Póster principal</string>
     <string name="app_language">Idioma de la aplicación</string>
     <string name="provider_languages_tip">Ver videos en estos idiomas</string>
-    <string name="search_poster_img_des">Poster</string>
+    <string name="search_poster_img_des">Póster</string>
     <string name="home_next_random_img_des">Siguiente al azar</string>
     <string name="all_languages_preference">Todos los Idiomas</string>
     <string name="go_back_img_des">Regresar</string>
     <string name="home_change_provider_img_des">Cambiar proveedor</string>
-    <string name="preview_background_img_des">Vista previa del fondo</string>
+    <string name="preview_background_img_des">Previsualizar fondo</string>
     <string name="rated_format" formatted="true">Nota:%.1f</string>
-    <string name="new_update_format" formatted="true">¡Nueva actualización encontrada!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">Se encontró una actualización nueva:\n%1$s → %2$s</string>
     <string name="download">Descargar</string>
     <string name="popup_pause_download">Pausar Descarga</string>
     <string name="subs_font">Formato de fuente</string>
     <string name="subs_background_color">Color de Fondo</string>
     <string name="subs_font_size">Tamaño de Fuente</string>
-    <string name="player_speed_text_format" formatted="true">Velocidad (%.2fx)</string>
+    <string name="player_speed_text_format" formatted="true">Velocidad (%.2f×)</string>
     <string name="skip_loading">Omitir carga</string>
     <string name="app_dub_sub_episode_text_format" formatted="true">%1$s Ep. %2$d</string>
-    <string name="next_episode_time_day_format" formatted="true">%1$dd %2$dh %3$dm</string>
-    <string name="cast_format" formatted="true">Elenco %s</string>
+    <string name="next_episode_time_day_format" formatted="true">%1$d d %2$d h %3$d m</string>
+    <string name="cast_format" formatted="true">Reparto: %s</string>
     <string name="filler" formatted="true">Relleno</string>
     <string name="duration_format" formatted="true">%d min</string>
     <string name="app_name">CloudStream</string>
@@ -114,13 +112,13 @@
     <string name="title_home">Inicio</string>
     <string name="title_search">Buscar</string>
     <string name="title_downloads">Descargas</string>
-    <string name="title_settings">Configuración</string>
+    <string name="title_settings">Ajustes</string>
     <string name="search_hint">Buscar…</string>
     <string name="search_hint_site" formatted="true">Buscar en %s…</string>
     <string name="no_data">Sin datos</string>
     <string name="result_tags">Géneros</string>
     <string name="result_share">Compartir</string>
-    <string name="result_open_in_browser">Abrir en Navegador</string>
+    <string name="result_open_in_browser">Abrir en navegador</string>
     <string name="loading">Cargando…</string>
     <string name="home_expanded_hide">Ocultar</string>
     <string name="sort_apply">Aplicar</string>
@@ -134,7 +132,7 @@
     <string name="type_plan_to_watch">Planeando ver</string>
     <string name="type_re_watching">Volviendo a mirar</string>
     <string name="play_movie_button">Reproducir película</string>
-    <string name="play_trailer_button">Reproducir Trailer</string>
+    <string name="play_trailer_button">Reproducir tráiler</string>
     <string name="play_livestream_button">Reproducir transmisión en vivo (livestream)</string>
     <string name="play_torrent_button">Transmitir Torrent</string>
     <string name="pick_source">Fuentes</string>
@@ -158,7 +156,7 @@
     <string name="home_info">Info</string>
     <string name="filter_bookmarks">Filtrar Marcadores</string>
     <string name="error_bookmarks_text">Marcadores</string>
-    <string name="action_remove_from_bookmarks">Remover</string>
+    <string name="action_remove_from_bookmarks">Eliminar</string>
     <string name="action_add_to_bookmarks">Seleccionar estado de visualización</string>
     <string name="sort_copy">Copiar</string>
     <string name="sort_close">Cerrar</string>
@@ -183,7 +181,7 @@
     <string name="subs_hold_to_reset_to_default">Mantenga pulsado para restablecer los valores predeterminados</string>
     <string name="subs_import_text" formatted="true">Importar fuentes colocándolas en %s</string>
     <string name="continue_watching">Continuar Viendo</string>
-    <string name="action_remove_watching">Remover</string>
+    <string name="action_remove_watching">Eliminar</string>
     <string name="action_open_watching">Más info</string>
     <string name="action_open_play">@string/home_play</string>
     <string name="vpn_might_be_needed">Tal vez se requiera una VPN para que este proveedor funcione correctamente</string>
@@ -224,12 +222,8 @@
     <string name="settings_info">Información</string>
     <string name="advanced_search">Búsqueda Avanzada</string>
     <string name="advanced_search_des">Mostrar los resultados de la búsqueda por proveedor</string>
-    <string name="bug_report_settings_off">Solo envíar los datos si la App se cierra / falla inesperadamente</string>
-    <string name="bug_report_settings_on">No enviar datos</string>
     <string name="show_trailers_settings">Mostrar avances</string>
     <string name="kitsu_settings">Mostrar pósters de Kitsu</string>
-    <string name="uprereleases_settings">Actualizar a las versiones preliminares</string>
-    <string name="uprereleases_settings_des">Buscar actualizaciones preliminares (beta) en lugar de solo versiones completas (stable releases)</string>
     <string name="github">Github</string>
     <string name="lightnovel">App de novela ligera de los mismos desarrolladores</string>
     <string name="anim">App de Anime de los mismos desarrolladores</string>
@@ -240,7 +234,6 @@
     <string name="no_links_found_toast">Enlaces no encontrados</string>
     <string name="copy_link_toast">Enlaces copiados al portapapeles</string>
     <string name="subs_default_reset_toast">Reiniciar a valores predefinidos</string>
-    <string name="acra_report_toast">Lo sentimos, la aplicación se bloqueó. Se enviará un informe de error anónimo a los desarrolladores</string>
     <string name="season">Temporada</string>
     <string name="season_format">%1$s %2$d%3$s</string>
     <string name="no_season">Ninguna Temporada</string>
@@ -255,8 +248,7 @@
     <string name="resume">Continuar</string>
     <string name="go_back_30">-30</string>
     <string name="go_forward_30">+30</string>
-    <string name="resume_time_left" formatted="true">%dm
-\nfaltante</string>
+    <string name="resume_time_left" formatted="true">%dm \nfaltante</string>
     <string name="status_ongoing">En curso</string>
     <string name="status_completed">Completado</string>
     <string name="status">Estado</string>
@@ -278,16 +270,13 @@
     <string name="apply_on_restart">Se aplicarán los cambios al reiniciar la App.</string>
     <string name="player_settings_play_in_app">Reproductor interno</string>
     <string name="extension_language">Idioma</string>
-    <string name="apk_installer_legacy">Legacy (método antiguo)</string>
-    <string name="apk_installer_package_installer">Instalador de paquetes</string>
-    <string name="blank_repo_message">CloudStream no tiene sitios instalados por defecto. Necesitas instalar los sitios desde los repositorios.
-\n
-\nÚnase a nuestro Discord o busque en línea.</string>
+    <string name="apk_installer_legacy">Tradicional</string>
+    <string name="apk_installer_package_installer">Instalador de programas</string>
+    <string name="blank_repo_message">CloudStream no tiene sitios instalados por defecto. Necesitas instalar los sitios desde los repositorios. \n \nÚnete a nuestro Discord o busca en línea.</string>
     <string name="download_all_plugins_from_repo">Advertencia: ¡CloudStream 3 no asume ninguna responsabilidad por el uso de extensiones de terceros y no brinda ningún soporte para ellas!</string>
     <string name="updates_settings">Mostrar actualizaciones de la aplicación</string>
     <string name="apk_installer_settings">Instalador de APK</string>
     <string name="apk_installer_settings_des">Algunos dispositivos no soportan el nuevo instalador de paquetes. Pruebe la opción antigua (legacy) si las actualizaciones no se instalan.</string>
-    <string name="pref_disable_acra">Desactivar reporte automático de bugs</string>
     <string name="episode_sync_settings_des">Sincronizar automáticamente el progreso de su episodio actual</string>
     <string name="automatic_plugin_updates">Actualización automática de plugins</string>
     <string name="pref_category_player_features">Características del reproductor</string>
@@ -439,7 +428,7 @@
     <string name="setup_done">Hecho</string>
     <string name="plugin_loaded">Plugin cargado</string>
     <string name="is_adult">18+</string>
-    <string name="batch_download_start_format" formatted="true">Comenzó la descarga de %1$d %2$s…</string>
+    <string name="batch_download_start_format" formatted="true">Iniciada descarga de %1$d %2$s…</string>
     <string name="batch_download">Descarga por lotes</string>
     <string name="plugin_singular">plugin</string>
     <string name="plugin">plugins</string>
@@ -468,7 +457,6 @@
     <string name="update_notification_installing">Instalando actualización de la aplicación…</string>
     <string name="update_notification_failed">No se pudo instalar la nueva versión de la aplicación</string>
     <string name="app_not_found_error">App no encontrada</string>
-    <string name="crash_reporting_title">Reporte de fallos</string>
     <string name="plugin_deleted">Plugin Borrado</string>
     <string name="plugin_load_fail" formatted="true">No puede cargar %s</string>
     <string name="extension_description">Descripción</string>
@@ -492,10 +480,8 @@
     <string name="sort_alphabetical_z">Alfabéticamente (Z a A)</string>
     <string name="select_library">Seleccionar biblioteca</string>
     <string name="open_with">Abrir con</string>
-    <string name="empty_library_no_accounts_message">Tu biblioteca está vacía :(
-\nInicia sesión en una cuenta de biblioteca o añade series desde tu biblioteca local.</string>
-    <string name="safe_mode_file">¡Se encontró un archivo en modo seguro!
-\nNo cargar ninguna extensión al inicio hasta que se elimine el archivo.</string>
+    <string name="empty_library_no_accounts_message">Tu biblioteca está vacía :( \nInicia sesión en una cuenta de biblioteca o añade series desde tu biblioteca local.</string>
+    <string name="safe_mode_file">¡Se encontró un archivo en modo seguro! \nNo cargar ninguna extensión al inicio hasta que se elimine el archivo.</string>
     <string name="android_tv_interface_on_seek_settings">Reproductor visible - buscar cantidad</string>
     <string name="android_tv_interface_off_seek_settings">Reproductor oculto - buscar cantidad</string>
     <string name="pref_category_android_tv">Android TV</string>
@@ -520,13 +506,7 @@
     <string name="pref_category_bypass">ISP Bypasses</string>
     <string name="watch_quality_pref_data">Calidad de visualización preferida (Datos móviles)</string>
     <string name="help">Ayuda</string>
-    <string name="quality_profile_help">Aquí puedes cambiar el orden de las fuentes. Si un vídeo tiene una prioridad más alta, aparecerá más arriba en la selección de las fuentes. La suma de la prioridad de la fuente y la prioridad de la calidad es la prioridad del vídeo.
-\n
-\nFuente A: 3
-\nCalidad B: 7
-\nTendrá una prioridad en el vídeo combinada de 10.
-\n
-\nNOTA: ¡Si la suma es 10 o más el reproductor saltará automáticamente la carga cuando se cargue ese enlace!</string>
+    <string name="quality_profile_help">Aquí puedes cambiar el orden de las fuentes. Si un vídeo tiene una prioridad más alta, aparecerá más arriba en la selección de las fuentes. La suma de la prioridad de la fuente y la prioridad de la calidad es la prioridad del vídeo. \n \nFuente A: 3 \nCalidad B: 7 \nTendrá una prioridad en el vídeo combinada de 10. \n \nNOTA: ¡Si la suma es 10 o más el reproductor saltará automáticamente la carga cuando se cargue ese enlace!</string>
     <string name="profile_number">Perfil %d</string>
     <string name="wifi">Wifi</string>
     <string name="edit">Editar</string>
@@ -546,11 +526,7 @@
     <string name="favorite_removed">%s eliminado de favoritos</string>
     <string name="favorites_list_name">Favoritos</string>
     <string name="favorite_added">%s añadido a favoritos</string>
-    <string name="duplicate_message_multiple" formatted="true">Se han encontrado posibles elementos duplicados en su biblioteca:
-\n
-\n%s
-\n
-\n¿Desea añadir este elemento de todos modos, sustituir los existentes o cancelar la acción?</string>
+    <string name="duplicate_message_multiple" formatted="true">Se han encontrado posibles elementos duplicados en su biblioteca: \n \n%s \n \n¿Desea añadir este elemento de todos modos, sustituir los existentes o cancelar la acción?</string>
     <string name="duplicate_title">Posible duplicado encontrado</string>
     <string name="lock_profile">Bloquear perfil</string>
     <string name="action_add_to_favorites">Añadido a favoritos</string>
@@ -563,9 +539,7 @@
     <string name="action_subscribe">Suscríbase</string>
     <string name="action_remove_from_favorites">Eliminar de favoritos</string>
     <string name="select_an_account">Seleccione una cuenta</string>
-    <string name="duplicate_message_single">Parece que ya existe un elemento potencialmente duplicado en su biblioteca: \'%s.\'
-\n
-\n¿Desea añadir este elemento de todos modos, sustituir el existente o cancelar la acción?</string>
+    <string name="duplicate_message_single">Parece que ya existe un elemento potencialmente duplicado en su colección: «%s». \n \n¿Quiere añadir este elemento de todos modos, sustituir el existente o cancelar la acción?</string>
     <string name="enter_pin">Introducir el PIN</string>
     <string name="pin">PIN</string>
     <string name="enter_current_pin">Introduzca el PIN actual</string>
@@ -577,8 +551,6 @@
     <string name="edit_account">Editar la cuenta</string>
     <string name="links_reloaded_toast">Enlaces recargados</string>
     <string name="rotate_video_desc">Mostrar un botón para cambiar la orientación de la pantalla</string>
-    <string name="rotate_video_key">rotate_video_key</string>
-    <string name="auto_rotate_video_key">auto_rotate_video_key</string>
     <string name="auto_rotate_video">Giro automático</string>
     <string name="rotate_video">Girar</string>
     <string name="auto_rotate_video_desc">Activar el cambio automático de la orientación de la pantalla en función de la orientación del vídeo</string>
@@ -597,20 +569,19 @@
     <string name="biometric_warning">Ahora se ha realizado una copia de seguridad de sus datos de CloudStream. Aunque la posibilidad de que esto ocurra es muy baja, todos los dispositivos pueden comportarse de forma diferente. En el raro caso de que no puedas acceder a la aplicación, borra completamente los datos de la aplicación y restaura desde una copia de seguridad. Sentimos mucho las molestias que esto pueda ocasionarte.</string>
     <string name="favorite">Favorito</string>
     <string name="unfavorite">Eliminar de favoritos</string>
-    <string name="resume_remaining" formatted="true">%s
-\nrestante</string>
-    <string name="repo_copy_label">Nombre del repositorio y su URL</string>
+    <string name="resume_remaining" formatted="true">%s \nrestante</string>
+    <string name="repo_copy_label">Nombre y URL del repositorio</string>
     <string name="toast_copied">¡Copiado!</string>
     <string name="clipboard_unknown_error">Error al copiar. Por favor, copie el logcat y comuníquese con el soporte de la aplicación.</string>
     <string name="clipboard_permission_error">Error al acceder al portapapeles. Inténtelo de nuevo.</string>
     <string name="ok">De acuerdo</string>
     <string name="battery_dialog_title">Desactivar optimización de batería</string>
-    <string name="music_singlar">Música</string>
+    <string name="music_singular">Música</string>
     <string name="app_unrestricted_toast">El uso de la batería de la aplicación está configurado sin restricciones</string>
     <string name="app_info_intent_error">No se puede abrir la información de la aplicación CloudStream.</string>
-    <string name="custom_media_singluar">Media</string>
+    <string name="custom_media_singular">Media</string>
     <string name="audio_book_singular">Audiolibro</string>
-    <string name="battery_dialog_message">Para garantizar descargas y notificaciones ininterrumpidas para programas de televisión suscritos, CloudStream necesita permiso para ejecutarse en segundo plano. Al presionar Aceptar, se le dirigirá a información de la aplicación. Presione «Permitir».\n\nTenga en cuenta que este permiso no significa que CS3 agotará su batería. Solo funcionará en segundo plano cuando sea necesario, como cuando reciba notificaciones o descargue vídeos desde extensiones oficiales.</string>
+    <string name="battery_dialog_message">Para garantizar las notificaciones y descargas sin interrupciones de programas de TV suscritos, CloudStream necesita permiso para ejecutarse en segundo plano. Al presionar Aceptar, se abrirá la información de la aplicación. Presione «Permitir».\n\nTenga en cuenta que este permiso no significa que CS3 consumirá la batería. Solo funcionará en segundo plano cuando es necesario, como cuando se reciben notificaciones o se descargan vídeos desde extensiones oficiales.</string>
     <string name="reset_btn">Reset</string>
     <string name="episode_upcoming_format" formatted="true">Próximamente en %s</string>
     <string name="next_season_episode_format" formatted="true">La temporada %1$d y el episodio %2$d se estrenarán en</string>
@@ -622,12 +593,11 @@
     <string name="auth_locally">Autenticación local</string>
     <string name="qr_image">Imagen del código QR</string>
     <string name="dismiss">Descartar</string>
-    <string name="open_downloaded_repo">Repositorio abierto</string>
-    <string name="device_pin_url_message">Visita <b> %s </b> en tu smartphone o ordenador e introduce el código anterior</string>
+    <string name="open_downloaded_repo">Abrir repositorio</string>
+    <string name="device_pin_url_message">Visita <b>%s</b> en tu smartphone o equipo e introduce el código anterior</string>
     <string name="device_pin_expired_message">¡El código PIN ya ha caducado!</string>
     <string name="device_pin_counter_text">El código caduca en %1$d mín y %2$d s</string>
     <string name="device_pin_error_message">No puedo obtener el código PIN del dispositivo; intente con la autenticación local</string>
-    <string name="hide_player_control_names_key" translatable="false">hide_player_control_names_key</string>
     <string name="play_from_beginning_img_des">Reproducir desde el principio</string>
     <string name="open_local_video">Abrir vídeo de forma local</string>
     <string name="test_warning">Advertencia</string>
@@ -636,24 +606,16 @@
     <string name="hide_player_control_names">Ocultar los nombres de los controles del reproductor</string>
     <string name="sort_release_date_old">Fecha de lanzamiento (antigua a nueva)</string>
     <string name="sort_release_date_new">Fecha de lanzamiento (de nueva a antigua)</string>
-    <string name="delete_message_series_only" formatted="true">¿Estás seguro de que quieres borrar permanentemente todos los episodios de la serie?
-\n
-\n%s</string>
+    <string name="delete_message_series_only" formatted="true">¿Estás seguro de que quieres borrar permanentemente todos los episodios de la serie? \n \n%s</string>
     <string name="downloads_delete_select">Seleccionar elementos para eliminar</string>
     <string name="offline_file">Disponible para visualizar sin conexión</string>
     <string name="select_all">Seleccionar todo</string>
     <string name="deselect_all">Deseleccionar todo</string>
     <string name="delete_files">Borrar archivos</string>
     <string name="delete_format" formatted="true">Borrar (%1$d | %2$s)</string>
-    <string name="delete_message_multiple" formatted="true">¿Seguro que quieres borrar de forma permanente los siguientes elementos?
-\n
-\n%s</string>
-    <string name="delete_message_series_episodes" formatted="true">¿Estás seguro de que deseas eliminar permanentemente los siguientes episodios en %1$s?
-\n
-\n%2$s</string>
-    <string name="delete_message_series_section" formatted="true">También borrará permanentemente todos los episodios de las siguientes series:
-\n
-\n%s</string>
+    <string name="delete_message_multiple" formatted="true">¿Seguro que quieres borrar de forma permanente los siguientes elementos? \n \n%s</string>
+    <string name="delete_message_series_episodes" formatted="true">¿Estás seguro de que deseas eliminar permanentemente los siguientes episodios en %1$s? \n \n%2$s</string>
+    <string name="delete_message_series_section" formatted="true">También borrará permanentemente todos los episodios de las siguientes series: \n \n%s</string>
     <string name="preview_seekbar_desc">Activar la previsualización para las miniaturas en la barra de búsqueda</string>
     <string name="preview_seekbar">Previsualización de Seekbar</string>
     <string name="no_subtitles_loaded">Aún no hay subtítulos cargados</string>
@@ -665,28 +627,28 @@
     <string name="custom">Personalizada</string>
     <string name="torrent_info">Este video está en una red de torrents, lo que significa que se puede rastrear su uso.\nAsegúrese de comprender las redes de torrents antes de continuar.</string>
     <string name="subs_edge_size">Tamaño del borde</string>
-    <string name="podcast_singluar">Podcast</string>
-    <string name="audio_singluar">Audio</string>
+    <string name="podcast_singular">Podcast</string>
+    <string name="audio_singular">Audio</string>
     <string name="encoding_error">Error de codificación</string>
     <string name="unsupported_error">Error no soportado</string>
     <string name="player_load_one_subtitle_online">Cargar primero disponible</string>
     <string name="torrent_preferred_media">Habilitación torrent en Opciones/Proveedores/Medio preferido</string>
     <string name="torrent_not_accepted">Reiniciar app y aceptar aparición de Stream Torrent para proceder.</string>
     <string name="software_decoding">Software de decodificado</string>
-    <string name="software_decoding_desc">El software de decodificado permite que el reproductor reproduzca archivos de video no soportados por su teléfono, lo cual podría causar una reproducción lenta o inestable en alta resolución</string>
-    <string name="player_notification_channel_description">La notificación del jugador para controlar el juego desde el segundo plano</string>
+    <string name="software_decoding_desc">El software de decodificado permite que el reproductor reproduzca archivos de video no soportados por su dispositivo, lo cual podría causar una reproducción lenta o inestable en alta resolución.</string>
+    <string name="player_notification_channel_description">La notificación del reproductor para controlar la reproducción en segundo plano</string>
     <string name="sort_episodes_rating_high_low">Puntuación (Más alta)</string>
     <string name="sort_episodes_number_desc">Episodio (Descendente)</string>
     <string name="sort_episodes_rating_low_high">Puntuación (Más baja)</string>
-    <string name="sort_episodes_date_newest">Fecha aérea (más nueva)</string>
+    <string name="sort_episodes_date_newest">Fecha de emisión (más nueva)</string>
     <string name="starting_plugin_update_manually">¡Iniciando el proceso de actualización del plugin!</string>
     <string name="update_plugins_manually">Actualizar complementos manualmente</string>
     <string name="player_notification_channel_name">Notificaciones del reproductor</string>
     <string name="update_plugins">Actualizar complementos</string>
-    <string name="sort_episodes_date_oldest">Fecha aérea (más antigua)</string>
+    <string name="sort_episodes_date_oldest">Fecha de emisión (más antigua)</string>
     <string name="sort_button_rating">Puntuar %s</string>
-    <string name="plugins_updated_manually">%d complemento(s) actualizados correctamente.</string>
-    <string name="no_plugins_updated_manually">Ningún complemento fue actualizado.</string>
+    <string name="plugins_updated_manually">¡%d complemento(s) actualizados correctamente!</string>
+    <string name="no_plugins_updated_manually">No se actualizó ningún complemento.</string>
     <string name="sort_episodes_number_asc">Episodio (Ascendente)</string>
     <string name="speech_recognition_unavailable">Reconocimiento de habla no disponible</string>
     <string name="begin_speaking">Empiece a hablar…</string>
@@ -698,5 +660,81 @@
     <string name="all_subtitles_bold">Poner todos los subtítulos en negrita</string>
     <string name="background_radius">Radio del fondo</string>
     <string name="volume_exceeded_100">El volumen ha excedido 100%</string>
-    <string name="slide_up_again_to_exceed_100">Deslice de nuevo hacia arriba para ir más allá del 100%</string>
-</resources>
\ No newline at end of file
+    <string name="slide_up_again_to_exceed_100">Desliza hacia arriba otra vez para sobrepasar 100%</string>
+    <string name="download_parallel_settings_des">Cuántos elementos diferentes pueden descargarse en paralelo</string>
+    <string name="player_settings_always_ask">Preguntar siempre</string>
+    <string name="parallel_downloads">Descargas en paralelo</string>
+    <string name="concurrent_connections">Conexiones simultáneas</string>
+    <string name="concurrent_connections_settings_des">Cuántas conexiones simultáneas puede usar cada descarga</string>
+    <string name="go_to_downloads">Ir a Descargas</string>
+    <string name="no_internet_connection">Sin conexión a internet. \n\nConéctese a internet y vuelva a intentarlo, o mire sus descargas mientras está sin conexión.</string>
+    <string name="overscan_settings_des">Cambios en los límites de la pantalla</string>
+    <string name="overscan_settings">Sobreexploración</string>
+    <string name="poster_size_settings_des">Cambios en el tamaño de los pósteres</string>
+    <string name="poster_size_settings">Tamaño del póster</string>
+    <string name="download_time_left_hour_min_sec_format" formatted="true">%1$d h %2$d m %3$d s</string>
+    <string name="download_time_left_min_sec_format" formatted="true">%1$d m %2$d s</string>
+    <string name="download_time_left_sec_format" formatted="true">%1$d s</string>
+    <string name="show_rating">Etiqueta de valoración</string>
+    <string name="speedup_summary">Mantenga presionado para duplicar la velocidad</string>
+    <string name="no_account">Sin cuenta</string>
+    <string name="edit_profile_image_error_empty">Ninguna URL Encontrada</string>
+    <string name="edit_profile_image_error_invalid">URL o imagen no válida</string>
+    <string name="edit_profile_image_success">Imagen Actualizada Correctamente</string>
+    <string name="action_mark_watched_up_to_this_episode">Marcar como vigilado en este episodio</string>
+    <string name="action_remove_mark_watched_up_to_this_episode">Retirar vigilado para este episodio</string>
+    <string name="action_reload">Recargado</string>
+    <string name="episode_action_play_mirror">Reproducir en espejo</string>"
+    <string name="edit_profile_image_title">Editar imagen de perfil</string>
+    <string name="edit_profile_image_hint">Introducir URL de imagen de perfil</string>
+    <string name="reload_provider">Recargar proveedor</string>
+    <string name="name">Nombre</string>
+    <string name="resolution_and_name">Resolución y nombre</string>
+    <string name="subs_subtitle_alignment">Alineación de subtítulos</string>
+    <string name="bottom_left">Inferior izquierda</string>
+    <string name="bottom_center">Inferior central</string>
+    <string name="bottom_right">Inferior derecho</string>
+    <string name="top_center">Arriba centrado</string>
+    <string name="top_right">Arriba derecha</string>
+    <string name="play_full_series_button">Reproducir toda la serie</string>
+    <string name="install_prerelease">Instalar version pre-lanzamiento</string>
+    <string name="prerelease_already_installed">Pre-lanzamiento ya está instalada.</string>
+    <string name="prerelease_install_failed">La instalación pre-lanzamiento ha fallado.</string>
+    <string name="show_episode_text">Texto del episodio</string>
+    <string name="speedup_title">Alternar velocidad de pulsación larga</string>
+    <string name="middle_left">Medio izquierda</string>
+    <string name="middle_center">Medio centro</string>
+    <string name="middle_right">Medio derecha</string>
+    <string name="top_left">Arriba a la izquierda</string>
+    <string name="search_suggestions">Sugerencias de Búsqueda</string>
+    <string name="search_suggestions_des">Mostrar sugerencias de búsqueda mientras escribe</string>
+    <string name="clear_suggestions">Borrar Sugerencias</string>
+    <string name="show_cast_in_details">Mostrar panel de reparto</string>
+    <string name="extra_brightness_settings">Atenuación extra</string>
+    <string name="extra_brightness_settings_des">Active el filtro de atenuación cuando se supere el 100 % de brillo de la pantalla</string>
+    <string name="extra_brightness_key">atenuación_extra_activado</string>
+    <string name="video_info">Información del archivo multimedia</string>
+    <string name="source_name">Nombre de origen</string>
+    <string name="download_queue">Cola de descarga</string>
+    <string name="queue_empty_message">Actualmente no hay descargas encoladas.</string>
+    <string name="source_priority">Prioridad de origen</string>
+    <string name="source_priority_help">Decida como los orígenes del vídeo estarían ordenados en el reproductor</string>
+    <string name="download_all">Descargar todo</string>
+    <string name="cancel_all">Cancelar todo</string>
+    <string name="download_episode_range">¿Desea descargar el episodio %s?</string>
+    <string name="cancel_queue_message">¿Desea cancelar todas las descargas de la cola?</string>
+    <plurals name="downloads_active">
+        <item quantity="one">%d descarga activa</item>
+        <item quantity="many">%d descargas activas</item>
+        <item quantity="other">%d descargas activas</item>
+    </plurals>
+    <plurals name="downloads_queued">
+        <item quantity="one">%d descarga encolada</item>
+        <item quantity="many">%d descargas encoladas</item>
+        <item quantity="other">%d descargas encoladas</item>
+    </plurals>
+    <string name="show_player_metadata_overlay">Mostrar superposición de metadatos del jugador</string>
+    <string name="video_singular">Vídeo</string>
+    <string name="skip_type_preview">Vista previa</string>
+    <string name="player_is_live">En Vivo</string>
+</resources>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-b+fa/strings.xml
similarity index 82%
rename from app/src/main/res/values-fa/strings.xml
rename to app/src/main/res/values-b+fa/strings.xml
index 3bb1de6459c..1018e9a8204 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-b+fa/strings.xml
@@ -10,7 +10,7 @@
     <string name="download_failed">دانلود ناموفق بود</string>
     <string name="filter_bookmarks">فیلتر کردن نشانک ها</string>
     <string name="search">جست‌وجو</string>
-    <string name="resize_fit">اندازه‌کردن</string>
+    <string name="resize_fit">اندازه کردن با صفحه نمایش</string>
     <string name="resize_fill">پر کردن</string>
     <string name="resize_zoom">بزرگ‌نمایی</string>
     <string name="all">همه</string>
@@ -55,7 +55,6 @@
     <string name="player_subtitles_settings">زیرنویس‌ها</string>
     <string name="action_remove_from_bookmarks">حذف</string>
     <string name="download_started">دانلود آغاز شد</string>
-    <string name="pref_disable_acra">غیرفعال کردن گذارش باگ خودکار</string>
     <string name="sort_clear">پاک کردن</string>
     <string name="update_started">به‌روزرسانی آغاز شد</string>
     <string name="sort_copy">کپی</string>
@@ -114,8 +113,7 @@
     <string name="type_watching">در حال تماشا</string>
     <string name="title_downloads">بارگیری‌ها</string>
     <string name="player_speed_text_format" formatted="true">سرعت (%.2f برابر)</string>
-    <string name="new_update_format" formatted="true">بروزرسانی جدید پیدا شد!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">بروزرسانی جدید پیدا شد! \n%1$s -&gt; %2$s</string>
     <string name="play_movie_button">پخش فیلم</string>
     <string name="browser">مرورگر</string>
     <string name="play_episode">پخش قسمت</string>
@@ -130,9 +128,8 @@
     <string name="type_plan_to_watch">برنامه‌ریزی برای تماشا</string>
     <string name="subs_hold_to_reset_to_default">برای بازنشانی به پیشفرض نگه‌دارید</string>
     <string name="library">کتابخانه</string>
-    <string name="status_ongoing">درادامه</string>
-    <string name="delete_message" formatted="true">این فرآیند بطور کامل %s را حذف می‌کند
-\nآیا از این کار اطمینان دارید؟</string>
+    <string name="status_ongoing">در ادامه</string>
+    <string name="delete_message" formatted="true">این فرآیند بطور کامل %s را حذف می‌کند \nآیا از این کار اطمینان دارید؟</string>
     <string name="repo_copy_label">نام مخزن و نشانی</string>
     <string name="toast_copied">کپی شد!</string>
     <string name="settings_info">درباره</string>
@@ -140,7 +137,7 @@
     <string name="subs_font_size">اندازه قلم</string>
     <string name="swipe_to_change_settings">برای تغییر تنظیمات بکشید</string>
     <string name="swipe_to_change_settings_des">برای تغییر میزان روشنایی یا صدا در گوشه چپ و راست به بالا یا پایین بکشید</string>
-    <string name="automatic_plugin_updates">بروزرسانی خودکار افزونه</string>
+    <string name="automatic_plugin_updates">بروزرسانی خودکار پلاگین</string>
     <string name="start">آغاز</string>
     <string name="app_language">زبان برنامه</string>
     <string name="play_episode_toast">پخش قسمت</string>
@@ -151,8 +148,8 @@
     <string name="subs_outline_color">رنگ حاشیه متن</string>
     <string name="player_size_settings">دکمه تغییر‌اندازه پخش‌کننده</string>
     <string name="speed_setting_summary">گزینه سرعت در پخش‌کننده را اضافه می‌کند</string>
-    <string name="category_updates">بروزرسانی‌ و پشتیبانی</string>
-    <string name="kitsu_settings">نمایش پوستر از طریق Kitsu</string>
+    <string name="category_updates">بروزرسانی و پشتیبانی</string>
+    <string name="kitsu_settings">نمیش پوستر از kitsu</string>
     <string name="advanced_search">جستجوی پیشرفته</string>
     <string name="season">فصل</string>
     <string name="episode">قسمت</string>
@@ -166,12 +163,12 @@
     <string name="category_account">حساب‌ها و امنیت</string>
     <string name="show_log_cat">نمایش Logcat 🐈</string>
     <string name="copy_link_toast">پیوند در حافظه موقت کپی شد</string>
-    <string name="no_links_found_toast">هیچ پیوندی یافت‌نشد</string>
+    <string name="no_links_found_toast">هیچ پیوندی یافت‌ نشد</string>
     <string name="asian_drama_singular">درام آسیایی</string>
-    <string name="automatic_plugin_download">بارگیری خودکار افزونه‌ها</string>
+    <string name="automatic_plugin_download">بارگیری خودکار افزونه‌ها (پلاگین ها)</string>
     <string name="documentaries_singular">مستند</string>
     <string name="eigengraumode_settings">سرعت پخش</string>
-    <string name="no_episodes_found">هیچ قسمتی یافت‌نشد</string>
+    <string name="no_episodes_found">هیچ قسمتی یافت‌ نشد</string>
     <string name="rated_format" formatted="true">امتیاز: %.1f</string>
     <string name="subs_import_text" formatted="true">قلم‌ها را با گذاشتن در %s وارد کنید</string>
     <string name="resume">ادامه</string>
@@ -179,19 +176,16 @@
     <string name="go_back_30">−۳۰</string>
     <string name="go_forward_30">+۳۰</string>
     <string name="delete_file">حذف پرونده</string>
-    <string name="show_trailers_settings">نمایش پیش‌پرده‌ها</string>
+    <string name="show_trailers_settings">نمایش تریلر ها</string>
     <string name="episodes">قسمت‌ها</string>
-    <string name="resume_time_left" formatted="true">%dد
-\nباقی‌مانده</string>
+    <string name="resume_time_left" formatted="true">%dد \nباقی‌مانده</string>
     <string name="github">گیتهاب</string>
-    <string name="pref_filter_search_quality">نهان کردن کیفیت ویدئو انتخابی در نتایج جستجو</string>
+    <string name="pref_filter_search_quality">پنهان کردن ویدیو مشخص شده از نتایج جستجو</string>
     <string name="cancel">لغو</string>
-    <string name="resume_remaining" formatted="true">%s
-\nباقی‌مانده</string>
+    <string name="resume_remaining" formatted="true">%s \nباقی‌مانده</string>
     <string name="action_default">پیش‌فرض</string>
     <string name="cartoons_singular">کارتون</string>
     <string name="torrent_singular">تورنت</string>
-    <string name="hide_player_control_names_key" translatable="false">hide_player_control_names_key</string>
     <string name="vpn_torrent">این ارائه‌دهنده تورنتی است، استفاده از VPN توصیه می‌شود</string>
     <string name="restore_success">بارگزاری پرونده پشتیبانی‌</string>
     <string name="subs_subtitle_elevation">ارتفاع زیرنویس</string>
@@ -260,12 +254,12 @@
     <string name="extension_language">زبان</string>
     <string name="app_not_found_error">برنامه پیدا نشد</string>
     <string name="error">خطا</string>
-    <string name="pref_category_ui_features">قابلیت‌های</string>
-    <string name="category_providers">ارائه‌دهنده‌ها</string>
+    <string name="pref_category_ui_features">قابلیت‌ها</string>
+    <string name="category_providers">ارائه‌دهنده ها</string>
     <string name="storage_error">خطای دانلود، دسترسی به حافظه را چک کنید</string>
     <string name="resolution">کیفیت</string>
     <string name="resolution_and_title">کیفیت و عنوان</string>
-    <string name="custom_media_singluar">محتوا</string>
+    <string name="custom_media_singular">محتوا</string>
     <string name="double_tap_to_seek_amount_settings">مقدار جلورفتن پخش‌کننده</string>
     <string name="no_repository_found_error">مخزن پیدا نشد، نشانی را چک کنید و فیلترشکن را امتحان کنید</string>
     <string name="example_lang_name">کد زبان (انگلیسی)</string>
@@ -306,4 +300,51 @@
     <string name="double_tap_to_pause_settings_des">برای مکث دو بار در وسط ضربه بزنید</string>
     <string name="use_system_brightness_settings_des">Use system brightness in the app player instead of a dark overlay</string>
     <string name="episode_sync_settings">به‌روزرسانی پیشرفت ساعت</string>
-</resources>
\ No newline at end of file
+    <string name="begin_speaking">شروع کنید به صحبت کردن…</string>
+    <string name="advanced_search_des">جواب سرچ های شما با تامین کننده</string>
+    <string name="updates_settings">نشان دادن آپدیت های برنامه</string>
+    <string name="redo_setup_process">دوباره پروسه راه اندازی را انجام بده</string>
+    <string name="apk_installer_settings">نصب کننده APK</string>
+    <string name="lightnovel">برنامه سبک رمان از توسعه دهندگان یکسان</string>
+    <string name="anim">برنامه انیمه از توسعه دهندگان یکسان</string>
+    <string name="no_chromecast_support_toast">این ارائه دهنده هیچ پشتیبانی از کروم کست ندارد</string>
+    <string name="test_failed">با شکست مواجه شد</string>
+    <string name="test_warning">اخطار</string>
+    <string name="rating">امتیاز</string>
+    <string name="livestreams">استریم های زنده</string>
+    <string name="nsfw">مثبت ۱۸ سال</string>
+    <string name="ova_singular">انیمه خانگی</string>
+    <string name="live_singular">پخش زنده</string>
+    <string name="nsfw_singular">مثبت ۱۸ سال</string>
+    <string name="music_singular">موسیقی</string>
+    <string name="audio_book_singular">کتاب صوتی</string>
+    <string name="audio_singular">صدا</string>
+    <string name="podcast_singular">پادکست</string>
+    <string name="episode_action_play_in_app">پخش کردن در برنامه</string>
+    <string name="episode_action_auto_download">دانلود اتوماتیک</string>
+    <string name="no_update_found">هیچ آپدیتی پیدا نشد</string>
+    <string name="video_lock">قفل</string>
+    <string name="video_aspect_ratio_resize">تغییر اندازه</string>
+    <string name="video_source">منبع</string>
+    <string name="dont_show_again">دیگر نمایش نده</string>
+    <string name="skip_update">این آپدیت را اسکیپ کن</string>
+    <string name="update">آپدیت</string>
+    <string name="video_ram_description">اگر در دستگاه های دارای حافظه کم در تنظیمات بالا گذاشته شود باعث کرش می‌شود، مانند تلویزیون های اندروید</string>
+    <string name="remove_site_pref">از بین بردن سایت</string>
+    <string name="download_path_pref">راه دانلود</string>
+    <string name="display_subbed_dubbed_settings">نمایش دادن انیمه های دوبله شده یا دارای زیرنویس</string>
+    <string name="legal_notice">هشدار</string>
+    <string name="pref_category_links">لینک ها</string>
+    <string name="pref_category_app_updates">آپدیت های برنامه</string>
+    <string name="pref_category_extensions">افزونه ها</string>
+    <string name="pref_category_android_tv">تلویزیون اندروید</string>
+    <string name="pref_category_security">محافظت</string>
+    <string name="pref_category_accounts">اکانت ها</string>
+    <string name="pref_category_subtitles">زیرنویس ها</string>
+    <string name="pref_category_defaults">حالت عادی</string>
+    <string name="category_general">کلی</string>
+    <string name="random_button_settings">دکمه رندوم</string>
+    <string name="test_extensions">­همه افزونه ها را تست کنید</string>
+    <string name="automatic">خودکار</string>
+    <string name="primary_color_settings">رنگ اصلی</string>
+</resources>
diff --git a/app/src/main/res/values-b+fil/strings.xml b/app/src/main/res/values-b+fil/strings.xml
new file mode 100644
index 00000000000..be54aa959a6
--- /dev/null
+++ b/app/src/main/res/values-b+fil/strings.xml
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="pin_error_incorrect">Maling PIN. Pakisubukang muli.</string>
+    <string name="action_remove_mark_watched_up_to_this_episode">Alisin ang napanood hanggang sa episode na ito</string>
+    <string name="no_internet_connection">Walang koneksyon sa internet.\n\nKumonekta sa internet at subukang muli, o panoorin ang iyong mga na-download habang ikaw ay offline.</string>
+    <string name="player_notification_channel_description">Ang abiso ng player para sa pagkontrol sa pag-playback mula sa background</string>
+    <string name="plugins_updated_manually">Matagumpay na na-update ang %d plugin!</string>
+    <string name="overscan_settings_des">Binabago ang mga hangganan ng screen</string>
+    <string name="all_subtitles_bold">Gawing bold ( ≖‿ ≖ ) ang lahat ng subtitle</string>
+    <string name="all_subtitles_italic">Gawing italic ang lahat ng subtitle</string>
+    <string name="volume_exceeded_100">Lakas ng tunog ay lumampas sa 100%</string>
+    <string name="slide_up_again_to_exceed_100">Muling mag-slide pataas upang lumampas sa 100%</string>
+    <string name="confirm_before_exiting_desc">Ipakita ang dialog bago lumabas sa app</string>
+    <string name="preview_seekbar_desc">Paganahin ang preview thumbnail sa seekbar</string>
+    <string name="no_subtitles_loaded">Wala pang na-load na mga subtitle</string>
+    <string name="confirm_before_exiting_title">Kumpirmahin bago lumabas</string>
+    <string name="torrent_not_accepted">I-restart ang app at tanggapin ang Stream Torrent pop-up upang magpatuloy.</string>
+    <string name="software_decoding_desc">Binibigyang-daan ng software decoding ang player na mag-play ng mga video file na hindi sinusuportahan ng iyong telepono, ngunit maaaring magdulot ng laggy o hindi maayos na pag-playback sa mataas na resolution</string>
+    <string name="backup_path_title">Lokasyon ng backup na folder</string>
+    <string name="hide_player_control_names">Itago ang mga pangalan ng mga kontrol ng player</string>
+    <string name="biometric_warning">Na-back up na ngayon ang iyong data sa CloudStream. Bagama\'t napakababa ng posibilidad nito, lahat ng device ay maaaring kumilos nang iba. Sa pambihirang kaso, na ma-lock out ka mula sa pag-access sa app, ganap na i-clear ang data ng app at i-restore mula sa isang backup. Lubos kaming humihingi ng paumanhin para sa anumang abala na dulot nito.</string>
+    <string name="skip_startup_account_select_pref">Laktawan ang pagpili ng account sa pagsisimula</string>
+    <string name="duplicate_message_multiple" formatted="true">May nakitang potensyal na mga nag-doble na mga items sa iyong library: \n\n%s \n\nGusto mo pa rin bang idagdag ang item na ito, palitan ang mga nauna na, o kanselahin ito?</string>
+    <string name="favorites_list_name">Mga paborito &lt;3</string>
+    <string name="quality_profile_help">Dito maaari mong baguhin kung paano inayos ang mga pinagmulan. Kung ang isang video ay may mas mataas na priyoridad, ito ay lalabas na mas mataas sa pagpili ng pinagmulan. Ang kabuuan ng priyoridad ng source at priyoridad sa quality ay ang priyoridad ng video. \n\nSource A: 3 \nQuality B: 7 \nMagkakaroon ng pinagsamang priyoridad ng video na 10. \n\nTANDAAN: Kung ang kabuuan ay 10 o higit pa ang player ay awtomatikong lalaktawan ang paglo-load kapag na-load ang link na iyon!</string>
+    <string name="unable_to_inflate">Hindi magawa nang tama ang UI, isa itong MAJOR BUG at dapat na iulat kaagad %s</string>
+    <string name="action_add_to_favorites">Idagdag sa mga paborito &lt;3</string>
+    <string name="action_remove_from_favorites">Alisin sa mga paborito &lt;/3</string>
+    <string name="duplicate_title">May Natagpuan na Nag-doble</string>
+    <string name="duplicate_message_single" formatted="true">Lumalabas na mayroong potensyal na nag-doble na item sa iyong library: \'%s.\' \n\nGusto mo pa rin bang idagdag ang item na ito, palitan ang nauna, o kanselahin ito?</string>
+    <string name="battery_dialog_message">Para matiyak ang mga walang patid na pag-download at notification para sa mga naka-subscribe na palabas sa TV, kailangan ng CloudStream ng pahintulot na tumakbo sa background. Sa pamamagitan ng pagpindot sa OK, ipapakita sa iyo ang isang dialog. Mangyaring pindutin ang \'Allow\'.\n\nPakitandaan, ang pahintulot na ito ay hindi nangangahulugan na maubos ng CS3 ang iyong baterya. Ito ay gagana lamang sa background kung kinakailangan, tulad ng kapag tumatanggap ng mga notification o nagda-download ng mga video mula sa mga opisyal na extension.</string>
+    <string name="blank_repo_message">Ang CloudStream ay walang mga site na naka-install sa umpisa. Kailangan mong i-install ang mga site mula sa mga repositoryo. \n \nSumali sa aming Discord o maghanap online.</string>
+    <string name="download_all_plugins_from_repo">Babala: Walang pananagutan ang CloudStream 3 sa paggamit ng mga extension ng third-party at hindi kami nagbibigay ng anumang suporta para sa kanila!</string>
+    <string name="speech_recognition_unavailable">Hindi available ang speech recognition</string>
+    <string name="result_open_in_browser">Buksan sa Browser</string>
+    <string name="torrent_info">Ang video na ito ay isang Torrent, nangangahulugan ito na ang iyong aktibidad sa video ay maaaring masubaybayan.\nTiyaking naiintindihan mo ang Torrenting bago magpatuloy.</string>
+    <string name="downloads_delete_select">Piliin ang Mga Item na Tatanggalin</string>
+    <string name="downloads_empty">Kasalukuyang walang mga dina-download.</string>
+    <string name="offline_file">Available para mapanood offline</string>
+    <string name="select_all">Piliin Lahat</string>
+    <string name="deselect_all">Alisin sa pagkakapili ang Lahat</string>
+    <string name="vpn_might_be_needed">Maaaring kailanganin ng VPN para gumana ang provider na ito</string>
+    <string name="vpn_torrent">Ang provider na ito ay isang torrent, inirerekomendang gumamit ng VPN</string>
+    <string name="provider_info_meta">Ang metadata ay hindi ibinigay ng site, hindi gagana ang video kung wala ito sa site.</string>
+    <string name="picture_in_picture_des">Ipinagpapatuloy ang pag-playback sa isang miniature na player sa ibabaw ng iba pang mga app</string>
+    <string name="speed_setting_summary">Nagdaragdag ng opsyon sa bilis sa player</string>
+    <string name="swipe_to_seek_settings_des">Mag-swipe mula sa gilid patungo sa kabilang gilid upang kontrolin ang iyong posisyon sa isang video</string>
+    <string name="swipe_to_change_settings_des">Mag-slide pataas o pababa sa kaliwa o kanang bahagi upang baguhin ang liwanag o volume</string>
+    <string name="episode_sync_settings_des">Awtomatikong i-sync ang iyong kasalukuyang episode</string>
+    <string name="backup_failed">Nawawala ang mga pahintulot sa storage. Pakisubukang muli.</string>
+    <string name="advanced_search_des">Binibigyan ka ng mga resulta ng paghahanap na pinaghihiwalay ng provider</string>
+    <string name="pref_filter_search_quality">Itago ang napiling quality ng video sa mga resulta ng paghahanap</string>
+    <string name="automatic_plugin_download_mode_title">Pumili ng mode upang i-filter ang pag-download ng mga plugin</string>
+    <string name="automatic_plugin_download_summary">Awtomatikong i-install ang lahat ng hindi pa naka-install na plugin mula sa mga idinagdag na repository.</string>
+    <string name="cast_format" formatted="true">Tauhan: %s</string>
+    <string name="next_episode_format" formatted="true">Kabanata %d ay ipapalabas sa</string>
+    <string name="next_season_episode_format" formatted="true">Season %1$d Kabanata %2$d ay ipapalabas sa</string>
+    <string name="next_episode_time_day_format" formatted="true">%1$da %2$do %3$dm</string>
+    <string name="next_episode_time_hour_format" formatted="true">%1$do %2$dm</string>
+    <string name="next_episode_time_min_format" formatted="true">%dm</string>
+    <string name="download_time_left_hour_min_sec_format" formatted="true">%1$do %2$dm %3$ds</string>
+    <string name="download_time_left_min_sec_format" formatted="true">%1$dm %2$ds</string>
+    <string name="download_time_left_sec_format" formatted="true">%1$ds</string>
+    <string name="episode_poster_img_des">Poster ng Kabanata</string>
+    <string name="home_next_random_img_des">Susunod na Kahit Ano</string>
+    <string name="go_back_img_des">Bumalik</string>
+    <string name="play_from_beginning_img_des">Ipatugtog mula sa Simula</string>
+    <string name="home_change_provider_img_des">Baguhin ang Tagatustos</string>
+    <string name="preview_background_img_des">Background ng Pasilip</string>
+    <string name="player_speed_text_format" formatted="true">Bilis (%.2fx)</string>
+    <string name="rated_format" formatted="true">Na-rate: %.1f</string>
+    <string name="new_update_format" formatted="true">May nakitang bagong update!\n%1$s -&gt; %2$s</string>
+    <string name="duration_format" formatted="true">%d min</string>
+    <string name="play_with_app_name">Ipatugtog sa CloudStream</string>
+    <string name="title_home">Bahay</string>
+    <string name="title_search">Maghanap</string>
+    <string name="title_downloads">Mga Download</string>
+    <string name="download_queue">Nakapila na download</string>
+    <string name="title_settings">Mga pagpipilian</string>
+    <string name="search_hint">Maghanap…</string>
+    <string name="search_hint_site" formatted="true">Maghanap %s…</string>
+    <string name="begin_speaking">Magsimulang magsalita…</string>
+    <string name="no_data">Walang Data</string>
+    <string name="episode_more_options_des">Iba pang Mga Pagpipilian</string>
+    <string name="next_episode">Susunod na kabanata</string>
+    <string name="result_tags">Mga Genre</string>
+    <string name="result_share">Ibahagi</string>
+    <string name="browser">Browser</string>
+    <string name="skip_loading">Laktawan ang paglo-load</string>
+    <string name="loading">Naglo-load…</string>
+    <string name="type_watching">Pinapanood</string>
+    <string name="type_on_hold">Nakabinbin</string>
+    <string name="type_completed">Nakumpleto</string>
+    <string name="type_plan_to_watch">Pinaplanong Panoorin</string>
+    <string name="type_re_watching">Pinapanood muli</string>
+    <string name="play_movie_button">Ipatugtog ang Pelikula</string>
+    <string name="play_trailer_button">Ipatugtog ang Trailer</string>
+    <string name="play_livestream_button">Ipatugtog ang Livestream</string>
+    <string name="play_full_series_button">Ipatugtog ang Buong Serye</string>
+    <string name="pick_source">Mga Mapagkukunan</string>
+    <string name="pick_subtitle">Mga saling-teksto</string>
+    <string name="reload_error">Subukang muli kumonekta…</string>
+    <string name="go_back">Bumalik</string>
+    <string name="play_episode">Ipatugtog ang Kabanata</string>
+    <string name="play_torrent_button">I-stream ang Torrent</string>
+    <string name="download">I-download</string>
+    <string name="downloaded">Na-download</string>
+    <string name="downloading">Dina-download</string>
+    <string name="download_paused">Hininto ang pag-download</string>
+    <string name="download_started">Sinimulan ang pag-download</string>
+    <string name="download_failed">Nabigong ma-download</string>
+    <string name="download_canceled">Kinansela ang pag-download</string>
+    <string name="download_done">Natapos ang pag-download</string>
+    <string name="queue_empty_message">Kasalukuyang walang nakapilang mga download.</string>
+    <string name="update_started">Sinimulan ang pag-update</string>
+    <string name="open_local_video">Buksan ang local video</string>
+    <string name="error_loading_links_toast">Nagkamali sa paglo-load ng mga link</string>
+    <string name="links_reloaded_toast">Ini-load muli ang mga link</string>
+    <string name="download_storage_text">Imbakan</string>
+    <string name="app_dubbed_text">Dub</string>
+    <string name="app_subbed_text">Sub</string>
+    <string name="popup_delete_file">Burahin ang File</string>
+    <string name="popup_play_file">Ipatugtog ang File</string>
+    <string name="popup_resume_download">Ipagpatuloy ang pag-download</string>
+    <string name="popup_pause_download">Ihinto ang pag-download</string>
+    <string name="home_more_info">Higit pang impormasyon</string>
+    <string name="home_expanded_hide">Itago</string>
+    <string name="home_play">Ipatugtog</string>
+    <string name="home_info">Impormasyon</string>
+    <string name="filter_bookmarks">I-filter ang Mga Bookmark</string>
+    <string name="error_bookmarks_text">Mga Bookmark</string>
+    <string name="action_remove_from_bookmarks">Alisin</string>
+    <string name="action_add_to_bookmarks">Itakda ang kapalaran ng panonood</string>
+    <string name="sort_apply">Ilapat</string>
+    <string name="sort_copy">Ikopya</string>
+    <string name="sort_close">Isara</string>
+    <string name="sort_clear">Alisin</string>
+    <string name="sort_save">I-save</string>
+    <string name="repo_copy_label">Pangalan ng repository at URL</string>
+    <string name="toast_copied">nakopya!</string>
+    <string name="subscribe_tooltip">Bagong notipikasyon ng kabanata</string>
+    <string name="result_search_tooltip">Maghanap sa iba pang mga extension</string>
+    <string name="recommendations_tooltip">Ipakita ang mga rekomendasyon</string>
+    <string name="player_speed">Bilis ng Manlalaro</string>
+    <string name="subtitles_settings">Pagpipilian sa Saling-teksto</string>
+    <string name="subs_text_color">Kulay ng Teksto</string>
+    <string name="subs_outline_color">Kulay ng Balangkas</string>
+    <string name="subs_background_color">Kulay ng Likuran</string>
+    <string name="subs_window_color">Kulay ng Bintana</string>
+    <string name="subs_subtitle_elevation">Kataasan ng Saling-teksto</string>
+    <string name="subs_font">Font</string>
+    <string name="subs_font_size">Laki ng Font</string>
+    <string name="search_provider_text_providers">Maghanap gamit ang mga tagatustos</string>
+    <string name="search_provider_text_types">Maghanap gamit ang mga uri</string>
+    <string name="benene_count_text">%d Benenes naibigay sa mga dev</string>
+    <string name="benene_count_text_none">Walang Benenes na binigay</string>
+    <string name="subs_auto_select_language">Awtomatikong Piliin ang Wika</string>
+    <string name="subs_download_languages">Mag-download ng Mga Wika</string>
+</resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-b+fr/strings.xml
similarity index 84%
rename from app/src/main/res/values-fr/strings.xml
rename to app/src/main/res/values-b+fr/strings.xml
index 853eff4cea2..bf401b20ad0 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-b+fr/strings.xml
@@ -47,7 +47,6 @@
     <string name="popup_play_file">Lire le fichier</string>
     <string name="popup_resume_download">Reprendre le téléchargement</string>
     <string name="popup_pause_download">Mettre en pause le téléchargement</string>
-    <string name="pref_disable_acra">Désactiver le rapport de bug automatique</string>
     <string name="home_more_info">Plus d\'information</string>
     <string name="home_expanded_hide">Cacher</string>
     <string name="home_main_poster_img_des">Affiche principale</string>
@@ -69,7 +68,6 @@
     <string name="copy_link_toast">Lien copié dans le presse-papier</string>
     <string name="play_episode_toast">Lecture de l\'episode</string>
     <string name="subs_default_reset_toast">Réinitialiser aux valeurs par défault</string>
-    <string name="acra_report_toast">Désolé, l\'application à crashé. Un rapport de bug anonyme va être envoyé aux développeurs</string>
     <string name="season">Saison</string>
     <string name="no_season">Pas de Saison</string>
     <string name="episode">Épisode</string>
@@ -81,8 +79,7 @@
     <string name="cancel">Annuler</string>
     <string name="pause">Pause</string>
     <string name="resume">Reprendre</string>
-    <string name="delete_message">Cela va supprimer définitivement %s
-\nÊtes-vous sûr ?</string>
+    <string name="delete_message">Cela va supprimer définitivement %s \nÊtes-vous sûr ?</string>
     <string name="status_ongoing">En cours</string>
     <string name="status_completed">Terminé</string>
     <string name="status">Statut</string>
@@ -124,8 +121,7 @@
     <string name="update">Mettre à jour</string>
     <string name="dns_pref_summary">Utile pour contourner les bloquages des FAI</string>
     <string name="download_path_pref">Emplacement de téléchargement</string>
-    <string name="new_update_format" formatted="true">Nouvelle mise à jour trouvée !
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">Nouvelle mise à jour trouvée ! \n%1$s -&gt; %2$s</string>
     <string name="filler" formatted="true">Épisode spécial</string>
     <string name="watch_quality_pref">Qualité de visionnage préférée (WiFi)</string>
     <string name="video_buffer_size_settings">Taille de la mémoire cache</string>
@@ -139,7 +135,7 @@
     <string name="display_subbed_dubbed_settings">Afficher les animés en Anglais (Dub) / sous-titrés</string>
     <string name="phone_layout">Disposition en mode téléphone</string>
     <string name="app_dub_sub_episode_text_format">%1$s Ep %2$d</string>
-    <string name="rated_format" formatted="true">Note : %.1f</string>
+    <string name="rated_format" formatted="true">Note : %.1f</string>
     <string name="resize_zoom">Zoom</string>
     <string name="resize_fit">Adapter à l\'écran</string>
     <string name="app_layout">Disposition de l\'application</string>
@@ -147,7 +143,7 @@
     <string name="provider_lang_settings">Langues des extensions</string>
     <string name="preferred_media_settings">Médias préférées</string>
     <string name="automatic">Auto</string>
-    <string name="cast_format">Distribution : %s</string>
+    <string name="cast_format">Distribution : %s</string>
     <string name="duration_format">%d min</string>
     <string name="search_hint_site">Rechercher sur %s…</string>
     <string name="type_re_watching">À re-regarder</string>
@@ -282,8 +278,6 @@
     <string name="settings_info">Info</string>
     <string name="advanced_search">Recherche avancée</string>
     <string name="advanced_search_des">Vous donne les résultats de la recherche séparés par fournisseur</string>
-    <string name="bug_report_settings_off">Envoi de données uniquement en cas d\'accident</string>
-    <string name="bug_report_settings_on">N\'envoie aucune donnée</string>
     <string name="show_fillers_settings">Afficher les épisodes spéciaux pour les animés</string>
     <string name="show_trailers_settings">Montrer les bandes-annonces</string>
     <string name="kitsu_settings">Montrer les affiches provenant de Kitsu</string>
@@ -291,14 +285,12 @@
     <string name="automatic_plugin_updates">Mises à jour automatiques des plugins</string>
     <string name="updates_settings">Afficher les mises à jour de l\'application</string>
     <string name="updates_settings_des">Recherche automatique de nouvelles mises à jour au démarrage.</string>
-    <string name="uprereleases_settings">Mettre à jour vers une version bêta</string>
-    <string name="uprereleases_settings_des">Recherche pour une mise à jour vers une version bêta au lieu des version complètes seulement</string>
     <string name="github">Github</string>
     <string name="lightnovel">Application Light Novel par les mêmes devs</string>
     <string name="anim">Anime app by the same devs</string>
     <string name="discord">Rejoignez le Discord</string>
-    <string name="next_episode_time_hour_format" formatted="true">%1$d h %2$d min</string>
-    <string name="next_episode_time_min_format" formatted="true">%d min</string>
+    <string name="next_episode_time_hour_format" formatted="true">%1$d h %2$d min</string>
+    <string name="next_episode_time_min_format" formatted="true">%d min</string>
     <string name="play_with_app_name">Lire avec CloudStream</string>
     <string name="play_livestream_button">Lire en direct</string>
     <string name="skip_type_ed">Fin</string>
@@ -308,18 +300,18 @@
     <string name="skip_type_format" formatted="true">Ignorer %s</string>
     <string name="skip_type_op">Ouverture</string>
     <string name="skip_type_recap">Récap</string>
-    <string name="skip_type_creddits">Crédits</string>
+    <string name="skip_type_credits">Crédits</string>
     <string name="skip_type_intro">Intro</string>
     <string name="clear_history">Effacer l\'historique</string>
     <string name="yes">Oui</string>
-    <string name="next_episode_time_day_format" formatted="true">%1$d j %2$d h %3$d min</string>
+    <string name="next_episode_time_day_format" formatted="true">%1$d j %2$d h %3$d min</string>
     <string name="stream">Stream</string>
-    <string name="confirm_exit_dialog">Êtes-vous sûr·e de vouloir quitter ?</string>
+    <string name="confirm_exit_dialog">Êtes-vous sûr·e de vouloir quitter ?</string>
     <string name="no">Non</string>
     <string name="update_notification_downloading">Téléchargement de la mise à jour…</string>
     <string name="next_episode_format" formatted="true">L\'épisode %d sera publié dans</string>
     <string name="show_hd">Étiquette de qualité</string>
-    <string name="limit_title_rez">Résolution du lecteur vidéo</string>
+    <string name="limit_title_rez">Afficher les informations du lecteur</string>
     <string name="add_site_pref">Cloner le site</string>
     <string name="remove_site_pref">Supprimer le site</string>
     <string name="add_site_summary">Ajoute un clone à un site déjà existant, avec une URL différente</string>
@@ -327,8 +319,7 @@
     <string name="example_site_name">Nouveau Nom du site</string>
     <string name="error_invalid_id">ID invalide</string>
     <string name="automatic_plugin_download_summary">Installer automatiquement les plugins qui sont dans les repository mais qui n\'ont pas encore été installés.</string>
-    <string name="resume_time_left" formatted="true">%dm
-\nrestant</string>
+    <string name="resume_time_left" formatted="true">%dm \nrestant</string>
     <string name="livestreams">En direct</string>
     <string name="others">Autres</string>
     <string name="live_singular">En direct</string>
@@ -369,7 +360,7 @@
     <string name="nsfw">NSFW</string>
     <string name="example_ip">127.0.0.1</string>
     <string name="sync_score_format" formatted="true">%d / 10</string>
-    <string name="sync_total_episodes_none">/??</string>
+    <string name="sync_total_episodes_none">/ ??</string>
     <string name="sync_total_episodes_some" formatted="true">/%d</string>
     <string name="quality_sd">SD</string>
     <string name="quality_uhd">UHD</string>
@@ -415,14 +406,14 @@
     <string name="batch_download_finish_format" formatted="true">Téléchargé %1$d %2$s</string>
     <string name="batch_download_nothing_to_download_format" formatted="true">Tous les %s déjà téléchargés</string>
     <string name="setup_extensions_subtext">Télécharger la liste de sites que vous voulez utiliser</string>
-    <string name="plugins_downloaded" formatted="true">Téléchargé : %d</string>
+    <string name="plugins_downloaded" formatted="true">Téléchargé : %d</string>
     <string name="video_tracks">Pistes vidéo</string>
     <string name="apply_on_restart">Redémarrez l\'application pour voir les changements.</string>
     <string name="safe_mode_description">Toutes les extensions ont été désactivé à cause d\'un crash pour vous aider à trouver l\'extension causant le problème.</string>
     <string name="safe_mode_title">Mode sans échec activé</string>
     <string name="extension_size">Taille</string>
     <string name="extension_version">Version</string>
-    <string name="extension_rating" formatted="true">Note : %s</string>
+    <string name="extension_rating" formatted="true">Note : %s</string>
     <string name="extension_description">Description</string>
     <string name="extension_status">Status</string>
     <string name="extension_install_first">Installer l\'extension d\'abord</string>
@@ -432,17 +423,16 @@
     <string name="skip_type_mixed_op">Introduction mitigée</string>
     <string name="update_notification_installing">Installation de la mise a jour de l\'application…</string>
     <string name="update_notification_failed">Impossible d\'installer la nouvelle version de l\'application</string>
-    <string name="apk_installer_settings_des">Certains téléphones ne supporte pas le nouvel installateur d\'application. Essayez l\'option de l\'ancien installateur si les mises-à-jour ne s\'installe pas.</string>
+    <string name="apk_installer_settings_des">Certains appareils ne supportent pas le nouvel installateur d\'application. Essayez l\'option de l\'ancien installateur si les mises-à-jour ne s\'installe pas.</string>
     <string name="previous">Précédent</string>
     <string name="skip_setup">Ignorer la configuration</string>
-    <string name="crash_reporting_title">Rapport de crash</string>
     <string name="repository_name_hint">Nom de dépôt (optionnel)</string>
     <string name="plugin_singular">plugin</string>
     <string name="delete_repository">Supprimer le repository</string>
-    <string name="plugins_disabled" formatted="true">Désactivé : %d</string>
-    <string name="plugins_not_downloaded" formatted="true">Non téléchargé : %d</string>
+    <string name="plugins_disabled" formatted="true">Désactivé : %d</string>
+    <string name="plugins_not_downloaded" formatted="true">Non téléchargé : %d</string>
     <string name="plugins_updated" formatted="true">%d plugins mis-à-jour</string>
-    <string name="download_all_plugins_from_repo">Avertissement : CloudStream 3 décline toute responsabilité concernant l’utilisation d’extensions tierces et ne fournit aucun support pour celles-ci !</string>
+    <string name="download_all_plugins_from_repo">Avertissement : CloudStream 3 décline toute responsabilité concernant l’utilisation d’extensions tierces et ne fournit aucun support pour celles-ci !</string>
     <string name="single_plugin_disabled" formatted="true">%s (Désactivé)</string>
     <string name="tracks">Pistes</string>
     <string name="audio_tracks">Pistes audio</string>
@@ -455,9 +445,7 @@
     <string name="apk_installer_package_installer">Installateur de paquet</string>
     <string name="plugin">plugins</string>
     <string name="delete_repository_plugins">Cela supprimera également tous les plugins du repository</string>
-    <string name="blank_repo_message">CloudStream n\'a aucun site installé par défaut. Vous devez installer les sites à partir de dépôts.
-\n
-\nRejoignez notre Discord ou cherchez en ligne.</string>
+    <string name="blank_repo_message">CloudStream n\'a aucun site installé par défaut. Vous devez installer les sites à partir de dépôts. \n \nRejoignez notre Discord ou cherchez en ligne.</string>
     <string name="extension_language">Langage</string>
     <string name="enable_skip_op_from_database_des">Afficher les popups skip pour les intro / fins</string>
     <string name="apk_installer_legacy">Ancienne méthode d\'installation</string>
@@ -486,8 +474,7 @@
     <string name="sort_rating_asc">Note (basse à haute)</string>
     <string name="sort_rating_desc">Note (haut à bas)</string>
     <string name="sort_alphabetical_a">Alphabétique (A à Z)</string>
-    <string name="empty_library_no_accounts_message">Votre bibliothèque est vide :(
-\nConnectez-vous à un compte de bibliothèque ou ajoutez des séries à votre bibliothèque locale.</string>
+    <string name="empty_library_no_accounts_message">Votre bibliothèque est vide :( \nConnectez-vous à un compte de bibliothèque ou ajoutez des séries à votre bibliothèque locale.</string>
     <string name="empty_library_logged_in_message">Cette liste est vide. Essayez d\'en changer.</string>
     <string name="pref_category_android_tv">Android TV</string>
     <string name="sort_by">Trier par</string>
@@ -496,8 +483,7 @@
     <string name="open_with">Ouvrir avec</string>
     <string name="sort_updated_new">Mis à jour (Nouveau vers ancien)</string>
     <string name="sort_updated_old">Mis à jour (ancien vers nouveau)</string>
-    <string name="safe_mode_file">Fichier du mode sans échec trouvé !
-\nAucune extension ne sera chargée au démarrage avant que le fichier ne soit enlevé.</string>
+    <string name="safe_mode_file">Fichier du mode sans échec trouvé ! \nAucune extension ne sera chargée au démarrage avant que le fichier ne soit enlevé.</string>
     <string name="stop">Arrêter</string>
     <string name="revert">Annuler</string>
     <string name="test_log">Enregistrer</string>
@@ -522,13 +508,7 @@
     <string name="jsdelivr_enabled">Impossible d\'atteindre GitHub. Activation du proxy jsDelivr…</string>
     <string name="already_voted">Vous avez déjà voté</string>
     <string name="disable">Désactivé</string>
-    <string name="quality_profile_help">Ici, vous pouvez modifier la façon dont les sources sont ordonnées. Si une vidéo a une priorité plus élevée, elle apparaîtra plus haut dans la sélection de la source. La somme de la priorité source et de la priorité qualité est la priorité vidéo.
-\n
-\nSource A : 3
-\nQualité B : 7
-\nLa priorité vidéo combinée sera de 10.
-\n
-\nREMARQUE : Si la somme est de 10 ou plus, le joueur sautera automatiquement le chargement lorsque ce lien est chargé !</string>
+    <string name="quality_profile_help">Ici, vous pouvez modifier la façon dont les sources sont ordonnées. Si une vidéo a une priorité plus élevée, elle apparaîtra plus haut dans la sélection de la source. La somme de la priorité source et de la priorité qualité est la priorité vidéo. \n \nSource A : 3 \nQualité B : 7 \nLa priorité vidéo combinée sera de 10. \n \nREMARQUE : Si la somme est de 10 ou plus, le joueur sautera automatiquement le chargement lorsque ce lien est chargé !</string>
     <string name="no_plugins_found_error">Aucun plugin trouvé dans ce dossier</string>
     <string name="no_repository_found_error">Dépôt introuvable, vérifiez l\'URL et essayez avec un VPN</string>
     <string name="mobile_data">Données mobiles</string>
@@ -561,20 +541,14 @@
     <string name="pin">PIN</string>
     <string name="favorites_list_name">Favoris</string>
     <string name="logged_account" formatted="true">Connecté en tant que %s</string>
-    <string name="duplicate_message_multiple" formatted="true">Des doublons potentiels ont été trouvés dans votre bibliothèque :
-\n
-\n%s
-\n
-\nSouhaitez-vous ajouter cet élément, remplacer les éléments existants ou annuler l\'action ?</string>
+    <string name="duplicate_message_multiple" formatted="true">Des doublons potentiels ont été trouvés dans votre bibliothèque : \n \n%s \n \nSouhaitez-vous ajouter cet élément, remplacer les éléments existants ou annuler l\'action ?</string>
     <string name="enter_pin_with_name" formatted="true">Saisir le code PIN pour %s</string>
     <string name="duplicate_title">Doublon potentiel trouvé</string>
     <string name="lock_profile">Verrouiller le profil</string>
     <string name="skip_startup_account_select_pref">Ignorer la sélection de compte au démarrage</string>
     <string name="action_unsubscribe">Se désabonner</string>
     <string name="action_subscribe">S\'abonner</string>
-    <string name="duplicate_message_single" formatted="true">Il semble qu\'un élément potentiellement dupliqué existe déjà dans votre bibliothèque : \'%s.
-\n
-\nSouhaitez-vous ajouter cet élément, remplacer l\'élément existant ou annuler l\'action ?</string>
+    <string name="duplicate_message_single" formatted="true">Il semble qu\'un élément potentiellement dupliqué existe déjà dans votre bibliothèque : \'%s. \n \nSouhaitez-vous ajouter cet élément, remplacer l\'élément existant ou annuler l\'action ?</string>
     <string name="enter_current_pin">Saisir le code PIN actuel</string>
     <string name="rotate_video">Pivoter</string>
     <string name="links_reloaded_toast">Les liens ont été rechargés</string>
@@ -587,16 +561,15 @@
     <string name="test_extensions">Testez toutes les extensions</string>
     <string name="recommendations_tooltip">Afficher les recommandations</string>
     <string name="test_extensions_summary">Ce test est destiné uniquement aux développeurs et ne vérifie ni n\'empêche le fonctionnement d\'aucune extension.</string>
-    <string name="toast_copied">Copié !</string>
+    <string name="toast_copied">Copié !</string>
     <string name="repo_copy_label">Nom du dépôt et adresse internet</string>
     <string name="favorite">Favori</string>
     <string name="biometric_warning">Vos données CloudStream viennent d\'être sauvegardées. Bien que cette éventualité soit très faible, tous les appareils peuvent se comporter différemment. Dans le rare cas où l\'accès à l\'application est bloqué, effacez complètement les données de l\'application et restaurez à partir d\'une sauvegarde. Nous sommes sincèrement désolés pour les désagréments occasionnés par cette situation.</string>
     <string name="battery_dialog_title">Désactiver l\'optimisation de la batterie</string>
     <string name="app_info_intent_error">Impossible d\'ouvrir les informations de l\'application CloudStream.</string>
     <string name="biometric_authentication_title">Déverrouiller CloudStream</string>
-    <string name="music_singlar">Musique</string>
-    <string name="resume_remaining" formatted="true">%s
-\nrestants</string>
+    <string name="music_singular">Musique</string>
+    <string name="resume_remaining" formatted="true">%s \nrestants</string>
     <string name="clipboard_permission_error">Erreur d\'accès au presse-papiers, veuillez réessayer.</string>
     <string name="ok">OK</string>
     <string name="biometric_unsupported">L\'authentification biométrique n\'est pas prise en charge sur cet appareil</string>
@@ -608,13 +581,12 @@
     <string name="battery_dialog_message">Pour garantir des téléchargements ininterrompus et des notifications pour les émissions de télévision auxquelles vous êtes abonné, CloudStream a besoin d\'une autorisation pour fonctionner en arrière-plan. En appuyant sur OK, une boite de dialogue sera affiché. Appuyé sur \'autoriser\'.\n\nVeuillez noter que cette autorisation ne signifie pas que CS3 épuisera votre batterie. Il ne fonctionnera en arrière-plan que lorsque cela sera nécessaire, par exemple lors de la réception de notifications ou du téléchargement de vidéos à partir d\'extensions officielles.</string>
     <string name="app_unrestricted_toast">L\'utilisation de la batterie de l\'application est déjà réglée sur illimitée</string>
     <string name="unfavorite">Supprimer des favoris</string>
-    <string name="custom_media_singluar">Média</string>
+    <string name="custom_media_singular">Média</string>
     <string name="reset_btn">Réinitialiser</string>
     <string name="episode_upcoming_format" formatted="true">À venir dans %s</string>
     <string name="biometric_setting">Verrouillage biométrique</string>
     <string name="player_settings_select_cast_device">Sélectionnez un appareil de diffusion</string>
     <string name="next_season_episode_format" formatted="true">Saison %1$d Episode %2$d sera publié dans</string>
-    <string name="hide_player_control_names_key" translatable="false">hide_player_control_names_key</string>
     <string name="play_from_beginning_img_des">Regarder depuis le début</string>
     <string name="open_local_video">Ouvrir une vidéo locale</string>
     <string name="test_warning">Attention</string>
@@ -628,10 +600,10 @@
     <string name="open_downloaded_repo">Ouvrir le dépôt</string>
     <string name="device_pin_counter_text">Code expire dans %1$dm %2$ds</string>
     <string name="cs3wiki">Wiki de CloudStream</string>
-    <string name="device_pin_expired_message">Le code PIN est maintenant expiré !</string>
+    <string name="device_pin_expired_message">Le code PIN est maintenant expiré !</string>
     <string name="qr_image">Image du code QR</string>
     <string name="delete_plugin">Supprimer l\'extension</string>
-    <string name="delete_message_multiple" formatted="true">Êtes-vous sûr de vouloir supprimer définitivement les éléments suivants ? \n \n%s</string>
+    <string name="delete_message_multiple" formatted="true">Êtes-vous sûr de vouloir supprimer définitivement les éléments suivants ? \n \n%s</string>
     <string name="auth_locally">Authentification locale</string>
     <string name="sort_release_date_old">Date de sortie (du plus ancien au plus récent)</string>
     <string name="sort_release_date_new">Date de sortie (du plus récent au plus ancien)</string>
@@ -647,9 +619,9 @@
     <string name="pref_category_accounts">Comptes</string>
     <string name="torrent_info">Cette vidéo est un torrent, ce qui signifie que votre activité vidéo peut être suivie.\nAssurez-vous de comprendre le fonctionnement des torrents avant de continuer.</string>
     <string name="dismiss">Ignorer</string>
-    <string name="delete_message_series_section" formatted="true">Vous allez également supprimer définitivement tous les épisodes des séries suivantes :\n\n%s</string>
-    <string name="delete_message_series_only" formatted="true">Êtes-vous sûr de vouloir supprimer définitivement tous les épisodes des séries suivantes ?\n\n%s</string>
-    <string name="delete_message_series_episodes" formatted="true">Êtes-vous sûr de vouloir supprimer définitivement les épisodes suivants dans %1$s ?\n\n%2$s</string>
+    <string name="delete_message_series_section" formatted="true">Vous allez également supprimer définitivement tous les épisodes des séries suivantes :\n\n%s</string>
+    <string name="delete_message_series_only" formatted="true">Êtes-vous sûr de vouloir supprimer définitivement tous les épisodes des séries suivantes ?\n\n%s</string>
+    <string name="delete_message_series_episodes" formatted="true">Êtes-vous sûr de vouloir supprimer définitivement les épisodes suivants dans %1$s ?\n\n%2$s</string>
     <string name="episode_action_cast_mirror">Recopier l’écran</string>
     <string name="no_subtitles_loaded">Aucun sous-titre n’a encore été chargé</string>
     <string name="backup_path_title">Emplacement du dossier de sauvegarde</string>
@@ -658,18 +630,18 @@
     <string name="confirm_before_exiting_title">Confirmer avant de quitter</string>
     <string name="unsupported_error">Erreur non supportée</string>
     <string name="encoding_error">Erreur d\'encodage</string>
-    <string name="software_decoding_desc">Le décodage logiciel permet au lecteur de lire des fichiers vidéo non pris en charge par votre téléphone, mais peut entraîner une lecture lente ou instable en haute résolution</string>
+    <string name="software_decoding_desc">Le décodage logiciel permet au lecteur de lire des fichiers vidéo non pris en charge par votre appareil, mais peut entraîner une lecture lente ou instable en haute résolution.</string>
     <string name="software_decoding">Décodage logiciel</string>
     <string name="torrent_preferred_media">Activer les torrents dans Paramètres/Sources/Média préféré</string>
     <string name="torrent_not_accepted">Redémarrez l\'application et acceptez la fenêtre contextuelle Stream Torrent pour continuer.</string>
     <string name="player_load_one_subtitle_online">Charger le premier disponible</string>
-    <string name="audio_singluar">Audio</string>
-    <string name="podcast_singluar">Podcast</string>
+    <string name="audio_singular">Audio</string>
+    <string name="podcast_singular">Podcast</string>
     <string name="sort_button_episode">Ép %s</string>
     <string name="sort_button_rating">Note %s</string>
     <string name="sort_button_date">Date %s</string>
     <string name="update_plugins">Mettre à jour les plugins</string>
-    <string name="plugins_updated_manually">%d plugin(s) mis à jour avec succès !</string>
+    <string name="plugins_updated_manually">%d plugin(s) mis à jour avec succès !</string>
     <string name="no_plugins_updated_manually">Aucun plugin n\'a été mis à jour.</string>
     <string name="sort_episodes_rating_high_low">Note (Plus Haute)</string>
     <string name="update_plugins_manually">Mettre à jour les plugins manuellement</string>
@@ -680,7 +652,7 @@
     <string name="player_notification_channel_description">La notification du lecteur pour contrôler la lecture en arrière-plan</string>
     <string name="sort_episodes_date_newest">Date (Plus Récent)</string>
     <string name="sort_episodes_rating_low_high">Note (Plus Basse)</string>
-    <string name="starting_plugin_update_manually">Démarrage du processus de mise à jour du plugin !</string>
+    <string name="starting_plugin_update_manually">Démarrage du processus de mise à jour du plugin !</string>
     <string name="subtitles_from_embedded">Intégré</string>
     <string name="subtitles_from_online">En ligne</string>
     <string name="speech_recognition_unavailable">La reconnaissance vocale n\'est pas disponible</string>
@@ -688,6 +660,82 @@
     <string name="volume_exceeded_100">Le volume a dépassé 100 %</string>
     <string name="slide_up_again_to_exceed_100">Glisser à nouveau vers le haut pour dépasser 100 %</string>
     <string name="all_subtitles_bold">Mettre tous les sous-titres en gras</string>
-    <string name="background_radius">Rayon de l\'arrière-plan</string>
+    <string name="background_radius">Rayon d\'arrière-plan</string>
     <string name="all_subtitles_italic">Mettre tous les sous-titres en italique</string>
-</resources>
\ No newline at end of file
+    <string name="download_time_left_hour_min_sec_format" formatted="true">%1$dh %2$dm %3$ds</string>
+    <string name="download_time_left_min_sec_format" formatted="true">%1$dm %2$ds</string>
+    <string name="download_time_left_sec_format" formatted="true">%1$ds</string>
+    <string name="show_rating">Étiquette de notation</string>
+    <string name="player_settings_always_ask">Demandez toujours</string>
+    <string name="download_parallel_settings_des">Combien d\'objets différents peuvent être téléchargés en parallèle</string>
+    <string name="parallel_downloads">Téléchargements parallèles</string>
+    <string name="concurrent_connections">Connections simultanées</string>
+    <string name="concurrent_connections_settings_des">Combien de connexions simultanées chaque téléchargement peut utiliser pendant le téléchargement</string>
+    <string name="go_to_downloads">Aller aux téléchargements</string>
+    <string name="no_internet_connection">Pas de connexion Internet.\n\nConnectez-vous à Internet et essayez à nouveau, ou regardez vos téléchargements pendant que vous êtes hors ligne.</string>
+    <string name="overscan_settings_des">Change les limites de l\'écran</string>
+    <string name="overscan_settings">Surbalayage</string>
+    <string name="poster_size_settings_des">Change la taille des affiches</string>
+    <string name="poster_size_settings">Taille des affiches</string>
+    <string name="speedup_title">Basculement de vitesse par appui long</string>
+    <string name="speedup_summary">Maintenir pour vitesse 2x</string>
+    <string name="no_account">Pas de compte</string>
+    <string name="edit_profile_image_title">Modifier le profil Image</string>
+    <string name="edit_profile_image_hint">Saisir l\'URL de la photo de profil</string>
+    <string name="edit_profile_image_error_empty">Aucune URL trouvée</string>
+    <string name="edit_profile_image_error_invalid">Image ou URL Invalide</string>
+    <string name="edit_profile_image_success">Image mise à jour avec succès</string>
+    <string name="action_mark_watched_up_to_this_episode">Marquer comme vu jusqu’à cet épisode</string>
+    <string name="action_remove_mark_watched_up_to_this_episode">Supprimer l\'historique de visionnage jusqu\'à cet épisode</string>
+    <string name="action_reload">Rechargé</string>
+    <string name="reload_provider">Recharger le fournisseur</string>
+    <string name="resolution_and_name">Solution et nom</string>
+    <string name="name">Nom</string>
+    <string name="episode_action_play_mirror">Lancer le miroir</string>"
+    <string name="subs_subtitle_alignment">Alignement des Sous-titres</string>
+    <string name="bottom_left">En bas à gauche</string>
+    <string name="bottom_center">En bas au centre</string>
+    <string name="bottom_right">En bas à droite</string>
+    <string name="middle_left">Au milieu à gauche</string>
+    <string name="middle_center">Au milieu au centre</string>
+    <string name="middle_right">Au milieu à droite</string>
+    <string name="top_left">En haut à gauche</string>
+    <string name="top_center">En haut au centre</string>
+    <string name="top_right">En haut à droite</string>
+    <string name="play_full_series_button">Jouer la série complète</string>
+    <string name="install_prerelease">Installer la version préliminaire</string>
+    <string name="prerelease_already_installed">La version préliminaire est déjà installée.</string>
+    <string name="prerelease_install_failed">L\'installation de la version préliminaire a échouée.</string>
+    <string name="show_episode_text">Texte de l\'épisode</string>
+    <string name="search_suggestions">Suggestions de recherche</string>
+    <string name="search_suggestions_des">Afficher des suggestions de recherche pendant la saisie</string>
+    <string name="clear_suggestions">Effacer les suggestions</string>
+    <string name="extra_brightness_settings">Luminosité supplémentaire</string>
+    <string name="extra_brightness_settings_des">Activer le filtre de luminosité lorsque la luminosité dépasse 100 %</string>
+    <string name="extra_brightness_key">extra_brightness_enabled</string>
+    <string name="show_cast_in_details">Afficher le panneau de cast</string>
+    <string name="video_info">Information du média</string>
+    <string name="source_name">Nom de la source</string>
+    <string name="download_queue">File d\'attente de téléchargements</string>
+    <string name="queue_empty_message">Il n\'y a actuellement aucun téléchargement en attente.</string>
+    <string name="source_priority">Priorité de la source</string>
+    <string name="source_priority_help">Déterminez comment les sources vidéo seront triées dans le lecteur</string>
+    <string name="download_all">Télécharger tout</string>
+    <string name="cancel_all">Tout annuler</string>
+    <string name="download_episode_range">Voulez-vous télécharger l\'épisode %s ?</string>
+    <string name="cancel_queue_message">Vous voulez annuler tous les téléchargements en file d\'attente ?</string>
+    <plurals name="downloads_active">
+        <item quantity="one">%d téléchargement actif</item>
+        <item quantity="many">%d téléchargements actifs</item>
+        <item quantity="other">%d téléchargements actifs</item>
+    </plurals>
+    <plurals name="downloads_queued">
+        <item quantity="one">%d téléchargement en attente</item>
+        <item quantity="many">%d téléchargements en attente</item>
+        <item quantity="other">%d téléchargements en attente</item>
+    </plurals>
+    <string name="show_player_metadata_overlay">Afficher les métadata de l\'overlay du lecteur vidéo</string>
+    <string name="video_singular">Vidéo</string>
+    <string name="skip_type_preview">Prévisualisation</string>
+    <string name="player_is_live">Direct</string>
+</resources>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-b+gl/strings.xml
similarity index 95%
rename from app/src/main/res/values-gl/strings.xml
rename to app/src/main/res/values-b+gl/strings.xml
index d5a88bcec91..e3775b0912b 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-b+gl/strings.xml
@@ -13,8 +13,7 @@
     <string name="episode_poster_img_des">Póster do Episodio</string>
     <string name="go_back_img_des">Regresar</string>
     <string name="home_change_provider_img_des">Cambiar provedor</string>
-    <string name="new_update_format" formatted="true">Nova actualización atopada!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">Nova actualización atopada! \n%1$s -&gt; %2$s</string>
     <string name="filler" formatted="true">Recheo</string>
     <string name="duration_format" formatted="true">%d min</string>
     <string name="title_settings">Configuración</string>
@@ -76,7 +75,6 @@
     <string name="popup_play_file">Reproducir Arquivo</string>
     <string name="popup_resume_download">Continuar Descarga</string>
     <string name="popup_pause_download">Pausar Descarga</string>
-    <string name="pref_disable_acra">Desactivar reporte automático de bugs</string>
     <string name="home_more_info">Máis información</string>
     <string name="home_expanded_hide">Agochar</string>
     <string name="home_play">Reproducir</string>
@@ -153,8 +151,6 @@
     <string name="player_subtitles_settings">Subtítulos</string>
     <string name="episode_sync_settings_des">Sincronizar automáticamente o progreso do episodio actual</string>
     <string name="use_system_brightness_settings_des">Use o brillo do sistema no reprodutor da aplicación en lugar dunha superposición oscura</string>
-    <string name="bug_report_settings_off">Só envía datos se a aplicacción falla inesperadamente</string>
-    <string name="bug_report_settings_on">Non enviar datos</string>
     <string name="show_fillers_settings">Mostrar episodio de recheo para Anime</string>
     <string name="show_trailers_settings">Mostrar Trailers</string>
     <string name="kitsu_settings">Mostrar pósters de Kitsu</string>
@@ -164,7 +160,6 @@
     <string name="automatic_plugin_download_mode_title">Selecciona o modo para filtrar a descarga dos complementos</string>
     <string name="automatic_plugin_download_summary">Instala automáticamente todos os complementos aínda non instalados dos repositorios engadidos.</string>
     <string name="updates_settings">Mostrar actualizacións da aplicación</string>
-    <string name="hide_player_control_names_key" translatable="false">hide_player_control_names_key</string>
     <string name="subs_default_reset_toast">Reiniciar aos valores predefinidos</string>
     <string name="go_back_30">-30</string>
     <string name="audio_book_singular">Audiolibro</string>
@@ -174,7 +169,6 @@
     <string name="anim">Aplicativo de Anime dos mesmos desenvolvedores</string>
     <string name="discord">Únete o Discord</string>
     <string name="speed_setting_summary">Engade unha opción de velocidade no reproductor</string>
-    <string name="uprereleases_settings">Actualizar as versións preliminares</string>
     <string name="lightnovel">Aplicativo de novela lixeira dos mesmos desenvolvedores</string>
     <string name="no_episodes_found">Non se atoparon capítulos</string>
     <string name="delete">Borrar</string>
@@ -191,7 +185,7 @@
     <string name="delete_message_multiple" formatted="true">Está seguro de querer borrar permanentemente os seguintes elementos?\n\n%s</string>
     <string name="delete_message" formatted="true">Esto borrarase %s permanentemente\nEstás seguro?</string>
     <string name="cartoons_singular">Debuxo animado</string>
-    <string name="custom_media_singluar">Media</string>
+    <string name="custom_media_singular">Media</string>
     <string name="season_format">%1$s %2$d%3$s</string>
     <string name="cartoons">Debuxos animados</string>
     <string name="render_error">Erro do renderizador</string>
@@ -209,7 +203,7 @@
     <string name="video_source">Fonte</string>
     <string name="unexpected_error">Erro inesperado do reproductor</string>
     <string name="episode">Capítulo</string>
-    <string name="music_singlar">Música</string>
+    <string name="music_singular">Música</string>
     <string name="episode_short">C</string>
     <string name="resume_time_left" formatted="true">%dm\nrestantes</string>
     <string name="status_ongoing">En curso</string>
@@ -271,19 +265,13 @@
     <string name="resume_remaining" formatted="true">%s\nrestante</string>
     <string name="nsfw_singular">NSFW</string>
     <string name="episode_action_play_in_format">Reproducir en %s</string>
-    <string name="uprereleases_settings_des">Buscar actualizacións preliminares no lugar de só versións completas</string>
     <string name="github">Github</string>
     <string name="benene">Dalle unha banana ós desenvolvedores</string>
     <string name="no_chromecast_support_toast">Este provedor non ten soporte para Chromecast</string>
     <string name="no_links_found_toast">Ligazóns non atopadas</string>
     <string name="copy_link_toast">Ligazón copiada ó portapapeis</string>
     <string name="play_episode_toast">Reproducir capítulo</string>
-    <string name="acra_report_toast">O sentimos, o aplicativo bloqueouse. Enviarase un informe de error anónimo aos desenvolvedores</string>
     <string name="season">Temporada</string>
-    <plurals name="episodes" translatable="false">
-        <item quantity="one">Capítulos</item>
-        <item quantity="other"/>
-    </plurals>
     <string name="episodes_range">%1$d-%2$d</string>
     <string name="episode_format" formatted="true">%1$d %2$s</string>
     <string name="season_short">T</string>
@@ -299,4 +287,4 @@
     <string name="video_aspect_ratio_resize">Redimensionar</string>
     <string name="video_skip_op">Omitir introducción</string>
     <string name="dont_show_again">Non volver a amosar</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-b+hi/strings.xml
similarity index 68%
rename from app/src/main/res/values-hi/strings.xml
rename to app/src/main/res/values-b+hi/strings.xml
index c1f495a810e..4e013ab3675 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-b+hi/strings.xml
@@ -2,8 +2,7 @@
 <resources>
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">स्पीड (%.2fx)</string>
-    <string name="new_update_format" formatted="true">नया अपडेट आया है!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">नया अपडेट आया है! \n%1$s -&gt; %2$s</string>
     <string name="title_home">होम</string>
     <string name="title_search">खोजें</string>
     <string name="title_downloads">डाउनलोडस</string>
@@ -21,7 +20,7 @@
     <string name="type_plan_to_watch">देखने की योजना</string>
     <string name="play_movie_button">मूवी चलाएं</string>
     <string name="play_torrent_button">टोरेंट चलाएं</string>
-    <string name="pick_source">सोर्स</string>
+    <string name="pick_source">स्त्रोत</string>
     <string name="reload_error">पुनः प्रयास करें…</string>
     <string name="go_back">वापिस जाए</string>
     <string name="play_episode">एपिसोड चलाएं</string>
@@ -40,7 +39,6 @@
     <string name="popup_play_file">फ़ाइल चलाएं</string>
     <string name="popup_resume_download">डाउनलोड फिर शुरू करें</string>
     <string name="popup_pause_download">डाउनलोड रोकें</string>
-    <string name="pref_disable_acra">स्वचालित बग रिपोर्टिंग अक्षम करें</string>
     <string name="home_more_info">और जानकारी</string>
     <string name="home_expanded_hide">छिपाएं</string>
     <string name="home_play">चलाएं</string>
@@ -72,10 +70,7 @@
     <string name="search">खोजें</string>
     <string name="settings_info">जानकारी</string>
     <string name="advanced_search_des">खोज नतीजों को प्रोवाइडरों के हिसाब से अलग-अलग आपको दिखाता है</string>
-    <string name="bug_report_settings_off">केवल क्रैश पर जानकारी भेजी जाएगी</string>
-    <string name="bug_report_settings_on">आपकी जानकारी नहीं भेजी जाएगी</string>
     <string name="updates_settings_des">हर बार एप खुलने पर स्वचालित रूप से नए अपडेट खोजें।</string>
-    <string name="uprereleases_settings_des">केवल पूर्ण रिलीज़ के बजाय प्रीरिलीज़ अपडेट खोजें</string>
     <string name="lightnovel">उन्हीं डेवलपर्स द्वारा Light novel ऐप</string>
     <string name="anim">उन्हीं डेवलपर्स द्वारा Anime ऐप</string>
     <string name="discord">Discord से जुड़िये</string>
@@ -86,14 +81,12 @@
     <string name="no_links_found_toast">कोई लिंक नहीं मिले</string>
     <string name="copy_link_toast">लिंक क्लिपबोर्ड पर कॉपी किया गया</string>
     <string name="play_episode_toast">एपिसोड चलायें</string>
-    <string name="acra_report_toast">क्षमा करें, एप्प क्रैश हो गया है । निर्माताओं को एक अनाम बग रिपोर्ट भेजी जाएगी</string>
     <string name="delete_file">फ़ाइल डिलीट करें</string>
     <string name="delete">डिलीट</string>
     <string name="cancel">रद्द करें</string>
     <string name="pause">रोकें</string>
     <string name="resume">फिर से चलाएं</string>
-    <string name="delete_message">इससे %s स्थायी रूप से हट जाएगा
-\nक्या आपका निर्णय निश्चित है ?</string>
+    <string name="delete_message">इससे %s स्थायी रूप से हट जाएगा \nक्या आपका निर्णय निश्चित है ?</string>
     <string name="status_ongoing">अभी चालू है</string>
     <string name="status_completed">मुकम्मल हुया</string>
     <string name="status">स्थिति</string>
@@ -128,14 +121,14 @@
     <string name="watch_quality_pref">देखने की तरजीही क्वालिटी (वाईफ़ाई)</string>
     <string name="dns_pref_summary">ISP ब्लॉक से छुटकारा पाएं</string>
     <string name="provider_lang_settings">एक्सटेंशन की भाषाएं</string>
-    <string name="app_layout">ऐप का लेआउट</string>
-    <string name="preferred_media_settings">तरजीही मीडिया</string>
+    <string name="app_layout">ऐप का रुप दर्शन</string>
+    <string name="preferred_media_settings">पसंदीदा मीडिया</string>
     <string name="download_path_pref">डाउनलोड पथ</string>
     <string name="display_subbed_dubbed_settings">डब किए /सबब् किए एनीमे दिखाएं</string>
-    <string name="tv_layout">टीवी लेआउट</string>
-    <string name="phone_layout">फ़ोन लेआउट</string>
+    <string name="tv_layout">टीवी रुप दर्शन</string>
+    <string name="phone_layout">फ़ोन रुप दर्शन</string>
     <string name="primary_color_settings">मुख्य रंग</string>
-    <string name="app_theme_settings">ऐप का थीम</string>
+    <string name="app_theme_settings">ऐप थीम</string>
     <string name="action_mark_as_watched">देखा हुआ चिह्नित करें</string>
     <string name="history">इतिहास</string>
     <string name="next_episode_format" formatted="true">भाग %d रिलीज़ किया जाएगा</string>
@@ -158,11 +151,7 @@
     <string name="duration_format" formatted="true">%d मिनट</string>
     <string name="app_name">क्लाउडस्ट्रीम</string>
     <string name="play_with_app_name">क्लाउडस्ट्रीम के साथ चलाएं</string>
-    <string name="duplicate_message_multiple" formatted="true">आपकी लाइब्रेरी में संभावित डुप्लिकेट आइटम पाए गए हैं:
-\n
-\n%s
-\n
-\nक्या आप किसी भी तरह इस आइटम को जोड़ना चाहेंगे, मौजूदा आइटम को बदलना चाहेंगे, या कार्रवाई रद्द करना चाहेंगे?</string>
+    <string name="duplicate_message_multiple" formatted="true">आपकी लाइब्रेरी में संभावित डुप्लिकेट आइटम पाए गए हैं: \n \n%s \n \nक्या आप किसी भी तरह इस आइटम को जोड़ना चाहेंगे, मौजूदा आइटम को बदलना चाहेंगे, या कार्रवाई रद्द करना चाहेंगे?</string>
     <string name="enter_pin_with_name" formatted="true">%s के लिए पिन दर्ज करें</string>
     <string name="duplicate_title">संभावित डुप्लिकेट मिला</string>
     <string name="update_started">अपडेट शुरू हुआ</string>
@@ -182,9 +171,7 @@
     <string name="select_an_account">अकाउंट चुनिये</string>
     <string name="skip_loading">लोडिंग स्किप करे</string>
     <string name="loading">लोडिंग…</string>
-    <string name="duplicate_message_single" formatted="true">ऐसा प्रतीत होता है कि संभावित रूप से डुप्लिकेट आइटम आपकी लाइब्रेरी में पहले से मौजूद है: \'%s.\'
-\n
-\nक्या आप किसी भी तरह इस आइटम को जोड़ना चाहेंगे, मौजूदा आइटम को बदलना चाहेंगे, या कार्रवाई रद्द करना चाहेंगे?</string>
+    <string name="duplicate_message_single" formatted="true">ऐसा प्रतीत होता है कि संभावित रूप से डुप्लिकेट आइटम आपकी लाइब्रेरी में पहले से मौजूद है: \'%s.\' \n \nक्या आप किसी भी तरह इस आइटम को जोड़ना चाहेंगे, मौजूदा आइटम को बदलना चाहेंगे, या कार्रवाई रद्द करना चाहेंगे?</string>
     <string name="enter_pin">पिन दर्ज करें</string>
     <string name="pin">पिन</string>
     <string name="links_reloaded_toast">लिंक पुन्ह खुली</string>
@@ -207,7 +194,6 @@
     <string name="subs_outline_color">रूपरेखा रंग</string>
     <string name="subs_subtitle_elevation">उपशीर्षक ऊंचाई</string>
     <string name="subs_font">मुद्रलिपि</string>
-    <string name="hide_player_control_names_key" translatable="false">hide_player_control_names_key</string>
     <string name="downloads_empty">वर्तमान में कोई डाउनलोड नहीं है।</string>
     <string name="play_from_beginning_img_des">आरम्भ से शुरू करें</string>
     <string name="downloads_delete_select">मिटाने के लिए वस्तु चुनें</string>
@@ -260,7 +246,7 @@
     <string name="episode_sync_settings_des">अपने वर्तमान प्रकरण की प्रगति को स्वचालित रूप से समकालीन बनाएं</string>
     <string name="show_fillers_settings">एनीमे के लिए पूरक प्रकरण दिखाएं</string>
     <string name="backup_success">आंकड़े संगृहीत हो गए</string>
-    <string name="music_singlar">संगीत</string>
+    <string name="music_singular">संगीत</string>
     <string name="torrent_info">यह वीडियो एक टॉरेंट है, इसका मतलब यह है कि आपकी वीडियो गतिविधि पर नजर रखी जा सकती है।\nजारी रखने से पहले सुनिश्चित करें कि आप टोरेंटिंग को समझते है।</string>
     <string name="double_tap_to_pause_settings_des">रोकने के लिए बीच में दो बार टैप करें</string>
     <string name="episode_sync_settings">देखा हुआ प्रोग्रेस अपडेट करें</string>
@@ -305,26 +291,127 @@
     <string name="asian_drama">एशियाई नाटक</string>
     <string name="automatic_plugin_download">स्वचालित रूप से प्लगइन डाउनलोड करें</string>
     <string name="nsfw">NSFW</string>
-    <string name="github">गिटहब</string>
+    <string name="github">गीटहब</string>
     <string name="episode_format" formatted="true">%1$d %2$s</string>
     <string name="season_short">S</string>
     <string name="episode_short">E</string>
     <string name="resume_time_left" formatted="true">%dm\nबाकी</string>
     <string name="documentaries">वृत्तचित्र</string>
-    <string name="unexpected_error">अप्रत्याशित प्लेयर त्रुटि</string>
+    <string name="unexpected_error">कोई नहीं जानता ये प्लेयर एरर क्यों आया</string>
     <string name="episode_action_download_subtitle">उपशीर्षक डाउनलोड करें</string>
     <string name="show_title">शीर्षक</string>
     <string name="library">लाइब्रेरी</string>
-    <string name="custom_media_singluar">मीडिया</string>
+    <string name="custom_media_singular">मीडिया</string>
     <string name="pref_filter_search_quality">खोज परिणामों में चयनित वीडियो गुणवत्ता छुपाएं</string>
-    <plurals name="episodes" translatable="false">
-        <item quantity="one">प्रकरण</item>
-        <item quantity="other"/>
-    </plurals>
     <string name="episodes_range">%1$d-%2$d</string>
     <string name="action_open_play">@string/home_play</string>
     <string name="double_tap_to_seek_amount_settings">प्लेयर में आगे पीछे जाने का समय (सेकंड्स)</string>
     <string name="automatic_plugin_download_summary">जोड़े गए रिपॉजिटरीज से अभी तक इंस्टॉल नहीं किए गए सभी प्लगइन्स को स्वचालित रूप से इंस्टॉल करें।</string>
     <string name="speech_recognition_unavailable">वाक् पहचान उपलब्ध नहीं है</string>
     <string name="begin_speaking">बोलना शुरू करें…</string>
-</resources>
\ No newline at end of file
+    <string name="download_time_left_hour_min_sec_format" formatted="true">%1$dh %2$dm %3$ds</string>
+    <string name="download_time_left_min_sec_format" formatted="true">%1$d मि %2$d से</string>
+    <string name="download_time_left_sec_format" formatted="true">%1$d सेकंड</string>
+    <string name="automatic_plugin_download_mode_title">प्लगइन डाउनलोड को फ़िल्टर करने के लिए मोड चुने</string>
+    <string name="updates_settings">ऐप अपडेट दिखाएं</string>
+    <string name="redo_setup_process">सेटअप प्रक्रिया दोबारा करें</string>
+    <string name="apk_installer_settings">APK इंस्टॉलर</string>
+    <string name="apk_installer_settings_des">कुछ डिवाइस नए पैकेज इंस्टॉलर को सपोर्ट नहीं करते हैं। यदि अपडेट इंस्टॉल नहीं होते हैं, तो पुराने विकल्प को आज़माएं।</string>
+    <string name="subs_default_reset_toast">डिफ़ॉल्ट मान पर रीसेट करें</string>
+    <string name="audio_singular">ऑडियो</string>
+    <string name="podcast_singular">पॉडकास्ट</string>
+    <string name="render_error">रेंडरर त्रुटि</string>
+    <string name="encoding_error">एन्कोडिंग त्रुटि</string>
+    <string name="unsupported_error">एरर क्योंकि सपोर्टेड नहीं</string>
+    <string name="storage_error">डाउनलोड नहीं कर पाए , प्लीज स्टोरेज परमिशन चेक करे</string>
+    <string name="episode_action_cast_mirror">टीवी में देखे</string>
+    <string name="episode_action_play_mirror">Play mirror</string>"
+    <string name="show_hd">कितना hd है वो वाला लेबल</string>
+    <string name="play_full_series_button">पूरी सीरीज़ शरु करे</string>
+    <string name="install_prerelease">प्री-रिलीज़ संस्करण स्थापित करें</string>
+    <string name="prerelease_already_installed">प्री-रिलीज़ पहले से ही स्थापित है।</string>
+    <string name="prerelease_install_failed">प्री-रिलीज़ इंस्टॉल करने में विफल रहा।</string>
+    <string name="show_dub">डब लेबल</string>
+    <string name="show_sub">सब लेबल</string>
+    <string name="show_rating">रेटिंग लेबल</string>
+    <string name="skip_update">इस अपडेट को छोड़ें</string>
+    <string name="watch_quality_pref_data">पसंदीदा देखने की गुणवत्ता (मोबाइल डेटा)</string>
+    <string name="limit_title">वीडियो प्लेयर शीर्षक अधिकतम वर्ण</string>
+    <string name="limit_title_rez">वीडियो प्लेयर रिज़ॉल्यूशन</string>
+    <string name="video_buffer_size_settings">वीडियो बफर साइज़</string>
+    <string name="video_buffer_length_settings">वीडियो बफर की लंबाई</string>
+    <string name="video_buffer_disk_settings">डिस्क पर वीडियो कैश</string>
+    <string name="video_buffer_clear_settings">वीडियो और इमेज कैश साफ़ करें</string>
+    <string name="android_tv_interface_on_seek_settings">प्लेयर दिखाये - सीक मूल्य</string>
+    <string name="android_tv_interface_on_seek_settings_summary">जब प्लेयर दिखाई दे रहा हो तो इस्तेमाल की जाने वाली सीक राशि</string>
+    <string name="android_tv_interface_off_seek_settings">प्लेयर छुपाए - सीक मूल्य</string>
+    <string name="android_tv_interface_off_seek_settings_summary">जब प्लेयर छिपा होता है तो इस्तेमाल की जाने वाली सीक राशि</string>
+    <string name="video_ram_description">अगर कम मेमोरी वाले डिवाइस, जैसे कि Android TV पर इसे बहुत ज़्यादा सेट किया जाता है, तो इससे क्रैश हो सकता है।</string>
+    <string name="video_disk_description">अगर कम मेमोरी वाले डिवाइस, जैसे कि एन्ड्रोइड टीवी पर इसे बहुत ज़्यादा सेट किया जाता है, तो इससे क्रैश हो सकता है।</string>
+    <string name="dns_pref">एचटीटीपीएस पर डीएनएस</string>
+    <string name="jsdelivr_proxy">गिटहब प्रॉक्सी</string>
+    <string name="jsdelivr_enabled">गिटहब तक नहीं पहुंचा जा सका। जेएस डीलीवर प्रॉक्सी चालू किया जा रहा है…</string>
+    <string name="jsdelivr_proxy_summary">जेएस डीलीवर का इस्तेमाल करके रॉ गिटहब यूआरएल ब्लॉकिंग को बायपास करें। इससे अपडेट में कुछ दिनों की देरी हो सकती है।</string>
+    <string name="add_site_pref">क्लोन साइट</string>
+    <string name="remove_site_pref">साइट हटाएं</string>
+    <string name="add_site_summary">मौजूदा साइट का एक क्लोन, अलग यूआरएल के साथ जोड़ें</string>
+    <string name="nginx_url_pref">एनजीआईएनएक्ष (एंजिन एक्स) सर्वर यूआरएल</string>
+    <string name="resize_fit">स्क्रीन पर फिट करें</string>
+    <string name="resize_fill">खींचा हुआ</string>
+    <string name="resize_zoom">ज़ूम</string>
+    <string name="legal_notice">अस्वीकरण</string>
+    <string name="pref_category_bypass">आईएसपी बाईपास</string>
+    <string name="pref_category_links">लिंक्स</string>
+    <string name="pref_category_app_updates">ऐप अपडेट्स</string>
+    <string name="pref_category_backup">बैकअप</string>
+    <string name="pref_category_extensions">एक्सटेंशन्स</string>
+    <string name="pref_category_actions">कार्यवाही</string>
+    <string name="pref_category_cache">कैश</string>
+    <string name="pref_category_android_tv">एंड्रॉइड टीवी</string>
+    <string name="pref_category_gestures">इशारे</string>
+    <string name="pref_category_security">सुरक्षा</string>
+    <string name="pref_category_accounts">अकाउंट</string>
+    <string name="pref_category_player_features">प्लेयर की विशेषताएं</string>
+    <string name="pref_category_subtitles">उपशीर्षक</string>
+    <string name="pref_category_player_layout">रुप दर्शन</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>
+    <string name="random_button_settings">यादृच्छिक बटन</string>
+    <string name="random_button_settings_desc">मुखपृष्ठ और लाइब्रेरी पर यादृच्छिक बटन दिखाएं</string>
+    <string name="enable_nsfw_on_providers">सपोर्टेड एक्सटेंशन पर एन एस एफ डब्ल्यू (NSFW) चालू करें</string>
+    <string name="subtitles_encoding">उपशीर्षक एन्कोडिंग</string>
+    <string name="category_providers">प्रदाताओं</string>
+    <string name="category_provider_test">प्रदाता परीक्षण</string>
+    <string name="test_extensions">सभी एक्सटेंशन का परीक्षण करें</string>
+    <string name="test_extensions_summary">यह परीक्षण मात्र डेवलपर्स के लिए है और किसी भी एक्सटेंशन के काम करने की पुष्टि या खंडन नहीं करता है।</string>
+    <string name="category_ui">रुप दर्शन</string>
+    <string name="automatic">स्वतह्</string>
+    <string name="emulator_layout">एमुलेटर रुप दर्शन</string>
+    <string name="bottom_title_settings">पोस्टर शीर्षक स्थान</string>
+    <string name="bottom_title_settings_des">शीर्षक को पोस्टर के नीचे रखें</string>
+    <string name="example_password">पासवर्ड१२३</string>
+    <string name="example_username">उपयोगकर्ता नाम</string>
+    <string name="example_email">हैलो@वर्ल्ड.कॉम</string>
+    <string name="example_ip">१२७.०.०.१</string>
+    <string name="example_site_name">नई साइट का नाम</string>
+    <string name="example_site_url">https://example.com</string>
+    <string name="example_lang_name">भाषा कोड (en)</string>
+    <string name="login_format" formatted="true">%1$s %2$s</string>
+    <string name="account">खाता</string>
+    <string name="logout">लॉग आउट</string>
+    <string name="login">लॉग इन</string>
+    <string name="auth_locally">स्थानीय रूप से प्रमाणित करें</string>
+    <string name="switch_account">खाता स्थानांतरित करें</string>
+    <string name="add_account">खाता जोड़ें</string>
+    <string name="create_account">खाता बनाएं</string>
+    <string name="add_sync">ट्रैकिंग जोड़ें</string>
+    <string name="added_sync_format" formatted="true">जोड़ा गया %s</string>
+    <string name="upload_sync">Sync</string>
+    <string name="sync_score">रेटेड</string>
+    <string name="download_queue">कतार डाउनलोड करें</string>
+    <string name="queue_empty_message">फिलहाल कोई डाउनलोड कतार में नहीं है।</string>
+    <string name="extra_brightness_settings">अतिरिक्त चमक</string>
+    <string name="extra_brightness_settings_des">डिस्प्ले की चमक 100% से अधिक होने पर ब्राइटनेस फ़िल्टर चालू करें</string>
+</resources>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-b+hr/strings.xml
similarity index 85%
rename from app/src/main/res/values-hr/strings.xml
rename to app/src/main/res/values-b+hr/strings.xml
index d9afb2b1bde..7927a15c447 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-b+hr/strings.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- FORMAT MIGHT TRANSLATE, WILL CAUSE CRASH IF APPLIED WRONG -->
-    <string name="extra_info_format" formatted="true" translatable="false">%d %s | %s</string>
-    <string name="storage_size_format" formatted="true" translatable="false">%s • %s</string>
-    <string name="download_size_format" formatted="true" translatable="false">%s / %s</string>
-    <string name="episode_name_format" formatted="true" translatable="false">%s %s</string>
-    <string name="ffw_text_format" formatted="true" translatable="false">+%d</string>
-    <string name="rew_text_format" formatted="true" translatable="false">-%d</string>
-    <string name="ffw_text_regular_format" formatted="true" translatable="false">%d</string>
-    <string name="rew_text_regular_format" formatted="true" translatable="false">%d</string>
-    <string name="rating_format" formatted="true" translatable="false">%.1f/10.0</string>
-    <string name="year_format" formatted="true" translatable="false">%d</string>
     <string name="app_dub_sub_episode_text_format" formatted="true">%1$s epizoda %2$d</string>
     <string name="cast_format" formatted="true">Glumačka postava: %s</string>
     <string name="next_episode_format" formatted="true">Epizoda %d će izaći za</string>
@@ -29,8 +19,7 @@
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">Brzina (%.2f×)</string>
     <string name="rated_format" formatted="true">Ocjena: %.1f</string>
-    <string name="new_update_format" formatted="true">Pronađeno je novo ažuriranje!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">Pronađeno je novo ažuriranje! \n%1$s -&gt; %2$s</string>
     <string name="filler" formatted="true">Umetak</string>
     <string name="duration_format" formatted="true">%d min</string>
     <string name="app_name">CloudStream</string>
@@ -81,7 +70,6 @@
     <string name="popup_play_file">Pokreni datoteku</string>
     <string name="popup_resume_download">Nastavi preuzimanje</string>
     <string name="popup_pause_download">Pauziraj preuzimanje</string>
-    <string name="pref_disable_acra">Onemogući automatsko izvješćivanje o greškama</string>
     <string name="home_more_info">Više informacija</string>
     <string name="home_expanded_hide">Sakrij</string>
     <string name="home_play">Pokreni</string>
@@ -145,7 +133,7 @@
     <string name="double_tap_to_seek_amount_settings">Količina pomicanja u playeru (sekunde)</string>
     <string name="double_tap_to_seek_settings_des">Dodirni dvaput desnu ili lijevu stranu za pomicanje prema naprijed ili natrag</string>
     <string name="double_tap_to_pause_settings_des">Dodirni dvaput u sredinu za pauziranje</string>
-    <string name="use_system_brightness_settings">Koristi svijetlinu sustava</string>
+    <string name="use_system_brightness_settings">Koristi svjetlinu sustava</string>
     <string name="use_system_brightness_settings_des">Koristi svjetlinu sustava u playeru aplikacija umjesto tamnog preklopa</string>
     <string name="episode_sync_settings">Ažuriraj napredak gledanja</string>
     <string name="episode_sync_settings_des">Automatski sinkronizira vaš trenutni napredak u filmu ili epizodi</string>
@@ -162,8 +150,6 @@
     <string name="settings_info">Informacije</string>
     <string name="advanced_search">Napredna pretraga</string>
     <string name="advanced_search_des">Daje rezultate pretrage odvojene prema pružatelju usluga</string>
-    <string name="bug_report_settings_off">Šalje samo podatke o padovima aplikacije</string>
-    <string name="bug_report_settings_on">Ne šalje podatke</string>
     <string name="show_fillers_settings">Prikaži dodatnu epizodu za anime</string>
     <string name="show_trailers_settings">Prikaži trailere</string>
     <string name="kitsu_settings">Prikaži postere iz Kitsua</string>
@@ -171,8 +157,6 @@
     <string name="automatic_plugin_updates">Automatsko ažuriranje dodataka</string>
     <string name="updates_settings">Prikaži ažuriranja aplikacije</string>
     <string name="updates_settings_des">Automatski traži nova ažuriranja nakon pokretanja aplikacije.</string>
-    <string name="uprereleases_settings">Ažuriranje na predizdanja</string>
-    <string name="uprereleases_settings_des">Tražite ažuriranja predizdanja umjesto samo potpunih izdanja</string>
     <string name="github">Github</string>
     <string name="lightnovel">Aplikacija za romane od istih programera</string>
     <string name="anim">Anime aplikacija od istih programera</string>
@@ -185,7 +169,6 @@
     <string name="copy_link_toast">Poveznica je kopirana u međuspremnik</string>
     <string name="play_episode_toast">Pokreni epizodu</string>
     <string name="subs_default_reset_toast">Vrati na zadanu vrijednost</string>
-    <string name="acra_report_toast">Nažalost se aplikacija srušila. Anonimno izvješće o grešci će se poslati programerima</string>
     <string name="season">Sezona</string>
     <string name="no_season">Nema sezone</string>
     <string name="episode">Epizoda</string>
@@ -202,10 +185,8 @@
     <string name="resume">Nastavi</string>
     <string name="go_back_30">−30</string>
     <string name="go_forward_30">+30</string>
-    <string name="delete_message" formatted="true">Ovo će trajno izbrisati %s
-\nJeste li sigurni?</string>
-    <string name="resume_time_left" formatted="true">%dmin
-\npreostalo</string>
+    <string name="delete_message" formatted="true">Ovo će trajno izbrisati %s \nJeste li sigurni?</string>
+    <string name="resume_time_left" formatted="true">%dmin \npreostalo</string>
     <string name="status_ongoing">U tijeku</string>
     <string name="status_completed">Završeno</string>
     <string name="status">Status</string>
@@ -250,7 +231,7 @@
     <string name="unexpected_error">Neočekivana pogreška playera</string>
     <string name="storage_error">Pogreška tijekom preuzimanja, provjeri dozvole za pohranu</string>
     <string name="episode_action_chromecast_episode">Chromecast epizoda</string>
-    <string name="episode_action_chromecast_mirror">Chromecast mirror</string>
+    <string name="episode_action_chromecast_mirror">Chromecast duplikat</string>
     <string name="episode_action_play_in_app">Pokreni u aplikaciji</string>
     <string name="episode_action_play_in_format">Pokreni u %s</string>
     <string name="episode_action_auto_download">Automatsko preuzimanje</string>
@@ -273,7 +254,7 @@
     <string name="update">Ažuriraj</string>
     <string name="watch_quality_pref">Preferirana kvaliteta gledanja (WiFi)</string>
     <string name="limit_title">Maksimalni broj znakova u naslovu video playera</string>
-    <string name="limit_title_rez">Rezolucija video playera</string>
+    <string name="limit_title_rez">Prikaži podatke playera</string>
     <string name="video_buffer_size_settings">Veličina međuspremnika videa</string>
     <string name="video_buffer_length_settings">Duljina međuspremnika videa</string>
     <string name="video_buffer_disk_settings">Predmemorija videa na disku</string>
@@ -292,7 +273,6 @@
     <string name="resize_fill">Rastegni</string>
     <string name="resize_zoom">Zoom</string>
     <string name="legal_notice">Pravna obavijest</string>
-    <string name="legal_notice_text" translatable="false">Any legal issues regarding the content on this application should be taken up with the actual file hosts and providers themselves as we are not affiliated with them. In case of copyright infringement, please directly contact the responsible parties or the streaming websites. The app is purely for educational and personal use. CloudStream 3 does not host any content on the app, and has no control over what media is put up or taken down. CloudStream 3 functions like any other search engine, such as Google. CloudStream 3 does not host, upload or manage any videos, films or content. It simply crawls, aggregates and displayes links in a convenient, user-friendly interface. It merely scrapes 3rd-party websites that are publicly accessable via any regular web browser. It is the responsibility of user to avoid any actions that might violate the laws governing his/her locality. Use CloudStream 3 at your own risk.</string>
     <string name="category_general">Općenito</string>
     <string name="random_button_settings">Gumb za slučajni odabir</string>
     <string name="random_button_settings_desc">Prikaži gumb za slučajni odabir na početnoj stranici i biblioteci</string>
@@ -406,7 +386,6 @@
     <string name="previous">Prethodno</string>
     <string name="skip_setup">Preskoči postavljanje</string>
     <string name="app_layout_subtext">Promijeni izgled aplikacije kako bi odgovarao tvom uređaju</string>
-    <string name="crash_reporting_title">Izvještavanje o rušenju</string>
     <string name="preferred_media_subtext">Što želiš vidjeti</string>
     <string name="setup_done">Gotovo</string>
     <string name="extensions">Proširenja</string>
@@ -429,13 +408,11 @@
     <string name="plugins_downloaded" formatted="true">Preuzeto: %d</string>
     <string name="plugins_disabled" formatted="true">Onemogućeno: %d</string>
     <string name="plugins_not_downloaded" formatted="true">Nepreuzeto: %d</string>
-    <string name="blank_repo_message">CloudStream standardno nema instalirane web stranice. Stranice morate instalirati iz repozitorija.
-\n
-\nPridružite se našem Discordu ili tražite online.</string>
+    <string name="blank_repo_message">CloudStream standardno nema instalirane web stranice. Stranice morate instalirati iz repozitorija. \n \nPridružite se našem Discordu ili tražite online.</string>
     <string name="view_public_repositories_button">Prikaži repozitorije zajednice</string>
     <string name="view_public_repositories_button_short">Javni popis</string>
     <string name="uppercase_all_subtitles">Koristi velika slova za sve titlove</string>
-    <string name="download_all_plugins_from_repo">Upozorenje: CloudStream 3 ne preuzima odgovornost za korištenje proširenja trećih strana i ne pruža podršku za njih!</string>
+    <string name="download_all_plugins_from_repo">Upozorenje: CloudStream ne preuzima odgovornost za korištenje proširenja trećih strana i ne pruža podršku za njih!</string>
     <string name="single_plugin_disabled" formatted="true">%s (onemogućeno)</string>
     <string name="tracks">Zapisi</string>
     <string name="audio_tracks">Audio zapis</string>
@@ -454,7 +431,7 @@
     <string name="extension_language">Jezik</string>
     <string name="hls_playlist">HLS playlista</string>
     <string name="automatic_plugin_download">Automatski instaliraj dodatke</string>
-    <string name="skip_type_creddits">Zasluge</string>
+    <string name="skip_type_credits">Zasluge</string>
     <string name="automatic_plugin_download_summary">Automatski instaliraj sve neinstalirane dodatke iz dodanih repozitorija.</string>
     <string name="player_pref">Preferirani video player</string>
     <string name="player_settings_play_in_app">Interni player</string>
@@ -476,7 +453,7 @@
     <string name="pref_category_links">Poveznice</string>
     <string name="play_trailer_button">Pokreni trailer</string>
     <string name="redo_setup_process">Ponovi postupak postavljanja</string>
-    <string name="apk_installer_settings_des">Neki telefoni ne podržavaju novi program za instaliranje paketa. Pokušaj sa starijom opcijom ako se ažuriranja ne instaliraju.</string>
+    <string name="apk_installer_settings_des">Neki uređaji ne podržavaju novi program za instaliranje paketa. Pokušaj sa starijom opcijom ako se ažuriranja ne instaliraju.</string>
     <string name="apk_installer_settings">Instalator APK-a</string>
     <string name="pref_category_app_updates">Ažuriranja aplikacije</string>
     <string name="pref_category_backup">Sigurnosna kopija</string>
@@ -501,7 +478,7 @@
     <string name="apk_installer_package_installer">PackageInstaller</string>
     <string name="season_format">%1$s %2$d%3$s</string>
     <string name="update_started">Aktualiziranje započeto</string>
-    <string name="delayed_update_notice">Aplikacija će se aktualizirati tijekom zatvaranja</string>
+    <string name="delayed_update_notice">Aplikacija će se ažurirati tijekom zatvaranja</string>
     <string name="plugin_downloaded">Dodatak preuzet</string>
     <string name="action_remove_from_watched">Ukloni iz pogledanog</string>
     <string name="browser">Preglednik</string>
@@ -510,17 +487,15 @@
     <string name="sort_by">Sortiraj prema</string>
     <string name="sort">Sortiraj</string>
     <string name="sort_rating_asc">Ocjena (Manja do veće)</string>
-    <string name="sort_updated_new">Ažurirano (Od novog do starog)</string>
-    <string name="sort_updated_old">Ažurirano (Od starog do novog)</string>
+    <string name="sort_updated_new">Ažurirano (od novog prema starom)</string>
+    <string name="sort_updated_old">Ažurirano (od starog prema novom)</string>
     <string name="sort_alphabetical_a">Abecedno (A do Ž)</string>
     <string name="sort_alphabetical_z">Abecedno (Ž do A)</string>
     <string name="select_library">Odaberite biblioteku</string>
     <string name="open_with">Otvori sa</string>
-    <string name="empty_library_no_accounts_message">Vaša je biblioteka prazna :(
-\nPrijavite se na račun biblioteke ili dodajte filmove / serije u svoju lokalnu biblioteku.</string>
+    <string name="empty_library_no_accounts_message">Vaša je biblioteka prazna :( \nPrijavite se na račun biblioteke ili dodajte filmove / serije u svoju lokalnu biblioteku.</string>
     <string name="empty_library_logged_in_message">Ova je lista prazna. Pokušajte se prebaciti na jednu drugu listu.</string>
-    <string name="safe_mode_file">Pronađena je datoteka sigurnog načina rada!
-\nProširenja se ne učitavaju tijekom pokretanja dok se datoteka ne ukloni.</string>
+    <string name="safe_mode_file">Pronađena je datoteka sigurnog načina rada! \nProširenja se ne učitavaju tijekom pokretanja dok se datoteka ne ukloni.</string>
     <string name="android_tv_interface_on_seek_settings">Prikazan player – Količina pomicanja</string>
     <string name="android_tv_interface_on_seek_settings_summary">Količina pomicanja koja se koristi kada je player vidljiv</string>
     <string name="android_tv_interface_off_seek_settings">Player skriven – Količina pomicanja</string>
@@ -559,23 +534,13 @@
     <string name="disable">Onemogući</string>
     <string name="no_plugins_found_error">U repozitoriju nisu pronađeni dodaci</string>
     <string name="no_repository_found_error">Repozitorij nije pronađen. Provjeri URL i pokušaj VPN</string>
-    <string name="quality_profile_help">Ovdje možete promijeniti način na koji su izvori poredani. Ako video ima viši prioritet, pojavit će se više u odabiru izvora. Zbroj prioriteta izvora i prioriteta kvalitete je prioritet videa.
-\n
-\nIzvor A: 3
-\nKvaliteta B: 7
-\nImat će kombinirani prioritet videa od 10.
-\n
-\nNAPOMENA: Ako je zbroj 10 ili više, video player će automatski preskočiti učitavanje kada se ta poveznica učita!</string>
+    <string name="quality_profile_help">Ovdje možete promijeniti način na koji su izvori poredani. Ako video ima viši prioritet, pojavit će se više u odabiru izvora. Zbroj prioriteta izvora i prioriteta kvalitete je prioritet videa. \n \nIzvor A: 3 \nKvaliteta B: 7 \nImat će kombinirani prioritet videa od 10. \n \nNAPOMENA: Ako je zbroj 10 ili više, video player će automatski preskočiti učitavanje kada se ta poveznica učita!</string>
     <string name="already_voted">Već si glasao/la</string>
     <string name="backup_frequency">Učestalost spremanja sigurnosne kopije</string>
     <string name="favorite_removed">%s uklonjeno iz favorita</string>
     <string name="favorites_list_name">Favoriti</string>
     <string name="favorite_added">%s dodano u favorite</string>
-    <string name="duplicate_message_multiple" formatted="true">Potencijalni duplikati pronađeni su u vašoj biblioteci:
-\n
-\n%s
-\n
-\nŽelite li ipak dodati ovu stavku koja zamjenjuje postojeće ili poništiti radnju?</string>
+    <string name="duplicate_message_multiple" formatted="true">Potencijalni duplikati pronađeni su u vašoj biblioteci: \n \n%s \n \nŽelite li ipak dodati ovu stavku koja zamjenjuje postojeće ili poništiti radnju?</string>
     <string name="duplicate_title">Pronađen potencijalni duplikat</string>
     <string name="lock_profile">Zaključaj profil</string>
     <string name="action_add_to_favorites">Dodaj u favorite</string>
@@ -588,9 +553,7 @@
     <string name="action_subscribe">Pretplata</string>
     <string name="action_remove_from_favorites">Ukloni iz favorita</string>
     <string name="select_an_account">Odaberite račun</string>
-    <string name="duplicate_message_single" formatted="true">Čini se da potencijalno duplicirana stavka već postoji u vašoj biblioteci: \'%s.\'
-\n
-\nŽelite li ipak dodati ovu stavku koja zamjenjuje postojeću ili poništiti radnju?</string>
+    <string name="duplicate_message_single" formatted="true">Čini se da potencijalno duplicirana stavka već postoji u vašoj biblioteci: \'%s.\' \n \nŽelite li ipak dodati ovu stavku koja zamjenjuje postojeću ili poništiti radnju?</string>
     <string name="enter_pin">Unesite PIN</string>
     <string name="pin">PIN</string>
     <string name="enter_current_pin">Unesite trenutni PIN</string>
@@ -605,8 +568,6 @@
     <string name="rotate_video_desc">Prikaži gumb za prebacivanje orijentacije zaslona</string>
     <string name="auto_rotate_video_desc">Omogućuje automatsko mijenjanje orijentacije zaslona na temelju orijentacije videa</string>
     <string name="auto_rotate_video">Automatsko rotiranje</string>
-    <string name="rotate_video_key">rotiraj_video_tipka</string>
-    <string name="auto_rotate_video_key">automatski_rotiraj_video_tipka</string>
     <string name="subscribe_tooltip">Obavijest za novu epizodu</string>
     <string name="result_search_tooltip">Traži u drugim proširenjima</string>
     <string name="speed_setting_summary">Dodaje opciju za brzinu u playeru</string>
@@ -616,8 +577,7 @@
     <string name="repo_copy_label">Ime repozitorija i URL</string>
     <string name="toast_copied">kopirano!</string>
     <string name="biometric_setting">Zaključaj s biometrijskim podatcima</string>
-    <string name="resume_remaining" formatted="true">%s
-\npreostalo</string>
+    <string name="resume_remaining" formatted="true">%s \npreostalo</string>
     <string name="clipboard_permission_error">Pogreška pri pristupanju međuspremnika. Pokušaj ponovo.</string>
     <string name="biometric_authentication_title">Otključaj CloudStream</string>
     <string name="password_pin_authentication_title">Lozinka/PIN autentifikacija</string>
@@ -626,25 +586,24 @@
     <string name="ok">U redu</string>
     <string name="battery_dialog_title">Deaktiviraj optimizaciju baterije</string>
     <string name="audio_book_singular">Audio knjiga</string>
-    <string name="custom_media_singluar">Medij</string>
+    <string name="custom_media_singular">Medij</string>
     <string name="app_unrestricted_toast">Korištenje baterije aplikacije već je postavljeno na neograničeno</string>
     <string name="app_info_intent_error">Neuspjelo otvaranje podataka CloudStream aplikacije.</string>
     <string name="favorite">Favorit</string>
     <string name="unfavorite">Ukloni iz favorita</string>
-    <string name="music_singlar">Glazba</string>
+    <string name="music_singular">Glazba</string>
     <string name="reset_btn">Obnovi</string>
     <string name="biometric_setting_summary">Otključaj aplikaciju pomoću otiska prsta, ID-a lica, PIN-a, uzorka i lozinke.</string>
     <string name="episode_upcoming_format" formatted="true">Sljedeća u %s</string>
     <string name="clipboard_unknown_error">Pogreška pri kopiranju. Kopirajte zapisnik i kontaktirajte podršku aplikacije.</string>
-    <string name="battery_dialog_message">Da biste osigurali neprekinuta preuzimanja i obavijesti za pretplaćene TV emisije, CloudStream treba dopuštenje za rad u pozadini. Pritiskom na \"U redu\" prikazat će vam se dijaloški okvir s zahtjevom. Molimo vas da pritisnete \"Dopusti\".  \n\nNapominjemo da ovo dopuštenje ne znači da će CS3 trošiti vašu bateriju. Aplikacija će raditi u pozadini samo kada je to potrebno, primjerice prilikom primanja obavijesti ili preuzimanja videozapisa iz službenih proširenja.</string>
+    <string name="battery_dialog_message">Da biste osigurali neprekinuta preuzimanja i obavijesti za pretplaćene TV emisije, CloudStream treba dopuštenje za rad u pozadini. Pritiskom na \"U redu\" prikazat će vam se dijaloški okvir s zahtjevom. Molimo vas da pritisnete \"Dopusti\". \n\nNapominjemo da ovo dopuštenje ne znači da će CS3 trošiti vašu bateriju. Aplikacija će raditi u pozadini samo kada je to potrebno, primjerice prilikom primanja obavijesti ili preuzimanja videozapisa iz službenih proširenja.</string>
     <string name="biometric_warning">Vaši CloudStream podaci su sada spremljeni u sigurnosnu kopiju. Iako je vjerojatnost mala, neki se uređaji mogu ponašati drugačije. Ako izgubite pristup aplikaciji, potpuno izbrišite podatke aplikacije i obnovite ih pomoću sigurnosne kopije. Ispričavamo se zbog mogućih neugodnosti.</string>
-    <string name="next_season_episode_format" formatted="true">Sezona %1$d epizoda %2$d izlazi</string>
-    <string name="episode_action_cast_mirror">Cast mirror</string>
+    <string name="next_season_episode_format" formatted="true">Sezona %1$d epizoda %2$d izlazi za</string>
+    <string name="episode_action_cast_mirror">Cast duplikat</string>
     <string name="player_settings_select_cast_device">Odaberi uređaj za emitiranje</string>
     <string name="cs3wiki">CloudStream Wiki</string>
     <string name="pref_category_accounts">Računi</string>
     <string name="pref_category_security">Sigurnost</string>
-    <string name="hide_player_control_names_key" translatable="false">hide_player_control_names_key</string>
     <string name="auth_locally">Lokalna autentifikacija</string>
     <string name="open_local_video">Otvori lokalni video</string>
     <string name="device_pin_url_message">Posjeti <b>%s</b> na svom mobitelu ili računalu i unesi gore navedeni kod</string>
@@ -663,22 +622,14 @@
     <string name="delete_plugin">Izbriši dodatak</string>
     <string name="offline_file">Dostupno za gledanje offline</string>
     <string name="select_all">Označi sve</string>
-    <string name="delete_message_multiple" formatted="true">Stvarno želite trajno izbrisati sljedeće stavke?
-\n
-\n%s</string>
-    <string name="delete_message_series_episodes" formatted="true">Stvarno želite trajno izbrisati sljedeće epizode u %1$s?
-\n
-\n%2$s</string>
-    <string name="delete_message_series_section" formatted="true">Trajno ćete izbrisati i sve epizode u sljedećim serijama:
-\n
-\n%s</string>
+    <string name="delete_message_multiple" formatted="true">Stvarno želite trajno izbrisati sljedeće stavke? \n \n%s</string>
+    <string name="delete_message_series_episodes" formatted="true">Stvarno želite trajno izbrisati sljedeće epizode u %1$s? \n \n%2$s</string>
+    <string name="delete_message_series_section" formatted="true">Trajno ćete izbrisati i sve epizode u sljedećim serijama: \n \n%s</string>
     <string name="downloads_delete_select">Odaberi stavke za brisanje</string>
     <string name="deselect_all">Odznači sve</string>
     <string name="delete_format" formatted="true">Izbriši (%1$d | %2$s)</string>
     <string name="delete_files">Izbriši datoteke</string>
-    <string name="delete_message_series_only" formatted="true">Stvarno želite trajno izbrisati sve epizode u sljedećoj seriji?
-\n
-\n%s</string>
+    <string name="delete_message_series_only" formatted="true">Stvarno želite trajno izbrisati sve epizode u sljedećoj seriji? \n \n%s</string>
     <string name="no_subtitles_loaded">Još nije učitan nijedan titl</string>
     <string name="preview_seekbar">Pretpregled trake za traženje</string>
     <string name="preview_seekbar_desc">Omogući minijaturu pregleda na traci za pretraživanje</string>
@@ -692,12 +643,12 @@
     <string name="encoding_error">Pogreška u kodiranju</string>
     <string name="unsupported_error">Nepodržana pogreška</string>
     <string name="software_decoding">Dekodiranje softvera</string>
-    <string name="software_decoding_desc">Softversko dekodiranje omogućuje playeru reprodukciju video datoteka koje tvoj mobitel ne podržava, ali može uzrokovati kašnjenja ili nestabilnu reprodukciju pri visokoj rezoluciji</string>
+    <string name="software_decoding_desc">Softversko dekodiranje omogućuje playeru reprodukciju video datoteka koje tvoj mobitel ne podržava, ali može uzrokovati kašnjenja ili nestabilnu reprodukciju pri visokoj rezoluciji.</string>
     <string name="torrent_info">Ovaj je video Torrent, što znači da se tvoja video aktivnost može pratiti.\nInformiraj se o korištenju Torrenta prije nego što nastaviš.</string>
     <string name="torrent_not_accepted">Ponovno pokrenite aplikaciju i prihvatite skočni prozor Stream Torrent za nastavak.</string>
     <string name="player_load_one_subtitle_online">Učitaj prvi dostupni</string>
-    <string name="audio_singluar">Audio</string>
-    <string name="podcast_singluar">Podcast</string>
+    <string name="audio_singular">Audio</string>
+    <string name="podcast_singular">Podcast</string>
     <string name="torrent_preferred_media">Aktiviraj torrent u Postavke/Pružatelji usluge/Preferirani mediji</string>
     <string name="sort_episodes_number_asc">Epizoda (Uzlazno)</string>
     <string name="sort_episodes_number_desc">Epizoda (Silazno)</string>
@@ -713,7 +664,7 @@
     <string name="update_plugins_manually">Ažuriraj podatke ručno</string>
     <string name="starting_plugin_update_manually">Pokreće se postupak ažuriranja dodataka!</string>
     <string name="player_notification_channel_name">Obavijesti reproduktora</string>
-    <string name="plugins_updated_manually">Uspješno ažuriran(o) %d dodatak(a)!</string>
+    <string name="plugins_updated_manually">Uspješno ažuriranih dodataka: %d!</string>
     <string name="player_notification_channel_description">Obavijest reproduktora za upravljanje reprodukcijom iz pozadine</string>
     <string name="all_subtitles_italic">Ukosite sve titlove</string>
     <string name="all_subtitles_bold">Podebljajte sve titlove</string>
@@ -724,4 +675,80 @@
     <string name="subtitles_from_online">Online</string>
     <string name="speech_recognition_unavailable">Prepoznavanje govora nije dostupno</string>
     <string name="begin_speaking">Počnite govoriti…</string>
-</resources>
\ No newline at end of file
+    <string name="download_time_left_hour_min_sec_format" formatted="true">%1$dh %2$dmin %3$ds</string>
+    <string name="download_time_left_min_sec_format" formatted="true">%1$dmin %2$ds</string>
+    <string name="download_time_left_sec_format" formatted="true">%1$ds</string>
+    <string name="show_rating">Oznaka za ocjenjivanje</string>
+    <string name="player_settings_always_ask">Uvijek pitaj</string>
+    <string name="no_account">Nema računa</string>
+    <string name="download_parallel_settings_des">Koliko se različitih stavki može istovremeno preuzimati</string>
+    <string name="parallel_downloads">Istovremena preuzimanja</string>
+    <string name="concurrent_connections">Istovremene veze</string>
+    <string name="concurrent_connections_settings_des">Koliko istovremenih veza svako preuzimanje može koristiti tijekom preuzimanja</string>
+    <string name="go_to_downloads">Idi na preuzimanja</string>
+    <string name="no_internet_connection">Nema internetske veze.\n\nPovežite se s internetom i pokušajte ponovo ili gledajte svoje preuzete sadržaje kada niste povezani s internetom.</string>
+    <string name="overscan_settings_des">Mijenja granice ekrana</string>
+    <string name="overscan_settings">Slika veća od ekrana</string>
+    <string name="poster_size_settings_des">Mijenja veličinu postera</string>
+    <string name="poster_size_settings">Veličina postera</string>
+    <string name="speedup_title">Prebacivanje brzine dugim pritiskom</string>
+    <string name="speedup_summary">Držite pritisnuto za dvostruku brzinu</string>
+    <string name="edit_profile_image_title">Uredi sliku profila</string>
+    <string name="edit_profile_image_hint">Unesite URL slike profila</string>
+    <string name="edit_profile_image_error_empty">Nijedan URL nije pronađen</string>
+    <string name="edit_profile_image_error_invalid">Nevaljan URL ili slika</string>
+    <string name="edit_profile_image_success">Slika uspješno ažurirana</string>
+    <string name="action_mark_watched_up_to_this_episode">Označi kao gledano do ove epizode</string>
+    <string name="action_remove_mark_watched_up_to_this_episode">Ukloni gledano do ove epizode</string>
+    <string name="action_reload">Ponovo učitano</string>
+    <string name="reload_provider">Usluga ponovnog učitavanja</string>
+    <string name="play_full_series_button">Reproduciraj cijelu seriju</string>
+    <string name="install_prerelease">Instaliraj predizdanje</string>
+    <string name="prerelease_already_installed">Predizdanje je već instalirano.</string>
+    <string name="prerelease_install_failed">Instalacija predizdanja nije uspjela.</string>
+    <string name="episode_action_play_mirror">Pokreni duplikat</string>"
+    <string name="show_episode_text">Tekst epizode</string>
+    <string name="name">Ime</string>
+    <string name="resolution_and_name">Rezolucija i ime</string>
+    <string name="subs_subtitle_alignment">Poravnanje titlova</string>
+    <string name="bottom_left">Dolje lijevo</string>
+    <string name="bottom_center">Dolje u sredini</string>
+    <string name="bottom_right">Dolje desno</string>
+    <string name="middle_left">Sredina lijevo</string>
+    <string name="middle_center">U sredini</string>
+    <string name="middle_right">Desno u sredini</string>
+    <string name="top_left">Gore lijevo</string>
+    <string name="top_center">Gore u sredini</string>
+    <string name="top_right">Gore desno</string>
+    <string name="extra_brightness_settings">Dodatna svjetlina</string>
+    <string name="extra_brightness_settings_des">Uključi filtar svjetline kada se prekorači 100 % svjetline ekrana</string>
+    <string name="extra_brightness_key">dodatna_svjetlina_uključena</string>
+    <string name="search_suggestions">Prijedlozi za pretraživanje</string>
+    <string name="search_suggestions_des">Prikaži prijedloge za pretraživanje tijekom tipkanja</string>
+    <string name="clear_suggestions">Izbriši prijedloge</string>
+    <string name="video_info">Podaci medija</string>
+    <string name="source_name">Ime izvora</string>
+    <string name="download_all">Preuzmi sve</string>
+    <string name="cancel_all">Odustani od svega</string>
+    <string name="download_queue">Red preuzimanja</string>
+    <string name="queue_empty_message">Sada nema preuzimanja u redu.</string>
+    <plurals name="downloads_active">
+        <item quantity="one">%d aktivno preuzimanje</item>
+        <item quantity="few">%d aktivna preuzimanja</item>
+        <item quantity="other">%d aktivnih preuzimanja</item>
+    </plurals>
+    <plurals name="downloads_queued">
+        <item quantity="one">%d preuzimanje u redu čekanja</item>
+        <item quantity="few">%d preuzimanja u redu čekanja</item>
+        <item quantity="other">%d preuzimanja u redu čekanja</item>
+    </plurals>
+    <string name="source_priority">Prioritet izvora</string>
+    <string name="source_priority_help">Odluči kako razvrstati izvor videa u playeru</string>
+    <string name="download_episode_range">Želiš li preuzeti epizodu %s?</string>
+    <string name="cancel_queue_message">Želiš li otkazati sva preuzimanja u redu čekanja?</string>
+    <string name="show_cast_in_details">Prikaži ploču glumačke postave</string>
+    <string name="video_singular">Video</string>
+    <string name="skip_type_preview">Pregled</string>
+    <string name="player_is_live">Uživo</string>
+    <string name="show_player_metadata_overlay">Prikaži sloj metapodataka playera</string>
+</resources>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-b+hu/strings.xml
similarity index 86%
rename from app/src/main/res/values-hu/strings.xml
rename to app/src/main/res/values-b+hu/strings.xml
index 3350f38870e..b753eadb295 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-b+hu/strings.xml
@@ -10,8 +10,7 @@
     <string name="home_change_provider_img_des">Szolgáltató Váltás</string>
     <string name="player_speed_text_format" formatted="true">Sebesség (%.2fx)</string>
     <string name="rated_format" formatted="true">Értékelés: %.1f</string>
-    <string name="new_update_format" formatted="true">Új frissítés található!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">Új frissítés található! \n%1$s -&gt; %2$s</string>
     <string name="duration_format" formatted="true">%d perc</string>
     <string name="app_dub_sub_episode_text_format" formatted="true">%1$sEp%2$d</string>
     <string name="app_name">CloudStream</string>
@@ -80,7 +79,6 @@
     <string name="popup_play_file">Fájl lejátszása</string>
     <string name="popup_resume_download">Letöltés folytatása</string>
     <string name="popup_pause_download">Letöltés szüneteltetése</string>
-    <string name="pref_disable_acra">Automatikus hibajelentés kikapcsolása</string>
     <string name="home_more_info">Több információ</string>
     <string name="home_expanded_hide">Elrejtés</string>
     <string name="home_play">Lejátszás</string>
@@ -150,8 +148,7 @@
     <string name="episode_short">Ep</string>
     <string name="no_episodes_found">Nem található epizód</string>
     <string name="delete_file">Fájl törlése</string>
-    <string name="resume_time_left" formatted="true">%dp
-\nhátra</string>
+    <string name="resume_time_left" formatted="true">%dp \nhátra</string>
     <string name="duration">Időtartam</string>
     <string name="free_storage">Elérhető</string>
     <string name="used_storage">Használatban</string>
@@ -188,7 +185,6 @@
     <string name="backup_failed_error_format">Hiba a biztonsági mentés során %s</string>
     <string name="category_account">Fiókok és Biztonság</string>
     <string name="advanced_search_des">Szolgáltató szerint elkülönítve adja meg a keresési eredményeket</string>
-    <string name="bug_report_settings_on">Nem küld adatokat</string>
     <string name="kitsu_settings">Poszterek megjelenítése Kitsu-ról</string>
     <string name="pref_filter_search_quality">Kiválasztott videóminőségek elrejtése keresési eredményekbe</string>
     <string name="automatic_plugin_updates">Automatikus bővítményfrissítések</string>
@@ -196,8 +192,6 @@
     <string name="automatic_plugin_download_summary">Automatikusan telepíti az összes még nem telepített bővítményt a hozzáadott tárolókból.</string>
     <string name="updates_settings">Alkalmazás frissítések megjelenítése</string>
     <string name="updates_settings_des">Automatikusan keressen új frissítéseket indításkor.</string>
-    <string name="uprereleases_settings">Frissítés az előzetes kiadásokhoz (prerelease)</string>
-    <string name="uprereleases_settings_des">Csak előzetesen kiadott frissítések (prerelease) keresése a teljes kiadások helyett</string>
     <string name="github">Github</string>
     <string name="discord">Csatlakozz a Discordhoz</string>
     <string name="benene">Adj Banánt a fejlesztőknek</string>
@@ -206,13 +200,11 @@
     <string name="copy_link_toast">A link vágólapra másolva</string>
     <string name="play_episode_toast">Epizód lejátszása</string>
     <string name="subs_default_reset_toast">Alapértelmezett értékre visszaállítása</string>
-    <string name="acra_report_toast">Az alkalmazás összeomlott. Egy névtelen hibabejelentés küldünk a fejlesztőknek</string>
     <string name="season">Évad</string>
     <string name="season_format">%1$s %2$d%3$s</string>
     <string name="no_season">Nincs évad</string>
     <string name="go_forward_30">+30</string>
-    <string name="delete_message" formatted="true">Ezzel véglegesen törli a %s
-\nBiztosan törli?</string>
+    <string name="delete_message" formatted="true">Ezzel véglegesen törli a %s \nBiztosan törli?</string>
     <string name="status_ongoing">Folyamatban levő</string>
     <string name="year">Év</string>
     <string name="site">Webhely</string>
@@ -253,7 +245,6 @@
     <string name="update_started">Frissítés elkezdődött</string>
     <string name="restore_failed_format" formatted="true">Nem sikerült visszaállítani az adatokat a %s fájlból</string>
     <string name="backup_failed">Tárolási engedélyek hiányoznak. Kérjük próbálja újra.</string>
-    <string name="bug_report_settings_off">Csak összeomlásokról küld adatokat</string>
     <string name="apk_installer_settings">APK Telepítő</string>
     <string name="apk_installer_settings_des">Egyes telefonok nem támogatják az új csomag telepítőt. Ha a frissítések nem települnek, próbálja meg a régi opciót.</string>
     <string name="benene_des">Banán adva</string>
@@ -265,7 +256,7 @@
     <string name="video_source">Forrás</string>
     <string name="video_skip_op">Bevezető intro átugrása</string>
     <string name="dont_show_again">Ne mutasd újra</string>
-    <string name="next_episode_format" formatted="true">A(z) %d epizód ekkor jelenik meg:</string>
+    <string name="next_episode_format" formatted="true">A(z) %d epizód ekkor jelenik meg</string>
     <string name="type_on_hold">Szüneteltetve</string>
     <string name="type_dropped">Elvetve</string>
     <string name="show_hd">Minőségi jelzés</string>
@@ -329,8 +320,7 @@
     <string name="extension_types">Támogatott</string>
     <string name="update_notification_downloading">Alkalmazásfrissítés letöltése…</string>
     <string name="sort_updated_new">Frissítve (újabbtól a régebbihez)</string>
-    <string name="empty_library_no_accounts_message">Úgy tűnik, a könyvtárad üres :(
-\nJelentkezz be egy könyvtár fiókba, vagy adj hozzá műsorokat a helyi könyvtárodhoz.</string>
+    <string name="empty_library_no_accounts_message">Úgy tűnik, a könyvtárad üres :( \nJelentkezz be egy könyvtár fiókba, vagy adj hozzá műsorokat a helyi könyvtárodhoz.</string>
     <string name="empty_library_logged_in_message">Úgy tűnik, ez a lista üres, próbálj meg egy másikra váltani.</string>
     <string name="max">Max</string>
     <string name="quality_4k">4K</string>
@@ -405,7 +395,6 @@
     <string name="player_load_subtitles">Betöltés fájlból</string>
     <string name="quality_hdr">HDR</string>
     <string name="app_layout_subtext">Az alkalmazás megjelenésének módosítása, hogy az megfeleljen az eszközödnek</string>
-    <string name="crash_reporting_title">Összeomlás jelentése</string>
     <string name="view_public_repositories_button_short">Nyilvános lista</string>
     <string name="extension_status">Állapot</string>
     <string name="skip_type_recap">Összefoglaló</string>
@@ -423,9 +412,7 @@
     <string name="subtitles_remove_captions">Zárt feliratok eltávolítása a feliratokból</string>
     <string name="is_adult">18+</string>
     <string name="delete_repository_plugins">Ez az összes tároló bővítményt is törli</string>
-    <string name="blank_repo_message">A CloudStream alapértelmezés szerint nem telepített webhelyeket. A webhelyeket a tárolókból kell telepítenie.
-\n
-\nCsatlakozz a Discord-unkhoz vagy keress online.</string>
+    <string name="blank_repo_message">A CloudStream alapértelmezés szerint nem telepített webhelyeket. A webhelyeket a tárolókból kell telepítenie. \n \nCsatlakozz a Discord-unkhoz vagy keress online.</string>
     <string name="extension_version">Verzió</string>
     <string name="action_mark_as_watched">Megjelölés megtekintettként</string>
     <string name="action_remove_from_watched">Eltávolítás a megnézettek közül</string>
@@ -476,11 +463,10 @@
     <string name="repository_url_hint">Repó URL</string>
     <string name="plugin_loaded">Bővítmény betöltve</string>
     <string name="plugin_downloaded">Bővítmény letöltve</string>
-    <string name="skip_type_creddits">Közreműködők</string>
+    <string name="skip_type_credits">Közreműködők</string>
     <string name="sort_alphabetical_z">Betűrendben (Z-től az A-ig)</string>
     <string name="select_library">Könyvtár kiválasztása</string>
-    <string name="safe_mode_file">Biztonságos módú fájlba ütköztünk!
-\nNem töltődik be semmilyen kiegészítő indításkor, amíg a fájl nem kerül törlésre.</string>
+    <string name="safe_mode_file">Biztonságos módú fájlba ütköztünk! \nNem töltődik be semmilyen kiegészítő indításkor, amíg a fájl nem kerül törlésre.</string>
     <string name="normal">Normál</string>
     <string name="player_loaded_subtitles" formatted="true">%s betöltve</string>
     <string name="skip_setup">Beállítás kihagyása</string>
@@ -543,18 +529,8 @@
     <string name="profiles">Profilok</string>
     <string name="action_remove_from_favorites">Eltávolítás kedvencekből</string>
     <string name="enter_current_pin">Adja meg a jelenlegi PIN-t</string>
-    <string name="quality_profile_help">Itt beállíthatja hogyan rendezze el a forrásokat. Ha egy videónak nagyobb a prioritása, előbb fog megjelenni a listában. A forrás prioritás és a minőség prioritás együttes értéke adja ki a videó prioritást.
-\n
-\nForrás A: 3
-\nMinőség B: 7
-\nEzek összértéke egy 10-es videó prioritást eredményez.
-\n
-\nFIGYELEM: Ha az összeg több mint 10, a lejátszó nem tölt be mást ha már a link betöltésre került!</string>
-    <string name="duplicate_message_multiple" formatted="true">Potenciálisan dupla elemek a könyvtárjában:
-\n
-\n%s
-\n
-\nSzeretné hozzáadni ezt az elemet mindenképpen, ezzel felülírva a jelenlegit, vagy visszavonja a műveletet?</string>
+    <string name="quality_profile_help">Itt beállíthatja hogyan rendezze el a forrásokat. Ha egy videónak nagyobb a prioritása, előbb fog megjelenni a listában. A forrás prioritás és a minőség prioritás együttes értéke adja ki a videó prioritást. \n \nForrás A: 3 \nMinőség B: 7 \nEzek összértéke egy 10-es videó prioritást eredményez. \n \nFIGYELEM: Ha az összeg több mint 10, a lejátszó nem tölt be mást ha már a link betöltésre került!</string>
+    <string name="duplicate_message_multiple" formatted="true">Potenciálisan dupla elemek a könyvtárjában: \n \n%s \n \nSzeretné hozzáadni ezt az elemet mindenképpen, ezzel felülírva a jelenlegit, vagy visszavonja a műveletet?</string>
     <string name="skip_startup_account_select_pref">Fiók választás kihagyása belépéskor</string>
     <string name="use_default_account">Használjon alapértelmezett fiókot</string>
     <string name="rotate_video">Elforgatás</string>
@@ -563,9 +539,7 @@
     <string name="favorite_added">%s hozzáadva a kedvencekhez</string>
     <string name="favorite_removed">%s eltávolítva a kedvencekből</string>
     <string name="action_add_to_favorites">Hozzáadás a kedvencekhez</string>
-    <string name="duplicate_message_single" formatted="true">Úgy tűnik egy potenciálisan dupla elem már létezik a könyvtárjában: \'%s.\'
-\n
-\nMindenképpen hozzá akarja adni ezt az elemet, ezzel felülírva a régit, vagy visszavonja a műveletet?</string>
+    <string name="duplicate_message_single" formatted="true">Úgy tűnik egy potenciálisan dupla elem már létezik a könyvtárjában: \'%s.\' \n \nMindenképpen hozzá akarja adni ezt az elemet, ezzel felülírva a régit, vagy visszavonja a műveletet?</string>
     <string name="enter_pin">Adja meg a PIN-t</string>
     <string name="lock_profile">Profil Zárolása</string>
     <string name="select_an_account">Válasszon egy fiókot</string>
@@ -586,7 +560,6 @@
     <string name="pin_error_length">A PIN 4 karakter hosszú kell legyen</string>
     <string name="auto_rotate_video">Auto elforgatás</string>
     <string name="auto_rotate_video_desc">Az automatikus videó orientáció alapján való képernyő elforgatás bekapcsolása</string>
-    <string name="hide_player_control_names_key" translatable="false">hide_player_control_names_key</string>
     <string name="open_local_video">Helyi videó megnyitása</string>
     <string name="repo_copy_label">Tárhely név és URL</string>
     <string name="torrent_info">Ez a videó egy Torrent, ami azt jelenti, hogy a videótevékenységed nyomon követhető.\nGyőződj meg róla, hogy megérted a torrentezés működését, mielőtt folytatnád.</string>
@@ -599,4 +572,66 @@
     <string name="offline_file">Elérhető offline megtekintésre</string>
     <string name="select_all">Mindet Kiválaszt</string>
     <string name="deselect_all">Mindent Kijelölés Eltávolítása</string>
-</resources>
\ No newline at end of file
+    <string name="download_time_left_hour_min_sec_format" formatted="true">%1$dh %2$dm %3$ds</string>
+    <string name="download_time_left_min_sec_format" formatted="true">%1$dm %2$ds</string>
+    <string name="download_time_left_sec_format" formatted="true">%1$ds</string>
+    <string name="download_queue">Letöltési sor</string>
+    <string name="speech_recognition_unavailable">Beszédfelismerés nem elérhető</string>
+    <string name="begin_speaking">Kezdjen beszélni…</string>
+    <string name="play_full_series_button">Teljes sorozat lejátszása</string>
+    <string name="queue_empty_message">Jelenleg nincs sorban álló letöltés.</string>
+    <string name="extra_brightness_settings">Extra fényerő</string>
+    <string name="extra_brightness_settings_des">A fényerő szűrő engedélyezése, ha a kijelző fényereje meghaladja a 100% -ot</string>
+    <string name="extra_brightness_key">extra_brightness_enabled</string>
+    <string name="search_suggestions">Keresési javaslatok</string>
+    <string name="search_suggestions_des">Mutasson keresési javaslatok gépelés közben</string>
+    <string name="clear_suggestions">Javaslatok törlése</string>
+    <string name="show_cast_in_details">Szereplők panel megjelenítése</string>
+    <string name="install_prerelease">Telepít kiadás előtti verziót</string>
+    <string name="prerelease_already_installed">Az előzetes verzió már telepítve van.</string>
+    <string name="prerelease_install_failed">Az előzetes verzió telepítése sikertelen.</string>
+    <string name="delete_files">Fájlok törlése</string>
+    <string name="delete_message_series_only" formatted="true">Biztosan törölni szeretné az alábbi sorozat összes megjelenését?\n\n%s</string>
+    <string name="resume_remaining" formatted="true">%s \nmaradék</string>
+    <string name="music_singular">Zene</string>
+    <string name="audio_book_singular">Hangoskönyv</string>
+    <string name="custom_media_singular">Média</string>
+    <string name="audio_singular">Hang</string>
+    <string name="podcast_singular">Podcast</string>
+    <string name="encoding_error">Kódolási hiba</string>
+    <string name="unsupported_error">Hiba nem támogatott</string>
+    <string name="delete_format" formatted="true">Törlés (%1$d | %2$s)</string>
+    <string name="test_warning">Figyelem</string>
+    <string name="delete_message_multiple" formatted="true">Biztosan véglegesen szeretné törölni a következő tételeket?\n\n%s</string>
+    <string name="delete_message_series_episodes" formatted="true">Biztosan véglegesen szeretné törölni a következő epizódokat?\n\n%2$s</string>
+    <string name="delete_message_series_section" formatted="true">A következő sorozatok összes epizódját is véglegesen törli:\n\n%s</string>
+    <string name="episode_action_play_mirror">Lejátszás tükrözve</string>"
+    <string name="show_rating">Értékelési címke</string>
+    <string name="show_episode_text">Epizód szövege</string>
+    <string name="pref_category_security">Biztonság</string>
+    <string name="pref_category_accounts">Fiókok</string>
+    <string name="auth_locally">Helyi hitelesítés</string>
+    <string name="player_load_one_subtitle_online">Töltse be az első létezőt</string>
+    <string name="qr_image">QR kód képe</string>
+    <string name="video_info">Média információ</string>
+    <string name="delete_plugin">Plugin törlése</string>
+    <string name="player_settings_always_ask">Mindig kérdezzen</string>
+    <string name="player_settings_select_cast_device">Válassza ki a lejátszó eszközt</string>
+    <string name="clipboard_permission_error">Hiba történt a vágólap elérésénél, kérjük, próbálkozzon újra.</string>
+    <string name="clipboard_unknown_error">Hiba történt a másolás során. Kérjük, másolja a logcat fájlt, és vegye fel a kapcsolatot az alkalmazás ügyfélszolgálatával.</string>
+    <string name="ok">Rendben</string>
+    <string name="dismiss">Elutasítás</string>
+    <string name="password_pin_authentication_title">Jelszó/PIN-kód hitelesítés</string>
+    <string name="biometric_unsupported">A biometrikus hitelesítés nem támogatott ezen az eszközön</string>
+    <string name="biometric_setting_summary">Az alkalmazás feloldása ujjlenyomat, arcfelismerés, PIN-kód, minta vagy jelszó segítségével.</string>
+    <string name="biometric_prompt_description">Néhány sikertelen kísérlet után a parancssor bezárul. Egyszerűen indítsa újra az alkalmazást, és próbálja meg újra.</string>
+    <string name="reset_btn">Visszaállítás</string>
+    <string name="cs3wiki">CloudStream Wiki</string>
+    <string name="device_pin_url_message">Látogasson el <b>%s</b> okostelefonján vagy számítógépén, és írja be a fenti kódot</string>
+    <string name="device_pin_error_message">Nem működik az eszköz PIN-kódja, próbálkozzon helyi hitelesítéssel</string>
+    <string name="device_pin_expired_message">A PIN-kód most lejárt!</string>
+    <string name="device_pin_counter_text">A kód %1$dm %2$ds után lejár</string>
+    <string name="sort_release_date_new">Kiadás dátuma (újabbaktól régebbi felé)</string>
+    <string name="sort_release_date_old">Kiadás dátuma (régitől újig)</string>
+    <string name="hide_player_control_names">A lejátszó vezérlői neveinek elrejtése</string>
+</resources>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-b+in/strings.xml
similarity index 77%
rename from app/src/main/res/values-in/strings.xml
rename to app/src/main/res/values-b+in/strings.xml
index f0bbe1ec30a..7d6475f31e7 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-b+in/strings.xml
@@ -30,15 +30,15 @@
     <string name="next_episode">Episode selanjutnya</string>
     <string name="result_tags">Genre</string>
     <string name="result_share">Bagikan</string>
-    <string name="result_open_in_browser">Buka Di Peramban</string>
+    <string name="result_open_in_browser">Buka di Peramban</string>
     <string name="skip_loading">Lewati Pemuatan</string>
     <string name="loading">Memuat…</string>
-    <string name="type_watching">Sedang Menonton</string>
+    <string name="type_watching">Sedang Ditonton</string>
     <string name="type_on_hold">Ditunda</string>
     <string name="type_completed">Selesai</string>
     <string name="type_dropped">Dihentikan</string>
-    <string name="type_plan_to_watch">Rencana untuk Menonton</string>
-    <string name="type_re_watching">Menonton Ulang</string>
+    <string name="type_plan_to_watch">Ingin Ditonton</string>
+    <string name="type_re_watching">Ditonton Ulang</string>
     <string name="play_movie_button">Putar Film</string>
     <string name="play_torrent_button">Stream Torrent</string>
     <string name="pick_source">Sumber</string>
@@ -50,20 +50,19 @@
     <string name="download">Unduh</string>
     <string name="downloaded">Terunduh</string>
     <string name="downloading">Mengunduh</string>
-    <string name="download_paused">Unduh Dijeda</string>
-    <string name="download_started">Unduh Dimulai</string>
-    <string name="download_failed">Unduh Gagal</string>
-    <string name="download_canceled">Unduh Dibatalkan</string>
-    <string name="download_done">Unduh Selesai</string>
+    <string name="download_paused">Unduhan dijeda</string>
+    <string name="download_started">Unduhan dimulai</string>
+    <string name="download_failed">Unduhan gagal</string>
+    <string name="download_canceled">Unduhan diibatalkan</string>
+    <string name="download_done">Unduhan selesai</string>
     <string name="error_loading_links_toast">Galat Memuat Tautan</string>
     <string name="download_storage_text">Penyimpanan Internal</string>
     <string name="app_dubbed_text">Dub</string>
     <string name="app_subbed_text">Sub</string>
     <string name="popup_delete_file">Hapus Berkas</string>
     <string name="popup_play_file">Putar Berkas</string>
-    <string name="popup_resume_download">Lanjutkan Unduh</string>
-    <string name="popup_pause_download">Jeda Unduh</string>
-    <string name="pref_disable_acra">Nonaktifkan pelaporan bug otomatis</string>
+    <string name="popup_resume_download">Lanjutkan unduhan</string>
+    <string name="popup_pause_download">Jeda unduhan</string>
     <string name="home_more_info">Lebih banyak info</string>
     <string name="home_expanded_hide">Sembunyikan</string>
     <string name="home_play">Putar</string>
@@ -125,7 +124,7 @@
     <string name="double_tap_to_seek_settings_des">Tekan dua kali di sisi kanan atau kiri untuk mengubah waktu ke depan atau ke belakang</string>
     <string name="double_tap_to_pause_settings_des">Tekan dua kali di tengah untuk menjeda</string>
     <string name="use_system_brightness_settings">Gunakan kecerahan sistem</string>
-    <string name="use_system_brightness_settings_des">Gunakan pencerahan sistem di pemutar aplikasi dari pada hamparan gelap</string>
+    <string name="use_system_brightness_settings_des">Gunakan pencerahan sistem pada pemutar aplikasi daripada overlay gelap</string>
     <string name="episode_sync_settings">Perbarui progres tontonan</string>
     <string name="episode_sync_settings_des">Sinkronisasikan progres episode saat ini secara otomatis</string>
     <string name="restore_settings">Pulihkan data dari cadangan</string>
@@ -134,20 +133,16 @@
     <string name="restore_failed_format" formatted="true">Gagal untuk memulihkan data dari file %s</string>
     <string name="backup_success">Data tersimpan</string>
     <string name="backup_failed">Izin penyimpanan tidak ditemukan, mohon coba lagi.</string>
-    <string name="backup_failed_error_format">Error saat mencadang %s</string>
+    <string name="backup_failed_error_format">Gagal mencadangkan %s</string>
     <string name="search">Cari</string>
     <string name="category_account">Akun dan Keamanan</string>
     <string name="category_updates">Update dan Cadangan</string>
     <string name="settings_info">Info</string>
     <string name="advanced_search">Pencarian Lanjutan</string>
     <string name="advanced_search_des">Memberikan hasil pencarian yang dipisahkan berdasarkan penyedia</string>
-    <string name="bug_report_settings_off">Hanya mengirim data saat ngecrash</string>
-    <string name="bug_report_settings_on">Tidak mengirim data</string>
     <string name="show_fillers_settings">Tampilkan episode filler untuk anime</string>
-    <string name="updates_settings">Tampilkan update aplikasi</string>
-    <string name="updates_settings_des">Secara otomatis mencari update terbaru setelah aplikasi dibuka.</string>
-    <string name="uprereleases_settings">Update ke prarilis</string>
-    <string name="uprereleases_settings_des">Hanya mencari update prarilis daripada rilis penuh</string>
+    <string name="updates_settings">Tampilkan pembaruan aplikasi</string>
+    <string name="updates_settings_des">Secara otomatis mencari pembaruan baru setelah aplikasi dibuka.</string>
     <string name="github">Github</string>
     <string name="lightnovel">Aplikasi novel ringan dari developer yang sama</string>
     <string name="anim">Aplikasi anime dari developer yang sama</string>
@@ -160,7 +155,6 @@
     <string name="copy_link_toast">Tautan disalin ke papan klip</string>
     <string name="play_episode_toast">Putar Episode</string>
     <string name="subs_default_reset_toast">Ulang ke pengaturan default</string>
-    <string name="acra_report_toast">Maaf, aplikasi ngecrash. Laporan bug anonim akan dikirim ke developer</string>
     <string name="season">Season</string>
     <string name="no_season">Tidak Ada Season</string>
     <string name="episode">Episode</string>
@@ -175,10 +169,8 @@
     <string name="resume">Lanjutkan</string>
     <string name="go_back_30">-30</string>
     <string name="go_forward_30">+30</string>
-    <string name="delete_message" formatted="true">Ini akan secara permanen menghapus %s
-\nApakah anda yakin?</string>
-    <string name="resume_time_left" formatted="true">%dm
-\ntersisa</string>
+    <string name="delete_message" formatted="true">Ini akan secara permanen menghapus %s \nApakah anda yakin?</string>
+    <string name="resume_time_left" formatted="true">%dm \ntersisa</string>
     <string name="status_ongoing">Masih Berlanjut</string>
     <string name="status_completed">Tamat</string>
     <string name="status">Status</string>
@@ -230,7 +222,7 @@
     <string name="show_title">Judul</string>
     <string name="poster_ui_settings">Aktifkan atau nonaktifkan elemen UI pada poster</string>
     <string name="no_update_found">Tidak Ada Update Yang Ditemukan</string>
-    <string name="check_for_update">Cek Untuk Update</string>
+    <string name="check_for_update">Periksa pembaruan</string>
     <string name="video_lock">Kunci</string>
     <string name="video_aspect_ratio_resize">Ubah Ukuran</string>
     <string name="video_source">Sumber</string>
@@ -240,7 +232,7 @@
     <string name="update">Update</string>
     <string name="watch_quality_pref">Kualitas nonton yang diinginkan (WiFi)</string>
     <string name="limit_title">Karakter maksimal judul pemutar video</string>
-    <string name="limit_title_rez">Resolusi pemutar video</string>
+    <string name="limit_title_rez">Tampilkan informasi pemutar</string>
     <string name="video_buffer_size_settings">Ukuran buffer video</string>
     <string name="video_buffer_length_settings">Panjang buffer video</string>
     <string name="video_buffer_disk_settings">Cache video di disk</string>
@@ -249,38 +241,29 @@
     <string name="video_disk_description">Dapat bermasalah pada sistem dengan ruang penyimpanan rendah, seperti Android TV, jika diatur terlalu tinggi.</string>
     <string name="dns_pref">DNS over HTTPS</string>
     <string name="dns_pref_summary">Berguna untuk melewati blok ISP</string>
-    <string name="download_path_pref">Jalur unduh</string>
+    <string name="download_path_pref">Lokasi unduhan</string>
     <string name="nginx_url_pref">NGINX server URL</string>
     <string name="display_subbed_dubbed_settings">Tampilkan Anime Dub/Sub</string>
     <string name="resize_fit">Paskan dengan layar</string>
     <string name="resize_fill">Regang</string>
     <string name="resize_zoom">Zoom</string>
     <string name="legal_notice">Disclaimer</string>
-    <string name="legal_notice_text" translatable="false">Any legal issues regarding the content on this application should be taken up with the actual file hosts and providers themselves as we are not affiliated with them. In case of copyright infringement, please directly contact the responsible parties or the streaming websites. The app is purely for educational and personal use. CloudStream 3 does not host any content on the app, and has no control over what media is put up or taken down. CloudStream 3 functions like any other search engine, such as Google. CloudStream 3 does not host, upload or manage any videos, films or content. It simply crawls, aggregates and displayes links in a convenient, user-friendly interface. It merely scrapes 3rd-party websites that are publicly accessable via any regular web browser. It is the responsibility of user to avoid any actions that might violate the laws governing his/her locality. Use CloudStream 3 at your own risk.</string>
     <string name="category_general">Umum</string>
     <string name="random_button_settings">Tombol Acak</string>
     <string name="random_button_settings_desc">Tampilkan tombol acak di Beranda dan Pustaka</string>
     <string name="provider_lang_settings">Bahasa ekstensi</string>
     <string name="app_layout">Tata Letak Aplikasi</string>
-    <string name="preferred_media_settings">Media yang lebih diinginkan</string>
+    <string name="preferred_media_settings">Preferensi media</string>
     <string name="category_ui">Antarmuka pengguna</string>
     <string name="automatic">Otomatis</string>
     <string name="tv_layout">Tata letak TV</string>
-    <string name="phone_layout">Tata letak HP</string>
-    <string name="emulator_layout">Tata letak emulator</string>
+    <string name="phone_layout">Tata letak Ponsel</string>
+    <string name="emulator_layout">Tata letak Emulator</string>
     <string name="primary_color_settings">Warna primer</string>
     <string name="app_theme_settings">Tema aplikasi</string>
     <string name="bottom_title_settings">Lokasi judul poster</string>
     <string name="bottom_title_settings_des">Meletakkan judul di bawah poster</string>
     <!-- account stuff -->
-    <!--
-    <string name="mal_account_settings" translatable="false">MAL</string>
-    <string name="anilist_account_settings" translatable="false">AniList</string>
-    <string name="tmdb_account_settings" translatable="false">TMDB</string>
-    <string name="imdb_account_settings" translatable="false">IMDB</string>
-    <string name="kitsu_account_settings" translatable="false">Kitsu</string>
-    <string name="trakt_account_settings" translatable="false">Trakt</string>
-    -->
     <string name="login_format" formatted="true">%1$s %2$s</string>
     <string name="account">akun</string>
     <string name="logout">Keluar</string>
@@ -303,7 +286,7 @@
     <string name="max">Maks</string>
     <string name="min">Min</string>
     <string name="subtitles_outline">Garis luar</string>
-    <string name="subtitles_depressed">Depresi</string>
+    <string name="subtitles_depressed">Ditekan</string>
     <string name="subtitles_shadow">Bayangan</string>
     <string name="subtitles_raised">Menonjol</string>
     <string name="subtitle_offset">Sinkronisasi sub</string>
@@ -354,10 +337,10 @@
     <string name="next_episode_time_min_format" formatted="true">%dm</string>
     <string name="next_episode_format" formatted="true">Episode %d akan dirilis tanggal</string>
     <string name="next_episode_time_day_format" formatted="true">%1$dh %2$dj %3$dm</string>
-    <string name="automatic_plugin_updates">Pembaruan otomatis plugin</string>
-    <string name="automatic_plugin_download">Unduh plugins secara otomatis</string>
+    <string name="automatic_plugin_updates">Pembaruan plugin otomatis</string>
+    <string name="automatic_plugin_download">Unduh plugin secara otomatis</string>
     <string name="kitsu_settings">Tampilkan poster dari Kitsu</string>
-    <string name="automatic_plugin_download_summary">Pasang otomatis semua plugins yang belum terpasang, dari repositori yang telah ditambahkan.</string>
+    <string name="automatic_plugin_download_summary">Pasang otomatis semua plugin yang belum terpasang dari repositori yang ditambahkan.</string>
     <string name="live_singular">Siaran langsung</string>
     <string name="nsfw_singular">NSFW</string>
     <string name="example_password">password123</string>
@@ -369,10 +352,10 @@
     <string name="pref_category_defaults">Bawaan</string>
     <string name="pref_category_looks">Tampilan</string>
     <string name="pref_category_ui_features">Fitur</string>
-    <string name="enable_nsfw_on_providers">Mengaktifkan NSFW pada Ekstensi yang didukung</string>
+    <string name="enable_nsfw_on_providers">Aktifkan NSFW pada ekstensi yang didukung</string>
     <string name="play_trailer_button">Putar Cuplikan</string>
     <string name="play_livestream_button">Putar Siaran Langsung</string>
-    <string name="stream">Aliran jaringan</string>
+    <string name="stream">Streaming jaringan</string>
     <string name="subs_subtitle_languages">Bahasa Subtitel</string>
     <string name="autoplay_next_settings">Putar otomatis episode selanjutnya</string>
     <string name="autoplay_next_settings_des">Putar episode selanjutnya, setelah ini berakhir</string>
@@ -386,7 +369,7 @@
     <string name="add_site_pref">Duplikasi Website</string>
     <string name="add_site_summary">Duplikasi website yang telah ada, dengan alamat berbeda</string>
     <string name="pref_category_links">Tautan</string>
-    <string name="pref_category_app_updates">Perbarui Aplikasi</string>
+    <string name="pref_category_app_updates">Perbarui aplikasi</string>
     <string name="pref_category_backup">Cadangkan</string>
     <string name="pref_category_extensions">Ekstensi</string>
     <string name="play_with_app_name">Putar di CloudStream</string>
@@ -397,39 +380,37 @@
     <string name="example_username">Username</string>
     <string name="example_email">contoh@email.com</string>
     <string name="example_ip">127.0.0.1</string>
-    <string name="example_site_name">NamaSitus Baru</string>
+    <string name="example_site_name">NamaSitusBaru</string>
     <string name="example_site_url">https://contoh.com</string>
     <string name="extras">Ekstra</string>
     <string name="preferred_media_subtext">Apa yang ingin anda lihat</string>
     <string name="plugin_deleted">Plugin terhapus</string>
     <string name="plugins_updated" formatted="true">%d plugin diperbarui</string>
-    <string name="view_public_repositories_button">Lihat Repositori dari Group</string>
-    <string name="view_public_repositories_button_short">List Umum</string>
-    <string name="blank_repo_message">CloudStream tidak memiliki situs yang terinstal secara default. Anda perlu menginstal situs-situs dari repositori.
-\n
-\nBergabunglah dengan Discord kami atau cari secara online.</string>
-    <string name="repository_url_hint">URL Arsip atau Kode Pendek</string>
+    <string name="view_public_repositories_button">Lihat repositori komunitas</string>
+    <string name="view_public_repositories_button_short">Daftar publik</string>
+    <string name="blank_repo_message">CloudStream tidak memiliki situs yang terinstal secara default. Anda perlu menginstal situs-situs dari repositori. \n \nBergabunglah dengan Discord kami atau cari secara online.</string>
+    <string name="repository_url_hint">URL Repositori atau Kode Pendek</string>
     <string name="create_account">Buat Akun</string>
     <string name="error">Error</string>
-    <string name="subtitles_filter_lang">Urutkan berdasarkan bahasa terpilih</string>
+    <string name="subtitles_filter_lang">Filter berdasarkan bahasa media pilihan</string>
     <string name="trailer">Cuplikan</string>
     <string name="plugin_loaded">Plugin terpasang</string>
     <string name="plugin_load_fail" formatted="true">Plugin %s gagal diambil</string>
     <string name="is_adult">18+</string>
-    <string name="repository_name_hint">Nama Arsip (Opsi)</string>
+    <string name="repository_name_hint">Nama repositori (Opsional)</string>
     <string name="plugin_singular">plugin</string>
     <string name="batch_download_nothing_to_download_format" formatted="true">Semua %s telah terunduh</string>
     <string name="batch_download">Unduh bersamaan</string>
-    <string name="plugin">plugins</string>
+    <string name="plugin">plugin</string>
     <string name="plugins_disabled" formatted="true">Tidak aktif: %d</string>
-    <string name="uppercase_all_subtitles">Ganti subtitel jadi huruf besar semua</string>
+    <string name="uppercase_all_subtitles">Gunakan huruf besar untuk semua subtitel</string>
     <string name="plugins_downloaded" formatted="true">Terunduh: %d</string>
     <string name="plugins_not_downloaded" formatted="true">Tidak terunduh: %d</string>
     <string name="download_all_plugins_from_repo">Peringatan: CloudStream 3 tidak bertanggung jawab atas penggunaan ekstensi pihak ketiga dan tidak menyediakan dukungan apa pun untuk ekstensi tersebut!</string>
-    <string name="safe_mode_title">Semua Umur</string>
+    <string name="safe_mode_title">Mode aman aktif</string>
     <string name="single_plugin_disabled" formatted="true">%s (Tidak aktif)</string>
     <string name="tracks">Trek</string>
-    <string name="apply_on_restart">Terapkan saat dimuat ulang untuk melihat perubahan.</string>
+    <string name="apply_on_restart">Mulai ulang aplikasi untuk melihat perubahan.</string>
     <string name="extension_description">Keterangan</string>
     <string name="extension_version">Versi</string>
     <string name="extension_status">Status</string>
@@ -445,33 +426,32 @@
     <string name="example_lang_name">Kode bahasa (en)</string>
     <string name="player_load_subtitles_online">Ambil dari internet</string>
     <string name="provider_languages_tip">Putar video di bahasa ini</string>
-    <string name="add_repository">Tambah Repositori</string>
+    <string name="add_repository">Tambah repositori</string>
     <string name="delete_repository_plugins">Pilih ini untuk menghapus semua repositori plugin</string>
     <string name="skip_setup">Lewati pengaturan</string>
-    <string name="error_invalid_url">Alamat salah</string>
+    <string name="error_invalid_url">URL salah</string>
     <string name="network_adress_example">https://contoh.com/contoh.mp4</string>
     <string name="next">Selanjutnya</string>
     <string name="previous">Sebelumnya</string>
     <string name="app_layout_subtext">Ubah tampilan aplikasi</string>
-    <string name="crash_reporting_title">Laporkan Crash</string>
     <string name="setup_done">Selesai</string>
     <string name="extensions">Ekstensi</string>
-    <string name="delete_repository">Hapus Repositori</string>
+    <string name="delete_repository">Hapus repositori</string>
     <string name="setup_extensions_subtext">Unduh semua situs yang ingin digunakan</string>
     <string name="extension_size">Ukuran</string>
     <string name="error_invalid_id">ID salah</string>
     <string name="history">Riwayat</string>
     <string name="action_mark_as_watched">Telah ditonton</string>
     <string name="error_invalid_data">Data salah</string>
-    <string name="subtitles_remove_captions">Hapus teks tertutup dari subtitel</string>
-    <string name="subtitles_remove_bloat">Hapus karakter sampah dari subtitel</string>
+    <string name="subtitles_remove_captions">Hapus closed caption dari subtitlel</string>
+    <string name="subtitles_remove_bloat">Hapus teks tidak perlu pada subtitel</string>
     <string name="audio_tracks">Audio Trek</string>
     <string name="video_tracks">Video Trek</string>
     <string name="extension_types">Dukungan</string>
     <string name="hls_playlist">Daftar putar HLS</string>
     <string name="apk_installer_settings">Penginstal APK</string>
-    <string name="subtitles_encoding">Teknik menampilkan subtitel</string>
-    <string name="pref_category_gestures">Gerakan</string>
+    <string name="subtitles_encoding">Enkode subtitel</string>
+    <string name="pref_category_gestures">Gestur</string>
     <string name="apk_installer_settings_des">Beberapa perangkat tidak mendukung penginstal paket mode baru. Coba mode lama jika pembaruan tidak dapat diinstal.</string>
     <string name="pref_category_actions">Aksi</string>
     <string name="referer">Memberi referensi (opsional)</string>
@@ -483,30 +463,29 @@
     <string name="skip_type_ed">Sesi Akhir</string>
     <string name="skip_type_recap">Sinopsis</string>
     <string name="skip_type_mixed_ed">Sesi akhir ganda</string>
-    <string name="skip_type_creddits">Sesi Kredit</string>
+    <string name="skip_type_credits">Sesi Kredit</string>
     <string name="skip_type_intro">Sesi Intro</string>
-    <string name="clipboard_too_large">Terlalu banyak karakter, tidak dapat menyimpan di clipboard.</string>
+    <string name="clipboard_too_large">Terlalu banyak teks. Tidak dapat menyalin ke papan klip.</string>
     <string name="confirm_exit_dialog">Yakin ingin keluar?</string>
     <string name="no">Tidak</string>
     <string name="update_notification_installing">Memasang pembaruan…</string>
     <string name="update_notification_failed">Tidak dapat memasang versi terbaru</string>
     <string name="app_not_found_error">Aplikasi tidak ditemukan</string>
-    <string name="clear_history">Hapus Riwayat</string>
+    <string name="clear_history">Hapus riwayat</string>
     <string name="enable_skip_op_from_database_des">Tampilkan popup untuk skip sesi pembuka/akhir</string>
     <string name="update_notification_downloading">Mengunduh pembaruan…</string>
     <string name="apk_installer_legacy">Versi lama</string>
     <string name="skip_type_mixed_op">Sesi pembuka ganda</string>
-    <string name="apk_installer_package_installer">Penginstal Paket</string>
-    <string name="plugin_downloaded">Plugin Terunduh</string>
-    <string name="delayed_update_notice">Aplikasi akan diperbaharui pada saat keluar</string>
-    <string name="update_started">Pembaharuan Dimulai</string>
+    <string name="apk_installer_package_installer">PackageInstaller</string>
+    <string name="plugin_downloaded">Plugin terunduh</string>
+    <string name="delayed_update_notice">Aplikasi akan diperbarui setelah keluar</string>
+    <string name="update_started">Pembaruan Dimulai</string>
     <string name="action_remove_from_watched">Hapus dari tontonan</string>
     <string name="browser">Peramban</string>
     <string name="select_library">Pilih pustaka</string>
-    <string name="empty_library_no_accounts_message">Yahh daftar pustaka kamu kosong :(
-\nMasuk ke akun pustaka atau tambah perlihatkan ke lokal pustaka kamu.</string>
+    <string name="empty_library_no_accounts_message">Yahh daftar pustaka kamu kosong :( \nMasuk ke akun pustaka atau tambah perlihatkan ke lokal pustaka kamu.</string>
     <string name="library">Pustaka</string>
-    <string name="sort_by">Urutkan berdasar</string>
+    <string name="sort_by">Urutkan berdasarkan</string>
     <string name="sort">Urutkan</string>
     <string name="sort_rating_asc">Peringkat (Rendah ke Tinggi)</string>
     <string name="sort_updated_old">Update (Lama ke Terbaru)</string>
@@ -516,8 +495,7 @@
     <string name="sort_alphabetical_z">Abjad (Z ke A)</string>
     <string name="open_with">Buka dengan</string>
     <string name="empty_library_logged_in_message">Yahh daftar ini kosong. Coba ganti ke yang lain.</string>
-    <string name="safe_mode_file">Mode aman file ditemukan!
-\nTidak memuat ekstensi pada startup sampai berkas dihapus.</string>
+    <string name="safe_mode_file">Mode aman file ditemukan! \nTidak memuat ekstensi pada startup sampai berkas dihapus.</string>
     <string name="android_tv_interface_off_seek_settings">Sembunyikan Pemutaran - Geser</string>
     <string name="android_tv_interface_on_seek_settings">Pemutar terlihat - Geser</string>
     <string name="android_tv_interface_on_seek_settings_summary">Geser untuk menghilangkan</string>
@@ -528,7 +506,7 @@
     <string name="category_provider_test">Tes penyedia</string>
     <string name="stop">Berhenti</string>
     <string name="start">Mulai</string>
-    <string name="restart">Mulai lagi</string>
+    <string name="restart">Mulai ulang</string>
     <string name="test_failed">Gagal</string>
     <string name="subscription_in_progress_notification">Memperbarui acara langganan</string>
     <string name="subscription_list_name">Berlangganan</string>
@@ -536,20 +514,14 @@
     <string name="subscription_deleted">Berhenti berlangganan di %s</string>
     <string name="subscription_episode_released">Episode %d telah rilis!</string>
     <string name="jsdelivr_proxy">Proxy GitHub</string>
-    <string name="jsdelivr_enabled">Tidak dapat menjangkau GitHub. Mengaktifkan proxy jsDelivr…</string>
+    <string name="jsdelivr_enabled">Gagal terhubung ke GitHub. Mengaktifkan proksi jsDelivr…</string>
     <string name="jsdelivr_proxy_summary">Lewati pemblokiran raw URL github menggunakan jsDelivr. Dapat menyebabkan pembaruan tertunda selama beberapa hari.</string>
     <string name="pref_category_bypass">Bypass ISP</string>
     <string name="revert">Pulihkan</string>
     <string name="watch_quality_pref_data">Kualitas nonton yang diinginkan (Data Seluler)</string>
     <string name="mobile_data">Data seluler</string>
     <string name="help">Bantuan</string>
-    <string name="quality_profile_help">Di sini anda dapat mengubah sumber yang diurutkan. Jika video memiliki prioritas lebih tinggi, video tersebut akan muncul lebih tinggi dalam pemilihan sumber. Jumlah prioritas sumber dan prioritas kualitas adalah prioritas video.
-\n
-\nSumber A: 3
-\nKualitas B: 7
-\nAkan memiliki prioritas video yang digabung 10.
-\n
-\nCATATAN: Jika jumlahnya 10 atau lebih, pemain akan melewatkan pemuatan secara otomatis saat tautan dimuat!</string>
+    <string name="quality_profile_help">Di sini anda dapat mengubah sumber yang diurutkan. Jika video memiliki prioritas lebih tinggi, video tersebut akan muncul lebih tinggi dalam pemilihan sumber. Jumlah prioritas sumber dan prioritas kualitas adalah prioritas video. \n \nSumber A: 3 \nKualitas B: 7 \nAkan memiliki prioritas video yang digabung 10. \n \nCATATAN: Jika jumlahnya 10 atau lebih, pemain akan melewatkan pemuatan secara otomatis saat tautan dimuat!</string>
     <string name="profile_number">Profil %d</string>
     <string name="wifi">Wifi</string>
     <string name="set_default">Pengaturan default</string>
@@ -560,37 +532,31 @@
     <string name="profile_background_des">Latar belakang profil</string>
     <string name="unable_to_inflate">UI tidak dapat dibuat dengan benar, ini adalah BUG UTAMA dan harus segera dilaporkan %s</string>
     <string name="disable">Nonaktif</string>
-    <string name="automatic_plugin_download_mode_title">Pilih mode untuk memfilter unduhan plugin</string>
+    <string name="automatic_plugin_download_mode_title">Pilih mode filter unduhan plugin</string>
     <string name="no_plugins_found_error">Tidak ada plugin yang ditemukan di repositori</string>
     <string name="no_repository_found_error">Repositori tidak ditemukan, periksa URL dan coba VPN</string>
     <string name="already_voted">Kamu sudah voting</string>
     <string name="favorite_removed">%s dihapus dari favorit</string>
     <string name="favorites_list_name">Favorit</string>
-    <string name="favorite_added">%s Ditambahkan ke favorit</string>
-    <string name="duplicate_message_multiple" formatted="true">Item duplikat potensial telah ditemukan di perpustakaan Anda:
-\n
-\n%s
-\n
-\nApakah Anda tetap ingin menambahkan item ini, mengganti item yang sudah ada, atau membatalkan tindakan?</string>
+    <string name="favorite_added">%s ditambahkan ke favorit</string>
+    <string name="duplicate_message_multiple" formatted="true">Item duplikat potensial telah ditemukan di pustaka Anda: \n \n%s \n \nApakah Anda tetap ingin menambahkan item ini, mengganti item yang sudah ada, atau membatalkan tindakan?</string>
     <string name="backup_frequency">Frekuensi pencadangan</string>
-    <string name="duplicate_title">Potensi Duplikat Ditemukan</string>
+    <string name="duplicate_title">Ditemukan Potensi Duplikat</string>
     <string name="lock_profile">Kunci Profil</string>
     <string name="action_add_to_favorites">Tambahkan ke favorit</string>
-    <string name="duplicate_replace_all">Mengganti Semua</string>
+    <string name="duplicate_replace_all">Timpa Semua</string>
     <string name="pin_error_incorrect">PIN Salah. Silahkan coba lagi.</string>
     <string name="action_unsubscribe">Unsubscribe</string>
     <string name="pin_error_length">PIN harus terdiri 4 karakter</string>
-    <string name="duplicate_replace">Mengganti</string>
+    <string name="duplicate_replace">Timpa</string>
     <string name="duplicate_add">Tambahkan</string>
     <string name="action_subscribe">Subscribe</string>
     <string name="action_remove_from_favorites">Hapus dari favorit</string>
     <string name="select_an_account">Pilih Akun</string>
-    <string name="duplicate_message_single" formatted="true">Tampaknya item yang berpotensi duplikat sudah ada di perpustakaan Anda: \'%s.\'
-\n
-\nApakah Anda tetap ingin menambahkan item ini, mengganti item yang sudah ada, atau membatalkan tindakan?</string>
+    <string name="duplicate_message_single" formatted="true">Tampaknya item yang berpotensi duplikat sudah ada di pustaka Anda: \'%s.\' \n \nApakah Anda tetap ingin menambahkan item ini, mengganti item yang sudah ada, atau membatalkan tindakan?</string>
     <string name="enter_pin">Masukan PIN</string>
     <string name="pin">PIN</string>
-    <string name="enter_current_pin">Masukkan PIN Saat Ini</string>
+    <string name="enter_current_pin">Masukkan PIN saat Ini</string>
     <string name="logged_account" formatted="true">Masuk sebagai %s</string>
     <string name="enter_pin_with_name" formatted="true">Masukan PIN untuk %s</string>
     <string name="use_default_account">Gunakan Akun Default</string>
@@ -604,19 +570,18 @@
     <string name="auto_rotate_video">Putar otomatis</string>
     <string name="result_search_tooltip">Cari di ekstensi lainnya</string>
     <string name="speed_setting_summary">Menambahkan opsi kecepatan di pemutar</string>
-    <string name="test_extensions_summary">Tes ini hanya ditujukan untuk pengembang dan tidak memverifikasi atau menolak kerja ekstensi apa pun.</string>
+    <string name="test_extensions_summary">Tes ini hanya untuk pengembang dan tidak memverifikasi atau membantag fungsi ekstensi apa pun.</string>
     <string name="subscribe_tooltip">Notifikasi episode baru</string>
     <string name="recommendations_tooltip">Tampilkan rekomendasi</string>
-    <string name="test_extensions">Menguji semua Ekstensi</string>
+    <string name="test_extensions">Tes semua ekstensi</string>
     <string name="biometric_warning">Data CloudStream Anda telah dicadangkan. Meskipun peluang terjadinya kasus ini sangat kecil dan jarang terjadi, tetapi semua perangkat berperilaku berbeda. Jika Anda ada dalam situasi terburuk, misalnya gagal untuk mengakses aplikasi, segera hapus data aplikasi sepenuhnya dan pulihkan data cadangan. Kami mohon maaf atas segala ketidaknyamanan yang mungkin ditimbulkan.</string>
     <string name="password_pin_authentication_title">Otentikasi Kata Sandi/PIN</string>
     <string name="biometric_unsupported">Otentikasi biometrik tidak didukung di perangkat ini</string>
-    <string name="biometric_setting_summary">Buka kunci aplikasi dengan Sidik Jari, ID Wajah, PIN, Pola, dan Kata Sandi.</string>
+    <string name="biometric_setting_summary">Buka kunci aplikasi dengan Sidik Jari, Face ID, PIN, Pola, dan Kata Sandi.</string>
     <string name="biometric_prompt_description">Setelah beberapa kali gagal, perintah akan ditutup. Cukup mulai ulang aplikasi untuk mencoba lagi.</string>
     <string name="unfavorite">Batalkan favorit</string>
     <string name="biometric_authentication_title">Buka kunci CloudStream</string>
-    <string name="resume_remaining" formatted="true">%s
-\ntersisa</string>
+    <string name="resume_remaining" formatted="true">%s \ntersisa</string>
     <string name="favorite">Favorit</string>
     <string name="biometric_setting">Kunci dengan Biometrik</string>
     <string name="repo_copy_label">Nama dan URL repositori</string>
@@ -624,12 +589,12 @@
     <string name="toast_copied">disalin!</string>
     <string name="clipboard_unknown_error">Gagal menyalin, mohon salin logcat dan hubungi pengembang aplikasi.</string>
     <string name="ok">Oke</string>
-    <string name="battery_dialog_title">Matikan pengoptimalan Baterai</string>
+    <string name="battery_dialog_title">Nonaktifkan optimasi baterai</string>
     <string name="app_unrestricted_toast">Pemakaian baterai untuk aplikasi ini sudah diatur menjadi tidak dibatasi</string>
     <string name="app_info_intent_error">Gagal membuka info aplikasi CloudStream.</string>
-    <string name="music_singlar">Musik</string>
+    <string name="music_singular">Musik</string>
     <string name="audio_book_singular">Buku Audio</string>
-    <string name="custom_media_singluar">Media</string>
+    <string name="custom_media_singular">Media</string>
     <string name="battery_dialog_message">Untuk memastikan unduhan dan pemberitahuan tanpa gangguan untuk acara TV berlangganan, CloudStream memerlukan izin untuk berjalan di latar belakang. Dengan menekan OK, Anda akan diperlihatkan dialog permintaan. Silakan tekan ‘Izinkan’.\n\nHarap dicatat, izin ini tidak berarti CS3 akan menguras baterai Anda. Aplikasi ini hanya akan beroperasi di latar belakang jika diperlukan, misalnya saat menerima notifikasi atau mengunduh video dari ekstensi resmi.</string>
     <string name="reset_btn">Mengatur ulang</string>
     <string name="next_season_episode_format" formatted="true">Musim %1$d Episode %2$d akan dirilis pada</string>
@@ -639,19 +604,18 @@
     <string name="cs3wiki">CloudStream Wiki</string>
     <string name="pref_category_security">Keamanan</string>
     <string name="pref_category_accounts">Akun</string>
-    <string name="hide_player_control_names_key" translatable="false">hide_player_control_names_key</string>
     <string name="test_warning">Hati hati</string>
-    <string name="device_pin_expired_message">Kode PIN kini telah kedaluwarsa!</string>
+    <string name="device_pin_expired_message">Kode PIN sudah kedaluwarsa!</string>
     <string name="qr_image">Gambar Kode QR</string>
-    <string name="dismiss">Mengabaikan</string>
-    <string name="device_pin_counter_text">Kode kedaluwarsa dalam %1$dm %2$ds</string>
+    <string name="dismiss">Tutup</string>
+    <string name="device_pin_counter_text">Kode kedaluwarsa dalam %1$dm %2$dd</string>
     <string name="auth_locally">Otorisasi Lokal</string>
     <string name="device_pin_url_message">Kunjungi <b>%s</b> di ponsel pintar atau komputer Anda dan masukkan kode di atas</string>
     <string name="preview_seekbar">Pratinjau bilah pencarian</string>
     <string name="preview_seekbar_desc">Aktifkan pratinjau gambar mini di bilah pencarian</string>
-    <string name="hide_player_control_names">Sembunyikan nama kontrol pemain</string>
-    <string name="open_downloaded_repo">Buka arsip</string>
-    <string name="play_from_beginning_img_des">Mainkan dari Awal</string>
+    <string name="hide_player_control_names">Sembunyikan Nama Kontrol Pemain</string>
+    <string name="open_downloaded_repo">Buka repositori</string>
+    <string name="play_from_beginning_img_des">Putar dari awal</string>
     <string name="downloads_empty">Tidak ada unduhan.</string>
     <string name="open_local_video">Buka video lokal</string>
     <string name="sort_release_date_old">Tanggal Rilis (Lama ke Baru)</string>
@@ -661,20 +625,12 @@
     <string name="select_all">Pilih Semua</string>
     <string name="deselect_all">Batal Pilih Semua</string>
     <string name="delete_files">Hapus File</string>
-    <string name="delete_message_multiple" formatted="true">Apakah Anda yakin ingin menghapus item berikut secara permanen?
-\n
-\n%s</string>
-    <string name="delete_message_series_episodes" formatted="true">Apakah Anda yakin ingin menghapus episode berikut di %1$s secara permanen?
-\n
-\n%2$s</string>
-    <string name="delete_message_series_section" formatted="true">Anda juga akan menghapus semua episode dalam seri berikut secara permanen:
-\n
-\n%s</string>
-    <string name="delete_message_series_only" formatted="true">Apakah Anda yakin ingin menghapus semua episode dalam seri berikut secara permanen?
-\n
-\n%s</string>
+    <string name="delete_message_multiple" formatted="true">Apakah Anda yakin ingin menghapus item berikut secara permanen? \n \n%s</string>
+    <string name="delete_message_series_episodes" formatted="true">Apakah Anda yakin ingin menghapus episode berikut di %1$s secara permanen? \n \n%2$s</string>
+    <string name="delete_message_series_section" formatted="true">Anda juga akan menghapus semua episode dalam seri berikut secara permanen: \n \n%s</string>
+    <string name="delete_message_series_only" formatted="true">Apakah Anda yakin ingin menghapus semua episode dalam seri berikut secara permanen? \n \n%s</string>
     <string name="delete_format" formatted="true">Hapus (%1$d | %2$s)</string>
-    <string name="delete_plugin">Hapus Plugin</string>
+    <string name="delete_plugin">Hapus plugin</string>
     <string name="device_pin_error_message">Tidak bisa mendapatkan kode PIN perangkat, coba autentikasi lokal</string>
     <string name="no_subtitles_loaded">Belum ada subtitel yang dimuat</string>
     <string name="subs_edge_size">Ukuran Tepi</string>
@@ -684,39 +640,111 @@
     <string name="confirm_before_exiting_title">Konfirmasi sebelum keluar</string>
     <string name="confirm_before_exiting_desc">Tampilkan dialog sebelum keluar dari aplikasi</string>
     <string name="dont_show">Jangan Tampilkan</string>
-    <string name="show">Perlihatkan</string>
-    <string name="audio_singluar">Audio</string>
-    <string name="podcast_singluar">Podcast</string>
+    <string name="show">Tampilkan</string>
+    <string name="audio_singular">Audio</string>
+    <string name="podcast_singular">Podcast</string>
     <string name="encoding_error">Pengkodean error</string>
     <string name="unsupported_error">Error yang tidak didukung</string>
     <string name="player_load_one_subtitle_online">Muat yang pertama tersedia</string>
     <string name="torrent_preferred_media">Aktifkan torrent di dalam Pengaturan/Penyedia/Media pilihan</string>
     <string name="torrent_not_accepted">Mulai ulang aplikasi dan terima pop-up Stream Torrent untuk melanjutkan.</string>
-    <string name="software_decoding_desc">Dekode perangkat lunak memungkinkan pemutar memainkan berkas video yang tidak didukung perangkat Anda, tetapi dapat memperburuk performa atau pemutaran yang tidak stabil pada resolusi tinggi</string>
+    <string name="software_decoding_desc">Dekode perangkat lunak memungkinkan pemutar memainkan berkas video yang tidak didukung perangkat Anda, tetapi dapat memperburuk performa atau pemutaran yang tidak stabil pada resolusi tinggi.</string>
     <string name="software_decoding">Dekode perangkat lunak</string>
-    <string name="sort_episodes_rating_low_high">Rating (terendah)</string>
+    <string name="sort_episodes_rating_low_high">Rating (Terendah)</string>
     <string name="sort_button_date">Tanggal %s</string>
     <string name="sort_episodes_number_asc">Episode (Naik)</string>
     <string name="sort_episodes_number_desc">Episode (Menurun)</string>
-    <string name="sort_episodes_rating_high_low">Rating (terbesar)</string>
+    <string name="sort_episodes_rating_high_low">Rating (Tertinggi)</string>
     <string name="sort_episodes_date_newest">Tanggal Tayang (Terbaru)</string>
     <string name="sort_episodes_date_oldest">Tanggal Tayang (Paling Lama)</string>
     <string name="sort_button_episode">Ep %s</string>
     <string name="sort_button_rating">Rating %s</string>
-    <string name="update_plugins">Pembaruan Plugin²</string>
+    <string name="update_plugins">Perbarui Plugin</string>
     <string name="starting_plugin_update_manually">Mulai proses pembaruan plugin!</string>
-    <string name="plugins_updated_manually">Berhasil mengapdate %d plugin²(s)!</string>
-    <string name="update_plugins_manually">Pembaruan Plugin² manual</string>
-    <string name="no_plugins_updated_manually">Tidak ada plugin² yang perlu pembaruan.</string>
+    <string name="plugins_updated_manually">Berhasil memperbarui %d plugin!</string>
+    <string name="update_plugins_manually">Perbarui plugin secara manual</string>
+    <string name="no_plugins_updated_manually">Tidak ada plugin yang diperbarui.</string>
     <string name="player_notification_channel_description">Pemberitahuan pemutar untuk mengontrol pemutaran dari latar belakang</string>
     <string name="subtitles_from_online">Daring</string>
     <string name="begin_speaking">Mulai bicara…</string>
     <string name="subtitles_from_embedded">Tertanam</string>
     <string name="player_notification_channel_name">Notifikasi pemain</string>
     <string name="speech_recognition_unavailable">Pengenalan ucapan tidak tersedia</string>
-    <string name="all_subtitles_bold">Membuat semua subtitle menjadi tebal</string>
-    <string name="all_subtitles_italic">Membuat semua subtitle menjadi miring</string>
+    <string name="all_subtitles_bold">Tebalkan semua subtitel</string>
+    <string name="all_subtitles_italic">Miringkan semua subtitel</string>
     <string name="background_radius">Radius Latar Belakang</string>
     <string name="volume_exceeded_100">Volume telah melebihi 100%</string>
     <string name="slide_up_again_to_exceed_100">Geser ke atas lagi untuk melampaui 100%</string>
-</resources>
\ No newline at end of file
+    <string name="player_settings_always_ask">Selalu tanya</string>
+    <string name="download_parallel_settings_des">Berapa banyak item yang bisa diunduh secara paralel</string>
+    <string name="parallel_downloads">Pengunduhan paralel</string>
+    <string name="poster_size_settings_des">Ubah ukuran poster</string>
+    <string name="poster_size_settings">Ukuran poster</string>
+    <string name="speedup_summary">Tahan untuk kecepatan 2x</string>
+    <string name="no_internet_connection">Sambungan internet tidak tersedia.\n\nSilakan sambung ke internet dan coba lagi, atau tonton unduhan Anda saat sedang luring.</string>
+    <string name="overscan_settings_des">Ubah batas layar</string>
+    <string name="go_to_downloads">Kunjungi Unduhan</string>
+    <string name="concurrent_connections_settings_des">Jumlah sambungan yang bisa digunakan secara bersamaan saat mengunduh</string>
+    <string name="download_time_left_hour_min_sec_format" formatted="true">%1$dj %2$dm %3$dd</string>
+    <string name="download_time_left_min_sec_format" formatted="true">%1$dm %2$dd</string>
+    <string name="download_time_left_sec_format" formatted="true">%1$dd</string>
+    <string name="show_rating">Label Penilaian</string>
+    <string name="no_account">Tidak ada akun</string>
+    <string name="concurrent_connections">Koneksi bersamaan</string>
+    <string name="overscan_settings">Pemotongan Layar Berlebih</string>
+    <string name="speedup_title">Alih Kecepatan (tekan lama)</string>
+    <string name="edit_profile_image_title">Sunting Gambar Profil</string>
+    <string name="edit_profile_image_hint">Masukkan URL Gambar Profil</string>
+    <string name="edit_profile_image_error_empty">URL Tidak Ditemukan</string>
+    <string name="edit_profile_image_error_invalid">URL atau Gambar Tidak Valid</string>
+    <string name="edit_profile_image_success">Gambar Profil Berhasil Diperbarui</string>
+    <string name="action_mark_watched_up_to_this_episode">Tandai sebagai telah ditonton hingga episode ini</string>
+    <string name="action_remove_mark_watched_up_to_this_episode">Hapus penandaan telah ditonton hingga episode ini</string>
+    <string name="action_reload">Dimuat Ulang</string>
+    <string name="reload_provider">Muat Ulang Penyedia</string>
+    <string name="episode_action_play_mirror">Putar mirror</string>"
+    <string name="name">Nama</string>
+    <string name="resolution_and_name">Resolusi dan nama</string>
+    <string name="subs_subtitle_alignment">Penyelarasan Subtitel</string>
+    <string name="bottom_left">Bawah kiri</string>
+    <string name="bottom_center">Bawah tengah</string>
+    <string name="bottom_right">Bawah kanan</string>
+    <string name="middle_left">Tengah kiri</string>
+    <string name="middle_center">Tengah tengah</string>
+    <string name="middle_right">Tengah kanan</string>
+    <string name="top_left">Atas kiri</string>
+    <string name="top_center">Atas tengah</string>
+    <string name="top_right">Atas kanan</string>
+    <string name="play_full_series_button">Putar Seri Penuh</string>
+    <string name="install_prerelease">Pasang versi pra-rilis</string>
+    <string name="prerelease_already_installed">Versi pra-rilis sudah terpasang.</string>
+    <string name="prerelease_install_failed">Gagal memasang versi pra-rilis.</string>
+    <string name="show_episode_text">Teks Episode</string>
+    <string name="extra_brightness_settings">Kecerahan ekstra</string>
+    <string name="extra_brightness_settings_des">Aktifkan filter kecerahan saat kecerahan layar melebihi 100%</string>
+    <string name="extra_brightness_key">extra_brightness_enabled</string>
+    <string name="clear_suggestions">Hapus saran</string>
+    <string name="show_cast_in_details">Tampilkan panel cast</string>
+    <string name="video_info">Info media</string>
+    <string name="source_name">Nama sumber</string>
+    <string name="search_suggestions">Saran pencarian</string>
+    <string name="search_suggestions_des">Tampilkan saran pencarian saat mengetik</string>
+    <plurals name="downloads_active">
+        <item quantity="other">%d unduhan aktif</item>
+    </plurals>
+    <plurals name="downloads_queued">
+        <item quantity="other">%d unduhan dalam antrean</item>
+    </plurals>
+    <string name="download_queue">Antrean unduhan</string>
+    <string name="queue_empty_message">Tidak ada unduhan dalam antrean.</string>
+    <string name="source_priority">Prioritas sumber</string>
+    <string name="source_priority_help">Tentukan bagaimana sumber video harus diurutkan dalam pemutar</string>
+    <string name="download_all">Unduh semua</string>
+    <string name="cancel_all">Batalkan semua</string>
+    <string name="download_episode_range">Apakah kamu ingin mengunduh episode %s?</string>
+    <string name="cancel_queue_message">Apakah kamu ingin membatalkan semua unduhan dalam antrean?</string>
+    <string name="show_player_metadata_overlay">Tampilkan overlay metadata pemutar</string>
+    <string name="player_is_live">Live</string>
+    <string name="video_singular">Video</string>
+    <string name="skip_type_preview">Pratinjau</string>
+</resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-b+it/strings.xml
similarity index 85%
rename from app/src/main/res/values-it/strings.xml
rename to app/src/main/res/values-b+it/strings.xml
index ada40b57c62..c47a84842ca 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-b+it/strings.xml
@@ -6,7 +6,7 @@
     <string name="next_episode_format" formatted="true">L\'episodio %d uscirà in</string>
     <string name="next_episode_time_day_format" formatted="true">%1$dd %2$dh %3$dm</string>
     <string name="next_episode_time_hour_format" formatted="true">%1$dh %2$dm</string>
-    <string name="next_episode_time_min_format" formatted="true">%d min</string>
+    <string name="next_episode_time_min_format" formatted="true">%d min</string>
     <!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
     <string name="result_poster_img_des">Poster</string>
     <string name="search_poster_img_des">Poster</string>
@@ -19,8 +19,7 @@
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">Velocità (%.2fx)</string>
     <string name="rated_format" formatted="true">Valutato: %.1f</string>
-    <string name="new_update_format" formatted="true">Nuovo aggiornamento trovato!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">Nuovo aggiornamento trovato! \n%1$s -&gt; %2$s</string>
     <string name="filler" formatted="true">Filler</string>
     <string name="duration_format" formatted="true">%d min</string>
     <!-- <string name="app_name">CloudStream</string> -->
@@ -70,7 +69,6 @@
     <string name="popup_play_file">Riproduci file</string>
     <string name="popup_resume_download">Riprendi download</string>
     <string name="popup_pause_download">Ferma download</string>
-    <string name="pref_disable_acra">Disabilita segnalazione automatica di bug</string>
     <string name="home_more_info">Più info</string>
     <string name="home_expanded_hide">Nascondi</string>
     <string name="home_play">Riproduci</string>
@@ -84,7 +82,7 @@
     <string name="sort_close">Chiudi</string>
     <string name="sort_clear">Cancella</string>
     <string name="sort_save">Salva</string>
-    <string name="player_speed">Velocità video</string>
+    <string name="player_speed">Velocità lettore</string>
     <string name="subtitles_settings">Impostazioni sottotitoli</string>
     <string name="subs_text_color">Colore testo</string>
     <string name="subs_outline_color">Colore contorno</string>
@@ -115,7 +113,7 @@
     <string name="torrent_no_plot">Nessuna descrizione trovata</string>
     <string name="show_log_cat">Mostra Logcat 🐈</string>
     <string name="picture_in_picture">Picture-in-Picture</string>
-    <string name="picture_in_picture_des">Continua la riproduzione in un player in miniatura sopra altre applicazioni</string>
+    <string name="picture_in_picture_des">Continua la riproduzione in un lettore in miniatura sopra altre applicazioni</string>
     <string name="player_size_settings">Pulsante di ridimensionamento del video</string>
     <string name="player_size_settings_des">Rimuovi bordi neri</string>
     <string name="player_subtitles_settings">Sottotitoli</string>
@@ -151,8 +149,6 @@
     <string name="settings_info">Info</string>
     <string name="advanced_search">Ricerca avanzata</string>
     <string name="advanced_search_des">Dividi i risultati della ricerca per provider</string>
-    <string name="bug_report_settings_off">Invia i dati solo in caso di crash</string>
-    <string name="bug_report_settings_on">Non inviare alcun dato</string>
     <string name="show_fillers_settings">Mostra tag [filler] per anime</string>
     <string name="show_trailers_settings">Mostra trailer</string>
     <string name="kitsu_settings">Mostra poster da Kitsu</string>
@@ -160,8 +156,6 @@
     <string name="automatic_plugin_updates">Aggiorna automaticamente i plugin</string>
     <string name="updates_settings">Mostra gli aggiornamenti dell\'app</string>
     <string name="updates_settings_des">Cerca automaticamente nuovi aggiornamenti dopo aver avviato l\'app.</string>
-    <string name="uprereleases_settings">Aggiorna alle prerelease</string>
-    <string name="uprereleases_settings_des">Cerca per aggiornamenti alle prerelease invice di cercare solo le release complete</string>
     <string name="github">GitHub</string>
     <string name="lightnovel">App per Light Novel degli stessi sviluppatori</string>
     <string name="anim">App per Anime degli stessi sviluppatori</string>
@@ -174,7 +168,6 @@
     <string name="copy_link_toast">Link copiato negli appunti</string>
     <string name="play_episode_toast">Riproduci episodio</string>
     <string name="subs_default_reset_toast">Ripristina il valore predefinito</string>
-    <string name="acra_report_toast">Spiacente, l\'applicazione è andata in crash. Una segnalazione anonima di bug sarà inviata agli sviluppatori</string>
     <string name="season">Stagione</string>
     <string name="season_format">%1$s %2$d%3$s</string>
     <string name="no_season">Nessuna stagione</string>
@@ -192,10 +185,8 @@
     <string name="resume">Riprendi</string>
     <string name="go_back_30">-30</string>
     <string name="go_forward_30">+30</string>
-    <string name="delete_message" formatted="true">Stai per eliminare permanentemente %s
-\nSei sicuro?</string>
-    <string name="resume_time_left" formatted="true">%dm
-\nrimanenti</string>
+    <string name="delete_message" formatted="true">Stai per eliminare permanentemente %s \nSei sicuro?</string>
+    <string name="resume_time_left" formatted="true">%dm \nrimanenti</string>
     <string name="status_ongoing">In corso</string>
     <string name="status_completed">Completato</string>
     <string name="status">Stato</string>
@@ -262,8 +253,8 @@
     <string name="skip_update">Salta questo aggiornamento</string>
     <string name="update">Aggiorna</string>
     <string name="watch_quality_pref">Qualità di visualizzazione preferita (WiFi)</string>
-    <string name="limit_title">Limita i caratteri del titolo nel player</string>
-    <string name="limit_title_rez">Risoluzione video player</string>
+    <string name="limit_title">Limita i caratteri del titolo nel lettore</string>
+    <string name="limit_title_rez">Mostra informazioni sul lettore</string>
     <string name="video_buffer_size_settings">Dimensione cache video</string>
     <string name="video_buffer_length_settings">Lunghezza buffer video</string>
     <string name="video_buffer_disk_settings">Dimensione cache video su disco</string>
@@ -395,7 +386,6 @@
     <string name="previous">Precedente</string>
     <string name="skip_setup">Salta configurazione</string>
     <string name="app_layout_subtext">Cambia l\'aspetto dell\'app per adattarla al proprio dispositivo</string>
-    <string name="crash_reporting_title">Segnala crash</string>
     <string name="preferred_media_subtext">Cosa vuoi vedere</string>
     <string name="setup_done">Fatto</string>
     <string name="extensions">Estensioni</string>
@@ -419,13 +409,11 @@
     <string name="plugins_disabled" formatted="true">Disabilitato: %d</string>
     <string name="plugins_not_downloaded" formatted="true">Non scaricato: %d</string>
     <string name="plugins_updated" formatted="true">Aggiornati %d plugin</string>
-    <string name="blank_repo_message">CloudStream non ha siti installati per impostazione predefinita. È necessario installare i siti dai repository.
-\n
-\nUnisciti al nostro Discord o cerca online.</string>
+    <string name="blank_repo_message">CloudStream non ha siti installati per impostazione predefinita. È necessario installare i siti dai repository. \n \nUnisciti al nostro Discord o cerca online.</string>
     <string name="view_public_repositories_button">Visualizza i repository della comunità</string>
     <string name="view_public_repositories_button_short">Lista pubblica</string>
     <string name="uppercase_all_subtitles">Tutti i sottotitoli in maiuscolo</string>
-    <string name="download_all_plugins_from_repo">Attenzione: CloudStream 3 non si assume alcuna responsabilità per l\'utilizzo di estensioni di terze parti e non fornisce alcun supporto per esse!</string>
+    <string name="download_all_plugins_from_repo">Attenzione: CloudStream non si assume alcuna responsabilità per l\'utilizzo di estensioni di terze parti e non fornisce alcun supporto per esse!</string>
     <string name="single_plugin_disabled" formatted="true">%s (Disabilitato)</string>
     <string name="tracks">Tracce</string>
     <string name="audio_tracks">Traccia audio</string>
@@ -444,8 +432,8 @@
     <string name="extension_language">Lingua</string>
     <string name="extension_install_first">Prima installa l\'estensione</string>
     <string name="hls_playlist">Playlist HLS</string>
-    <string name="player_pref">Video player preferito</string>
-    <string name="player_settings_play_in_app">Player interno</string>
+    <string name="player_pref">Video lettore preferito</string>
+    <string name="player_settings_play_in_app">Lettore interno</string>
     <string name="app_not_found_error">App non trovata</string>
     <string name="all_languages_preference">Tutte le lingue</string>
     <string name="skip_type_format" formatted="true">Salta %s</string>
@@ -454,7 +442,7 @@
     <string name="skip_type_recap">Riassunto</string>
     <!--<string name="skip_type_mixed_ed">Mixed ending</string>-->
     <!--<string name="skip_type_mixed_op">Mixed opening</string>-->
-    <string name="skip_type_creddits">Crediti</string>
+    <string name="skip_type_credits">Crediti</string>
     <!--<string name="skip_type_intro">Intro</string>-->
     <string name="clear_history">Cancella cronologia</string>
     <string name="history">Cronologia</string>
@@ -479,7 +467,7 @@
     <string name="update_notification_downloading">Download aggiornamento dell\'app…</string>
     <string name="automatic_plugin_download_summary">Installa automaticamente tutti i plugin non ancora installati dai repository aggiunti.</string>
     <string name="apk_installer_package_installer">ProgrammaInstallazionePacchetti</string>
-    <string name="apk_installer_settings_des">Alcuni telefoni non supportano il nuovo programma di installazione dei pacchetti. Prova l\'opzione legacy se gli aggiornamenti non vengono installati.</string>
+    <string name="apk_installer_settings_des">Alcuni dispositivi non supportano il nuovo programma di installazione dei pacchetti. Se gli aggiornamenti non vengono installati, prova l\'opzione legacy.</string>
     <string name="apk_installer_settings">Installer APK</string>
     <string name="apk_installer_legacy">Legacy</string>
     <string name="play_trailer_button">Riproduci trailer</string>
@@ -509,20 +497,18 @@
     <string name="sort_updated_old">Aggiornato (Da vecchio a nuovo)</string>
     <string name="sort_alphabetical_a">Alfabetico (A - Z)</string>
     <string name="sort_alphabetical_z">Alfabetico (Z - A)</string>
-    <string name="empty_library_no_accounts_message">La tua libreria è vuota :(
-\nAccedi a un account di libreria o aggiungi degli show alla tua libreria locale.</string>
+    <string name="empty_library_no_accounts_message">La tua libreria è vuota :( \nAccedi a un account di libreria o aggiungi degli show alla tua libreria locale.</string>
     <string name="select_library">Seleziona libreria</string>
     <string name="open_with">Apri con</string>
     <string name="library">Libreria</string>
     <string name="sort">Ordina</string>
     <string name="empty_library_logged_in_message">Questo elenco è vuoto. Prova a passare a un altro.</string>
-    <string name="safe_mode_file">File \"safe mode\" trovato!
-\nAll\'avvio non sarà caricata alcuna estensione finchè il file non verrà rimosso.</string>
-    <string name="android_tv_interface_off_seek_settings_summary">Quantità di avanzamento usata quando il player è nascosto</string>
+    <string name="safe_mode_file">File \"safe mode\" trovato! \nAll\'avvio non sarà caricata alcuna estensione finchè il file non verrà rimosso.</string>
+    <string name="android_tv_interface_off_seek_settings_summary">Intervallo di ricerca utilizzato quando il lettore è nascosto</string>
     <string name="pref_category_android_tv">TV Android</string>
-    <string name="android_tv_interface_on_seek_settings_summary">Quantità di avanzamento usata quando il player è visibile</string>
-    <string name="android_tv_interface_on_seek_settings">Player visibile - Quantità di secondi da avanzare</string>
-    <string name="android_tv_interface_off_seek_settings">Player nascosto - Quantità di secondi da avanzare</string>
+    <string name="android_tv_interface_on_seek_settings_summary">Intervallo di ricerca utilizzato quando il lettore è visibile</string>
+    <string name="android_tv_interface_on_seek_settings">Lettore visibile - Intervallo di ricerca</string>
+    <string name="android_tv_interface_off_seek_settings">Lettore nascosto - Intervallo di ricerca</string>
     <string name="test_log">Registro</string>
     <string name="start">Avvia</string>
     <string name="category_provider_test">Test del provider</string>
@@ -541,13 +527,7 @@
     <string name="subscription_in_progress_notification">Aggiornando shows a cui sei iscritto</string>
     <string name="subscription_episode_released">L\'episodio %d è stato rilasciato!</string>
     <string name="watch_quality_pref_data">Qualità di visualizzazione preferita (Dati mobili)</string>
-    <string name="quality_profile_help">Qui puoi cambiare l\'ordine delle fonti. Se un video ha una priorità maggiore, apparirà più in alto nella selezione delle fonti. La somma tra la priorità della fonte e la priorità della qualità è la priorità video.
-\n
-\nFonte A: 3
-\nQualità B: 7
-\nAvranno una priorità video combinata di 10.
-\n
-\nNOTA: se la somma è pari o superiore a 10, il lettore salterà automaticamente il caricamento quando viene caricato quel link!</string>
+    <string name="quality_profile_help">Qui puoi cambiare l\'ordine delle fonti. Se un video ha una priorità maggiore, apparirà più in alto nella selezione delle fonti. La somma tra la priorità della fonte e la priorità della qualità è la priorità video. \n \nFonte A: 3 \nQualità B: 7 \nAvranno una priorità video combinata di 10. \n \nNOTA: se la somma è pari o superiore a 10, il lettore salterà automaticamente il caricamento quando viene caricato quel link!</string>
     <string name="profile_number">Profilo %d</string>
     <string name="wifi">Wi-Fi</string>
     <string name="set_default">Imposta predefinito</string>
@@ -567,11 +547,7 @@
     <string name="favorite_removed">%s rimosso dai preferiti</string>
     <string name="favorites_list_name">Preferiti</string>
     <string name="favorite_added">%s aggiunto ai preferiti</string>
-    <string name="duplicate_message_multiple" formatted="true">Dei possibili duplicati sono stati trovati nella tua libreria:
-\n
-\n%s
-\n
-\nVorresti aggiungere l\'oggetto alla libreria comunque, rimpiazzare l\'esistente, o cancellare l\'azione?</string>
+    <string name="duplicate_message_multiple" formatted="true">Dei possibili duplicati sono stati trovati nella tua libreria: \n \n%s \n \nVorresti aggiungere l\'oggetto alla libreria comunque, rimpiazzare l\'esistente, o cancellare l\'azione?</string>
     <string name="backup_frequency">Frequenza di backup</string>
     <string name="duplicate_title">Trovato Possibile Duplicato</string>
     <string name="action_add_to_favorites">Aggiungi ai preferiti</string>
@@ -584,9 +560,7 @@
     <string name="action_subscribe">Iscriviti</string>
     <string name="action_remove_from_favorites">Rimuovi dai preferiti</string>
     <string name="select_an_account">Seleziona un account</string>
-    <string name="duplicate_message_single">Sembra che nella tua libreria esista già un elemento potenzialmente duplicato: \'%s.\'
-\n
-\nDesideri aggiungere comunque questo elemento, sostituire quello esistente o annullare l\'azione?</string>
+    <string name="duplicate_message_single">Sembra che nella tua libreria esista già un elemento potenzialmente duplicato: \'%s.\' \n \nDesideri aggiungere comunque questo elemento, sostituire quello esistente o annullare l\'azione?</string>
     <string name="enter_pin">Inserisci PIN</string>
     <string name="pin">PIN</string>
     <string name="enter_current_pin">Inserisci PIN corrente</string>
@@ -616,8 +590,7 @@
     <string name="biometric_prompt_description">Dopo alcuni tentativi falliti, il prompt si chiuderà. Riavvia semplicemente l\'app per riprovare.</string>
     <string name="biometric_warning">È stato eseguito il backup dei tuoi dati CloudStream. Sebbene questa possibilità sia molto bassa, tutti i dispositivi possono comportarsi in modo diverso. Nel raro caso in cui ti venga bloccato l\'accesso all\'app, cancella completamente i dati dell\'app e ripristina da un backup. Siamo molto spiacenti per qualsiasi inconveniente derivanti da questo.</string>
     <string name="unfavorite">Non preferito</string>
-    <string name="resume_remaining" formatted="true">%s
-\nresiduo</string>
+    <string name="resume_remaining" formatted="true">%s \nresiduo</string>
     <string name="favorite">Preferito</string>
     <string name="repo_copy_label">Nome e URL del repository</string>
     <string name="toast_copied">copiato!</string>
@@ -626,10 +599,10 @@
     <string name="ok">OK</string>
     <string name="battery_dialog_title">Disabilita ottimizzazione della batteria</string>
     <string name="app_info_intent_error">Impossibile aprire le informazioni sull\'app CloudStream.</string>
-    <string name="custom_media_singluar">Media</string>
+    <string name="custom_media_singular">Media</string>
     <string name="battery_dialog_message">Per garantire download e notifiche ininterrotti per le serie TV a cui si è abbonati, CloudStream necessita dell\'autorizzazione per funzionare in background. Premendo OK, verrà mostrata una finestra di dialogo di richiesta. Premi \"Consenti\".\n\nNota che questa autorizzazione non significa che CS3 scaricherà la batteria. Funzionerà in background solo quando necessario, ad esempio quando si ricevono notifiche o si scaricano video da estensioni ufficiali.</string>
     <string name="app_unrestricted_toast">L\'utilizzo della batteria dell\'app è già impostato su \"Senza restrizioni\"</string>
-    <string name="music_singlar">Musica</string>
+    <string name="music_singular">Musica</string>
     <string name="audio_book_singular">Audiolibro</string>
     <string name="reset_btn">Reimposta</string>
     <string name="episode_upcoming_format" formatted="true">Prossimamente tra %s</string>
@@ -647,7 +620,6 @@
     <string name="device_pin_error_message">Impossibile ottenere il codice PIN del dispositivo, prova l\'autenticazione locale</string>
     <string name="device_pin_expired_message">Il codice PIN è scaduto!</string>
     <string name="device_pin_counter_text">Il codice scadrà tra %1$dm %2$ds</string>
-    <string name="hide_player_control_names_key" translatable="false">hide_player_control_names_key</string>
     <string name="open_local_video">Apri il video locale</string>
     <string name="downloads_empty">Al momento non ci sono download.</string>
     <string name="play_from_beginning_img_des">Riproduci dall\'inizio</string>
@@ -660,20 +632,12 @@
     <string name="select_all">Seleziona tutto</string>
     <string name="deselect_all">Deseleziona tutto</string>
     <string name="delete_format" formatted="true">Elimina (%1$d | %2$s)</string>
-    <string name="delete_message_series_episodes" formatted="true">Sei sicuro di voler eliminare definitivamente i seguenti episodi in %1$s?
-\n
-\n%2$s</string>
-    <string name="delete_message_series_section" formatted="true">Eliminerai definitivamente anche tutti gli episodi delle seguenti serie:
-\n
-\n%s</string>
-    <string name="delete_message_series_only" formatted="true">Sei sicuro di voler eliminare definitivamente tutti gli episodi delle seguenti serie?
-\n
-\n%s</string>
+    <string name="delete_message_series_episodes" formatted="true">Sei sicuro di voler eliminare definitivamente i seguenti episodi in %1$s? \n \n%2$s</string>
+    <string name="delete_message_series_section" formatted="true">Eliminerai definitivamente anche tutti gli episodi delle seguenti serie: \n \n%s</string>
+    <string name="delete_message_series_only" formatted="true">Sei sicuro di voler eliminare definitivamente tutti gli episodi delle seguenti serie? \n \n%s</string>
     <string name="sort_release_date_old">Data di rilascio (dal più vecchio)</string>
     <string name="delete_files">Elimina file</string>
-    <string name="delete_message_multiple" formatted="true">Sei sicuro di voler eliminare definitivamente i seguenti elementi?
-\n
-\n%s</string>
+    <string name="delete_message_multiple" formatted="true">Sei sicuro di voler eliminare definitivamente i seguenti elementi? \n \n%s</string>
     <string name="preview_seekbar">Anteprima barra di avanzamento</string>
     <string name="preview_seekbar_desc">Abilita miniatura di anteprima sulla barra di avanzamento</string>
     <string name="no_subtitles_loaded">Nessun sottotitolo caricato</string>
@@ -685,15 +649,15 @@
     <string name="custom">Personalizzato</string>
     <string name="torrent_info">Questo video è un Torrent, il che significa che la tua attività video può essere tracciata.\nAssicurati di aver capito il significato di scaricare tramite Torrent prima di continuare.</string>
     <string name="subs_edge_size">Dimensione bordo</string>
-    <string name="audio_singluar">Audio</string>
-    <string name="podcast_singluar">Podcast</string>
+    <string name="audio_singular">Audio</string>
+    <string name="podcast_singular">Podcast</string>
     <string name="unsupported_error">Errore non supportato</string>
     <string name="encoding_error">Errore di codifica</string>
     <string name="player_load_one_subtitle_online">Carica il primo disponibile</string>
     <string name="torrent_not_accepted">Riavvia l\'app e accetta il pop-up Stream Torrent per procedere.</string>
     <string name="torrent_preferred_media">Abilita torrent in Impostazioni/Provider/Media preferiti</string>
     <string name="software_decoding">Decodifica software</string>
-    <string name="software_decoding_desc">La decodifica software consente al lettore di riprodurre file video non supportati dal telefono, ma potrebbe causare una riproduzione lenta o instabile ad alta risoluzione</string>
+    <string name="software_decoding_desc">La decodifica software consente al lettore di riprodurre file video non supportati dal dispositivo, ma potrebbe causare una riproduzione lenta o instabile ad alta risoluzione.</string>
     <string name="sort_episodes_rating_high_low">Valutazione (più alta)</string>
     <string name="sort_episodes_rating_low_high">Valutazione (più bassa)</string>
     <string name="sort_episodes_date_newest">Data di messa in onda (più recente)</string>
@@ -719,4 +683,80 @@
     <string name="background_radius">Raggio di sfondo</string>
     <string name="volume_exceeded_100">Il volume ha superato il 100%</string>
     <string name="slide_up_again_to_exceed_100">Scorri di nuovo verso l\'alto per andare oltre il 100%</string>
-</resources>
\ No newline at end of file
+    <string name="download_parallel_settings_des">Quanti oggetti possono essere scaricati contemporaneamente</string>
+    <string name="parallel_downloads">Download paralleli</string>
+    <string name="concurrent_connections">Connessioni concorrenti</string>
+    <string name="concurrent_connections_settings_des">Quante connessioni simultanee può utilizzare ogni download durante il download</string>
+    <string name="go_to_downloads">Vai ai Downloads</string>
+    <string name="no_internet_connection">Nessuna connessione a internet. \n\nConnettiti a Internet e riprova oppure guarda i tuoi download mentre sei offline.</string>
+    <string name="overscan_settings_des">Modifica limiti dello schermo</string>
+    <string name="overscan_settings">Overscan</string>
+    <string name="poster_size_settings_des">Modifica dimensioni dei poster</string>
+    <string name="poster_size_settings">Dimensione poster</string>
+    <string name="player_settings_always_ask">Chiedi sempre</string>
+    <string name="speedup_title">Attiva/disattiva velocità LongPress</string>
+    <string name="speedup_summary">Tieni premuto per velocità 2x</string>
+    <string name="download_time_left_hour_min_sec_format" formatted="true">%1$dh %2$dm %3$ds</string>
+    <string name="download_time_left_min_sec_format" formatted="true">%1$dm %2$ds</string>
+    <string name="download_time_left_sec_format" formatted="true">%1$ds</string>
+    <string name="show_rating">Etichetta di valutazione</string>
+    <string name="no_account">Nessun account</string>
+    <string name="edit_profile_image_title">Modifica immagine del profilo</string>
+    <string name="edit_profile_image_hint">Inserisci l\'URL dell\'immagine del profilo</string>
+    <string name="edit_profile_image_error_empty">Nessun URL trovato</string>
+    <string name="edit_profile_image_error_invalid">URL o immagine non validi</string>
+    <string name="edit_profile_image_success">Immagine aggiornata con successo</string>
+    <string name="action_remove_mark_watched_up_to_this_episode">Rimuovi gli episodi visti fino a questo</string>
+    <string name="action_mark_watched_up_to_this_episode">Contrassegna come visto fino a questo episodio</string>
+    <string name="action_reload">Ricaricato</string>
+    <string name="reload_provider">Ricarica provider</string>
+    <string name="name">Nome</string>
+    <string name="resolution_and_name">Risoluzione e nome</string>
+    <string name="subs_subtitle_alignment">Allineamento sottotitoli</string>
+    <string name="bottom_left">In basso a sinistra</string>
+    <string name="episode_action_play_mirror">Riproduci mirror</string>"
+    <string name="bottom_center">In basso al centro</string>
+    <string name="bottom_right">In basso a destra</string>
+    <string name="middle_center">In centro</string>
+    <string name="middle_right">In centro a destra</string>
+    <string name="top_left">In alto a sinistra</string>
+    <string name="top_center">In alto al centro</string>
+    <string name="top_right">In alto a destra</string>
+    <string name="middle_left">In centro a sinistra</string>
+    <string name="play_full_series_button">Riproduci serie completa</string>
+    <string name="install_prerelease">Installa la versione pre-release</string>
+    <string name="prerelease_already_installed">La versione pre-release è già installata.</string>
+    <string name="prerelease_install_failed">Impossibile installare la versione pre-release.</string>
+    <string name="show_episode_text">Testo dell\'episodio</string>
+    <string name="search_suggestions">Suggerimenti per la ricerca</string>
+    <string name="search_suggestions_des">Mostra suggerimenti di ricerca durante la digitazione</string>
+    <string name="clear_suggestions">Cancella suggerimenti</string>
+    <string name="show_cast_in_details">Mostra pannello cast</string>
+    <string name="video_info">Info sui media</string>
+    <string name="source_name">Nome sorgente</string>
+    <string name="extra_brightness_settings">Luminosità extra</string>
+    <string name="extra_brightness_settings_des">Attiva il filtro di luminosità quando viene superato il 100% della luminosità dello schermo</string>
+    <string name="extra_brightness_key">extra_brightness_enabled</string>
+    <string name="download_queue">Coda di download</string>
+    <string name="queue_empty_message">Al momento non ci sono download in coda.</string>
+    <string name="download_all">Scarica tutto</string>
+    <string name="cancel_all">Annulla tutto</string>
+    <string name="download_episode_range">Vuoi scaricare l\'episodio %s?</string>
+    <string name="cancel_queue_message">Vuoi annullare tutti i download in coda?</string>
+    <plurals name="downloads_active">
+        <item quantity="one">%d download attivo</item>
+        <item quantity="many">%d download attivi</item>
+        <item quantity="other">%d download attivi</item>
+    </plurals>
+    <plurals name="downloads_queued">
+        <item quantity="one">%d download in coda</item>
+        <item quantity="many">%d download in coda</item>
+        <item quantity="other">%d download in coda</item>
+    </plurals>
+    <string name="source_priority">Priorità sorgente</string>
+    <string name="source_priority_help">Decidi come le sorgenti video devono essere ordinate nel lettore</string>
+    <string name="show_player_metadata_overlay">Mostra sovrapposizione metadati lettore</string>
+    <string name="video_singular">Video</string>
+    <string name="skip_type_preview">Anteprima</string>
+    <string name="player_is_live">Live</string>
+</resources>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-b+iw/strings.xml
similarity index 92%
rename from app/src/main/res/values-iw/strings.xml
rename to app/src/main/res/values-b+iw/strings.xml
index 6ebe405bcc4..3b2d0153a11 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-b+iw/strings.xml
@@ -6,8 +6,7 @@
     <string name="home_change_provider_img_des">לשנות ספק</string>
     <string name="player_speed_text_format" formatted="true">מהירות (%.2fx)</string>
     <string name="rated_format" formatted="true">דירוג: %.1f</string>
-    <string name="new_update_format" formatted="true">נמצא עדכון חדש!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">נמצא עדכון חדש! \n%1$s -&gt; %2$s</string>
     <string name="filler" formatted="true">סינון</string>
     <string name="duration_format" formatted="true">%d דקות</string>
     <string name="app_name">קלאודסטרים</string>
@@ -50,7 +49,7 @@
     <string name="download_failed">ההורדה נכשלה</string>
     <string name="download_canceled">ההורדה בוטלה</string>
     <string name="download_done">נגן טריילר</string>
-    <string name="stream">להזרים טורנט</string>
+    <string name="stream">זרם רשתי</string>
     <string name="error_loading_links_toast">שגיאה בטעינת קישורים</string>
     <string name="download_storage_text">אחסון פנימי</string>
     <string name="app_subbed_text">עם כתוביות</string>
@@ -58,7 +57,6 @@
     <string name="popup_play_file">נגן קובץ</string>
     <string name="popup_resume_download">המשך הורדה</string>
     <string name="popup_pause_download">השהה את ההורדה</string>
-    <string name="pref_disable_acra">השבת את דיווח הבאגים האוטומטי</string>
     <string name="home_play">נגן</string>
     <string name="home_info">מידע</string>
     <string name="filter_bookmarks">סנן סימניות</string>
@@ -133,8 +131,6 @@
     <string name="updates_settings_des">חפש אוטומטית עדכונים חדשים לאחר פתיחת האפליקציה.</string>
     <string name="updates_settings">הצג עדכונים לאפליקציה</string>
     <string name="redo_setup_process">בצע מחדש את תהליך ההגדרה</string>
-    <string name="uprereleases_settings">עדכן למהדורות מוקדמות</string>
-    <string name="uprereleases_settings_des">חפש עדכוני מהדרות מוקדמות במקום מהדורות מלאות בלבד</string>
     <string name="episodes">פרקים</string>
     <string name="episodes_range">%1$d-%2$d</string>
     <string name="episode">פרק</string>
@@ -149,10 +145,8 @@
     <string name="resume">המשך</string>
     <string name="go_back_30">-30</string>
     <string name="go_forward_30">+30</string>
-    <string name="resume_time_left" formatted="true">%dדקות
-\nנותרו</string>
-    <string name="delete_message" formatted="true">‬פעולה זאת תמחק לצמיתות את %s
-\nהאם אתם בטוחים?</string>
+    <string name="resume_time_left" formatted="true">%dדקות \nנותרו</string>
+    <string name="delete_message" formatted="true">‬פעולה זאת תמחק לצמיתות את %s \nהאם אתם בטוחים?</string>
     <string name="status_ongoing">מתמשך</string>
     <string name="duration">משך זמן</string>
     <string name="rating">דירוג</string>
@@ -191,7 +185,6 @@
     <string name="automatic_plugin_updates">עדכוני תוספים אוטומטיים</string>
     <string name="benene_des">כמות בנינים שניתנו</string>
     <string name="season">עונה</string>
-    <string name="acra_report_toast">מצטערים, האפליקציה קרסה. דוח באג אנונימי יישלח למפתחים</string>
     <string name="torrent">טורנטים</string>
     <string name="nsfw">NSFW</string>
     <string name="render_error">שגיאת מעבד</string>
@@ -280,11 +273,9 @@
     <string name="backup_failed">חסרות הרשאות אחסון. אנא נסה שוב.</string>
     <string name="backup_failed_error_format">שגיאה בגיבוי %s</string>
     <string name="search">חיפוש</string>
-    <string name="category_account">חשבונות</string>
+    <string name="category_account">חשבונות ובטיחות</string>
     <string name="benene_count_text_none">לא ניתנו בנינים</string>
-    <string name="eigengraumode_settings">מצב איגנגראבי</string>
-    <string name="bug_report_settings_off">שולח נתונים רק בקריסות</string>
-    <string name="bug_report_settings_on">לא שולח נתונים</string>
+    <string name="eigengraumode_settings">מהירות ניגון</string>
     <string name="show_trailers_settings">הצג טריילרים</string>
     <string name="kitsu_settings">הצג פוסטרים מKitsu</string>
     <string name="pref_filter_search_quality">הסתר את איכות הסרטון שנבחרה בתוצאות החיפוש</string>
@@ -413,7 +404,6 @@
     <string name="provider_languages_tip">צפה בסרטונים בשפות אלה</string>
     <string name="previous">קודם</string>
     <string name="app_layout_subtext">שנה את מראה האפליקציה כך שיתאים למכשירך</string>
-    <string name="crash_reporting_title">דיווח על קריסה</string>
     <string name="setup_done">סוים</string>
     <string name="extensions">הרחבות</string>
     <string name="add_repository">הוסף מאגר</string>
@@ -429,13 +419,11 @@
     <string name="batch_download_nothing_to_download_format" formatted="true">כל %s כבר הורד</string>
     <string name="extension_authors">מחברים</string>
     <string name="extension_language">שפה</string>
-    <string name="skip_type_creddits">קרדיטים</string>
+    <string name="skip_type_credits">קרדיטים</string>
     <string name="sort">מיין</string>
     <string name="select_library">בחר ספרייה</string>
-    <string name="empty_library_no_accounts_message">נראה שהספרייה שלכם ריקה :(
-\nהתחברו לחשבון ספריה או הוסיפו סדרות לספרייה המקומית שלכם.</string>
-    <string name="safe_mode_file">קובץ מצב בטוח נמצא!
-\nלא טוען שום תוספות בהפעלה עד להסרת הקובץ.</string>
+    <string name="empty_library_no_accounts_message">נראה שהספרייה שלכם ריקה :( \nהתחברו לחשבון ספריה או הוסיפו סדרות לספרייה המקומית שלכם.</string>
+    <string name="safe_mode_file">קובץ מצב בטוח נמצא! \nלא טוען שום תוספות בהפעלה עד להסרת הקובץ.</string>
     <string name="update_notification_failed">לא ניתן להתקין את הגרסה החדשה של האפליקציה</string>
     <string name="batch_download">הורדת אצווה</string>
     <string name="plugin_singular">תוסף</string>
@@ -451,11 +439,7 @@
     <string name="plugins_downloaded" formatted="true">הורד: %d</string>
     <string name="plugins_disabled" formatted="true">מוגבל: %d</string>
     <string name="plugins_not_downloaded" formatted="true">לא מורד: %d</string>
-    <string name="blank_repo_message">לקלאודסטרים אין אתרים מותקנים כברירת מחדל. עליכם להתקין את האתרים ממאגרים.
-\n
-\nבגלל הסרת DMCA על ידי Sky UK LImited 🤮 אנחנו לא יכולים לקשר את אתר המאגרים באפליקציה.
-\n
-\nתצטרפו לדיסקורד שלנו או תחפשו באינטרנט.</string>
+    <string name="blank_repo_message">לקלאודסטרים אין אתרים מותקנים כברירת מחדל. עליכם להתקין את האתרים ממאגרים. \n \nבגלל הסרת DMCA על ידי Sky UK LImited 🤮 אנחנו לא יכולים לקשר את אתר המאגרים באפליקציה. \n \nתצטרפו לדיסקורד שלנו או תחפשו באינטרנט.</string>
     <string name="view_public_repositories_button">הצג מאגרים קהילתיים</string>
     <string name="view_public_repositories_button_short">רשימה ציבורית</string>
     <string name="uppercase_all_subtitles">לשים את הכתוביות באותיות רישיות</string>
@@ -537,12 +521,27 @@
     <string name="set_default">קביעה כברירת מחדל</string>
     <string name="test_passed">עבר</string>
     <string name="pref_category_bypass">מעקף ספק אינטרנט</string>
-    <string name="quality_profile_help">כאן ניתן לשנות את סדר המקורות. אם לוידיאו יש עדיפות גבוהה יותר, הוא יופיע גבוה יותר בבחירת המקור. סכום עדיפות המקור ועדיפות האיכות היא עדיפות הוידיאו.
-\n
-\nמקור א: 3
-\nאיכות ב: 7
-\nיגרמו לעדיפות הסרטון להיות 10.
-\n
-\nשימו לב: אם הסכום הוא 10 או יותר, הנגן ידלג על טעינת הסרטון כאשר הלינק נטען!</string>
-    <string name="hide_player_control_names_key" translatable="false">hide_player_control_names_key</string>
-</resources>
\ No newline at end of file
+    <string name="quality_profile_help">כאן ניתן לשנות את סדר המקורות. אם לוידיאו יש עדיפות גבוהה יותר, הוא יופיע גבוה יותר בבחירת המקור. סכום עדיפות המקור ועדיפות האיכות היא עדיפות הוידיאו. \n \nמקור א: 3 \nאיכות ב: 7 \nיגרמו לעדיפות הסרטון להיות 10. \n \nשימו לב: אם הסכום הוא 10 או יותר, הנגן ידלג על טעינת הסרטון כאשר הלינק נטען!</string>
+    <string name="next_season_episode_format" formatted="true">עונה %1$d פרק %2$d תשודר ב:</string>
+    <string name="download_time_left_hour_min_sec_format" formatted="true">%1$d שעות %2$d דקות %3$d שניות</string>
+    <string name="download_time_left_min_sec_format" formatted="true">%1$d דקות %2$d שניות</string>
+    <string name="download_time_left_sec_format" formatted="true">%1$d שניות</string>
+    <string name="play_from_beginning_img_des">נגן מההתחלה</string>
+    <string name="speech_recognition_unavailable">זיהוי דיבור לא זמין</string>
+    <string name="begin_speaking">התחל לדבר…</string>
+    <string name="torrent_info">וידיאו זה הוא טורנט, זה אומר שניתן לעקוב אחרי פעילות הוידיאו שלך.\nנא וודא שהינך מבין טורנטים לפני המשך.</string>
+    <string name="downloads_delete_select">בחר פריטים למחוק</string>
+    <string name="downloads_empty">אין הורדות כרגע.</string>
+    <string name="offline_file">זמין לצפיה אופליין</string>
+    <string name="select_all">בחר הכל</string>
+    <string name="deselect_all">הסר בחירה מהכל</string>
+    <string name="open_local_video">פתח וידיאו מקומי</string>
+    <string name="links_reloaded_toast">קישורים נטענו</string>
+    <string name="repo_copy_label">שם ו-URL רפוזיטורי</string>
+    <string name="toast_copied">הועתק!</string>
+    <string name="subscribe_tooltip">התרעת פרק חדש</string>
+    <string name="result_search_tooltip">חיפוש בתוספים אחרים</string>
+    <string name="recommendations_tooltip">הראה המלצות</string>
+    <string name="speed_setting_summary">מוסיף אפשרות מהירות בנגן</string>
+    <string name="backup_frequency">תדירות גיבוי</string>
+</resources>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-b+ja/strings.xml
similarity index 88%
rename from app/src/main/res/values-ja/strings.xml
rename to app/src/main/res/values-b+ja/strings.xml
index b2c39da7da6..3de9a971a74 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-b+ja/strings.xml
@@ -46,7 +46,7 @@
     <string name="category_general">全般</string>
     <string name="other_singular">動画</string>
     <string name="category_player">プレーヤー</string>
-    <string name="type_plan_to_watch">懐う</string>
+    <string name="type_plan_to_watch">視聴予定</string>
     <string name="play_trailer_button">予告編を再生</string>
     <string name="episode_short">エピソード</string>
     <string name="type_watching">視聴</string>
@@ -62,8 +62,7 @@
     <string name="loading">ローディング…</string>
     <string name="result_open_in_browser">ブラウザで開く</string>
     <string name="season_short">シーズン</string>
-    <string name="resume_time_left" formatted="true">残り
-\n%d分</string>
+    <string name="resume_time_left" formatted="true">残り \n%d分</string>
     <string name="play_episode">再生エピソード</string>
     <string name="downloaded">ダウンロード済</string>
     <string name="pref_category_backup">バックアップ</string>
@@ -81,13 +80,12 @@
     <string name="home_main_poster_img_des">主要ポスター</string>
     <string name="home_next_random_img_des">次のランダム</string>
     <string name="go_back_img_des">戻り</string>
-    <string name="rated_format" formatted="true">視聴率 %.1f</string>
-    <string name="new_update_format" formatted="true">新しいアップデートを発見!
-\n%1$s -&gt; %2$s</string>
+    <string name="rated_format" formatted="true">評価: %.1f</string>
+    <string name="new_update_format" formatted="true">新しいアップデートを発見! \n%1$s -&gt; %2$s</string>
     <string name="duration_format" formatted="true">%d分</string>
     <string name="search_hint_site" formatted="true">%sを検索…</string>
     <string name="pick_source">ソース</string>
-    <string name="filler" formatted="true">ろくごうきじ</string>
+    <string name="filler" formatted="true">番外編</string>
     <string name="reload_error">接続を再試行…</string>
     <string name="go_back">戻り</string>
     <string name="action_remove_from_bookmarks">削除</string>
@@ -184,16 +182,12 @@
     <string name="network_adress_example">https://example.com/example.mp4</string>
     <string name="subtitle_offset_extra_hint_none_format">字幕遅延なし</string>
     <string name="delete_repository">リポジトリ削除</string>
-    <string name="download_all_plugins_from_repo">警告: CloudStream 3はサードパーティの拡張機能の使用について一切の責任を負わず、それらに対するサポートも提供しません！</string>
+    <string name="download_all_plugins_from_repo">警告: CloudStreamはサードパーティの拡張機能の使用について一切の責任を負わず、それらに対するサポートも提供しません！</string>
     <string name="action_add_to_bookmarks">視聴状態を設定</string>
     <string name="subtitle_offset">字幕を同期</string>
     <string name="add_repository">リポジトリを追加</string>
     <string name="repository_name_hint">リポジトリ名 (オプション)</string>
-    <string name="blank_repo_message">CloudStreamはデフォルトでサイトがインストールされていません。リポジトリからサイトをインストールする必要があります。
-\n
-\nSky UK Limitedによる無脳なDMCAテイクダウンのため🤮、アプリ内でリポジトリサイトをリンクすることができません。
-\n
-\n私たちのDiscordに参加するか、オンラインで検索してください。</string>
+    <string name="blank_repo_message">CloudStreamはデフォルトでサイトがインストールされていません。リポジトリからサイトをインストールする必要があります。 \n \n私たちのDiscordに参加するか、オンラインで検索してください。</string>
     <string name="preview_background_img_des">バックグラウンドをプレビュー</string>
     <string name="play_livestream_button">ライブストリームの再生</string>
     <string name="home_change_provider_img_des">プロバイダーの変更</string>
@@ -217,7 +211,6 @@
     <string name="error_loading_links_toast">リンクの読み込みエラー</string>
     <string name="enter_pin">137905</string>
     <string name="links_reloaded_toast">リンクがリロードされました</string>
-    <string name="pref_disable_acra">自動バグ報告を無効にする</string>
     <string name="player_speed">プレーヤーの速度</string>
     <string name="subtitles_settings">字幕設定</string>
     <string name="app_dubbed_text">ダブ</string>
@@ -239,10 +232,8 @@
     <string name="autoplay_next_settings_des">現在のエピソードが終了したら次のエピソードを開始する</string>
     <string name="subs_hold_to_reset_to_default">長押しするとデフォルトにリセットされます</string>
     <string name="popup_resume_download">ダウンロードを再開</string>
-    <string name="hide_player_control_names_key" translatable="false">hide_player_control_names_key</string>
     <string name="filter_bookmarks">ブックマークのフィルタ</string>
     <string name="normal_no_plot">プロットが見つかりません</string>
-    <string name="bug_report_settings_on">データを送信しない</string>
     <string name="double_tap_to_pause_settings">ダブルタップで一時停止</string>
     <string name="show_trailers_settings">トレーラーを表示</string>
     <string name="jsdelivr_proxy">GitHub プロキシ</string>
@@ -278,7 +269,7 @@
     <string name="example_email">hello@world.com</string>
     <string name="disable">無効化</string>
     <string name="subtitles_outline">概要</string>
-    <string name="music_singlar">音楽</string>
+    <string name="music_singular">音楽</string>
     <string name="double_tap_to_pause_settings_des">中央で２回タップして一時停止</string>
     <string name="episode_action_play_in_format">%s で再生</string>
     <string name="switch_account">アカウントを切り替え</string>
@@ -304,8 +295,8 @@
     <string name="repo_copy_label">リポジトリ名とURL</string>
     <string name="toast_copied">コピーされました！</string>
     <string name="audio_book_singular">オーディオブック</string>
-    <string name="custom_media_singluar">メディア</string>
-    <string name="limit_title_rez">ビデオプレーヤーの解像度</string>
+    <string name="custom_media_singular">メディア</string>
+    <string name="limit_title_rez">プレイヤー情報を表示</string>
     <string name="speed_setting_summary">プレイヤーに速度オプションを追加</string>
     <string name="downloads_delete_select">削除する項目を選択</string>
     <string name="offline_file">オフラインで視聴可能</string>
@@ -317,9 +308,7 @@
     <string name="nginx_url_pref">NGINXサーバーのURL</string>
     <string name="restore_settings">バックアップからデータを復元</string>
     <string name="updates_settings_des">アプリ起動後に自動的に更新を探します。</string>
-    <string name="uprereleases_settings">プレリリースにアップデート</string>
     <string name="subs_default_reset_toast">初期値にリセット</string>
-    <string name="acra_report_toast">残念ながらアプリがクラッシュしました。匿名のバグ報告が開発者に送信されます</string>
     <string name="episode_format" formatted="true">%1$d %2$s</string>
     <string name="no_episodes_found">エピソードが見つかりません</string>
     <string name="app_theme_settings">アプリのテーマ</string>
@@ -423,7 +412,6 @@
     <string name="subtitles_from_embedded">埋め込み</string>
     <string name="subtitles_from_online">オンライン</string>
     <string name="lightnovel">同じ開発者によるライトノベルアプリ</string>
-    <string name="uprereleases_settings_des">完全リリースだけでなくプレリリースのアップデートも検索</string>
     <string name="add_site_pref">サイトをクローン</string>
     <string name="actor_main">メイン</string>
     <string name="subtitles_remove_bloat">字幕から不要なものを削除</string>
@@ -479,7 +467,7 @@
     <string name="plugins_disabled" formatted="true">無効: %d</string>
     <string name="player_pref">優先ビデオプレーヤー</string>
     <string name="skip_type_format" formatted="true">%s をスキップ</string>
-    <string name="skip_type_creddits">クレジット</string>
+    <string name="skip_type_credits">クレジット</string>
     <string name="app_unrestricted_toast">アプリのバッテリー使用はすでに無制限に設定されています</string>
     <string name="sort">並べ替え</string>
     <string name="revert">元に戻す</string>
@@ -490,7 +478,7 @@
     <string name="benene_des">与えられたベネネ</string>
     <string name="use">使用</string>
     <string name="quality_sd">SD</string>
-    <string name="apk_installer_settings_des">一部の携帯電話は新しいパッケージインストーラをサポートしていません。アップデートがインストールされない場合はレガシーオプションを試してください。</string>
+    <string name="apk_installer_settings_des">一部のスマートフォンは新しいパッケージインストーラをサポートしていません。アップデートがインストールされない場合はレガシーオプションを試してください。</string>
     <string name="episode_action_chromecast_mirror">Chromecastミラー</string>
     <string name="double_tap_to_seek_settings_des">前後にシークするために右側または左側をダブルタップ</string>
     <string name="quality_hdr">HDR</string>
@@ -545,7 +533,7 @@
     <string name="result_search_tooltip">他の拡張機能で検索</string>
     <string name="test_extensions_summary">このテストは開発者専用であり、拡張機能の動作を検証または否定しません。</string>
     <string name="biometric_setting">生体認証でロック</string>
-    <string name="resume_remaining" formatted="true">残り %s</string>
+    <string name="resume_remaining" formatted="true">%s\n残り</string>
     <string name="clipboard_unknown_error">コピー中にエラーが発生しました。logcatをコピーしてアプリサポートに連絡してください。</string>
     <string name="ok">OK</string>
     <string name="battery_dialog_title">バッテリー最適化を無効にする</string>
@@ -560,7 +548,7 @@
     <string name="jsdelivr_proxy_summary">jsDelivrを使用して生のGitHub URLのブロックを回避します。アップデートが数日遅れる可能性があります。</string>
     <string name="speech_recognition_unavailable">音声認識は利用できません</string>
     <string name="begin_speaking">話し始めてください…</string>
-    <string name="torrent_info">このビデオはトレントです。つまり、ビデオの活動が追跡される可能性があります。続行する前にトレントについて理解してください。</string>
+    <string name="torrent_info">このビデオはトレントのため、ビデオの活動が追跡される可能性があります。\n続行する前にトレントについて理解してください。</string>
     <string name="watch_quality_pref_data">優先視聴品質 (モバイルデータ)</string>
     <string name="limit_title">ビデオプレーヤーのタイトル最大文字数</string>
     <string name="video_disk_description">ストレージが少ないデバイス（Android TVなど）で高く設定すると問題が発生します。</string>
@@ -569,12 +557,10 @@
     <string name="subtitles_depressed">凹んだ</string>
     <string name="qr_image">QRコード画像</string>
     <string name="previous">前へ</string>
-    <string name="crash_reporting_title">クラッシュレポート</string>
     <string name="preferred_media_subtext">表示したいもの</string>
     <string name="batch_download_finish_format" formatted="true">%1$d %2$s をダウンロードしました</string>
     <string name="lock_profile">プロフィールをロック</string>
     <string name="password_pin_authentication_title">パスワード/PIN認証</string>
-    <string name="bug_report_settings_off">クラッシュ時のみデータを送信</string>
     <string name="pref_filter_search_quality">検索結果で選択したビデオ品質を非表示</string>
     <string name="automatic_plugin_download_summary">追加されたリポジトリから未インストールのすべてのプラグインを自動的にインストールします。</string>
     <string name="redo_setup_process">セットアッププロセスを再実行</string>
@@ -658,13 +644,13 @@
     <string name="torrent_preferred_media">設定/プロバイダ/優先メディアでトレントを有効にする</string>
     <string name="torrent_not_accepted">アプリを再起動し、ポップアップに同意して続行します。</string>
     <string name="software_decoding">ソフトウェアデコーディング</string>
-    <string name="software_decoding_desc">ソフトウェアデコーディングにより、携帯電話でサポートされていないビデオファイルを再生できますが、高解像度で遅延や不安定な再生を引き起こす可能性があります</string>
+    <string name="software_decoding_desc">ソフトウェアデコーディングにより、機器でサポートされていないビデオファイルを再生できますが、高解像度で遅延や不安定な再生を引き起こす可能性があります。</string>
     <string name="plugins_updated_manually">%d 個のプラグインを正常に更新しました！</string>
     <string name="no_plugins_updated_manually">更新されたプラグインはありません。</string>
     <string name="player_notification_channel_name">プレーヤー通知</string>
     <string name="player_notification_channel_description">バックグラウンドから再生を制御するためのプレーヤー通知</string>
-    <string name="audio_singluar">オーディオ</string>
-    <string name="podcast_singluar">ポッドキャスト</string>
+    <string name="audio_singular">オーディオ</string>
+    <string name="podcast_singular">ポッドキャスト</string>
     <string name="android_tv_interface_off_seek_settings">プレーヤー非表示時 - シーク量</string>
     <string name="encoding_error">エンコーディングエラー</string>
     <string name="unsupported_error">サポートされていないエラー</string>
@@ -675,4 +661,72 @@
     <string name="slide_up_again_to_exceed_100">再度上へスライドして100%以上に調整できます</string>
     <string name="all_subtitles_italic">字幕を斜体にする</string>
     <string name="background_radius">背景の半径</string>
-</resources>
\ No newline at end of file
+    <string name="player_settings_always_ask">常に尋ねること</string>
+    <string name="download_parallel_settings_des">並行してダウンロードできるアイテム</string>
+    <string name="parallel_downloads">並行ダウンロード</string>
+    <string name="concurrent_connections">並行接続</string>
+    <string name="concurrent_connections_settings_des">ダウンロード中に使用できる同時接続数</string>
+    <string name="go_to_downloads">ダウンロードへ</string>
+    <string name="no_internet_connection">インターネットに接続していません。\n\nインターネットに接続して再度お試しいただくか、オフラインの状態でダウンロードをご覧ください。</string>
+    <string name="overscan_settings_des">画面の境界を変更する</string>
+    <string name="overscan_settings">オーバースキャン</string>
+    <string name="poster_size_settings_des">ポスターの大きさを変更</string>
+    <string name="poster_size_settings">ポスター</string>
+    <string name="speedup_title">長押し速度トグル</string>
+    <string name="speedup_summary">ホールドで2倍速に</string>
+    <string name="download_time_left_hour_min_sec_format" formatted="true">%1$d時間 %2$d分 %3$d秒</string>
+    <string name="download_time_left_min_sec_format" formatted="true">%1$d分 %2$d秒</string>
+    <string name="download_time_left_sec_format" formatted="true">%1$d秒</string>
+    <string name="episode_action_play_mirror">ミラーを再生</string>"
+    <string name="show_rating">評価</string>
+    <string name="no_account">アカウントなし</string>
+    <string name="edit_profile_image_title">プロフィール画像を編集</string>
+    <string name="edit_profile_image_hint">プロフィール画像のURLを入力</string>
+    <string name="edit_profile_image_error_empty">URLが見つかりません</string>
+    <string name="edit_profile_image_error_invalid">無効なURLまたは画像です</string>
+    <string name="edit_profile_image_success">画像を正常に更新しました</string>
+    <string name="action_mark_watched_up_to_this_episode">このエピソードまでを視聴済みにする</string>
+    <string name="action_remove_mark_watched_up_to_this_episode">このエピソードまでの視聴済みマークを解除</string>
+    <string name="action_reload">再読み込みが完了しました</string>
+    <string name="reload_provider">プロバイダーを再読み込み</string>
+    <string name="name">名前</string>
+    <string name="resolution_and_name">解像度と名前</string>
+    <string name="subs_subtitle_alignment">字幕の配置</string>
+    <string name="bottom_left">左下</string>
+    <string name="bottom_center">中央下</string>
+    <string name="bottom_right">右下</string>
+    <string name="middle_left">中央左</string>
+    <string name="middle_center">中央</string>
+    <string name="middle_right">中央右</string>
+    <string name="top_left">左上</string>
+    <string name="top_center">上中央</string>
+    <string name="top_right">右上</string>
+    <string name="play_full_series_button">全シリーズを再生</string>
+    <string name="install_prerelease">プレリリース版をインストール</string>
+    <string name="prerelease_already_installed">プレリリース版は既にインストールされています。</string>
+    <string name="prerelease_install_failed">プレリリース版のインストールに失敗しました。</string>
+    <string name="show_episode_text">エピソードのテキスト</string>
+    <string name="search_suggestions">検索候補</string>
+    <string name="search_suggestions_des">入力中に検索候補を表示する</string>
+    <string name="clear_suggestions">候補を消去</string>
+    <string name="show_cast_in_details">キャストパネルを表示</string>
+    <string name="source_name">ソース名</string>
+    <string name="video_info">メディア情報</string>
+    <string name="extra_brightness_settings">追加の輝度設定</string>
+    <string name="extra_brightness_settings_des">画面の輝度が100%を超えた場合に輝度フィルターを有効にします</string>
+    <string name="extra_brightness_key">追加の輝度を有効化</string>
+    <string name="download_queue">ダウンロードキュー</string>
+    <string name="queue_empty_message">現在、ダウンロードキューは空です。</string>
+    <string name="download_all">すべてダウンロード</string>
+    <string name="cancel_all">すべてキャンセル</string>
+    <string name="download_episode_range">エピソード %s をダウンロードしますか？</string>
+    <string name="cancel_queue_message">ダウンロードキューをすべてキャンセルしますか？</string>
+    <plurals name="downloads_active">
+        <item quantity="other">%d 件をダウンロード中</item>
+    </plurals>
+    <plurals name="downloads_queued">
+        <item quantity="other">%d 件が待機中</item>
+    </plurals>
+    <string name="source_priority">ソースの優先順位</string>
+    <string name="source_priority_help">プレイヤーでのビデオソースの並び順を設定します</string>
+</resources>
diff --git a/app/src/main/res/values-kn/strings.xml b/app/src/main/res/values-b+kn/strings.xml
similarity index 97%
rename from app/src/main/res/values-kn/strings.xml
rename to app/src/main/res/values-b+kn/strings.xml
index 8be5a737b65..ba6da787cb8 100644
--- a/app/src/main/res/values-kn/strings.xml
+++ b/app/src/main/res/values-b+kn/strings.xml
@@ -26,7 +26,6 @@
     <string name="download_storage_text">ಇಂಟರ್ನಲ್ ಸ್ಟೋರೇಜ್</string>
     <string name="app_dubbed_text">ಡಬ್</string>
     <string name="app_subbed_text">ಸಬ್</string>
-    <string name="pref_disable_acra">ಸ್ವಯಂಚಾಲಿತ ದೋಷ ವರದಿಯನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ</string>
     <string name="home_expanded_hide">ಹೈಡ್</string>
     <string name="home_play">ಪ್ಲೇ</string>
     <string name="home_info">ಮಾಹಿತಿ</string>
@@ -84,8 +83,7 @@
     <string name="result_share">ಶೇರ್</string>
     <string name="popup_delete_file">ಫೈಲ್ ಅಳಿಸಿ</string>
     <string name="home_more_info">ಹೆಚ್ಚಿನ ಮಾಹಿತಿ</string>
-    <string name="new_update_format" formatted="true">ಹೊಸ ಅಪ್ಡೇಟ್ ಬಂದಿದೆ
-\n%1$s-%2$s</string>
+    <string name="new_update_format" formatted="true">ಹೊಸ ಅಪ್ಡೇಟ್ ಬಂದಿದೆ \n%1$s-%2$s</string>
     <string name="loading">ಲೋಡಿಂಗ್…</string>
     <string name="subs_download_languages">ಡೌನ್‌ಲೋಡ್ ಭಾಷೆಗಳನ್ನು ಮಾಡಿ</string>
     <string name="play_livestream_button">ಲೈವ್‌ಸ್ಟ್ರೀಮ್ ಪ್ಲೇ ಮಾಡಿ</string>
@@ -130,5 +128,4 @@
     <string name="swipe_to_change_settings_des">Brightness ಅಥವಾ volume ಬದಲಾಯಿಸಲು ಎಡ ಅಥವಾ ಬಲಭಾಗದಲ್ಲಿ ಮೇಲಕ್ಕೆ ಅಥವಾ ಕೆಳಕ್ಕೆ ಸ್ಲೈಡ್ ಮಾಡಿ</string>
     <string name="autoplay_next_settings_des">ಈಗಿನ ಎಪಿಸೋಡ್ ಮುಗಿದಾಗ ಮುಂದಿನ ಎಪಿಸೋಡ್ ಅನ್ನು ಪ್ರಾರಂಭಿಸಿ</string>
     <string name="swipe_to_change_settings">ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಬದಲಾಯಿಸಲು ಸ್ವೈಪ್ ಮಾಡಿ</string>
-    <string name="hide_player_control_names_key" translatable="false">hide_player_control_names_key</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-b+ko/strings.xml
similarity index 65%
rename from app/src/main/res/values-ko/strings.xml
rename to app/src/main/res/values-b+ko/strings.xml
index 36da4ddad63..14d327372ff 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-b+ko/strings.xml
@@ -1,21 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <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="search_poster_img_des">포스터</string>
     <string name="episode_poster_img_des">에피소드 포스터</string>
     <string name="home_main_poster_img_des">메인 포스터</string>
-    <string name="home_next_random_img_des">다음 랜덤</string>
+    <string name="home_next_random_img_des">다음 추천</string>
     <string name="go_back_img_des">뒤로가기</string>
     <string name="home_change_provider_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="rated_format" formatted="true">평점: %.1f</string>
-    <string name="new_update_format" formatted="true">새로운 업데이트!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">새로운 업데이트! \n%1$s -&gt; %2$s</string>
     <string name="duration_format" formatted="true">%d분</string>
     <string name="app_name">CloudStream</string>
-    <string name="play_with_app_name">CloudStream에서 재생</string>
+    <string name="play_with_app_name">CloudStream으로 재생</string>
     <string name="title_home">홈</string>
     <string name="title_downloads">다운로드</string>
     <string name="title_settings">설정</string>
@@ -26,14 +25,14 @@
     <string name="next_episode">다음 에피소드</string>
     <string name="result_tags">장르</string>
     <string name="result_share">공유</string>
-    <string name="result_open_in_browser">브라우저에서 열기</string>
+    <string name="result_open_in_browser">브라우저로 열기</string>
     <string name="browser">브라우저</string>
-    <string name="skip_loading">로딩 건너뛰기</string>
+    <string name="skip_loading">로딩 스킵</string>
     <string name="loading">로딩중…</string>
     <string name="type_watching">시청</string>
     <string name="type_on_hold">보류</string>
     <string name="type_completed">시청 완료</string>
-    <string name="type_dropped">포기</string>
+    <string name="type_dropped">시청 포기</string>
     <string name="type_plan_to_watch">시청 예정</string>
     <string name="type_re_watching">다시보기</string>
     <string name="play_movie_button">영화 재생</string>
@@ -46,24 +45,23 @@
     <string name="play_episode">에피소드 재생</string>
     <string name="download">다운로드</string>
     <string name="popup_play_file">파일 재생</string>
-    <string name="popup_resume_download">계속 다운로드</string>
+    <string name="popup_resume_download">다운로드 재개</string>
     <string name="popup_pause_download">다운로드 일시정지</string>
-    <string name="pref_disable_acra">자동 오류 보고 비활성화</string>
     <string name="home_more_info">상세 정보</string>
-    <string name="home_expanded_hide">닫기</string>
+    <string name="home_expanded_hide">숨기기</string>
     <string name="home_play">재생</string>
     <string name="home_info">정보</string>
     <string name="action_add_to_bookmarks">시청 상태 설정</string>
     <string name="sort_save">저장</string>
     <string name="player_speed">재생 속도</string>
-    <string name="subs_text_color">글자 색깔</string>
-    <string name="subs_outline_color">외곽선 색깔</string>
-    <string name="subs_background_color">배경 색깔</string>
-    <string name="subs_window_color">창 색깔</string>
-    <string name="subs_edge_type">가장자리 타입</string>
+    <string name="subs_text_color">글자 색상</string>
+    <string name="subs_outline_color">윤곽선 색상</string>
+    <string name="subs_background_color">배경 색상</string>
+    <string name="subs_window_color">배경 색상</string>
+    <string name="subs_edge_type">윤곽선 유형</string>
     <string name="subs_subtitle_elevation">자막 높이</string>
     <string name="subs_font">폰트</string>
-    <string name="subs_font_size">폰트 크기</string>
+    <string name="subs_font_size">글자 크기</string>
     <string name="downloaded">다운로드됨</string>
     <string name="downloading">다운로드중</string>
     <string name="download_paused">다운로드 일시정지</string>
@@ -110,7 +108,7 @@
     <string name="player_subtitles_settings_des">플레이어 자막 설정</string>
     <string name="chromecast_subtitles_settings">Chromecast 자막</string>
     <string name="chromecast_subtitles_settings_des">Chromecast 자막 설정</string>
-    <string name="eigengraumode_settings">배속 모드</string>
+    <string name="eigengraumode_settings">재생 속도</string>
     <string name="swipe_to_seek_settings">스와이프하여 탐색</string>
     <string name="swipe_to_seek_settings_des">좌우로 스와이프하여 동영상 위치 제어하기</string>
     <string name="swipe_to_change_settings">스와이프하여 설정 변경</string>
@@ -120,12 +118,12 @@
     <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="use_system_brightness_settings_des">어두운 오버레이 대신 앱 플레이어의 시스템 밝기를 사용합니다</string>
     <string name="episode_sync_settings">시청 진행 상황 업데이트</string>
     <string name="episode_sync_settings_des">현재 에피소드 진행 상황을 자동으로 동기화합니다</string>
-    <string name="restore_settings">백업에서 데이터 복원</string>
+    <string name="restore_settings">데이터 복원</string>
     <string name="backup_settings">데이터 백업</string>
     <string name="restore_failed_format" formatted="true">파일에서 데이터를 복원하지 못했습니다 %s</string>
     <string name="backup_success">저장된 데이터</string>
@@ -136,16 +134,14 @@
     <string name="category_account">계정 및 보안</string>
     <string name="advanced_search_des">소스별로 구분된 검색 결과를 제공합니다</string>
     <string name="show_trailers_settings">예고편 보기</string>
-    <string name="kitsu_settings">Kitsu에서 포스터 보기</string>
+    <string name="kitsu_settings">Kitsu에서 포스터 가져오기</string>
     <string name="pref_filter_search_quality">검색 결과에서 선택한 동영상 품질 숨기기</string>
     <string name="automatic_plugin_download">플러그인 자동 다운로드</string>
     <string name="automatic_plugin_updates">플러그인 자동 업데이트</string>
     <string name="automatic_plugin_download_summary">추가된 저장소에서 아직 설치되지 않은 모든 플러그인을 자동으로 설치합니다.</string>
     <string name="updates_settings">앱 업데이트 표시</string>
     <string name="updates_settings_des">앱을 시작한 후 새 업데이트를 자동으로 검색합니다.</string>
-    <string name="uprereleases_settings">미리보기로 업데이트</string>
-    <string name="uprereleases_settings_des">정식 릴리즈 대신 미리보기 업데이트만 검색합니다</string>
-    <string name="apk_installer_settings_des">일부 휴대폰은 새 패키지 설치 프로그램을 지원하지 않습니다. 업데이트가 설치되지 않으면 레거시 옵션을 사용해 보세요.</string>
+    <string name="apk_installer_settings_des">일부 기기에서는 최신 방식의 설치 프로그램이 작동하지 않을 수 있습니다. 업데이트가 안 된다면 \'기본 방식\' 설정을 사용해 보세요.</string>
     <string name="lightnovel">같은 개발자가 만든 라이트 노벨 앱</string>
     <string name="anim">같은 개발자가 만든 애니메이션 앱</string>
     <string name="discord">Discord에 참여하기</string>
@@ -153,22 +149,19 @@
     <string name="benene_des">바나나 줌</string>
     <string name="app_language">앱 언어</string>
     <string name="no_links_found_toast">링크를 찾을 수 없음</string>
-    <string name="copy_link_toast">클립보드에 링크 복사됨</string>
+    <string name="copy_link_toast">클립보드에 링크 복사함</string>
     <string name="play_episode_toast">에피소드 재생</string>
     <string name="subs_default_reset_toast">기본값으로 재설정</string>
-    <string name="acra_report_toast">죄송합니다, 애플리케이션이 충돌했습니다. 버그 보고서가 익명으로 개발자에게 전송됩니다</string>
     <string name="episodes">에피소드</string>
     <string name="episodes_range">%1$d-%2$d</string>
-    <string name="status_ongoing">진행중</string>
-    <string name="status_completed">시청 완료</string>
+    <string name="status_ongoing">방영 중</string>
+    <string name="status_completed">완결</string>
     <string name="status">상태</string>
     <string name="year">년</string>
     <string name="rating">평점</string>
     <string name="go_forward_30">+30</string>
-    <string name="delete_message" formatted="true">%s가 영구 삭제됩니다
-\n정말 삭제하시겠습니까?</string>
-    <string name="resume_time_left" formatted="true">%d분
-\n남음</string>
+    <string name="delete_message" formatted="true">%s이(가) 영구적으로 삭제됩니다 \n정말 삭제하시겠습니까?</string>
+    <string name="resume_time_left" formatted="true">%d분 \n남음</string>
     <string name="site">사이트</string>
     <string name="duration">시간</string>
     <string name="synopsis">개요</string>
@@ -184,30 +177,30 @@
     <string name="anime">애니</string>
     <string name="torrent">토렌트</string>
     <string name="episode_action_chromecast_mirror">Chromecast 미러링</string>
-    <string name="episode_action_play_in_app">앱에서 재생</string>
-    <string name="episode_action_play_in_format">%s에서 재생</string>
+    <string name="episode_action_play_in_app">앱으로 재생</string>
+    <string name="episode_action_play_in_format">%s로 재생</string>
     <string name="episode_action_auto_download">자동 다운로드</string>
-    <string name="episode_action_download_mirror">다운로드 미러</string>
-    <string name="episode_action_reload_links">링크 새로고침</string>
+    <string name="episode_action_download_mirror">다운로드 소스 목록</string>
+    <string name="episode_action_reload_links">링크 초기화</string>
     <string name="episode_action_download_subtitle">자막 다운로드</string>
-    <string name="show_hd">화질 탭</string>
-    <string name="show_dub">더빙 탭</string>
-    <string name="show_sub">자막 탭</string>
+    <string name="show_hd">화질 라벨</string>
+    <string name="show_dub">더빙 라벨</string>
+    <string name="show_sub">자막 라벨</string>
     <string name="show_title">제목</string>
     <string name="check_for_update">업데이트 확인</string>
     <string name="video_lock">잠금</string>
     <string name="video_aspect_ratio_resize">크기 조정</string>
     <string name="video_source">소스</string>
-    <string name="video_skip_op">오프닝 건너뛰기</string>
-    <string name="skip_update">이 업데이트 건너뛰기</string>
+    <string name="video_skip_op">오프닝 스킵</string>
+    <string name="skip_update">다음에 업데이트</string>
     <string name="watch_quality_pref">선호하는 화질 (WiFi)</string>
     <string name="watch_quality_pref_data">선호하는 화질 (모바일 데이터)</string>
-    <string name="limit_title_rez">동영상 플레이어 해상도</string>
+    <string name="limit_title_rez">플레이어 내 표시 정보</string>
     <string name="video_buffer_size_settings">동영상 버퍼 크기</string>
-    <string name="video_buffer_clear_settings">동영상 및 이미지 캐시 지우기</string>
+    <string name="video_buffer_clear_settings">비디오 및 이미지 캐시 삭제</string>
     <string name="dns_pref">DNS over HTTPS</string>
     <string name="jsdelivr_enabled">GitHub에 연결할 수 없습니다. jsDelivr 프록시를 켜는 중…</string>
-    <string name="jsdelivr_proxy_summary">jsDelivr을 사용하여 GitHub 차단을 우회합니다. 업데이트가 며칠 지연될 수 있습니다.</string>
+    <string name="jsdelivr_proxy_summary">jsDelivr를 사용하여 차단된 GitHub 주소를 우회합니다. 단, 업데이트 반영이 며칠 정도 늦어질 수 있습니다.</string>
     <string name="add_site_pref">복제 사이트</string>
     <string name="remove_site_pref">사이트 삭제</string>
     <string name="add_site_summary">다른 URL을 사용하여 기존 사이트의 복제본을 추가합니다</string>
@@ -221,10 +214,10 @@
     <string name="category_general">일반</string>
     <string name="pref_category_player_features">플레이어 기능</string>
     <string name="pref_category_ui_features">기능</string>
-    <string name="provider_lang_settings">소스 언어</string>
+    <string name="provider_lang_settings">확장프로그램 언어</string>
     <string name="app_layout">앱 레이아웃</string>
     <string name="preferred_media_settings">선호하는 미디어</string>
-    <string name="enable_nsfw_on_providers">지원되는 공급업체에서 19금 사용 설정</string>
+    <string name="enable_nsfw_on_providers">확장프로그램에서 NSFW 활성화</string>
     <string name="subtitles_encoding">자막 인코딩</string>
     <string name="category_providers">소스</string>
     <string name="category_provider_test">소스 테스트</string>
@@ -255,7 +248,7 @@
     <string name="all">전부</string>
     <string name="max">최대</string>
     <string name="min">최소</string>
-    <string name="subtitles_outline">윤곽선</string>
+    <string name="subtitles_outline">윤곽선 효과</string>
     <string name="subtitles_shadow">그림자</string>
     <string name="subtitle_offset">자막 동기화</string>
     <string name="subtitle_offset_hint">1000 ms</string>
@@ -281,7 +274,7 @@
     <string name="error_invalid_data">잘못된 데이터</string>
     <string name="error_invalid_url">잘못된 URL</string>
     <string name="error">오류</string>
-    <string name="subtitles_remove_captions">자막에서 선택 캡션 제거</string>
+    <string name="subtitles_remove_captions">청각 장애인용 자막 요소 제거</string>
     <string name="subtitles_filter_lang">선호하는 미디어 언어로 필터링</string>
     <string name="trailer">예고편</string>
     <string name="next">다음</string>
@@ -301,19 +294,15 @@
     <string name="delete_repository">저장소 삭제</string>
     <string name="setup_extensions_subtext">사용하려는 사이트 목록 다운로드</string>
     <string name="plugins_downloaded" formatted="true">다운로드됨: %d</string>
-    <string name="blank_repo_message">CloudStream에는 기본적으로 설치된 사이트가 없습니다. 저장소에서 사이트를 설치해야 합니다.
-\n
-\nSky UK Limited의 무분별한 DMCA 게시 중단으로 인해 앱에서 저장소 사이트를 연결 할 수 없습니다.
-\n
-\nDiscord에 가입하거나 온라인으로 검색해 보세요.</string>
+    <string name="blank_repo_message">CloudStream에는 기본적으로 설치된 사이트가 없습니다. 저장소에서 사이트를 설치해야 합니다. \n \nDiscord에 가입하거나 온라인으로 검색해 보세요.</string>
     <string name="view_public_repositories_button">커뮤니티 저장소 보기</string>
     <string name="view_public_repositories_button_short">공개 목록</string>
-    <string name="uppercase_all_subtitles">모든 자막 대문자화</string>
-    <string name="download_all_plugins_from_repo">이 저장소에서 모든 플러그인을 다운로드하시겠습니까?경고: CloudStream 3은 타 사 확장 프로그램 사용에 대해 책임을 지지 않으며 이를 지원하지 않습니다!</string>
+    <string name="uppercase_all_subtitles">자막 대문자화 표시</string>
+    <string name="download_all_plugins_from_repo">경고: CloudStream은 외부 확장 프로그램 사용에 대해 어떠한 책임도 지지 않으며, 관련 기술 지원을 제공하지 않습니다!</string>
     <string name="single_plugin_disabled" formatted="true">%s (사용불가)</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_deleted">플러그인 삭제됨</string>
@@ -326,18 +315,16 @@
     <string name="safe_mode_crash_info">충돌 정보 보기</string>
     <string name="extension_language">언어</string>
     <string name="subscription_episode_released">에피소드 %d 공개!</string>
-    <string name="picture_in_picture">Picture-in-picture</string>
+    <string name="picture_in_picture">Picture-in-picture 모드</string>
     <string name="player_size_settings">플레이어 크기 조정 버튼</string>
-    <string name="picture_in_picture_des">다른 앱 위에 있는 미니어처 플레이어에서 재생을 계속합니다</string>
-    <string name="bug_report_settings_off">충돌에 관한 데이터만 전송</string>
-    <string name="player_size_settings_des">검은색 테두리 제거</string>
+    <string name="picture_in_picture_des">미니플레이어를 통해 다른 앱 상단에서 계속 재생합니다</string>
+    <string name="player_size_settings_des">레터박스 제거</string>
     <string name="double_tap_to_seek_settings_des">오른쪽 또는 왼쪽을 두 번 탭하여 앞뒤로 탐색하기</string>
     <string name="player_subtitles_settings">자막</string>
-    <string name="restore_success">로드된 백업 파일</string>
+    <string name="restore_success">백업 파일을 성공적으로 로드하였습니다</string>
     <string name="settings_info">정보</string>
     <string name="advanced_search">고급 검색</string>
-    <string name="bug_report_settings_on">데이터를 보내지 않습니다</string>
-    <string name="redo_setup_process">설정 프로세스 다시 실행</string>
+    <string name="redo_setup_process">설정 프로세스 재실행</string>
     <string name="apk_installer_settings">APK 인스톨러</string>
     <string name="github">Github</string>
     <string name="source_error">소스 오류</string>
@@ -359,8 +346,8 @@
     <string name="test_failed">실패</string>
     <string name="sync_score">평점</string>
     <string name="extension_rating" formatted="true">평점: %s</string>
-    <string name="sort_rating_desc">평점 (높음에서 낮음으로)</string>
-    <string name="sort_rating_asc">평점 (낮음에서 높음으로)</string>
+    <string name="sort_rating_desc">평점 (높은순)</string>
+    <string name="sort_rating_asc">평점 (낮은순)</string>
     <string name="nsfw_singular">19금</string>
     <string name="documentaries">다큐멘터리</string>
     <string name="livestreams">라이브 방송</string>
@@ -380,15 +367,15 @@
     <string name="anime_singular">애니</string>
     <string name="ova_singular">OVA</string>
     <string name="remote_error">원격 오류</string>
-    <string name="storage_error">다운로드 오류, 저장 권한 확인</string>
+    <string name="storage_error">다운로드 오류, 저장소 권한을 확인하세요</string>
     <string name="episode_action_chromecast_episode">Chromecast 에피소드</string>
     <string name="unexpected_error">예기치 않은 플레이어 오류</string>
     <string name="dont_show_again">다시 표시하지 않음</string>
     <string name="no_update_found">업데이트를 찾을 수 없음</string>
     <string name="update">업데이트</string>
-    <string name="jsdelivr_proxy">raw.githubusercontent.com 프록시</string>
+    <string name="jsdelivr_proxy">GitHub 프록시</string>
     <string name="video_buffer_length_settings">동영상 버퍼 길이</string>
-    <string name="video_buffer_disk_settings">저장소에 동영상 캐시</string>
+    <string name="video_buffer_disk_settings">디스크 비디오 캐시</string>
     <string name="video_ram_description">Android TV와 같이 메모리가 부족한 디바이스에서 너무 높게 설정하면 충돌이 발생할 수 있습니다.</string>
     <string name="resize_fill">화면 크기에 맞춤</string>
     <string name="video_disk_description">Android TV와 같이 저장 공간이 부족한 기기에서 너무 높게 설정하면 문제가 발생할 수 있습니다.</string>
@@ -403,12 +390,12 @@
     <string name="pref_category_app_updates">앱 업데이트</string>
     <string name="pref_category_extensions">확장 기능</string>
     <string name="logout">로그아웃</string>
-    <string name="example_site_url">사이트 URL</string>
+    <string name="example_site_url">https://example.com</string>
     <string name="example_password">비밀번호</string>
     <string name="account">계정</string>
     <string name="example_username">사용자 이름</string>
     <string name="example_lang_name">언어 코드 (ko)</string>
-    <string name="example_site_name">사이트 이름</string>
+    <string name="example_site_name">새사이트이름</string>
     <string name="login_format" formatted="true">%1$s %2$s</string>
     <string name="subtitle_offset_extra_hint_before_format">자막이 %d ms 너무 늦게 표시되는 경우, 사용하세요</string>
     <string name="subtitle_offset_extra_hint_none_format">자막 지연 없음</string>
@@ -424,7 +411,6 @@
     <string name="category_player">플레이어</string>
     <string name="quality_hdr">HDR</string>
     <string name="quality_tc">TC</string>
-    <string name="crash_reporting_title">충돌 보고</string>
     <string name="setup_done">완료</string>
     <string name="plugins_not_downloaded" formatted="true">다운로드되지 않음: %d</string>
     <string name="quality_hq">HQ</string>
@@ -445,16 +431,16 @@
     <string name="extension_install_first">먼저 확장 프로그램을 설치하세요</string>
     <string name="app_not_found_error">앱을 찾을 수 없음</string>
     <string name="all_languages_preference">모든 언어</string>
-    <string name="skip_type_format" formatted="true">건너뛰기 %s</string>
+    <string name="skip_type_format" formatted="true">%s 스킵</string>
     <string name="skip_type_op">오프닝</string>
     <string name="skip_type_ed">엔딩</string>
     <string name="skip_type_mixed_ed">혼합 엔딩</string>
     <string name="skip_type_mixed_op">혼합 오프닝</string>
-    <string name="skip_type_creddits">크레딧</string>
-    <string name="skip_type_intro">소개</string>
+    <string name="skip_type_credits">크레딧</string>
+    <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_remove_from_watched">시청에서 삭제</string>
     <string name="confirm_exit_dialog">정말 종료하시겠습니까?</string>
@@ -463,20 +449,18 @@
     <string name="update_notification_downloading">앱 업데이트 다운로드 중…</string>
     <string name="update_notification_installing">앱 업데이트 설치 중…</string>
     <string name="update_notification_failed">새 버전의 앱을 설치할 수 없습니다</string>
-    <string name="apk_installer_legacy">레거시</string>
+    <string name="apk_installer_legacy">기본 방식</string>
     <string name="apk_installer_package_installer">패키지 인스톨러</string>
     <string name="delayed_update_notice">앱 종료시 업데이트됩니다</string>
     <string name="sort_by">정렬 기준</string>
     <string name="sort">정렬</string>
-    <string name="sort_updated_new">업데이트됨 (새로움에서 오래된 순)</string>
-    <string name="sort_updated_old">업데이트 (오래됨에서 새로운 순)</string>
+    <string name="sort_updated_new">업데이트 (최신순)</string>
+    <string name="sort_updated_old">업데이트 (오래된순)</string>
     <string name="sort_alphabetical_a">알파벳순 (A에서 Z)</string>
     <string name="sort_alphabetical_z">알파벳순 (Z에서 A)</string>
     <string name="open_with">다음으로 열기</string>
-    <string name="empty_library_no_accounts_message">라이브러리가 비어 있습니다 :(
-\n라이브러리 계정으로 로그인하거나 로컬 라이브러리에 프로그램을 추가하세요.</string>
-    <string name="safe_mode_file">안전 모드 파일을 찾았습니다!
-\n파일이 제거될 때까지 시작 시 확장 프로그램을 로드하지 않습니다.</string>
+    <string name="empty_library_no_accounts_message">라이브러리가 비어 있습니다 :( \n라이브러리 계정으로 로그인하거나 로컬 라이브러리에 프로그램을 추가하세요.</string>
+    <string name="safe_mode_file">안전 모드 파일을 찾았습니다! \n파일이 제거될 때까지 시작 시 확장 프로그램을 로드하지 않습니다.</string>
     <string name="hls_playlist">HLS 재생목록</string>
     <string name="player_settings_play_in_app">내부 플레이어</string>
     <string name="player_pref">선호하는 동영상 플레이어</string>
@@ -484,7 +468,7 @@
     <string name="empty_library_logged_in_message">이 목록이 비어 있습니다. 다른 목록으로 전환해 보세요.</string>
     <string name="filler" formatted="true">필러</string>
     <string name="play_livestream_button">라이브 스트리밍 재생</string>
-    <string name="stream">스트림</string>
+    <string name="stream">네트워크 스트림</string>
     <string name="search_provider_text_types">유형을 사용하여 검색</string>
     <string name="benene_count_text">개발자에게 %d 바나나 줌</string>
     <string name="benene_count_text_none">바나나를 주지 않음</string>
@@ -492,43 +476,43 @@
     <string name="action_open_play">@string/home_play</string>
     <string name="normal_no_plot">플롯을 찾을 수 없음</string>
     <string name="torrent_no_plot">설명을 찾을 수 없음</string>
-    <string name="show_log_cat">Logcat 🐈 표시</string>
+    <string name="show_log_cat">로그캣 🐈 보기</string>
     <string name="show_fillers_settings">애니메이션용 필러 에피소드 표시</string>
     <string name="test_passed">통과</string>
     <string name="resume">계속</string>
-    <string name="limit_title">동영상 플레이어 제목 최대 글자 수</string>
-    <string name="android_tv_interface_on_seek_settings">표시된 플레이어 - 빨리 감기 및 되감기 초</string>
-    <string name="android_tv_interface_on_seek_settings_summary">플레이어가 보일 때 사용되는 탐색량</string>
-    <string name="android_tv_interface_off_seek_settings">플레이어 숨김 - 빨리 감기 및 되감기 초</string>
-    <string name="android_tv_interface_off_seek_settings_summary">플레이어가 숨겨져 있을 때 사용되는 탐색량</string>
+    <string name="limit_title">플레이어 내 표시 제목의 최대 글자 수</string>
+    <string name="android_tv_interface_on_seek_settings">플레이어 표시 시 탐색 시간</string>
+    <string name="android_tv_interface_on_seek_settings_summary">플레이어 표시 중 탐색 간격</string>
+    <string name="android_tv_interface_off_seek_settings">플레이어 미표시 시 탐색 시간</string>
+    <string name="android_tv_interface_off_seek_settings_summary">플레이어 미표시 시 탐색 간격</string>
     <string name="pref_category_actions">동작</string>
     <string name="pref_category_looks">외형</string>
     <string name="random_button_settings">랜덤 버튼</string>
-    <string name="random_button_settings_desc">홈페이지에 랜덤 버튼 표시</string>
+    <string name="random_button_settings_desc">홈페이지 및 라이브러리에서 랜덤 버튼 표시</string>
     <string name="bottom_title_settings_des">포스터 아래에 제목을 이동</string>
-    <string name="subtitles_depressed">내려감</string>
-    <string name="subtitles_raised">올라감</string>
+    <string name="subtitles_depressed">음각</string>
+    <string name="subtitles_raised">양각</string>
     <string name="subtitles_example_text">다람쥐 헌 쳇바퀴에 타고파</string>
-    <string name="subtitles_remove_bloat">자막에서 부풀림 제거</string>
+    <string name="subtitles_remove_bloat">불필요한 요소/코드 제거</string>
     <string name="extras">엑스트라</string>
-    <string name="network_adress_example">스트림 링크</string>
+    <string name="network_adress_example">https://example.com/example.mp4</string>
     <string name="tracks">트랙</string>
-    <string name="referer">레퍼러</string>
+    <string name="referer">Referer (선택)</string>
     <string name="skip_type_recap">요약</string>
-    <string name="action_mark_as_watched">시청함으로 표시</string>
+    <string name="action_mark_as_watched">시청 완료로 표시</string>
     <string name="revert">되돌리기</string>
     <string name="subscription_in_progress_notification">구독한 프로그램 업데이트</string>
     <string name="subscription_list_name">구독중</string>
     <string name="subscription_new">구독 %s</string>
     <string name="subscription_deleted">구독 취소 %s</string>
     <string name="pref_category_security">보안</string>
-    <string name="pref_category_accounts">장부</string>
+    <string name="pref_category_accounts">계정</string>
     <string name="no_plugins_found_error">리포지토리에서 플러그인을 찾을 수 없습니다</string>
-    <string name="toast_copied">복사됨!</string>
+    <string name="toast_copied">복사 완료!</string>
     <string name="repo_copy_label">레포지토리 이름 및 URL</string>
     <string name="test_extensions_summary">본 테스트는 개발자만을 대상으로 하며, 확장자의 작업을 확인하거나 거부하지 않습니다.</string>
-    <string name="cs3wiki">클라우스스트림 위키</string>
-    <string name="links_reloaded_toast">다시 기록된 링크</string>
+    <string name="cs3wiki">CloudStream 위키</string>
+    <string name="links_reloaded_toast">링크 초기화 완료</string>
     <string name="backup_frequency">백업 빈도</string>
     <string name="favorites_list_name">즐겨찾기</string>
     <string name="qr_image">QR 이미지</string>
@@ -538,7 +522,7 @@
     <string name="dismiss">취소</string>
     <string name="open_downloaded_repo">저장소 열기</string>
     <string name="enter_current_pin">현재 PIN 입력</string>
-    <string name="auto_rotate_video_desc">비디오 방향에 따라 화면 방향을 자동으로 전환합니다</string>
+    <string name="auto_rotate_video_desc">비디오 방향에 따라 화면 방향을 자동으로 회전합니다</string>
     <string name="device_pin_error_message">장치 PIN 코드를 가져올 수 없습니다, 로컬 인증을 시도하세요</string>
     <string name="device_pin_expired_message">PIN 코드가 만료되었습니다!</string>
     <string name="device_pin_counter_text">코드 만료까지 남은 시간: %1$dm %2$ds</string>
@@ -553,7 +537,7 @@
     <string name="profiles">프로필</string>
     <string name="ok">확인</string>
     <string name="battery_dialog_title">배터리 최적화 사용 안 함</string>
-    <string name="app_unrestricted_toast">앱 배터리 사용량이 이미 무제한으로 설정되었습니다</string>
+    <string name="app_unrestricted_toast">배터리 사용량이 \'제한 없음\'으로 이미 설정되어 있습니다</string>
     <string name="app_info_intent_error">CloudStream의 App 정보를 열 수 없습니다.</string>
     <string name="favorite_added">즐겨찾기에 %s 추가</string>
     <string name="profile_number">프로필 %d</string>
@@ -568,95 +552,185 @@
     <string name="unfavorite">즐겨찾기 해제</string>
     <string name="biometric_authentication_title">잠금 해제</string>
     <string name="biometric_setting">생체 인식으로 잠금</string>
-    <string name="music_singlar">음악</string>
+    <string name="music_singular">음악</string>
     <string name="audio_book_singular">오디오책</string>
     <string name="auto_rotate_video">자동 회전</string>
     <string name="mobile_data">모바일 데이터</string>
     <string name="disable">사용 불가능</string>
     <string name="player_settings_select_cast_device">캐스트 장치 선택</string>
-    <string name="clipboard_unknown_error">복사하는 중 오류가 발생했습니다. 로그캣을 복사하고 문의하십시오.</string>
+    <string name="clipboard_unknown_error">복사하는 중 오류가 발생했습니다. 로그캣을 복사하고 개발자에게 문의하십시오.</string>
     <string name="action_unsubscribe">구독 취소</string>
     <string name="set_default">기본값 설정</string>
     <string name="action_subscribe">구독</string>
     <string name="use">사용</string>
-    <string name="duplicate_message_single" formatted="true">당신의 라이브러리에 이미 잠재적으로 중복된 항목이 존재합니다: \'%s\'.
-\n
-\n이 항목을 그래도 추가하시겠습니까, 기존 항목을 교체하시겠습니까, 아니면 작업을 취소하시겠습니까?</string>
+    <string name="duplicate_message_single" formatted="true">당신의 라이브러리에 이미 잠재적으로 중복된 항목이 존재합니다: \'%s\'. \n \n이 항목을 그래도 추가하시겠습니까, 기존 항목을 교체하시겠습니까, 아니면 작업을 취소하시겠습니까?</string>
     <string name="duplicate_replace_all">전부 대체</string>
     <string name="duplicate_add">추가</string>
     <string name="favorite_removed">즐겨찾기에서 %s 제거</string>
-    <string name="duplicate_message_multiple" formatted="true">당신의 라이브러리에 잠재적으로 중복된 항목이 발견되었습니다:
-\n
-\n%s
-\n
-\n이 항목을 그래도 추가하시겠습니까, 기존 항목을 교체하시겠습니까, 아니면 작업을 취소하시겠습니까?</string>
+    <string name="duplicate_message_multiple" formatted="true">당신의 라이브러리에 잠재적으로 중복된 항목이 발견되었습니다: \n \n%s \n \n이 항목을 그래도 추가하시겠습니까, 기존 항목을 교체하시겠습니까, 아니면 작업을 취소하시겠습니까?</string>
     <string name="select_an_account">계정 선택</string>
     <string name="use_default_account">기본 계정 사용</string>
     <string name="rotate_video">회전</string>
-    <string name="rotate_video_desc">화면 방향을 전환할 토글 버튼 표시</string>
+    <string name="rotate_video_desc">화면 방향 전환 버튼 표시</string>
     <string name="manage_accounts">계정 관리</string>
     <string name="lock_profile">프로필 잠금</string>
     <string name="pin_error_incorrect">잘못된 PIN입니다. 다시 시도하세요.</string>
     <string name="edit_account">계정 편집</string>
-    <string name="custom_media_singluar">미디어</string>
+    <string name="custom_media_singular">미디어</string>
     <string name="password_pin_authentication_title">비밀번호/PIN 인증</string>
     <string name="biometric_unsupported">이 장치에서는 생체 인식이 지원되지 않습니다</string>
     <string name="biometric_setting_summary">지문, 얼굴 ID, PIN, 패턴 또는 비밀번호로 앱을 잠급니다.</string>
     <string name="biometric_prompt_description">여러 번 실패하면 프롬프트가 닫힙니다. 다시 시도하려면 앱을 다시 시작하세요.</string>
     <string name="reset_btn">재설정</string>
     <string name="automatic_plugin_download_mode_title">플러그인 다운로드를 필터링할 모드 선택</string>
-    <string name="biometric_warning">데이터가 백업되었습니다. 장치에 따라 동작이 다를 수 있으며 앱 접근이 차단될 경우 앱 데이터를 완전히 지우고 백업에서 복원하세요. 이로 인해 발생하는 불편을 사과드립니다.</string>
-    <string name="device_pin_url_message">스마트폰이나 컴퓨터에서 <b>%s</b>를 방문하여 위의 코드를 입력하세요</string>
-    <string name="battery_dialog_message">구독 TV 프로그램에 대한 중단 없는 다운로드 및 알림을 보장하기 위해 CloudStream은 백그라운드에서 실행할 수 있는 권한이 필요합니다. 확인을 누르면 App info로 이동합니다. 거기서 𝘼𝙥𝙥 𝙗𝙖𝙩𝙩𝙚𝙧𝙮 𝙪𝙨𝙖𝙜𝙚로 스크롤하여 배터리 사용량을 𝙐𝙣𝙧𝙚𝙨𝙩𝙧𝙞𝙘𝙩𝙚𝙙로 설정합니다. 이 권한은 CS3가 배터리를 소모한다는 의미가 아닙니다. 알림을 받거나 공식 확장에서 동영상을 다운로드하는 등 필요할 때만 백그라운드에서 작동합니다. 취소를 선택한 경우 나중에 𝙂𝙚𝙣𝙚𝙧𝙖𝙡 𝙎𝙚𝙩𝙩𝙞𝙣𝙜𝙨에서 이 설정을 조정할 수 있습니다.</string>
-    <string name="quality_profile_help">여기서 소스의 순서를 변경할 수 있습니다. 비디오의 우선 순위가 높은 경우에는 소스 선택에 더 높게 나타납니다. 소스 우선 순위와 품질 우선 순위의 합이 비디오 우선 순위입니다.
-\n
-\n참고 A: 3
-\n품질 B: 7
-\n총 비디오 우선 순위는 10입니다.
-\n
-\n참고: 합이 10 이상이면 해당 링크가 로드되면 플레이어는 자동으로 로드를 건너뜁니다!</string>
-    <string name="next_season_episode_format" formatted="true">시즌 %1$d 에피소드 %2$d이(가) 출시됩니다</string>
-    <string name="result_search_tooltip">다른 확장자에서 검색</string>
+    <string name="biometric_warning">CloudStream 데이터 백업이 완료되었습니다. 드문 경우지만, 기기에 따라 앱 접속이 안 되는 오류가 발생할 수 있습니다. 만약 앱이 열리지 않는다면, 앱 데이터를 완전히 삭제(초기화)한 후 이 백업 파일로 복구해 주시기 바랍니다. 이용에 불편을 드려 대단히 죄송합니다.</string>
+    <string name="device_pin_url_message">스마트폰이나 컴퓨터에서 <b>%s</b> 위의 코드를 입력하세요</string>
+    <string name="battery_dialog_message">구독 중인 TV 쇼의 알림을 받고 다운로드를 끊김 없이 완료하려면, CloudStream의 백그라운드 실행 권한이 필요합니다. \'확인\'을 누른 후 나타나는 요청 창에서 \'허용\'을 선택해 주세요.\n\n참고로, 이 권한을 허용한다고 해서 배터리가 계속 소모되는 것은 아닙니다. 알림을 받거나 공식 확장 프로그램에서 영상을 다운로드할 때처럼 꼭 필요한 상황에서만 백그라운드 작업을 수행합니다.</string>
+    <string name="quality_profile_help">여기서 소스의 순서를 변경할 수 있습니다. 비디오의 우선 순위가 높은 경우에는 소스 선택 화면에 더 높게 나타납니다. 소스 우선 순위와 품질 우선 순위의 합이 비디오 우선 순위입니다. \n \n참고 A: 3 \n품질 B: 7 \n총 비디오 우선 순위는 10입니다. \n \n참고: 합이 10 이상이면 해당 링크가 로드되면 플레이어는 자동으로 로드를 건너뜁니다!</string>
+    <string name="next_season_episode_format" formatted="true">시즌 %1$d 에피소드 %2$d 공개 예정</string>
+    <string name="result_search_tooltip">다른 확장프로그램에서 검색</string>
     <string name="subscribe_tooltip">새로운 에피소드 알림</string>
-    <string name="recommendations_tooltip">권장 사항 표시</string>
+    <string name="recommendations_tooltip">추천목록 보기</string>
     <string name="speed_setting_summary">플레이어에 속도 옵션을 추가합니다</string>
-    <string name="episode_upcoming_format" formatted="true">%s로 출시 예정</string>
-    <string name="resume_remaining" formatted="true">%s
-\n남음</string>
+    <string name="episode_upcoming_format" formatted="true">%s 후 공개 예정</string>
+    <string name="resume_remaining" formatted="true">%s \n남음</string>
     <string name="duplicate_title">잠재적 중복 발견</string>
     <string name="enter_pin_with_name" formatted="true">%s의 PIN 입력</string>
     <string name="action_remove_from_favorites">즐겨찾기에서 제거</string>
-    <string name="episode_action_cast_mirror">캐스트미러</string>
-    <string name="hide_player_control_names_key" translatable="false">hide_player_control_names_key</string>
+    <string name="episode_action_cast_mirror">Cast 소스 목록</string>
     <string name="delete_plugin">플러그인 삭제</string>
     <string name="test_warning">경고</string>
     <string name="preview_seekbar">탐색바 미리보기</string>
-    <string name="preview_seekbar_desc">탐색바에서 미리보기 화면 활성화</string>
-    <string name="play_from_beginning_img_des">처음부터 시작</string>
+    <string name="preview_seekbar_desc">탐색바에서 화면 미리보기 활성화</string>
+    <string name="play_from_beginning_img_des">처음부터 재생</string>
     <string name="downloads_empty">현재 다운로드가 없습니다.</string>
     <string name="downloads_delete_select">삭제할 항목을 선택하십시오</string>
-    <string name="offline_file">오프라인 시청가능</string>
+    <string name="offline_file">오프라인 시청 가능</string>
     <string name="select_all">모두 선택</string>
     <string name="deselect_all">모두 선택해제</string>
     <string name="open_local_video">로컬 비디오 열기</string>
     <string name="delete_files">파일 삭제</string>
     <string name="delete_format" formatted="true">삭제 (%1$d | %2$s)</string>
-    <string name="delete_message_multiple" formatted="true">다음 항목을 영구적으로 삭제 하시겠습니까??
-\n
-\n%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="delete_message_series_only" formatted="true">다음 시리즈의 모든 에피소드를 영구적으로 삭제 하시겠습니까??
-\n
-\n%s</string>
-    <string name="sort_release_date_new">출시일 (새로운 것부터 오래된 것)</string>
-    <string name="sort_release_date_old">출시일 (오래된것부터 새로운것)</string>
-    <string name="hide_player_control_names">플레이어 컨트롤 이름 숨기기</string>
-    <string name="torrent_info">이 동영상은 토렌트이므로 동영상 활동이 추적될 수 있습니다.\n계속하기 전에 토렌트에 대해 충분히 이해했는지 확인하세요.</string>
-    <string name="audio_singluar">오디오</string>
-    <string name="podcast_singluar">팟캐스트</string>
-</resources>
\ No newline at end of file
+    <string name="delete_message_multiple" formatted="true">다음 항목을 영구적으로 삭제 하시겠습니까? \n \n%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="delete_message_series_only" formatted="true">다음 시리즈의 모든 에피소드를 영구적으로 삭제 하시겠습니까? \n \n%s</string>
+    <string name="sort_release_date_new">공개일 (최신순)</string>
+    <string name="sort_release_date_old">공개일 (오래된순)</string>
+    <string name="hide_player_control_names">플레이어 내 버튼명 숨기기</string>
+    <string name="torrent_info">이 동영상은 토렌트이므로 시청 활동이 추적될 수 있습니다.\n계속하기 전에 토렌트에 대해 충분히 이해했는지 확인하세요.</string>
+    <string name="audio_singular">오디오</string>
+    <string name="podcast_singular">팟캐스트</string>
+    <string name="begin_speaking">시작하기 …</string>
+    <string name="encoding_error">인코딩 오류</string>
+    <string name="unsupported_error">미지원 오류</string>
+    <string name="speech_recognition_unavailable">음성 인식 사용 불가</string>
+    <string name="download_time_left_hour_min_sec_format" formatted="true">%1$d시간 %2$d분 %3$d초</string>
+    <string name="download_time_left_min_sec_format" formatted="true">%1$d분 %2$d초</string>
+    <string name="download_time_left_sec_format" formatted="true">%1$d초</string>
+    <string name="play_full_series_button">전체 시리즈 재생하기</string>
+    <string name="install_prerelease">출시 전 버전 설치</string>
+    <string name="prerelease_already_installed">출시 전 버전이 이미 설치되어 있습니다.</string>
+    <string name="prerelease_install_failed">출시 전 버전 설치 실패.</string>
+    <string name="episode_action_play_mirror">재생 소스 목록</string>"
+    <string name="show_rating">평가 라벨</string>
+    <string name="show_episode_text">에피소드 본문</string>
+    <string name="player_load_one_subtitle_online">사용 가능한 자막 불러오기</string>
+    <string name="player_settings_always_ask">항상 묻기</string>
+    <string name="sort_episodes_number_asc">에피소드 (오름차순)</string>
+    <string name="sort_episodes_number_desc">에피소드 (내림차순)</string>
+    <string name="sort_episodes_rating_high_low">평가 (높은순)</string>
+    <string name="sort_episodes_rating_low_high">평가 (낮은순)</string>
+    <string name="sort_episodes_date_newest">공개일 (최신순)</string>
+    <string name="sort_episodes_date_oldest">공개일 (오래된순)</string>
+    <string name="sort_button_episode">에피소드 %s</string>
+    <string name="sort_button_rating">평가 %s</string>
+    <string name="sort_button_date">날짜 %s</string>
+    <string name="no_account">계정 없음</string>
+    <string name="no_subtitles_loaded">자막이 아직 로드되지 않음</string>
+    <string name="backup_path_title">백업 폴더 위치</string>
+    <string name="custom">커스텀</string>
+    <string name="confirm_before_exiting_title">나가기 전에 확인</string>
+    <string name="confirm_before_exiting_desc">이 알림을 앱 종료 전에 표시</string>
+    <string name="show">보이기</string>
+    <string name="dont_show">보이지 않기</string>
+    <string name="subs_edge_size">윤곽선 굵기</string>
+    <string name="torrent_preferred_media">Settings/Providers/Preferred media 에서 토렌트 활성화</string>
+    <string name="torrent_not_accepted">진행하려면 앱 재시작 후 토렌트 스트리밍 팝업란의 수락이 필요합니다.</string>
+    <string name="software_decoding">소프트웨어 디코딩</string>
+    <string name="software_decoding_desc">소프트웨어 디코딩은 해당 기기에서 지원되지 않는 영상 파일들을 재생할 수 있지만, 높은 화질에서 렉 또는 불안정한 재생을 유발할 수 있습니다.</string>
+    <string name="volume_exceeded_100">볼륨이 100%를 초과하였습니다</string>
+    <string name="slide_up_again_to_exceed_100">100% 너머로 높이려면 한번 더 슬라이드 하십시오</string>
+    <string name="update_plugins">플러그인 업데이트하기</string>
+    <string name="update_plugins_manually">수동으로 플러그인 업데이트 하기</string>
+    <string name="starting_plugin_update_manually">플러그인 업데이트 절차를 시작합니다!</string>
+    <string name="plugins_updated_manually">성공적으로 %d 플러그인을 업데이트 하였습니다!</string>
+    <string name="no_plugins_updated_manually">업데이트 된 플러그인이 없습니다.</string>
+    <string name="player_notification_channel_name">플레이어 알림</string>
+    <string name="player_notification_channel_description">백그라운드에서 재생을 제어하기 위한 플레이어 알림</string>
+    <string name="subtitles_from_embedded">내장 자막</string>
+    <string name="subtitles_from_online">온라인</string>
+    <string name="all_subtitles_bold">자막 굵게 표시</string>
+    <string name="all_subtitles_italic">자막 기울게 표시</string>
+    <string name="download_parallel_settings_des">병렬로 다운로드 할 수 있는 아이템의 수</string>
+    <string name="parallel_downloads">병렬 다운로드</string>
+    <string name="concurrent_connections">동시 연결수</string>
+    <string name="concurrent_connections_settings_des">다운로드 시 각 항목마다 사용할 수 있는 동시 연결의 수</string>
+    <string name="go_to_downloads">다운로드로 이동</string>
+    <string name="no_internet_connection">인터넷 연결 없음.\n\n인터넷에 연결 한 후 재시도 하거나, 혹은 이미 다운로드 된 항목을 재생하십시오.</string>
+    <string name="overscan_settings_des">화면의 잘림 현상을 방지하기 위해 경계를 조정합니다</string>
+    <string name="poster_size_settings_des">포스터 크기 변경</string>
+    <string name="poster_size_settings">포스터 크기</string>
+    <string name="speedup_title">길게 눌러 배속 활성화</string>
+    <string name="speedup_summary">길게 눌러 2배속 재생</string>
+    <string name="edit_profile_image_title">프로필 사진 변경</string>
+    <string name="edit_profile_image_hint">프로필 사진 URL 입력</string>
+    <string name="edit_profile_image_error_empty">URL을 찾을 수 없습니다</string>
+    <string name="edit_profile_image_error_invalid">잘못된 URL 혹은 이미지 입니다</string>
+    <string name="edit_profile_image_success">이미지 업데이트 성공</string>
+    <string name="action_mark_watched_up_to_this_episode">이 에피소드까지 시청 완료로 표시</string>
+    <string name="action_remove_mark_watched_up_to_this_episode">이 에피소드까지 시청함 표시 제거</string>
+    <string name="name">이름</string>
+    <string name="resolution_and_name">해상도 및 이름</string>
+    <string name="subs_subtitle_alignment">자막 정렬</string>
+    <string name="bottom_left">왼쪽 아래</string>
+    <string name="bottom_center">중앙 아래</string>
+    <string name="bottom_right">오른쪽 아래</string>
+    <string name="middle_left">왼쪽 중앙</string>
+    <string name="middle_center">정중앙</string>
+    <string name="middle_right">오른쪽 중앙</string>
+    <string name="top_left">왼쪽 위</string>
+    <string name="top_center">중앙 위</string>
+    <string name="top_right">오른쪽 위</string>
+    <string name="source_priority_help">비디오 소스가 플레이어에서 정렬되는 순서 설정</string>
+    <string name="extra_brightness_settings_des">디스플레이 밝기가 100%를 초과하면 밝기 필터를 활성화합니다</string>
+    <string name="cancel_queue_message">모든 다운로드 작업을 취소하시겠습니까?</string>
+    <string name="download_episode_range">에피소드를 다운로드 하시겠습니까 %s?</string>
+    <string name="queue_empty_message">다운로드 대기열이 비어 있습니다.</string>
+    <plurals name="downloads_active">
+        <item quantity="other">%d 활성 다운로드</item>
+    </plurals>
+    <plurals name="downloads_queued">
+        <item quantity="other">%d 다운로드</item>
+    </plurals>
+    <string name="search_suggestions_des">입력하는 동안 검색어 제안 표시</string>
+    <string name="show_cast_in_details">출연진 정보 표시</string>
+    <string name="background_radius">배경 테두리 곡률</string>
+    <string name="reload_provider">공급자 새로고침</string>
+    <string name="search_suggestions">검색어 제안</string>
+    <string name="clear_suggestions">제안 삭제</string>
+    <string name="video_info">미디어 정보</string>
+    <string name="source_name">소스 이름</string>
+    <string name="extra_brightness_settings">최대 밝기 확장</string>
+    <string name="download_queue">다운로드 작업</string>
+    <string name="download_all">모두 다운로드</string>
+    <string name="cancel_all">모두 취소</string>
+    <string name="source_priority">소스 우선순위</string>
+    <string name="overscan_settings">오버스캔(화면 경계) 설정</string>
+    <string name="action_reload">새로고침</string>
+    <string name="extra_brightness_key">최대 밝기 확장 활성화</string>
+    <string name="show_player_metadata_overlay">플레이어에 메타데이터 오버레이 표시</string>
+    <string name="video_singular">비디오</string>
+    <string name="skip_type_preview">프리뷰</string>
+    <string name="player_is_live">라이브</string>
+</resources>
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-b+lt/strings.xml
similarity index 96%
rename from app/src/main/res/values-lt/strings.xml
rename to app/src/main/res/values-b+lt/strings.xml
index cc68d77eb88..db7e994f087 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-b+lt/strings.xml
@@ -9,7 +9,6 @@
     <string name="home_next_random_img_des">Sekantis atsitiktinai</string>
     <string name="preview_background_img_des">Peržiūros fonas</string>
     <string name="play_movie_button">Paleisti filmą</string>
-    <string name="pref_disable_acra">Išjungti automatini klaidų pateikimą</string>
     <string name="subs_default_reset_toast">Atstatyti į numatytą reikšmę</string>
     <string name="sort_clear">Išvalyti</string>
     <string name="search_poster_img_des">Plakatas</string>
@@ -32,8 +31,7 @@
     <string name="go_forward_30">+30</string>
     <string name="download_done">Atsiuntimas baigtas</string>
     <string name="continue_watching">Tęsti žiūrėjimą</string>
-    <string name="new_update_format" formatted="true">Rastas atnaujinimas!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">Rastas atnaujinimas! \n%1$s -&gt; %2$s</string>
     <string name="subs_download_languages">Atsisiųsti kalbas</string>
     <string name="search_provider_text_providers">Ieškoti naudojant tiekėjus</string>
     <string name="go_back_img_des">Grįžti atgal</string>
@@ -89,8 +87,7 @@
     <string name="popup_resume_download">Pratęsti siuntimą</string>
     <string name="asian_drama">Azijietiškos dramos</string>
     <string name="episode">Serija</string>
-    <string name="empty_library_no_accounts_message">Jūsų biblioteka tuščia :(
-\nPrisijunkite prie bibliotekos paskyros arba pridėkite laidas prie vietinės bibliotekos.</string>
+    <string name="empty_library_no_accounts_message">Jūsų biblioteka tuščia :( \nPrisijunkite prie bibliotekos paskyros arba pridėkite laidas prie vietinės bibliotekos.</string>
     <string name="autoplay_next_settings_des">Pradėti sekančia seriją, kai dabartinė baigsis</string>
     <string name="subs_text_color">Teksto spalva</string>
     <string name="type_completed">Užbaigta</string>
@@ -182,11 +179,7 @@
     <string name="example_ip">127.0.0.1</string>
     <string name="batch_download_finish_format" formatted="true">Atsiųsta %1$d %2$s</string>
     <string name="skip_type_format" formatted="true">Praleisti %s</string>
-    <string name="blank_repo_message">Pagal numatytuosius nustatymus „CloudStream“ neturi įdiegtų svetainių. Turite įdiegti svetaines iš saugyklų.
-\n
-\nDėl beprotiško DMCA reikalavimų, kurios atliko Sky UK Limited 🤮, negalime susieti saugyklos svetainės programoje.
-\n
-\nPrisijunkite prie mūsų Discord arba ieškokite internete.</string>
+    <string name="blank_repo_message">Pagal numatytuosius nustatymus „CloudStream“ neturi įdiegtų svetainių. Turite įdiegti svetaines iš saugyklų. \n \nDėl beprotiško DMCA reikalavimų, kurios atliko Sky UK Limited 🤮, negalime susieti saugyklos svetainės programoje. \n \nPrisijunkite prie mūsų Discord arba ieškokite internete.</string>
     <string name="mobile_data">Mobilūs duomenys</string>
     <string name="example_username">šaunusPrisijungimoVardas</string>
     <string name="extension_authors">Autoriai</string>
@@ -255,5 +248,4 @@
     <string name="confirm_exit_dialog">Ar tikrai norite išeiti?</string>
     <string name="action_remove_from_watched">Pašalinti iš žiūrimų</string>
     <string name="audio_tracks">Garso takelis</string>
-    <string name="hide_player_control_names_key" translatable="false">hide_player_control_names_key</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-b+lv/strings.xml
similarity index 59%
rename from app/src/main/res/values-lv/strings.xml
rename to app/src/main/res/values-b+lv/strings.xml
index 9469aa8e81f..9ab29cd4364 100644
--- a/app/src/main/res/values-lv/strings.xml
+++ b/app/src/main/res/values-b+lv/strings.xml
@@ -2,28 +2,27 @@
 <resources>
     <string name="search_poster_img_des">Plakāts</string>
     <string name="app_dub_sub_episode_text_format" formatted="true">%1$s Ep %2$d</string>
-    <string name="cast_format" formatted="true">Cast: %s</string>
+    <string name="cast_format" formatted="true">Lomās: %s</string>
     <string name="result_poster_img_des">Plakāts</string>
     <string name="episode_poster_img_des">Epizodes plakāts</string>
     <string name="home_main_poster_img_des">Galvenais plakāts</string>
-    <string name="home_next_random_img_des">Nākamais random</string>
+    <string name="home_next_random_img_des">Nākamais nejaušais</string>
     <string name="go_back_img_des">Iet atpakaļ</string>
     <string name="home_change_provider_img_des">Nomainīt dvēju</string>
     <string name="preview_background_img_des">Apskatīt background</string>
     <string name="player_speed_text_format" formatted="true">Ātrums (%.2fx)</string>
     <string name="rated_format" formatted="true">Lidzīgi: %.1f</string>
-    <string name="new_update_format" formatted="true">Jauns atjauninājums atrasts!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">Jauns atjauninājums atrasts! \n%1$s -&gt; %2$s</string>
     <string name="duration_format" formatted="true">%d galvenais</string>
-    <string name="app_name">Claudstream</string>
+    <string name="app_name">CloudStream</string>
     <string name="play_with_app_name">Atskaņo ar cloudstream</string>
-    <string name="title_home">Mājas</string>
+    <string name="title_home">Sākums</string>
     <string name="title_search">Meklēt</string>
     <string name="search_hint_site" formatted="true">Meklēt %s…</string>
     <string name="no_data">Nav datu</string>
     <string name="episode_more_options_des">Vairāk opcijas</string>
     <string name="next_episode">Nākamā epizode</string>
-    <string name="browser">Internets</string>
+    <string name="browser">Pārlūks</string>
     <string name="skip_loading">Izlaist ladešanos</string>
     <string name="loading">Lādējas…</string>
     <string name="type_watching">Skaties</string>
@@ -42,21 +41,20 @@
     <string name="go_back">Iet atpakaļ</string>
     <string name="play_episode">Palaist epizodi</string>
     <string name="download">Ieladēt</string>
-    <string name="download_paused">Lādēšana pauzēta</string>
+    <string name="download_paused">Lejupielāde iepauzēta</string>
     <string name="download_started">Lādēšana sakās</string>
-    <string name="download_failed">Ielādēt neizdevās</string>
-    <string name="download_canceled">Ielādēšana atcelta</string>
-    <string name="download_done">Pabeidza ieladēt</string>
-    <string name="update_started">Atjauninājums sakās</string>
-    <string name="stream">Skaties</string>
-    <string name="error_loading_links_toast">Kļūda padejot linkus</string>
+    <string name="download_failed">Lejupielāde neizdevās</string>
+    <string name="download_canceled">Lejupielāde atcelta</string>
+    <string name="download_done">Lejupielāde pabeigta</string>
+    <string name="update_started">Atjaunināšana sākta</string>
+    <string name="stream">Tīkla plūsma</string>
+    <string name="error_loading_links_toast">Kļūda, ielādējot saites</string>
     <string name="download_storage_text">Iekšējā atmiņa</string>
     <string name="app_dubbed_text">Dub</string>
-    <string name="popup_delete_file">Dzēst failu</string>
-    <string name="popup_play_file">Palaist failu</string>
+    <string name="popup_delete_file">Dzēst datni</string>
+    <string name="popup_play_file">Atskaņot datni</string>
     <string name="popup_resume_download">Atsākt ielādi</string>
     <string name="popup_pause_download">Pauzēt ielādi</string>
-    <string name="pref_disable_acra">Atslēgt automātisko kļūdu ziņošanu</string>
     <string name="home_more_info">Vairāk informācijas</string>
     <string name="home_expanded_hide">Slēpt</string>
     <string name="home_play">Atskaņot</string>
@@ -65,11 +63,11 @@
     <string name="error_bookmarks_text">Bookmarks</string>
     <string name="action_remove_from_bookmarks">Noņemt</string>
     <string name="action_add_to_bookmarks">Ieliec skatīšanās statusu</string>
-    <string name="sort_apply">Izmantot</string>
+    <string name="sort_apply">Apstiprināt</string>
     <string name="sort_copy">Kopēt</string>
     <string name="sort_save">Saglabāt</string>
     <string name="player_speed">Atskaņošanas ātrums</string>
-    <string name="subtitles_settings">Subtitru iestādijumi</string>
+    <string name="subtitles_settings">Subtitru iestatījumi</string>
     <string name="subs_outline_color">Apkārt krāsa</string>
     <string name="subs_background_color">Backgrounds krāsa</string>
     <string name="subs_window_color">Līga krāsa</string>
@@ -79,26 +77,26 @@
     <string name="search_provider_text_providers">Meklēt izmantojot devējus</string>
     <string name="search_provider_text_types">Meklēt izmantojot tipus</string>
     <string name="benene_count_text">%d Banāni iedoti veidotājiem</string>
-    <string name="next_episode_format" formatted="true">Episode %d būs izlaista</string>
+    <string name="next_episode_format" formatted="true">%d. epizode būs pieejama</string>
     <string name="filler" formatted="true">Filtrs</string>
-    <string name="title_downloads">Ieladētas</string>
+    <string name="title_downloads">Lejupielādes</string>
     <string name="search_hint">Meklēt…</string>
-    <string name="title_settings">Settingi</string>
+    <string name="title_settings">Iestatījumi</string>
     <string name="result_tags">Žanrs</string>
-    <string name="result_share">Dalities</string>
-    <string name="result_open_in_browser">Atvērt internetā</string>
+    <string name="result_share">Kopīgot</string>
+    <string name="result_open_in_browser">Atvērt pārlūkā</string>
     <string name="downloaded">Ieladēts</string>
     <string name="downloading">Lādējas</string>
     <string name="sort_close">Aizvērt</string>
     <string name="app_subbed_text">Sub</string>
     <string name="benene_count_text_none">Nav banāni iedoti</string>
-    <string name="subs_subtitle_elevation">Subtitru augstums</string>
+    <string name="subs_subtitle_elevation">Subtitru paaugstinājums</string>
     <string name="sort_clear">Iztīrīt</string>
     <string name="subs_text_color">Teksta krāsa</string>
     <string name="subs_auto_select_language">Automātiski-iestādīt valodu</string>
-    <string name="next_episode_time_hour_format" formatted="true">%1$dh %2$dm</string>
-    <string name="next_episode_time_min_format" formatted="true">%dm</string>
-    <string name="next_episode_time_day_format" formatted="true">%1$dd %2$dh %3$dm</string>
+    <string name="next_episode_time_hour_format" formatted="true">%1$dst. %2$dmin.</string>
+    <string name="next_episode_time_min_format" formatted="true">%dmin.</string>
+    <string name="next_episode_time_day_format" formatted="true">%1$dd. %2$dst. %3$dmin.</string>
     <string name="subs_download_languages">Ielādēt valodas</string>
     <string name="subs_subtitle_languages">Subtitru valoda</string>
     <string name="subs_hold_to_reset_to_default">Tūri lai restartētu uz sākumu</string>
@@ -113,17 +111,17 @@
     <string name="torrent_plot">Apraksts</string>
     <string name="normal_no_plot">Nav apraksts atrasts</string>
     <string name="torrent_no_plot">Apraksts nav atrasts</string>
-    <string name="show_log_cat">Radīt Logcat 🐈</string>
+    <string name="show_log_cat">Rādīt Logcat 🐈</string>
     <string name="test_log">Log</string>
     <string name="picture_in_picture">Bilde bildē</string>
-    <string name="picture_in_picture_des">Turpina spēlēt mazā lodziņā virs aplikācijām</string>
+    <string name="picture_in_picture_des">Turpina atskaņošanu miniatūrā atskaņotājā virs citām lietotnēm</string>
     <string name="player_size_settings">Players izmēra poga</string>
     <string name="player_size_settings_des">Noņemt melnās malas</string>
     <string name="player_subtitles_settings">Subtitri</string>
-    <string name="player_subtitles_settings_des">Players subtitru iestādijumi</string>
+    <string name="player_subtitles_settings_des">Atskaņotāja subtitru iestatījumi</string>
     <string name="chromecast_subtitles_settings">Chromecast subtitri</string>
-    <string name="chromecast_subtitles_settings_des">Chromecast subtitru iestāfijumi</string>
-    <string name="eigengraumode_settings">Eigengravy Mode</string>
+    <string name="chromecast_subtitles_settings_des">Chromecast subtitru iestatījumi</string>
+    <string name="eigengraumode_settings">Atskaņošanas ātrums</string>
     <string name="swipe_to_seek_settings">Novelc lai paradītu</string>
     <string name="swipe_to_seek_settings_des">Novelc no māla lidz malai lai pozicionētu video</string>
     <string name="swipe_to_change_settings">Novēlu lai mainītu iestādījums</string>
@@ -136,43 +134,40 @@
     <string name="double_tap_to_seek_settings_des">Uzpied divreiz pa labi vai kreisi lai palaistu atpakaļ vai uz priekšu</string>
     <string name="double_tap_to_pause_settings_des">Uzpied divreiz vidū lai pauzētu</string>
     <string name="use_system_brightness_settings">Lietot sistēmas gaišums</string>
-    <string name="use_system_brightness_settings_des">Lietot sistēmas gaišumu aplikācijas playerī nevis tumšunu</string>
+    <string name="use_system_brightness_settings_des">Izmanto sistēmas spilgtumu, nevis atskaņotāja tumšo pārklājumu</string>
     <string name="episode_sync_settings">Atjaunināt skatīšanos progresu</string>
     <string name="episode_sync_settings_des">Automātiski sync savu pašreizējo epizodes progresu</string>
     <string name="restore_settings">Atgūt datus no backupa</string>
     <string name="backup_settings">Saglabāt datus</string>
-    <string name="restore_success">Ieladētie atgūtie faili</string>
-    <string name="restore_failed_format" formatted="true">Neizdevās restaurēt datus no faila %s</string>
+    <string name="restore_success">Atjaunots no dublējuma</string>
+    <string name="restore_failed_format" formatted="true">Neizdevās atjaunot datus no %s datnes</string>
     <string name="backup_success">Dati saglabāti</string>
     <string name="backup_failed">Krātuves atļaujas nav. Lūdzu mēģiniet vēlreiz.</string>
     <string name="backup_failed_error_format">Kļūda meiģinot saglabāt %s</string>
     <string name="search">Meklēt</string>
     <string name="library">Library</string>
-    <string name="category_account">Konts</string>
-    <string name="category_updates">Atjaunināt un saglabāt</string>
+    <string name="category_account">Konti un drošība</string>
+    <string name="category_updates">Atjauninājumi un dublēšana</string>
     <string name="settings_info">Informācija</string>
     <string name="advanced_search">Advancēta meklēšana</string>
     <string name="advanced_search_des">Dod tev meklēšanas rezultātus citus no devēja</string>
-    <string name="bug_report_settings_off">Tikai sūtīt datus no kļudām</string>
-    <string name="bug_report_settings_on">Nesutīt datus</string>
-    <string name="show_fillers_settings">Radīt fillera epizodi priekš animē</string>
-    <string name="show_trailers_settings">Radīt feel</string>
-    <string name="kitsu_settings">Radīt plakātu no kitsu</string>
+    <string name="show_fillers_settings">Rādīt anime papilda epizodi</string>
+    <string name="show_trailers_settings">Rādīt reklāmkadrus</string>
+    <string name="kitsu_settings">Rādīt Kitsu vietnes plakātus</string>
     <string name="pref_filter_search_quality">Slēpt izvēlētos video kvalitāti meklēšanas rezultātus</string>
-    <string name="automatic_plugin_updates">Automātiski papildinājumu atjauninājumi</string>
-    <string name="automatic_plugin_download">Automātiski ielādēt papildinājumus</string>
-    <string name="automatic_plugin_download_summary">Automātiski instalēt visus neinstalētos papildinājumus no glabātavas.</string>
-    <string name="updates_settings">Radīt aplikācijas atjauninājumus</string>
-    <string name="updates_settings_des">Automātiski meklēt jaunus atjauninājumus kad palaiž aplikāciju.</string>
+    <string name="automatic_plugin_updates">Automātiska papildinājumu atjaunināšana</string>
+    <string name="automatic_plugin_download">Automātiski lejupielādēt papildinājumus</string>
+    <string name="automatic_plugin_download_summary">Automātiski uzstāda visus vēl neuzstādītos papildinājumus no pievienotajiem repozitorijiem.</string>
+    <string name="updates_settings">Rādīt lietotņu atjauninājumus</string>
+    <string name="updates_settings_des">Automātiski pārbauda atjauninājumus, kad atver lietotni.</string>
     <string name="redo_setup_process">Atsākt uzstādīšanas procesu</string>
-    <string name="uprereleases_settings">Atjaunināt uz priekšizlaišanu</string>
-    <string name="apk_installer_settings_des">Dažu telefoni nepieņem jauno aplikāciju instaletāju. Meiģiniet veco opciju ja nevar stjaunināt.</string>
-    <string name="lightnovel">Noveles aplikācija no šiem izstrādātājiem</string>
-    <string name="anim">Anime aplikāciju no tiem pašiem izstradatājiem</string>
+    <string name="apk_installer_settings_des">Dažas ierīces neatbalsta jauno pakotnes uzstādītāju. Izmantojiet legacy (veco) uzstādītāju, ja atjauninājumus nevar uzstādīt.</string>
+    <string name="lightnovel">Viegla romānu lietotne no šiem pašiem izstrādātājiem</string>
+    <string name="anim">Anime lietotne no šiem pašiem izstrādātājiem</string>
     <string name="discord">Ienāc discordā</string>
     <string name="benene">Iedot banānu izstrādātājiem</string>
     <string name="benene_des">Iedotie banāni</string>
-    <string name="app_language">Aplikācijas valoda</string>
+    <string name="app_language">Lietotnes valoda</string>
     <string name="no_chromecast_support_toast">Šim devējam nav Chromecast pieņemšana</string>
     <string name="no_links_found_toast">Nav linku strastu</string>
     <string name="copy_link_toast">Links kopēts cliobordā</string>
@@ -187,7 +182,7 @@
     <string name="season_short">S</string>
     <string name="episode_short">E</string>
     <string name="no_episodes_found">Epizodes netika atrastas</string>
-    <string name="delete_file">Dzēsti faili</string>
+    <string name="delete_file">Dzēst datni</string>
     <string name="delete">Dzēst</string>
     <string name="cancel">Atcelt</string>
     <string name="pause">Pauzēt</string>
@@ -197,22 +192,20 @@
     <string name="resume">Atsākt</string>
     <string name="go_back_30">-30</string>
     <string name="go_forward_30">+30</string>
-    <string name="delete_message" formatted="true">Šis pilnibā dzesīs %s
-\nEsat parliecināts?</string>
-    <string name="resume_time_left" formatted="true">%dm
-\natlikušas</string>
+    <string name="delete_message" formatted="true">Šis pilnibā dzesīs %s \nEsat parliecināts?</string>
+    <string name="resume_time_left" formatted="true">%dm \natlikušas</string>
     <string name="status_completed">Pabeigts</string>
     <string name="status">Statuss</string>
-    <string name="year">gads</string>
-    <string name="rating">Reitings</string>
+    <string name="year">Gads</string>
+    <string name="rating">Vērtējums</string>
     <string name="duration">Ilgums</string>
-    <string name="site">Saite</string>
-    <string name="synopsis">Synopsis</string>
-    <string name="queued">Gaida</string>
+    <string name="site">Vietne</string>
+    <string name="synopsis">Konspekts</string>
+    <string name="queued">ievietots rindā</string>
     <string name="used_storage">Lietotie</string>
-    <string name="app_storage">Aplikācija</string>
+    <string name="app_storage">Lietotne</string>
     <string name="movies">Filmas</string>
-    <string name="tv_series">Seriāli</string>
+    <string name="tv_series">Seriāli, raidījumi</string>
     <string name="cartoons">Animācija</string>
     <string name="anime">Anime</string>
     <string name="torrent">Torrenti</string>
@@ -223,7 +216,7 @@
     <string name="nsfw">NSFW</string>
     <string name="others">Citi</string>
     <string name="movies_singular">Filmas</string>
-    <string name="tv_series_singular">Sērijas</string>
+    <string name="tv_series_singular">Seriāls, raidījums</string>
     <string name="cartoons_singular">Animācija</string>
     <string name="anime_singular">Anime</string>
     <string name="ova_singular">OVA</string>
@@ -239,13 +232,13 @@
     <string name="storage_error">Ielādēšanas kļūda, pārbaudi atmiņas atļauju</string>
     <string name="episode_action_chromecast_episode">Chromecast epizode</string>
     <string name="episode_action_chromecast_mirror">Chromecast morror</string>
-    <string name="episode_action_play_in_app">Palaist aplikācijā</string>
+    <string name="episode_action_play_in_app">Atskaņot lietotnē</string>
     <string name="episode_action_play_in_format">Atskaņot uekšā %s</string>
     <string name="episode_action_auto_download">Automātiski ielādēt</string>
     <string name="episode_action_download_mirror">Ielādēt spoguli</string>
     <string name="episode_action_reload_links">Pārlādēt saites</string>
-    <string name="episode_action_download_subtitle">Ielādēt subtitrus</string>
-    <string name="show_hd">Kvalitāte</string>
+    <string name="episode_action_download_subtitle">Lejupielādēt subtitrus</string>
+    <string name="show_hd">Kvalitātes zīme</string>
     <string name="show_dub">Dub lable</string>
     <string name="show_sub">Subtirti</string>
     <string name="show_title">Nosaukums</string>
@@ -269,8 +262,8 @@
     <string name="android_tv_interface_off_seek_settings">Atskaņotājs paslēpts — meklēšanas summa</string>
     <string name="video_ram_description">Izraisa avārijas, ja ierīcēs ar mazu atmiņu ir iestatīta pārāk augsta vērtība, piemēram, Android TV.</string>
     <string name="dns_pref_summary">Izdevīgs lai izlaistu ISO aizturi</string>
-    <string name="jsdelivr_proxy">raw.githubusercontent.com Proxy</string>
-    <string name="jsdelivr_proxy_summary">Apiet GitHub bloķēšanu, izmantojot jsdelivr. Tādēļ atjauninājumi var aizkavēties par dažām dienām.</string>
+    <string name="jsdelivr_proxy">GitHub starpniekserveris</string>
+    <string name="jsdelivr_proxy_summary">Apiet tiešo GitHub URL saišu piekļuves ierobežojumus, izmantojot jsDelivr. Tādēļ atjauninājumi var aizkavēties vairākas dienas.</string>
     <string name="add_site_pref">Klonēt saiti</string>
     <string name="remove_site_pref">Noņemt saiti</string>
     <string name="add_site_summary">Pievienojiet esošas vietnes klonu ar citu URL</string>
@@ -281,7 +274,7 @@
     <string name="legal_notice">Atruna</string>
     <string name="pref_category_bypass">ISP Izlaists</string>
     <string name="pref_category_links">Links</string>
-    <string name="pref_category_app_updates">Aplikācijas atjauninājumus</string>
+    <string name="pref_category_app_updates">Lietotnes atjauninājumi</string>
     <string name="pref_category_backup">Dublējums</string>
     <string name="pref_category_extensions">Papildinājumi</string>
     <string name="pref_category_actions">Akcijas</string>
@@ -296,11 +289,11 @@
     <string name="pref_category_ui_features">Funkcijas</string>
     <string name="category_general">Ģenerāls</string>
     <string name="random_button_settings">Randomā poga</string>
-    <string name="random_button_settings_desc">Rādīt izlases pogu mājaslapā</string>
-    <string name="provider_lang_settings">Devēja valodas</string>
-    <string name="app_layout">Aplikācijas izskats</string>
+    <string name="random_button_settings_desc">Rādīt izlases pogu Sākums un Bibliotēka sadaļās</string>
+    <string name="provider_lang_settings">Papildinājuma valodas</string>
+    <string name="app_layout">Lietotnes izkārtojums</string>
     <string name="preferred_media_settings">Izvēlētā media</string>
-    <string name="enable_nsfw_on_providers">Iespējojiet NSFW atbalstītajiem pakalpojumu sniedzējiem</string>
+    <string name="enable_nsfw_on_providers">Iespējot nepiedienīgu, izaicinošu saturu (NSFW) atbalstītajos papildinājumos</string>
     <string name="subtitles_encoding">Subtitru kodējums</string>
     <string name="category_providers">Devēji</string>
     <string name="category_provider_test">Devēju tests</string>
@@ -311,11 +304,11 @@
     <string name="emulator_layout">Emulators izskats</string>
     <string name="bottom_title_settings">Plakāta virsraksta lokācija</string>
     <string name="example_password">Parole123</string>
-    <string name="example_username">MansStilīgaisNosaukums</string>
+    <string name="example_username">Lietotājvārds</string>
     <string name="example_email">Sveiki@pasaule.com</string>
     <string name="example_ip">127.0.0.1</string>
-    <string name="example_site_name">ManaForšāSaite</string>
-    <string name="example_site_url">Piemērs.com</string>
+    <string name="example_site_name">JaunāsVietnesNosaukums</string>
+    <string name="example_site_url">https://piemērs.com</string>
     <string name="example_lang_name">Valodas kods (lv)</string>
     <string name="account">Konts</string>
     <string name="logout">Iziet</string>
@@ -337,21 +330,21 @@
     <string name="all">Viss</string>
     <string name="max">Maksimālais</string>
     <string name="min">Minimālais</string>
-    <string name="subtitles_outline">Apkartlinija</string>
-    <string name="subtitles_depressed">Depresija</string>
+    <string name="subtitles_outline">Kontūrs</string>
+    <string name="subtitles_depressed">Iespiests</string>
     <string name="subtitles_shadow">Ēna</string>
-    <string name="subtitles_raised">Paugstināts</string>
-    <string name="subtitle_offset">Sync subs</string>
+    <string name="subtitles_raised">Izvirzīts</string>
+    <string name="subtitle_offset">Subtitru sinhronizācija</string>
     <string name="subtitle_offset_hint">1000 ms</string>
-    <string name="subtitle_offset_title">Subtitru pslēninājums</string>
-    <string name="subtitle_offset_extra_hint_later_format">Izmantojiet šo, ja subtitri tiek rādīti %d ms pārāk agri</string>
-    <string name="subtitle_offset_extra_hint_none_format">Nav subtitru kavēšanās</string>
-    <string name="subtitles_example_text">Ātrā brūnā lapsa lec pāri slinkajam sunim</string>
-    <string name="player_loaded_subtitles" formatted="true">Ielādeja %s</string>
-    <string name="player_load_subtitles">Lādēt no faila</string>
-    <string name="app_theme_settings">Aplikācijas theme</string>
-    <string name="player_load_subtitles_online">Ielādēt no interneta</string>
-    <string name="downloaded_file">Ieladētie faili</string>
+    <string name="subtitle_offset_title">Subtitru nobīde</string>
+    <string name="subtitle_offset_extra_hint_later_format">Ja subtitri steidzas pa %d ms</string>
+    <string name="subtitle_offset_extra_hint_none_format">Nav subtitru nobīdes - kavēšanās vai apsteigšana</string>
+    <string name="subtitles_example_text">Fogts čuhņā mīļi lenc - ģērbj, žvadz, pūkšķ</string>
+    <string name="player_loaded_subtitles" formatted="true">Ielādēti %s</string>
+    <string name="player_load_subtitles">Ielādēt no datnes</string>
+    <string name="app_theme_settings">Lietotnes motīvs</string>
+    <string name="player_load_subtitles_online">Lejupielādēt no interneta</string>
+    <string name="downloaded_file">Lejupielādēta datne</string>
     <string name="actor_main">Galvenais</string>
     <string name="actor_supporting">Atbalsta</string>
     <string name="actor_background">Aizmugure</string>
@@ -377,71 +370,70 @@
     <string name="error_invalid_data">Nederīgi dati</string>
     <string name="error_invalid_url">Nederīgs URL</string>
     <string name="error">Kļūda</string>
-    <string name="subtitles_remove_captions">Noņemiet slēgtos parakstus no subtitriem</string>
-    <string name="subtitles_remove_bloat">Noņemiet uzpūšanos no subtitriem</string>
-    <string name="subtitles_filter_lang">Filtrējiet pēc vēlamās multivides valodas</string>
+    <string name="subtitles_remove_captions">Noņemt slēgtos parakstus no subtitriem</string>
+    <string name="subtitles_remove_bloat">Noņemt lieko no subtitriem (piemēram, reklāmu)</string>
+    <string name="subtitles_filter_lang">Filtrēt pēc vēlamās multivides valodas</string>
     <string name="extras">Ekstras</string>
     <string name="trailer">Treileris</string>
-    <string name="network_adress_example">Links uz tstresmu</string>
+    <string name="network_adress_example">https://piemērs.com/piemērs.mp4</string>
     <string name="referer">Referents</string>
     <string name="next">Nākamais</string>
     <string name="provider_languages_tip">Skatieties videoklipus šajās valodās</string>
     <string name="previous">Iepriekšējais</string>
     <string name="skip_setup">Izlaist uzstādīšanu</string>
     <string name="app_layout_subtext">Mainiet lietotnes izskatu, lai tā atbilstu savai ierīcei</string>
-    <string name="crash_reporting_title">Avārijas ziņošana</string>
     <string name="preferred_media_subtext">Ko tu vēlies redzēt</string>
     <string name="setup_done">Pabeigts</string>
     <string name="extensions">Papildinājumi</string>
     <string name="add_repository">Pievienot repozitoriju</string>
-    <string name="repository_url_hint">Repository URL</string>
-    <string name="plugin_loaded">Plugin ieladēti</string>
-    <string name="plugin_deleted">Plugins dzēsts</string>
+    <string name="repository_url_hint">Repozitorija URL vai īsskods</string>
+    <string name="plugin_loaded">Papildinājums ielādēts</string>
+    <string name="plugin_deleted">Papildinājums dzēsts</string>
     <string name="plugin_load_fail" formatted="true">Nevarēja ielādēt %s</string>
     <string name="is_adult">18+</string>
     <string name="batch_download_start_format" formatted="true">Sākta %1$d %2$s lejupielāde…</string>
     <string name="batch_download_finish_format" formatted="true">Lejuplādēts %1$d %2$s</string>
     <string name="batch_download">Pakešu lejupielāde</string>
-    <string name="plugin_singular">Plugins</string>
-    <string name="plugin">Plugins</string>
-    <string name="delete_repository_plugins">Tādējādi tiks izdzēsti arī visi repozitorija pluginus</string>
+    <string name="plugin_singular">papildinājums</string>
+    <string name="plugin">papildinājumi</string>
+    <string name="delete_repository_plugins">Tiks izdzēsti arī visi repozitorija papildinājumi</string>
     <string name="delete_repository">Dzēst repozitoriju</string>
-    <string name="plugins_downloaded" formatted="true">Lejupielādēt: %d</string>
+    <string name="plugins_downloaded" formatted="true">Lejupielādēts: %d</string>
     <string name="plugins_disabled" formatted="true">Atspējots: %d</string>
-    <string name="plugins_not_downloaded" formatted="true">Nav lejupielādēts: %d</string>
-    <string name="plugins_updated" formatted="true">Atjaunināti %d spraudņi</string>
-    <string name="view_public_repositories_button">Skatīt kopienas krātuves</string>
-    <string name="view_public_repositories_button_short">Publisks saraksts</string>
+    <string name="plugins_not_downloaded" formatted="true">Nelejupielādēts: %d</string>
+    <string name="plugins_updated" formatted="true">Atjaunināti %d papildinājumi</string>
+    <string name="view_public_repositories_button">Skatīt kopienas repozitorijus</string>
+    <string name="view_public_repositories_button_short">Publiskais saraksts</string>
     <string name="uppercase_all_subtitles">Visi subtitri ar lielajiem burtiem</string>
-    <string name="download_all_plugins_from_repo">Vai lejupielādēt visus spraudņus no šīs krātuves?</string>
+    <string name="download_all_plugins_from_repo">Uzmanību: CloudStream neuzņemas nekādu atbildību par trešo pušu papildinājumu izmantošanu un nesniedz nekādu tā atbalstu!</string>
     <string name="single_plugin_disabled" formatted="true">%s (atspējots)</string>
     <string name="tracks">Tracks</string>
     <string name="audio_tracks">Audio dziesmas</string>
     <string name="video_tracks">Video tracks</string>
-    <string name="apply_on_restart">Likt uz restartēšanu</string>
+    <string name="apply_on_restart">Palaist pa jaunu lietotni, lai redzētu izmaiņas.</string>
     <string name="restart">Restartēt</string>
     <string name="stop">Pārtraukt</string>
     <string name="safe_mode_title">Drošais režīms ieslēgts</string>
-    <string name="safe_mode_description">Visi paplašinājumi tika izslēgti avārijas dēļ, lai palīdzētu jums atrast to, kas rada problēmas.</string>
+    <string name="safe_mode_description">Visi papildinājumi tika izslēgti avārijas dēļ, lai palīdzētu jums atrast to, kurš rada problēmas.</string>
     <string name="safe_mode_crash_info">Skatīt avārijas informāciju</string>
-    <string name="extension_rating" formatted="true">Rating: %s</string>
+    <string name="extension_rating" formatted="true">Vērtējums: %s</string>
     <string name="extension_description">Apraksts</string>
     <string name="extension_version">Versija</string>
-    <string name="extension_status">Status</string>
+    <string name="extension_status">Statuss</string>
     <string name="extension_size">Izmērs</string>
-    <string name="extension_authors">Autors</string>
+    <string name="extension_authors">Autori</string>
     <string name="extension_types">Atbalstīts</string>
-    <string name="extension_language">Valodas</string>
+    <string name="extension_language">Valoda</string>
     <string name="hls_playlist">HLS atskaņošanas saraksts</string>
     <string name="player_pref">Vēlamais video atskaņotājs</string>
     <string name="player_settings_play_in_app">Iekšējais atskaņotājs</string>
-    <string name="app_not_found_error">Aplikācijs nav atrasta</string>
+    <string name="app_not_found_error">Lietotne nav atrasta</string>
     <string name="all_languages_preference">Visas valodas</string>
     <string name="skip_type_ed">Beigas</string>
     <string name="skip_type_recap">Kopsavilkums</string>
     <string name="skip_type_mixed_ed">Jauktas beigas</string>
     <string name="skip_type_mixed_op">Jauktais sākums</string>
-    <string name="skip_type_creddits">Kredīts</string>
+    <string name="skip_type_credits">Kredīts</string>
     <string name="clear_history">Notīrīt vēsturi</string>
     <string name="history">Vēsture</string>
     <string name="enable_skip_op_from_database_des">Rādīt izlaižamos uznirstošos logus atvēršanai/beigšanai</string>
@@ -463,17 +455,14 @@
     <string name="sort_alphabetical_z">Alfabētiskā secībā (Z līdz A)</string>
     <string name="select_library">Atlasiet Bibliotēka</string>
     <string name="open_with">Atvērt ar</string>
-    <string name="empty_library_no_accounts_message">Šķiet, ka jūsu bibliotēka ir tukša :(
-\nPiesakieties bibliotēkas kontā vai pievienojiet pārraides savai vietējai bibliotēkai.</string>
+    <string name="empty_library_no_accounts_message">Šķiet, ka jūsu bibliotēka ir tukša :( \nPiesakieties bibliotēkas kontā vai pievienojiet pārraides savai vietējai bibliotēkai.</string>
     <string name="revert">Atgriest</string>
     <string name="subscription_deleted">Anulēts %s abonements</string>
     <string name="subscription_episode_released">%d sērija izlaista!</string>
-    <string name="uprereleases_settings_des">Meklēt pirmsizlaišanas atjauninājumus nevis tikai pilnos atjauninājumus</string>
     <string name="apk_installer_settings">Apk insteletājs</string>
-    <string name="github">Github</string>
+    <string name="github">GitHub</string>
     <string name="no_subtitles">Nav subtitru</string>
     <string name="play_episode_toast">Atskaņot epizodi</string>
-    <string name="acra_report_toast">Piedodiet, bet aplikācijā bija kļūda. Anonīms kļūdas ziņojums tika aizsūtīts izstrādātājiem</string>
     <string name="status_ongoing">Iet</string>
     <string name="free_storage">Bezmaksas</string>
     <string name="poster_ui_settings">Ieslēgt elementus uz plakātiem</string>
@@ -490,7 +479,7 @@
     <string name="primary_color_settings">Galvenā krāsa</string>
     <string name="login_format" formatted="true">%1$s %2$s</string>
     <string name="bottom_title_settings_des">Likt nosaukumu zem plakāta</string>
-    <string name="subtitle_offset_extra_hint_before_format">Izmantojiet šo, ja subtitri tiek rādīti %d ms pārāk vēlu</string>
+    <string name="subtitle_offset_extra_hint_before_format">Ja subtitri kavējas pa %d ms</string>
     <string name="recommended">Rekomendācijas</string>
     <string name="coming_soon">Drīzumā…</string>
     <string name="quality_cam_hd">Kamera</string>
@@ -498,28 +487,124 @@
     <string name="quality_webrip">Web</string>
     <string name="quality_sdr">SDR</string>
     <string name="resolution">Rezulūcija</string>
-    <string name="blank_repo_message">CloudStream pēc noklusējuma nav instalēta neviena vietne. Vietnes jāinstalē no krātuvēm.
-\n
-\nSky UK Limited bezsmadzeņu DMCA noņemšanas dēļ mēs nevaram saistīt ar repozitorija vietni lietotnē.
-\n
-\nPievienojieties mūsu Discord vai meklējiet tiešsaistē.</string>
+    <string name="blank_repo_message">CloudStream pēc noklusējuma nesatur, nav uzstādīts neviens repozitorijs. Lai izmantotu lietotni, obligāti jāpievieno vismaz viens repozitorijs, kas satur vismaz vienu papildinājumu. Repozitorijus var uzstādīt zem Iestatījumi. Tas viss pateicoties Sky UK Limited 🤮 bezsmadzeņu DMCA noņemšanas rīkojumam, kas liedz iekļaut repozitorijus lietotnē.\n\nPievienojieties mūsu Discord serverim vai meklējiet tiešsaistē.</string>
     <string name="batch_download_nothing_to_download_format" formatted="true">Viss %s jau ir lejupielādēts</string>
-    <string name="repository_name_hint">Repozitorija nosaukums</string>
-    <string name="plugin_downloaded">Plugin ielādēti</string>
+    <string name="repository_name_hint">Repozitorija nosaukums (pēc izvēles, neobligāti)</string>
+    <string name="plugin_downloaded">Papildinājums lejupielādēts</string>
     <string name="setup_extensions_subtext">Lejupielādējiet to vietņu sarakstu, kuras vēlaties izmantot</string>
-    <string name="extension_install_first">Vispirms instalējiet paplašinājumu</string>
+    <string name="extension_install_first">Vispirms uzstādīt papildinājumu</string>
     <string name="skip_type_op">Atvēršana</string>
-    <string name="skip_type_intro">Sākums</string>
+    <string name="skip_type_intro">Ievads</string>
     <string name="skip_type_format" formatted="true">Izlaist %s</string>
     <string name="action_remove_from_watched">Noņemt no skatītajiem</string>
     <string name="action_mark_as_watched">Atzīmēt kā skatītu</string>
     <string name="confirm_exit_dialog">Vai tiešām vēlaties iziet?</string>
     <string name="empty_library_logged_in_message">Šķiet, ka šis saraksts ir tukšs, mēģiniet pārslēgties uz citu.</string>
-    <string name="safe_mode_file">Atrasts drošā režīma fails!
-\n Paplašinājumi netiek ielādēti startēšanas laikā, kamēr fails nav noņemts.</string>
+    <string name="safe_mode_file">Atrasta drošā režīma datne!\nPalaišanas laikā neviens papildinājums netiek ielādēts, kamēr datne nav izdzēsta.</string>
     <string name="sort_rating_asc">Vērtējums (no zema līdz augstam)</string>
     <string name="subscription_in_progress_notification">Abonēto šovu atjaunināšana</string>
     <string name="subscription_list_name">Abonēts</string>
     <string name="subscription_new">Abonēts %s</string>
-    <string name="hide_player_control_names_key" translatable="false">hide_player_control_names_key</string>
-</resources>
\ No newline at end of file
+    <string name="next_season_episode_format" formatted="true">%1$d. sezonas %2$d. epizode būs pieejama</string>
+    <string name="download_time_left_hour_min_sec_format" formatted="true">%1$dst. %2$dmin. %3$dsek.</string>
+    <string name="download_time_left_min_sec_format" formatted="true">%1$dmin. %2$dsek.</string>
+    <string name="download_time_left_sec_format" formatted="true">%1$dsek.</string>
+    <string name="play_from_beginning_img_des">Atskaņot no sākuma</string>
+    <string name="speech_recognition_unavailable">Runas atpazīšana nav pieejama</string>
+    <string name="begin_speaking">Sāciet runāt…</string>
+    <string name="torrent_info">Šis video ir torrenta fails, kas nozīmē, ka jūsu video aktivitātes var izsekot.\nPirms turpināt, pārliecinieties, ka saprotat torrenta failu lietošanu.</string>
+    <string name="downloads_delete_select">Atlasiet vienumus, ko dzēst</string>
+    <string name="downloads_empty">Pašlaik nav pieejama neviena lejupielāde.</string>
+    <string name="offline_file">Pieejams skatīšanai bezsaistē</string>
+    <string name="wifi">Bezvadu (Wi-Fi)</string>
+    <string name="use">Izmantot</string>
+    <string name="edit">Rediģēt</string>
+    <string name="profiles">Profili</string>
+    <string name="help">Palīdzība</string>
+    <string name="qualities">Kvalitāte</string>
+    <string name="disable">Atspējot</string>
+    <string name="favorites_list_name">Iecienītākie</string>
+    <string name="action_subscribe">Abonēt</string>
+    <string name="action_unsubscribe">Pārtraukt abonēt</string>
+    <string name="duplicate_add">Pievienot</string>
+    <string name="duplicate_replace">Aizstāt</string>
+    <string name="pin">PIN kods</string>
+    <string name="rotate_video">Pagriezt</string>
+    <string name="unfavorite">Noņemt no iecienītajiem</string>
+    <string name="favorite">Pievienot iecienītajiem</string>
+    <string name="toast_copied">nokopēts!</string>
+    <string name="ok">Labi</string>
+    <string name="music_singular">Mūzika</string>
+    <string name="reset_btn">Atiestatīt</string>
+    <string name="pref_category_security">Drošība</string>
+    <string name="pref_category_accounts">Konti</string>
+    <string name="test_warning">Brīdinājums</string>
+    <string name="show">Rādīt</string>
+    <string name="audio_singular">Audio</string>
+    <string name="podcast_singular">Raidieraksts</string>
+    <string name="subtitles_from_embedded">Iegultie</string>
+    <string name="subtitles_from_online">No interneta</string>
+    <string name="name">Nosaukums</string>
+    <string name="profile_number">Profils %d</string>
+    <string name="mobile_data">Mobilie dati</string>
+    <string name="profile_background_des">Profila fons</string>
+    <string name="backup_frequency">Rezerves kopijas izveides biežums</string>
+    <string name="duplicate_replace_all">Aizstāt visus</string>
+    <string name="enter_pin">Ievadiet PIN kodu</string>
+    <string name="enter_pin_with_name" formatted="true">Ievadiet %s PIN kodu</string>
+    <string name="enter_current_pin">Ievadiet pašreizējo PIN kodu</string>
+    <string name="lock_profile">Aizslēgt profilu</string>
+    <string name="pin_error_incorrect">Nepareizs PIN kods. Lūdzu, ievadiet to no jauna.</string>
+    <string name="pin_error_length">PIN kods satur 4 rakstzīmes</string>
+    <string name="select_an_account">Atlasiet kontu</string>
+    <string name="no_account">Nav konta</string>
+    <string name="manage_accounts">Pārvaldīt kontus</string>
+    <string name="edit_account">Rediģēt kontu</string>
+    <string name="repo_copy_label">Repozitorija nosaukums un URL</string>
+    <string name="no_plugins_found_error">Repozitorijā nav atrasts neviens papildinājums</string>
+    <string name="no_repository_found_error">Repozitorijs nav atrasts, pārbaudiet URL un izmēģiniet ar ieslēgtu VPN</string>
+    <string name="open_downloaded_repo">Atvērt repozitoriju</string>
+    <string name="unable_to_inflate">Lietotāja saskarni nevarēja izveidot pareizi, tā ir NOPIETNA KĻŪDA, un par to jāziņo nekavējoties %s</string>
+    <string name="automatic_plugin_download_mode_title">Atlasiet režīmu pēc kā filtrēt papildinājumu lejupielādi</string>
+    <string name="delete_plugin">Dzēst papildinājumu</string>
+    <string name="update_plugins">Atjaunināt papildinājumus</string>
+    <string name="update_plugins_manually">Atjaunināt papildinājumus manuāli</string>
+    <string name="starting_plugin_update_manually">Sāk papildinājuma atjaunināšanas procesu!</string>
+    <string name="plugins_updated_manually">Veiksmīgi atjaunināts(-i) %d papildinājums(-i)!</string>
+    <string name="no_plugins_updated_manually">Neviens papildinājums netika atjaunināts.</string>
+    <string name="result_search_tooltip">Meklēt citos papildinājumos</string>
+    <string name="test_extensions">Pārbaudīt visus papildinājumus</string>
+    <string name="test_extensions_summary">Šis tests ir paredzēts tikai izstrādātājiem, un tas neapstiprina vai nenoliedz papildinājumu funkcionalitāti.</string>
+    <string name="battery_dialog_message">Lai nodrošinātu nepārtrauktu abonēto TV pārraižu (seriālu un raidījumu) lejupielādi un paziņojumu saņemšanu, CloudStream nepieciešama darboties fonā atļauja. Noklikšķinot uz 𝙇𝙖𝙗𝙞, tiks parādīts vaicājumlogs. Lūdzu, noklikšķiniet uz \'Atļaut\'.\n\nLūdzu, nesatraucieties, ka piešķirot šo atļauja, CloudStream 3 sāks veikt pastāvīgu akumulatora izlādi. Tas tiks palaists fonā tikai nepieciešamības gadījumā, piemēram, saņemot paziņojumus vai lejupielādējot video no oficiālajiem papildinājumiem.</string>
+    <string name="delete_files">Dzēst datnes</string>
+    <string name="quality_profile_help">Šeit jūs varat mainīt avotu atlases secību. Ja video ir augstāka prioritāte, tad tas tiks parādīts augstāk avotu atlases sarakstā. Avota prioritātes un kvalitātes prioritātes summa ir video prioritāte.\n\nAvots A: 3\nKvalitāte B: 7\nRezultātā kopējā video prioritātes summa ir 10.\n\nPIEZĪME: Ja kopējā summa ir vienāda ar 10 vai vairāk, atskaņotājs automātiski izlaidīs atskaņot, lejupielādēt video, kad šī saite ir ielādēta!</string>
+    <string name="software_decoding_desc">Programmatūras (procesora) dekodēšana ļauj atskaņot video datnes, kuras jūsu ierīce neatbalsta. Taču var izraisīt aizkavētu vai nestabilu atskaņošanu video ar augstu izšķirtspēju, ja procesora veiktspēja ir neadekvāta.</string>
+    <string name="edit_profile_image_title">Nomainīt profila attēlu</string>
+    <string name="edit_profile_image_hint">Ievadiet profila attēla URL</string>
+    <string name="edit_profile_image_error_empty">URL nav norādīts vai atrodams</string>
+    <string name="edit_profile_image_error_invalid">Nepareizs URL vai nederīgs attēls</string>
+    <string name="edit_profile_image_success">Profila attēls veiksmīgi nomainīts</string>
+    <string name="recommendations_tooltip">Rādīt ieteikumus</string>
+    <string name="resolution_and_name">Izšķirtspēja un nosaukums</string>
+    <string name="player_load_one_subtitle_online">Lejupielādēt pirmo pieejamo</string>
+    <string name="no_subtitles_loaded">Neviens subtitrs vēl nav ielādēts</string>
+    <string name="all_subtitles_bold">Padarīt visus subtitrus treknrakstā</string>
+    <string name="all_subtitles_italic">Padarīt visus subtitrus slīprakstā</string>
+    <string name="speed_setting_summary">Pievieno atskaņošanas ātruma izvēli atskaņotājā</string>
+    <string name="delete_format" formatted="true">Dzēst (%1$d | %2$s)</string>
+    <plurals name="downloads_active">
+        <item quantity="zero">%d aktīvas lejupielādes</item>
+        <item quantity="one">%d aktīva lejupielāde</item>
+        <item quantity="other">%d aktīvas lejupielādes</item>
+    </plurals>
+    <string name="download_queue">Lejupielādes rinda</string>
+    <string name="auto_rotate_video">Automātiski pagriezt</string>
+    <string name="biometric_authentication_title">Atbloķēt CloudStream</string>
+    <string name="password_pin_authentication_title">Paroles/PIN autentifikācija</string>
+    <string name="play_full_series_button">Atskaņot visas epizodes</string>
+    <string name="delete_message_series_episodes" formatted="true">Vai tiešām vēlaties neatgriezeniski dzēst šīs %1$s epizodes?\n\n%2$s</string>
+    <string name="delete_message_series_section" formatted="true">Jūs arī neatgriezeniski izdzēsīsiet visas šī seriāla, raidījuma epizodes:\n\n%s</string>
+    <string name="delete_message_series_only" formatted="true">Vai tiešām vēlaties neatgriezeniski dzēst visas šī seriāla, raidījuma epizodes?\n\n%s</string>
+    <string name="queue_empty_message">Pašlaik nav nevienas rindā ievietotas lejupielādes.</string>
+    <string name="open_local_video">Atvērt vietējo video</string>
+</resources>
diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-b+mk/strings.xml
similarity index 92%
rename from app/src/main/res/values-mk/strings.xml
rename to app/src/main/res/values-b+mk/strings.xml
index a6f095484a9..ea467833e9e 100644
--- a/app/src/main/res/values-mk/strings.xml
+++ b/app/src/main/res/values-b+mk/strings.xml
@@ -47,7 +47,6 @@
     <string name="popup_play_file">Пушти датотека</string>
     <string name="popup_resume_download">Продолжи со преземање</string>
     <string name="popup_pause_download">Паузирај со преземање</string>
-    <string name="pref_disable_acra">Оневозможи автоматско известување за грешки</string>
     <string name="home_more_info">Повеќе информации</string>
     <string name="home_expanded_hide">Скриј</string>
     <string name="home_play">Пушти</string>
@@ -101,13 +100,9 @@
     <string name="settings_info">Информации</string>
     <string name="advanced_search">Напредно пребарување</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>
     <string name="updates_settings">Прикажи ажурирања на апликации</string>
     <string name="updates_settings_des">Автоматски пребарувај нови ажурирања откако ќе ја стартуваш апликацијата.</string>
-    <string name="uprereleases_settings">Ажурирање на пред официјални верзии</string>
-    <string name="uprereleases_settings_des">Побарај дали има нови неофицијални верзии наместо само ажурирања на официјални верзии</string>
     <string name="github">Github</string>
     <string name="lightnovel">Едноставна апликација за новели од истите развивачи</string>
     <string name="anim">Апликација за аниме од истите развивачи</string>
@@ -120,7 +115,6 @@
     <string name="copy_link_toast">Линкот е копиран во таблата со исечоци</string>
     <string name="play_episode_toast">Пушти ја епизодата</string>
     <string name="subs_default_reset_toast">Ресетирање на стандардните вредности</string>
-    <string name="acra_report_toast">За жал, апликацијата падна. Ќе се испрати анонимен извештај за грешка до програмерите</string>
     <string name="season">Сезона</string>
     <string name="no_season">Нема сезона</string>
     <string name="episode">Епизода</string>
@@ -132,8 +126,7 @@
     <string name="cancel">Откажи</string>
     <string name="pause">Паузирај</string>
     <string name="resume">Продолжи</string>
-    <string name="delete_message">Ова трајно ќе го избрише %s
-\nДали си сигурен?</string>
+    <string name="delete_message">Ова трајно ќе го избрише %s \nДали си сигурен?</string>
     <string name="status_ongoing">Во тек</string>
     <string name="status_completed">Изгледанo</string>
     <string name="status">Статус</string>
@@ -235,7 +228,7 @@
     <string name="emulator_layout">Изглед на емулатор</string>
     <string name="other_singular">Видео</string>
     <string name="sort_clear">Исчисти</string>
-    <string name="test_passed">Положен</string>
+    <string name="test_passed">Успешна верификација</string>
     <string name="example_site_name">Име на сајт</string>
     <string name="error_invalid_data">Неважечки податоци</string>
     <string name="actor_supporting">Поддршка</string>
@@ -266,7 +259,7 @@
     <string name="sort">Подреди</string>
     <string name="player_settings_play_in_app">Внатрешен плеер</string>
     <string name="resolution">Резолуција</string>
-    <string name="skip_type_creddits">Кредити</string>
+    <string name="skip_type_credits">Кредити</string>
     <string name="search_hint_site" formatted="true">Пребарај %s…</string>
     <string name="plugin_deleted">Приклучокот е избришан</string>
     <string name="extension_status">Статус</string>
@@ -401,7 +394,7 @@
     <string name="android_tv_interface_on_seek_settings">Прикажан плеер - Барај износ</string>
     <string name="pref_category_android_tv">Андроид ТВ</string>
     <string name="restore_failed_format" formatted="true">Не успеа да ги врати податоците од датотеката %s</string>
-    <string name="test_failed">Не успеа</string>
+    <string name="test_failed">Неуспешна верификација</string>
     <string name="documentaries_singular">Документарец</string>
     <string name="stream">Мрежен проток</string>
     <string name="duration_format" formatted="true">%d мин</string>
@@ -423,8 +416,7 @@
     <string name="batch_download_start_format" formatted="true">Почна да презема %1$d %2$s…</string>
     <string name="automatic_plugin_updates">Автоматски ажурирања на приклучоци</string>
     <string name="go_back_30">-30</string>
-    <string name="resume_time_left" formatted="true">%dm
-\nпреостанува</string>
+    <string name="resume_time_left" formatted="true">%dm \nпреостанува</string>
     <string name="video_buffer_disk_settings">Видео кеш на дискот</string>
     <string name="network_adress_example">https://example.com/example.mp4</string>
     <string name="setup_done">Готово</string>
@@ -452,7 +444,7 @@
     <string name="autoplay_next_settings_des">Започни ја следната епизода кога ќе заврши тековната</string>
     <string name="backup_failed_error_format">Грешка при правење резервна копија на %s</string>
     <string name="pref_filter_search_quality">Сокриј го избраниот квалитет на видеото во резултатите од пребарувањето</string>
-    <string name="apk_installer_settings_des">Некои телефони не го поддржуваат новиот инсталатор на пакети. Испробај ја легаси опцијата ако ажурирањата не се инсталираат.</string>
+    <string name="apk_installer_settings_des">Некои уреди не го поддржуваат новиот инсталатор на пакети. Испробај ја легаси(старата) опција, ако ажурирањата не се инсталираат.</string>
     <string name="limit_title_rez">Резолуција на видео плеер</string>
     <string name="video_buffer_size_settings">Големина на видео баферот</string>
     <string name="pref_category_player_layout">Распоред</string>
@@ -466,7 +458,6 @@
     <string name="previous">Претходно</string>
     <string name="skip_setup">Прескокни го поставувањето</string>
     <string name="app_layout_subtext">Промени го изгледот на апликацијата за да одговара на твојот уред</string>
-    <string name="crash_reporting_title">Известување за пад</string>
     <string name="preferred_media_subtext">Што сакате да видите</string>
     <string name="repository_name_hint">Име на изворот (Опционално)</string>
     <string name="plugin_downloaded">Приклучокот е преземен</string>
@@ -574,7 +565,7 @@
     <string name="unfavorite">Неомилен</string>
     <string name="favorite">Омилен</string>
     <string name="biometric_setting">Заклучување со биометрика</string>
-    <string name="music_singlar">Музика</string>
+    <string name="music_singular">Музика</string>
     <string name="subscribe_tooltip">Известување за нова епизода</string>
     <string name="result_search_tooltip">Пребарај во други екстензии</string>
     <string name="recommendations_tooltip">Прикажи препораки</string>
@@ -592,15 +583,13 @@
     <string name="biometric_authentication_title">Отклучи CloudStream</string>
     <string name="biometric_unsupported">Биометриската автентикација не е поддржана на овој уред</string>
     <string name="biometric_prompt_description">По неколку неуспешни обиди, известувањето ќе се затвори. Едноставно вклучи ја апликацијата повторно за да се обидеш повторно.</string>
-    <string name="custom_media_singluar">Медиуми</string>
+    <string name="custom_media_singular">Медиуми</string>
     <string name="episode_upcoming_format" formatted="true">Претстои во %s</string>
-    <string name="resume_remaining" formatted="true">%s
-\nпреостанати</string>
+    <string name="resume_remaining" formatted="true">%s \nпреостанати</string>
     <string name="battery_dialog_message">За да се обезбедат непрекинати преземања и известувања за претплатените ТВ серии, CloudStream треба дозвола за работа во позадина. Со притискање на „ОК“, ќе ви биде прикажан дијалог за барање дозвола. Ве молиме, притиснете „Дозволи“.\n\nИмајте предвид дека оваа дозвола не значи дека CS3 ќе ја троши вашата батерија. Ќе работи во позадина само кога е потребно, како на пример при примање известувања или преземање видеа од официјални екстензии.</string>
     <string name="clipboard_permission_error">Грешка при пристапот до таблата со исечоци, обиди се повторно.</string>
     <string name="clipboard_unknown_error">Грешка при копирање, молам копирај го логот и контактирај ја поддршката на апликацијата.</string>
     <string name="audio_book_singular">Аудио книга</string>
-    <string name="hide_player_control_names_key" translatable="false">hide_player_control_names_key</string>
     <string name="pref_category_security">Безбедност</string>
     <string name="dismiss">Отфрли</string>
     <string name="open_downloaded_repo">Отвори извор</string>
@@ -641,14 +630,14 @@
     <string name="cs3wiki">CloudStream Wiki</string>
     <string name="delete_message_series_episodes" formatted="true">Дали си сигурен дека сакаш трајно да ги избришеш следните епизоди во %1$s?\n\n%2$s</string>
     <string name="device_pin_counter_text">Кодот истекува за %1$d минута/и и %2$d секунда/и</string>
-    <string name="audio_singluar">Аудио</string>
-    <string name="podcast_singluar">Поткаст</string>
+    <string name="audio_singular">Аудио</string>
+    <string name="podcast_singular">Поткаст</string>
     <string name="encoding_error">Грешка при кодирање на преводот</string>
     <string name="unsupported_error">Неподдржана грешка</string>
     <string name="player_load_one_subtitle_online">Вчитај прво достапно</string>
     <string name="torrent_not_accepted">Рестартирај ја апликацијата и прифати го Stream Torrent искачувачкиот прозорец за да продолжиш.</string>
     <string name="torrent_preferred_media">Овозможи torrent во Поставки/Провајдери/Претпочитани медиуми</string>
-    <string name="software_decoding_desc">Софтверското декодирање му овозможува на плеерот да репродуцира видео фајлови што не се поддржани од вашиот телефон, но може да предизвика задоцнување или нестабилна репродукција при висока резолуција.</string>
+    <string name="software_decoding_desc">Софтверското декодирање овозможува плеерот да воспоставува видео фајлови кои не се поддржани од вашиот уред, но може да предизвика застој или нестабилно репродуцирање при висока резолуција.</string>
     <string name="software_decoding">Софтверско декодирање</string>
     <string name="starting_plugin_update_manually">Започнување на процесот на ажурирање на приклучоци!</string>
     <string name="update_plugins">Ажурирај приклучоци</string>
@@ -675,4 +664,45 @@
     <string name="speech_recognition_unavailable">Препознавањето на говор не е достапно</string>
     <string name="begin_speaking">Започни со зборување…</string>
     <string name="background_radius">Радиус на позадина</string>
-</resources>
\ No newline at end of file
+    <string name="download_parallel_settings_des">Колку различни содржини можат да се симнуваат паралелно</string>
+    <string name="parallel_downloads">Паралелни симнувања</string>
+    <string name="concurrent_connections">Истовремени конекции</string>
+    <string name="concurrent_connections_settings_des">Колку истовремени конекции може да користи секое симнување додека се симнува</string>
+    <string name="go_to_downloads">Оди во Симнувања</string>
+    <string name="no_internet_connection">Нема интернет конекција.\n\nПоврзете се на интернет и обидете се повторно, или гледајте ги симнатите содржини додека сте офлајн.</string>
+    <string name="overscan_settings_des">Ги менува границите на екранот</string>
+    <string name="overscan_settings">Оверскен</string>
+    <string name="poster_size_settings_des">Менување на големината на постерите</string>
+    <string name="poster_size_settings">Големина на постер</string>
+    <string name="player_settings_always_ask">Секогаш прашувај</string>
+    <string name="speedup_title">Префрлувач на брзина со долго притискање</string>
+    <string name="speedup_summary">Држи за да добиеш 2x брзина</string>
+    <string name="download_time_left_hour_min_sec_format" formatted="true">%1$dч %2$dм %3$dс</string>
+    <string name="download_time_left_min_sec_format" formatted="true">%1$dм %2$dс</string>
+    <string name="download_time_left_sec_format" formatted="true">%1$dс</string>
+    <string name="show_rating">Ознака за рејтинг</string>
+    <string name="no_account">Нема корисничка сметка</string>
+    <string name="edit_profile_image_title">Измени профилна слика</string>
+    <string name="edit_profile_image_hint">Внеси линк на профилна слика</string>
+    <string name="edit_profile_image_error_empty">Линкот не е пронајден</string>
+    <string name="edit_profile_image_error_invalid">Неважечки линк или слика</string>
+    <string name="edit_profile_image_success">Успешно прикачена слика</string>
+    <string name="action_mark_watched_up_to_this_episode">Означи изгледано до оваа епизода</string>
+    <string name="action_remove_mark_watched_up_to_this_episode">Избриши изгледано до оваа епизода</string>
+    <string name="action_reload">Повторно вчитано</string>
+    <string name="reload_provider">Повторно вчитај провајдер</string>
+    <string name="episode_action_play_mirror">Пушти друг линк</string>"
+    <string name="name">Име</string>
+    <string name="resolution_and_name">Резолуција и име</string>
+    <string name="subs_subtitle_alignment">Усогласување на превод</string>
+    <string name="bottom_left">Доле на лево</string>
+    <string name="bottom_center">Доле во центар</string>
+    <string name="bottom_right">Доле на десно</string>
+    <string name="middle_left">Средина на лево</string>
+    <string name="middle_center">Средина во центар</string>
+    <string name="middle_right">Средина на десно</string>
+    <string name="top_left">Горе на лево</string>
+    <string name="top_center">Горе во центар</string>
+    <string name="top_right">Горе на десно</string>
+    <string name="play_full_series_button">Пушти ја целата серија</string>
+</resources>
diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-b+ml/strings.xml
similarity index 94%
rename from app/src/main/res/values-ml/strings.xml
rename to app/src/main/res/values-b+ml/strings.xml
index bf0fede72d1..c2b25c5ee77 100644
--- a/app/src/main/res/values-ml/strings.xml
+++ b/app/src/main/res/values-b+ml/strings.xml
@@ -3,8 +3,7 @@
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">വേഗം (%.2fx)</string>
     <string name="rated_format" formatted="true">റേറ്റിംഗ്: %.1f</string>
-    <string name="new_update_format" formatted="true">പുതിയ അപ്ഡേറ്റ്!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">പുതിയ അപ്ഡേറ്റ്! \n%1$s -&gt; %2$s</string>
     <string name="app_name">ക്ലൗഡ് സ്ട്രീം</string>
     <string name="title_home">ഹോം</string>
     <string name="title_search">തിരയുക</string>
@@ -45,7 +44,6 @@
     <string name="popup_play_file">ഫയൽ പ്ലേയ് ചെയ്യുക</string>
     <string name="popup_resume_download">ഡൌൺലോഡ് തുടരുക</string>
     <string name="popup_pause_download">ഡൌൺലോഡ് നിർത്തുക</string>
-    <string name="pref_disable_acra">ഓട്ടോമാറ്റിക് ബഗ് റിപ്പോർട്ടിംഗ് പ്രവർത്തനരഹിതമാക്കുക</string>
     <string name="home_more_info">കൂടുതൽ വിവരം</string>
     <string name="home_expanded_hide">ഒളിക്കുക</string>
     <string name="home_play">പ്ലേയ്</string>
@@ -94,12 +92,8 @@
     <string name="settings_info">വിവരം</string>
     <!-- <string name="advanced_search">Advanced Search</string> -->
     <string name="advanced_search_des">സ്ട്രോതസായി തിരിച്ച ഫലം തരുക</string>
-    <string name="bug_report_settings_off">ക്രാഷാകുമ്പോൾ മാത്രം അയക്കുക</string>
-    <string name="bug_report_settings_on">ടാറ്റ അയക്കാതിരിക്കുക</string>
     <string name="updates_settings">അപ്ഡേറ്റുകൾ അറിയിക്കുക</string>
     <string name="updates_settings_des">ആരംഭത്തിൽ അപ്ഡേറ്റുകൾ തിരയുക</string>
-    <string name="uprereleases_settings">പരീക്ഷണാത്മക അപ്ഡേറ്</string>
-    <string name="uprereleases_settings_des">പരീക്ഷണാത്മക അപ്ഡേറ്റുകൾ മാത്രം സ്വീകരിക്കുക</string>
     <string name="github">ഗിറ്റ്ഹബ്</string>
     <string name="lightnovel">നമ്മുടെ ലൈറ്റ് നോവൽ ആപ്പ്</string>
     <string name="anim">നമ്മുടെ ആനിമേ ആപ്പ്</string>
@@ -111,7 +105,6 @@
     <string name="no_links_found_toast">ലിങ്കുകൾ ലഭ്യമല്ല</string>
     <string name="copy_link_toast">ലിങ്ക് പകർത്തിയിരിക്കുന്നു</string>
     <string name="play_episode_toast">എപ്പിസോഡ് പ്ലേയ് ചെയ്യുക</string>
-    <string name="acra_report_toast">ആപ്പ് നിശ്ചലമായിരിക്കുന്നതിന് ക്ഷമിക്കണം</string>
     <string name="season">സീസൺ</string>
     <string name="no_season">സീസണില്ല</string>
     <string name="episode">എപ്പിസോഡ്</string>
@@ -121,8 +114,7 @@
     <string name="cancel">റദ്ദാക്കുക</string>
     <string name="pause">നിർത്തുക</string>
     <string name="resume">തുടരുക</string>
-    <string name="delete_message">സ്ഥിരമായി %sനെ ഡിലീറ്റ് ചെയ്യുക
-\nഉറപ്പാണോ?</string>
+    <string name="delete_message">സ്ഥിരമായി %sനെ ഡിലീറ്റ് ചെയ്യുക \nഉറപ്പാണോ?</string>
     <string name="status_ongoing">തുടരുന്നു</string>
     <string name="status_completed">പൂർത്തിയായി</string>
     <string name="status">അവസ്ഥ</string>
@@ -198,9 +190,7 @@
     <string name="subs_import_text" formatted="true">%s ൽ ഫോൻ്റ്‌സ് വെച്ചു കൊണ്ട് ഇംപോർട്ട് ചെയ്യുക</string>
     <string name="safe_mode_description">പ്രശ്‌നമുണ്ടാക്കുന്ന ഒന്ന് കണ്ടെത്താൻ നിങ്ങളെ സഹായിക്കുന്നതിന് ഒരു ക്രാഷ് കാരണം എല്ലാ വിപുലീകരണങ്ങളും ഓഫാക്കി.</string>
     <string name="view_public_repositories_button_short">പൊതു പട്ടിക</string>
-    <string name="blank_repo_message">CloudStream-ന് സ്ഥിരസ്ഥിതിയായി സൈറ്റുകളൊന്നും ഇൻസ്റ്റാൾ ചെയ്തിട്ടില്ല. നിങ്ങൾ റിപ്പോസിറ്ററികളിൽ നിന്ന് സൈറ്റുകൾ ഇൻസ്റ്റാൾ ചെയ്യേണ്ടതുണ്ട്.
-\n
-\nഞങ്ങളുടെ ഡിസ്കോർഡിൽ ചേരുക അല്ലെങ്കിൽ ഓൺലൈനിൽ തിരയുക.</string>
+    <string name="blank_repo_message">CloudStream-ന് സ്ഥിരസ്ഥിതിയായി സൈറ്റുകളൊന്നും ഇൻസ്റ്റാൾ ചെയ്തിട്ടില്ല. നിങ്ങൾ റിപ്പോസിറ്ററികളിൽ നിന്ന് സൈറ്റുകൾ ഇൻസ്റ്റാൾ ചെയ്യേണ്ടതുണ്ട്. \n \nഞങ്ങളുടെ ഡിസ്കോർഡിൽ ചേരുക അല്ലെങ്കിൽ ഓൺലൈനിൽ തിരയുക.</string>
     <string name="sort_copy">പകർത്തുക</string>
     <string name="uppercase_all_subtitles">എല്ലാ സബ്‌ടൈറ്റിലുകളും വലിയക്ഷരമാക്കുക</string>
     <string name="render_error">റെൻഡറർ പിശക്</string>
@@ -267,8 +257,7 @@
     <string name="empty_library_logged_in_message">ഈ ലിസ്റ്റ് ശൂന്യമാണ്. മറ്റൊന്നിലേക്ക് മാറാൻ ശ്രമിക്കുക.</string>
     <string name="clear_history">ചരിത്രം മായ്ക്കുക</string>
     <string name="show_log_cat">ലോഗ്കാറ്റ് കാണിക്കുക 🐈</string>
-    <string name="empty_library_no_accounts_message">നിങ്ങളുടെ ലൈബ്രറി ശൂന്യമാണ് :(
-\nഒരു ലൈബ്രറി അക്കൗണ്ടിൽ ലോഗിൻ ചെയ്യുക അല്ലെങ്കിൽ നിങ്ങളുടെ പ്രാദേശിക ലൈബ്രറിയിലേക്ക് ഷോകൾ ചേർക്കുക.</string>
+    <string name="empty_library_no_accounts_message">നിങ്ങളുടെ ലൈബ്രറി ശൂന്യമാണ് :( \nഒരു ലൈബ്രറി അക്കൗണ്ടിൽ ലോഗിൻ ചെയ്യുക അല്ലെങ്കിൽ നിങ്ങളുടെ പ്രാദേശിക ലൈബ്രറിയിലേക്ക് ഷോകൾ ചേർക്കുക.</string>
     <string name="other_singular">വീഡിയോ</string>
     <string name="repo_copy_label">റിപ്പോസിറ്ററി നാമവും URL ഉം</string>
     <string name="toast_copied">പകർത്തി!</string>
@@ -278,5 +267,4 @@
     <string name="subs_edge_type">എഡ്ജ് തരം</string>
     <string name="subs_outline_color">ഔട്ട്ലൈൻ നിറം</string>
     <string name="subs_background_color">പശ്ചാത്തല നിറം</string>
-    <string name="hide_player_control_names_key" translatable="false">hide_player_control_names_key</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-b+ms/strings.xml
similarity index 85%
rename from app/src/main/res/values-ms/strings.xml
rename to app/src/main/res/values-b+ms/strings.xml
index e865d58dbbb..ab0d0a54f97 100644
--- a/app/src/main/res/values-ms/strings.xml
+++ b/app/src/main/res/values-b+ms/strings.xml
@@ -5,7 +5,7 @@
     <string name="history">Sejarah</string>
     <string name="clear_history">Kosongkan sejarah</string>
     <string name="skip_type_intro">Pengenalan</string>
-    <string name="skip_type_creddits">Kredit</string>
+    <string name="skip_type_credits">Kredit</string>
     <string name="skip_type_mixed_op">Pembukaan bercampur</string>
     <string name="skip_type_ed">Penamat</string>
     <string name="skip_type_op">Pembukaan</string>
@@ -54,11 +54,9 @@
     <string name="result_share">Kongsi</string>
     <string name="title_settings">Tetapan</string>
     <string name="sort_close">Tutup</string>
-    <string name="hide_player_control_names_key" translatable="false">hide_player_control_names_key</string>
     <string name="preview_background_img_des">Pratonton</string>
     <string name="rated_format" formatted="true">Resensi:%.1f</string>
-    <string name="new_update_format" formatted="true">Kemas kini baru dijumpai!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">Kemas kini baru dijumpai! \n%1$s -&gt; %2$s</string>
     <string name="duration_format" formatted="true">%d min</string>
     <string name="play_from_beginning_img_des">Main dari mula</string>
     <string name="next_season_episode_format" formatted="true">Musim %1$d Episod %2$d akan dikeluarkan di</string>
@@ -66,10 +64,9 @@
     <string name="sort_clear">Buang</string>
     <string name="toast_copied">disalin!</string>
     <string name="player_speed">Kelajuan Pemain</string>
-    <string name="pref_disable_acra">Lumpuhkan pelaporan pepijat automatik</string>
     <string name="action_remove_from_bookmarks">Buang</string>
     <string name="autoplay_next_settings_des">Mulakan episod seterusnya apabila episod semasa tamat</string>
-    <string name="open_local_video">Pasang video lokal</string>
+    <string name="open_local_video">Buka video tempatan</string>
     <string name="subtitles_settings">Tetapan Sari Kata</string>
     <string name="subscribe_tooltip">Pemberitahuan episod baru</string>
     <string name="result_search_tooltip">Carian dalam sambungan lain</string>
@@ -94,7 +91,7 @@
     <string name="type_plan_to_watch">Dirancang untuk ditonton</string>
     <string name="type_re_watching">Tonton semula</string>
     <string name="pick_source">Sumber</string>
-    <string name="pick_subtitle">Sari kata</string>
+    <string name="pick_subtitle">Sarikata</string>
     <string name="go_back">Kembali</string>
     <string name="downloading">Memuat turun</string>
     <string name="download_canceled">Muat turun dibatalkan</string>
@@ -106,7 +103,7 @@
     <string name="popup_resume_download">Sambung muat turun</string>
     <string name="download_storage_text">Storan dalaman</string>
     <string name="search_provider_text_providers">Carian mengikut sumber</string>
-    <string name="benene_count_text">%d Benenes yang diberikan kepada pemaju</string>
+    <string name="benene_count_text">%d Pisang yang diberikan kepada pemaju</string>
     <string name="subs_font_size">Saiz Teks</string>
     <string name="sort_apply">Mohon</string>
     <string name="subs_text_color">Warna teks</string>
@@ -118,7 +115,7 @@
     <string name="continue_watching">Sambung tonton</string>
     <string name="action_remove_watching">Buang</string>
     <string name="action_open_watching">Lebih Maklumat</string>
-    <string name="vpn_torrent">Sumber ini adalah torrent, penggunaan VPN disyorkan</string>
+    <string name="vpn_torrent">Sumber ini adalah torrent, penggunaan VPN digalakkan</string>
     <string name="provider_info_meta">Metadata tidak diberikan oleh laman web, video lalai akan gagala sekiranya tidak wujud di laman web.</string>
     <string name="torrent_plot">Penerangan</string>
     <string name="show_log_cat">Papar Logcat🐈</string>
@@ -137,13 +134,13 @@
     <string name="select_all">Pilih semua</string>
     <string name="deselect_all">Nyahpilih semua</string>
     <string name="vpn_might_be_needed">VPN mungkin diperlukan untuk sumber ini berjalan dengan lancar</string>
-    <string name="picture_in_picture_des">Sambung pasang dalam pemain mini di atas aplikasi lain</string>
+    <string name="picture_in_picture_des">Sambung Rakaman didalam pemain mini di atas aplikasi lain</string>
     <string name="player_subtitles_settings">Sari kata</string>
     <string name="player_subtitles_settings_des">Tetapan sari kata pemain</string>
     <string name="chromecast_subtitles_settings">Chromecast Sari kata</string>
     <string name="eigengraumode_settings">Kelajuan pemain</string>
     <string name="autoplay_next_settings">Auto-pasang episod seterusnya</string>
-    <string name="use_system_brightness_settings">Gunakan terang system</string>
+    <string name="use_system_brightness_settings">Gunakan keterangan sistem</string>
     <string name="reload_error">Cuba sambungan talian…</string>
     <string name="settings_info">Informasi</string>
     <string name="safe_mode_crash_info">Lihat info ralat</string>
@@ -163,7 +160,6 @@
     <string name="category_player">Pemain</string>
     <string name="delayed_update_notice">Aplikasi akan dikemas kini ketika keluar</string>
     <string name="player_settings_play_in_app">Pemain dalaman</string>
-    <string name="bug_report_settings_on">Tiada data dihantar</string>
     <string name="duration">Durasi</string>
     <string name="site">Laman web</string>
     <string name="synopsis">Sinopsis</string>
@@ -288,7 +284,7 @@
     <string name="sync_total_episodes_some" formatted="true">/%d</string>
     <string name="subtitle_offset_extra_hint_later_format">Gunakan ini sekiranya sari kata yang dipaparkan awal sebanyak %d</string>
     <string name="quality_hdr">HDR</string>
-    <string name="custom_media_singluar">Media</string>
+    <string name="custom_media_singular">Media</string>
     <string name="tv_layout">Susun atur TV</string>
     <string name="tv_series">TV Bersiri</string>
     <string name="plugin_load_fail" formatted="true">Tidak dapat papar %s</string>
@@ -382,8 +378,7 @@
     <string name="jsdelivr_enabled">Github tidak dapat dicapai. Menghidupkan proksi jsDelivr…</string>
     <string name="random_button_settings_desc">Papar butang rawak di laman utama dan perpustakaan</string>
     <string name="single_plugin_disabled" formatted="true">%s (Dilumpuhkan)</string>
-    <string name="empty_library_no_accounts_message">Perpustakaan anda kosong :(
-\nLog masuk dalam akaun perpustakaan atau tambah cerita di perpustakaan lokal</string>
+    <string name="empty_library_no_accounts_message">Perpustakaan anda kosong :(\nLog masuk dalam akaun perpustakaan atau tambah cerita di perpustakaan lokal.</string>
     <string name="subtitle_offset_title">Kelewatan sari kata</string>
     <string name="sort_release_date_old">Tarikh Keluar (Tua ke Baru)</string>
     <string name="sort_release_date_new">Tarikh Keluar (Baru ke Tua)</string>
@@ -394,7 +389,7 @@
     <string name="stop">Berhenti</string>
     <string name="already_voted">Anda telah mengundi</string>
     <string name="action_remove_from_favorites">Alih keluar dari Kegemaran</string>
-    <string name="music_singlar">Musik</string>
+    <string name="music_singular">Musik</string>
     <string name="downloads_delete_select">Pilih benda untuk dibuang</string>
     <string name="player_size_settings_des">Buang sempadan hitam</string>
     <string name="category_account">Akaun dan Sekuriti</string>
@@ -402,7 +397,7 @@
     <string name="advanced_search_des">Beri hasil carian dipisah mengikut pelbagai sumber</string>
     <string name="lightnovel">Aplikasi Light novel oleh pembangun sama</string>
     <string name="anim">Aplikasi Anime oleh pembangun sama</string>
-    <string name="discord">Masuk Discord</string>
+    <string name="discord">Menyertai Discord</string>
     <string name="delete_files">Padam Fail</string>
     <string name="delete_format" formatted="true">Padam (%1$d | %2$s)</string>
     <string name="resize_fit">Muatkan ke skrin</string>
@@ -417,12 +412,11 @@
     <string name="quality_hd">HD</string>
     <string name="previous">Sebelum</string>
     <string name="app_layout_subtext">Tukar kelihatan aplikasi mengikut peranti</string>
-    <string name="crash_reporting_title">Laporkan ralat</string>
     <string name="setup_done">Tamat</string>
     <string name="extensions">Tambahan</string>
     <string name="add_repository">Tambah repositori</string>
-    <string name="repository_name_hint">Nama repositori</string>
-    <string name="repository_url_hint">URL repositori</string>
+    <string name="repository_name_hint">Nama repositori (Pilihan)</string>
+    <string name="repository_url_hint">Arkibkan URL atau Kod Pendek</string>
     <string name="batch_download_finish_format" formatted="true">Dimuat turun %1$d%2$s</string>
     <string name="batch_download_nothing_to_download_format" formatted="true">Semua %s telah dimuat turun</string>
     <string name="setup_extensions_subtext">Muat turun senarai laman web yang anda ingin gunakan</string>
@@ -436,7 +430,7 @@
     <string name="extension_version">Versi</string>
     <string name="extension_authors">Pengarang</string>
     <string name="extension_install_first">Tetapkan tambahan dahulu</string>
-    <string name="biometric_setting_summary">Buka aplikasi dengan Cap Jari, Pengesahan Muka, PIN, Corak dan Password</string>
+    <string name="biometric_setting_summary">Buka aplikasi dengan Cap Jari, Pengesahan Muka, PIN, Corak dan Password.</string>
     <string name="resize_zoom">Zum</string>
     <string name="category_general">Umum</string>
     <string name="pref_category_extensions">Tambahan</string>
@@ -489,4 +483,54 @@
     <string name="episode_sync_settings_des">Selaraskan kemajuan episod secara automatik</string>
     <string name="restore_success">Memuatkan fail sandaran</string>
     <string name="category_updates">Kemaskini dan sandaran</string>
-</resources>
\ No newline at end of file
+    <string name="double_tap_to_seek_settings">Ketik dua kali untuk mencari</string>
+    <string name="use_system_brightness_settings_des">Gunakan kecerahan sistem dalam pemain apl dan bukannya tindanan gelap</string>
+    <string name="download_time_left_hour_min_sec_format" formatted="true">%1$dh %2$dm %3$ds</string>
+    <string name="download_time_left_min_sec_format" formatted="true">%1$dm %2$ds</string>
+    <string name="download_time_left_sec_format" formatted="true">%1$ds</string>
+    <string name="speech_recognition_unavailable">Pengecaman pertuturan tidak tersedia</string>
+    <string name="begin_speaking">Mula Bercakap…</string>
+    <string name="torrent_info">Video ini adalah torrent, ini bermakna aktiviti video anda dapat dikesan.\nPastikan anda memahami torrenting sebelum meneruskan.</string>
+    <string name="action_open_play">@string/home_play</string>
+    <string name="double_tap_to_seek_amount_settings">Pemain Mencari Amaun (Seconds)</string>
+    <string name="automatic_plugin_download_summary">Secara automatik memasang semua plugin yang belum dipasang dari repositori yang ditambah.</string>
+    <string name="updates_settings">Tunjukkan kemas kini aplikasi</string>
+    <string name="updates_settings_des">Secara automatik cari kemas kini baru selepas memulakan aplikasi.</string>
+    <string name="redo_setup_process">Redo Proses Persediaan</string>
+    <string name="apk_installer_settings">Pemasang APK</string>
+    <string name="apk_installer_settings_des">Sesetengah telefon tidak menyokong pemasang pakej baru. Cuba pilihan Legacy jika kemas kini tidak dipasang.</string>
+    <string name="benene">Berikan benen kepada devs</string>
+    <string name="benene_des">Diberi pisang</string>
+    <string name="app_language">Bahasa App</string>
+    <string name="no_chromecast_support_toast">Penyedia ini tidak mempunyai sokongan Chromecast</string>
+    <string name="no_links_found_toast">Tiada pautan yang dijumpai</string>
+    <string name="copy_link_toast">Pautan disalin ke papan klip</string>
+    <string name="play_episode_toast">Main episod</string>
+    <string name="subs_default_reset_toast">Tetapkan semula ke nilai lalai</string>
+    <string name="season">Musim</string>
+    <string name="season_format">%1$s %2$d%3$s</string>
+    <string name="no_season">Tiada musim</string>
+    <string name="restore_settings">Pulihkan data dari sandaran</string>
+    <string name="backup_settings">Sandarkan data</string>
+    <string name="restore_failed_format" formatted="true">Gagal pulihkan data dari fail %s</string>
+    <string name="backup_failed_error_format">Ralat sandaran %s</string>
+    <string name="episode_upcoming_format" formatted="true">Akan datang pada %s</string>
+    <string name="delete_message" formatted="true">Ini akan memadamkan secara kekal %s\nAdakah anda pasti?</string>
+    <string name="delete_message_multiple" formatted="true">Adakah anda pasti mahu memadamkan item berikut secara kekal?\n\n%s</string>
+    <string name="delete_message_series_episodes" formatted="true">Adakah anda pasti mahu memadamkan episod berikut secara kekal %1$s?\n\n%2$s</string>
+    <string name="delete_message_series_section" formatted="true">Anda juga akan memadamkan semua episod dalam siri berikut secara kekal:\n\n%s</string>
+    <string name="delete_message_series_only" formatted="true">Adakah anda pasti mahu memadamkan semua episod dalam siri berikut secara kekal?\n\n%s</string>
+    <string name="resume_remaining" formatted="true">%s\nyang tinggal</string>
+    <string name="status_ongoing">Sedang berlangsung</string>
+    <string name="rating">Penilaian</string>
+    <string name="movies">Filem</string>
+    <string name="torrent">Torrents</string>
+    <string name="documentaries">Dokumentari</string>
+    <string name="livestreams">Siaran Langsung</string>
+    <string name="movies_singular">Movie</string>
+    <string name="torrent_singular">Torrent</string>
+    <string name="documentaries_singular">Dokumentari</string>
+    <string name="live_singular">Siaran Langsung</string>
+    <string name="audio_singular">Audio</string>
+    <string name="podcast_singular">Podcast</string>
+</resources>
diff --git a/app/src/main/res/values-mt/strings.xml b/app/src/main/res/values-b+mt/strings.xml
similarity index 96%
rename from app/src/main/res/values-mt/strings.xml
rename to app/src/main/res/values-b+mt/strings.xml
index ee890fbbd05..8f8bf6cd71e 100644
--- a/app/src/main/res/values-mt/strings.xml
+++ b/app/src/main/res/values-b+mt/strings.xml
@@ -18,8 +18,7 @@
     <string name="home_change_provider_img_des">Ibdel Il-fornitur</string>
     <string name="player_speed_text_format" formatted="true">veloċità (%.2fx)</string>
     <string name="rated_format" formatted="true">Klassifikazzjoni: %.1f</string>
-    <string name="new_update_format" formatted="true">Aġġornament ġdid misjub!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">Aġġornament ġdid misjub! \n%1$s -&gt; %2$s</string>
     <string name="duration_format" formatted="true">%d min</string>
     <string name="app_name">CloudStream</string>
     <string name="play_with_app_name">Ara bil-CloudStream</string>
@@ -115,7 +114,6 @@
     <string name="popup_delete_file">Hassar il-fajl</string>
     <string name="popup_resume_download">Kompli Nizzel</string>
     <string name="popup_pause_download">Ieqaf Nizzel</string>
-    <string name="pref_disable_acra">Iddiżattiva r-rappurtar awtomatiku tal-bugs</string>
     <string name="home_more_info">Iktar Informazzjoni</string>
     <string name="home_expanded_hide">Aħbi</string>
     <string name="filter_bookmarks">Iffiltra l-Bookmarks</string>
@@ -123,5 +121,4 @@
     <string name="error_bookmarks_text">Bookmarks</string>
     <string name="action_remove_from_bookmarks">Neħħi</string>
     <string name="download_failed">Falla t-tniżżil</string>
-    <string name="hide_player_control_names_key" translatable="false">hide_player_control_names_key</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-my/strings.xml b/app/src/main/res/values-b+my/strings.xml
similarity index 94%
rename from app/src/main/res/values-my/strings.xml
rename to app/src/main/res/values-b+my/strings.xml
index 9d82dd47dbd..d360d095d85 100644
--- a/app/src/main/res/values-my/strings.xml
+++ b/app/src/main/res/values-b+my/strings.xml
@@ -11,8 +11,7 @@
     <string name="go_back_img_des">နောက်သို့</string>
     <string name="preview_background_img_des">နောက်ခံပုံရိပ်ကို အကြိုကြည့်ရန်</string>
     <string name="rated_format" formatted="true">အဆင့်: %.1f</string>
-    <string name="new_update_format" formatted="true">အပ်ဒိတ်အသစ်!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">အပ်ဒိတ်အသစ်! \n%1$s -&gt; %2$s</string>
     <string name="filler" formatted="true">စစ်ထုတ်မှု</string>
     <string name="duration_format" formatted="true">%d မိနစ်</string>
     <string name="app_name">CloudStream</string>
@@ -92,7 +91,6 @@
     <string name="category_updates">အပ်ဒိတ်များနှင့်အရန်သိမ်းဆည်းမှု</string>
     <string name="advanced_search">နက်နက်ရှိုင်းရှိုင်းရှာခြင်း</string>
     <string name="advanced_search_des">သင့်ကိုဝန်ဆောင်မှုပေးသူအလိုက်ရှာဖွေမှုရလဒ်များပေးမည်</string>
-    <string name="bug_report_settings_off">ချို့ယွင်းမှုအကြီးစားဖြစ်မှသာဒေတာများပေးပို့ပါ</string>
     <string name="show_fillers_settings">anime များအတွက်ဖြည့်စွက်အပိုင်းကိုပြရန်</string>
     <string name="show_trailers_settings">ထွေလာများကိုပြရန်</string>
     <string name="kitsu_settings">Kitsu မှ ပိုစတာများကိုပြရန်</string>
@@ -112,10 +110,8 @@
     <string name="episode">အပိုင်း</string>
     <string name="episodes">အပိုင်းများ</string>
     <string name="episodes_range">%1$d-%2$d</string>
-    <string name="delete_message" formatted="true">ဒါကအပြီးဖျက်ခြင်းဖြစ်ပါသည် %s
-\nသင်သေချာပါသလား။</string>
-    <string name="resume_time_left" formatted="true">%dမိနစ်
-\nကျန်ရိှသည်</string>
+    <string name="delete_message" formatted="true">ဒါကအပြီးဖျက်ခြင်းဖြစ်ပါသည် %s \nသင်သေချာပါသလား။</string>
+    <string name="resume_time_left" formatted="true">%dမိနစ် \nကျန်ရိှသည်</string>
     <string name="status_ongoing">ထုတ်လွှင့်နေဆဲ</string>
     <string name="status_completed">ထုတ်လွှင့်မှုပြီးဆုံး</string>
     <string name="status">အခြေအနေ</string>
@@ -239,7 +235,6 @@
     <string name="popup_play_file">ဖိုင်ကို ဖွင့်ရန်</string>
     <string name="popup_resume_download">ဒေါင်းလုဒ် ဆက်လုပ်ရန်</string>
     <string name="popup_pause_download">ဒေါင်းလုဒ် ရပ်ရန်</string>
-    <string name="pref_disable_acra">အလိုအလျောက်အက်ပ်ချို့ယွင်းချက်ပေးပို့ခြင်းကိုပိတ်မည်</string>
     <string name="home_more_info">ပိုမို၍</string>
     <string name="search_provider_text_providers">ပ့ံပိုးပေးသောဝန်ဆောင်မှုများအသုံးပြု၍ရှာရန်</string>
     <string name="home_expanded_hide">ဝုက်ရန်</string>
@@ -267,7 +262,6 @@
     <string name="search">ရှာရန်</string>
     <string name="category_account">အကောင့်များ</string>
     <string name="settings_info">အချက်အလက်</string>
-    <string name="bug_report_settings_on">ဒေတာများမပို့ရန်</string>
     <string name="android_tv_interface_on_seek_settings">ကြည့်ရှုပြီးသောအချိန်ပမာဏ</string>
     <string name="video_disk_description">Android TV ကဲ့သို့သော သိုလှောင်မှုနေရာနည်းပါးသော စက်ပစ္စည်းများတွင် အလွန်မြင့်မားစွာ သတ်မှတ်ပါက ပြဿနာများ ဖြစ်လာနိုင်သည်။</string>
     <string name="dns_pref_summary">ISP ပိတ်ဆို့ခြင်းကို ကျော်လွှားရန်အတွက် အသုံးဝင်သည်</string>
@@ -278,8 +272,6 @@
     <string name="pref_category_player_layout">အပြင်အဆင်</string>
     <string name="pref_category_ui_features">လုပ်ဆောင်ချက်များ</string>
     <string name="random_button_settings">ကျပန်းခလုတ်</string>
-    <string name="uprereleases_settings">ရှေ့ပြေးအပ်ဒိတ်များကိုထည့်သွင်းပါ</string>
-    <string name="uprereleases_settings_des">ပုံမှန်အပ်ဒိတ်များအစား ရှေ့ပြေးအက်ဒိတ်များကိုရှာပါ</string>
     <string name="lightnovel">တူညီသောအက်ပ်ရေးသားသူများ၏ ဝတ္ထုရှည်များဖတ်နိုင်သည့် အက်ပ်</string>
     <string name="anim">တူညီသောအက်ပ်ရေးသားသူများ၏ Anime အက်ပ်</string>
     <string name="discord">Discord ကိုဝင်ရန်</string>
@@ -287,7 +279,6 @@
     <string name="benene_des">ပေးခဲ့သောစာအရေအတွက်</string>
     <string name="app_language">အက်ပ်ဘာသာစကား</string>
     <string name="subs_default_reset_toast">မူလအခြေအနေများကိုပြန်ထားပါ</string>
-    <string name="acra_report_toast">စိတ်မကောင်းပါ။အက်ပ်ရပ်တန့်သွားပါတယ်။အမည်မဖော်ထားတဲ့တင်ပြချက်ကို အက်ပ်ရေးသားသူများထံ ပို့မှာဖြစ်ပါတယ်</string>
     <string name="season_format">%1$s %2$d%3$s</string>
     <string name="season_short">အတွဲ</string>
     <string name="episode_format" formatted="true">%1$d %2$s</string>
@@ -342,17 +333,13 @@
     <string name="skip_type_recap">အစမှပြန်စ</string>
     <string name="skip_type_mixed_ed">ရောထားသောအဆုံးပိုင်း</string>
     <string name="skip_type_mixed_op">ရောထားသောအစပိုင်း</string>
-    <string name="skip_type_creddits">ခရက်ဒစ်များ</string>
+    <string name="skip_type_credits">ခရက်ဒစ်များ</string>
     <string name="skip_type_intro">အစ</string>
     <string name="yes">သေချာသည်</string>
     <string name="apk_installer_legacy">သမားရိုးကျ</string>
     <string name="apk_installer_package_installer">ထည့်သွင်းသူ</string>
     <string name="delayed_update_notice">ထွက်ချိန်တွင် အက်ပ်ကို အပ်ဒိတ်လုပ်ပါမည်</string>
-    <string name="blank_repo_message">CloudStream တွင် မူရင်းအတိုင်း ထည့်သွင်းထားသည့်ဆိုက်များ မရှိပါ။ ရီပိုစစ်ထရီများ မှ ဆိုဒ် များကို ထည့်သွင်းရန်လိုအပ်သည်။
-\n
-\nSky UK Limited မှ ဦးနှောက်မဲ့ DMCA ကို ဖယ်ရှားလိုက်ခြင်းကြောင့် 🤮 ကျွန်ုပ်တို့သည် ရီပိုစစ်ထရီဆိုဒ်ကို အက်ပ်တွင် ချိတ်ဆက်၍မရပါ။
-\n
-\nကျွန်ုပ်တို့၏ Discord တွင်ပါဝင်ပါ သို့မဟုတ် အွန်လိုင်းတွင်ရှာဖွေပါ။</string>
+    <string name="blank_repo_message">CloudStream တွင် မူရင်းအတိုင်း ထည့်သွင်းထားသည့်ဆိုက်များ မရှိပါ။ ရီပိုစစ်ထရီများ မှ ဆိုဒ် များကို ထည့်သွင်းရန်လိုအပ်သည်။ \n \nSky UK Limited မှ ဦးနှောက်မဲ့ DMCA ကို ဖယ်ရှားလိုက်ခြင်းကြောင့် 🤮 ကျွန်ုပ်တို့သည် ရီပိုစစ်ထရီဆိုဒ်ကို အက်ပ်တွင် ချိတ်ဆက်၍မရပါ။ \n \nကျွန်ုပ်တို့၏ Discord တွင်ပါဝင်ပါ သို့မဟုတ် အွန်လိုင်းတွင်ရှာဖွေပါ။</string>
     <string name="view_public_repositories_button">အခြားသူများ၏ရီပိုစစ်ထရီများကိုရှာဖွေမည်</string>
     <string name="tracks">အသံများ</string>
     <string name="audio_tracks">အသံဖိုင်များ</string>
@@ -428,8 +415,7 @@
     <string name="update_notification_downloading">အက်ပ်အပ်ဒိတ်အားဒေါင်းလုဒ်လုပ်နေသည်…</string>
     <string name="update_notification_installing">အက်ပ်အပ်ဒိတ်အားသွင်းနေသည်…</string>
     <string name="sort_updated_new">အပ်ဒိတ်ဖြစ်မှု (အသစ် မှ အဟောင်း)</string>
-    <string name="empty_library_no_accounts_message">သင့်လိုက်ဘရီသည် ဗလာဖြစ်နေသည် :(
-\nအကောင့်ဝင်ပါ သို့မဟုတ် သင့်ဖုန်းလိုက်ဘရီတွင် ကြည့်စရာများထည့်ပါ။</string>
+    <string name="empty_library_no_accounts_message">သင့်လိုက်ဘရီသည် ဗလာဖြစ်နေသည် :( \nအကောင့်ဝင်ပါ သို့မဟုတ် သင့်ဖုန်းလိုက်ဘရီတွင် ကြည့်စရာများထည့်ပါ။</string>
     <string name="use">သုံးရန်</string>
     <string name="edit">တည်းဖြတ်ရန်</string>
     <string name="qualities">အရည်အသွေးများ</string>
@@ -457,7 +443,6 @@
     <string name="quality_tc">TC</string>
     <string name="resolution">အရည်အသွေး</string>
     <string name="skip_setup">အစီအစဥ်ချခြင်းကိုကျော်မည်</string>
-    <string name="crash_reporting_title">ချို့ယွင်းမှုသတင်းပေးပို့ခြင်း</string>
     <string name="preferred_media_subtext">ဘာတွေကြည့်ချင်လဲ</string>
     <string name="setup_done">ပြီးပြီ</string>
     <string name="extensions">အဆက်များ</string>
@@ -523,8 +508,7 @@
     <string name="subscription_new">စာရင်းသွင်းပြီး %s</string>
     <string name="subscription_deleted">စာရင်းသွင်းမှုပယ်ဖျက်ပြီး %s</string>
     <string name="empty_library_logged_in_message">ဤစာရင်းသည် ဗလာဖြစ်နေသည်။ အခြားတစ်ခုသို့ ပြောင်းကြည့်ပါ။</string>
-    <string name="safe_mode_file">Safe mode ဖိုင်ကို တွေ့ရှိခဲ့သည်။
-\nဖိုင်ကိုမဖယ်ရှားမချင်း စတင်ဖွင့်စတွင် မည်သည့် extension များကိုမျှ မတင်ပါ။</string>
+    <string name="safe_mode_file">Safe mode ဖိုင်ကို တွေ့ရှိခဲ့သည်။ \nဖိုင်ကိုမဖယ်ရှားမချင်း စတင်ဖွင့်စတွင် မည်သည့် extension များကိုမျှ မတင်ပါ။</string>
     <string name="subscription_episode_released">အပိုင်းသစ် %d ထွက်ပြီ</string>
     <string name="profile_number">ပရိုဖိုင် %d</string>
     <string name="wifi">ဝိုင်ဖိုင်</string>
@@ -532,17 +516,10 @@
     <string name="set_default">ပုံသေထားရန်</string>
     <string name="profiles">ပရိုဖိုင်များ</string>
     <string name="help">အကူအညီ</string>
-    <string name="quality_profile_help">ဤနေရာတွင် သင်သည် အရင်းအမြစ်များကို မည်ကဲ့သို့ အစီအစဥ်ချမည်ကို ပြောင်းလဲနိုင်သည်။ ဗီဒီယိုတစ်ခုတွင် ပိုမိုဦးစားပေးပါက ရင်းမြစ်ရွေးချယ်မှုတွင် ပိုမိုမြင့်မားလာမည်ဖြစ်သည်။ အရင်းအမြစ် ဦးစားပေးနှင့် အရည်အသွေး ဦးစားပေး၏ ပေါင်းစုသည် ဗီဒီယို ဦးစားပေးဖြစ်သည်။
-\n
-\nအရင်းအမြစ် A: 3
-\nအရည်အသွေး B: 7
-\nပေါင်းစပ်ဗီဒီယို ဦးစားပေး 10 ခု ရှိပါမည်။
-\n
-\nမှတ်ချက်- ပေါင်းလဒ်သည် 10 သို့မဟုတ် ထို့ထက်ပိုပါက ထိုလင့်ခ်ကို တင်သည့်အခါ ဗီဒီယိုဖွင့်စက်သည် အလိုအလျောက် ဒေါင်းလုဒ်ကို ကျော်သွားမည်ဖြစ်သည်</string>
+    <string name="quality_profile_help">ဤနေရာတွင် သင်သည် အရင်းအမြစ်များကို မည်ကဲ့သို့ အစီအစဥ်ချမည်ကို ပြောင်းလဲနိုင်သည်။ ဗီဒီယိုတစ်ခုတွင် ပိုမိုဦးစားပေးပါက ရင်းမြစ်ရွေးချယ်မှုတွင် ပိုမိုမြင့်မားလာမည်ဖြစ်သည်။ အရင်းအမြစ် ဦးစားပေးနှင့် အရည်အသွေး ဦးစားပေး၏ ပေါင်းစုသည် ဗီဒီယို ဦးစားပေးဖြစ်သည်။ \n \nအရင်းအမြစ် A: 3 \nအရည်အသွေး B: 7 \nပေါင်းစပ်ဗီဒီယို ဦးစားပေး 10 ခု ရှိပါမည်။ \n \nမှတ်ချက်- ပေါင်းလဒ်သည် 10 သို့မဟုတ် ထို့ထက်ပိုပါက ထိုလင့်ခ်ကို တင်သည့်အခါ ဗီဒီယိုဖွင့်စက်သည် အလိုအလျောက် ဒေါင်းလုဒ်ကို ကျော်သွားမည်ဖြစ်သည်</string>
     <string name="profile_background_des">ပရိုဖိုင်နောက်ခံ</string>
     <string name="unable_to_inflate">UI ကို မှန်ကန်စွာ ဖန်တီး၍မရပါ၊ ၎င်းသည် အဓိက ချို့ယွင်းချက်တစ်ခုဖြစ်ပြီး ချက်ချင်းသတင်းပို့သင့်သည်။ %s</string>
     <string name="already_voted">သင်နဂိုတည်းကသတ်မှတ်ပြီး</string>
     <string name="select_library">လိုက်ဘရီရွေးချယ်ရန်</string>
     <string name="open_with">ဖြင့်ဖွင့်မည်</string>
-    <string name="hide_player_control_names_key" translatable="false">hide_player_control_names_key</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-ne/strings.xml b/app/src/main/res/values-b+ne/strings.xml
similarity index 97%
rename from app/src/main/res/values-ne/strings.xml
rename to app/src/main/res/values-b+ne/strings.xml
index bff19dd3a98..49e5a93506e 100644
--- a/app/src/main/res/values-ne/strings.xml
+++ b/app/src/main/res/values-b+ne/strings.xml
@@ -15,8 +15,7 @@
     <string name="home_main_poster_img_des">मुख्य पोस्टर</string>
     <string name="app_dub_sub_episode_text_format" formatted="true">%1$s Ep %2$d</string>
     <string name="cast_format" formatted="true">अभिनेता:%s</string>
-    <string name="new_update_format" formatted="true">नयाँ अपडेट भेटियो!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">नयाँ अपडेट भेटियो! \n%1$s -&gt; %2$s</string>
     <string name="filler" formatted="true">फिलर</string>
     <string name="duration_format" formatted="true">%d मिनेट</string>
     <string name="app_name">क्लाउडस्ट्रीम</string>
@@ -83,7 +82,6 @@
     <string name="type_re_watching">पुन: हेर्दै</string>
     <string name="play_torrent_button">स्ट्रिम टोरेन्ट</string>
     <string name="pick_source">स्रोतहरू</string>
-    <string name="pref_disable_acra">स्वचालित बग रिपोर्टिङ असक्षम गर्नुहोस्</string>
     <string name="sort_apply">लागू गर्नुहोस्</string>
     <string name="provider_info_meta">साइट ले मेटाडाटा दिएको छैन,मेटाडाटा बिना भिडियो लोड नहुन सक्छ।</string>
     <string name="next_season_episode_format" formatted="true">प्रकरण %1$d प्रसङ्ग %2$d प्रशारण हुनेवाला छ</string>
@@ -128,5 +126,4 @@
     <string name="player_subtitles_settings_des">प्लेयरको उपशीर्षकको सेटिङ</string>
     <string name="repo_copy_label">रिपोजिटरी को नाम र यूआरएल</string>
     <string name="toast_copied">कपी गरियो!</string>
-    <string name="hide_player_control_names_key" translatable="false">hide_player_control_names_key</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-b+nl/strings.xml
similarity index 78%
rename from app/src/main/res/values-nl/strings.xml
rename to app/src/main/res/values-b+nl/strings.xml
index e4a331a8fc2..ace3aa0d429 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-b+nl/strings.xml
@@ -19,8 +19,7 @@
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">Snelheid (%.2fx)</string>
     <string name="rated_format" formatted="true">Beoordeeld: %.1fAls</string>
-    <string name="new_update_format" formatted="true">Nieuwe update gevonden!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">Nieuwe update gevonden! \n%1$s -&gt; %2$s</string>
     <string name="filler" formatted="true">Filler</string>
     <string name="duration_format" formatted="true">%d min</string>
     <string name="app_name">CloudStream</string>
@@ -62,7 +61,7 @@
     <string name="download_failed">Download Mislukt</string>
     <string name="download_canceled">Download Geannuleerd</string>
     <string name="download_done">Download Gereed</string>
-    <string name="stream">Stream</string>
+    <string name="stream">Netwerkstream</string>
     <string name="error_loading_links_toast">Fout bij laden links</string>
     <string name="download_storage_text">Interne opslag</string>
     <string name="app_dubbed_text">Dub</string>
@@ -71,7 +70,6 @@
     <string name="popup_play_file">Bestand afspelen</string>
     <string name="popup_resume_download">Download hervatten</string>
     <string name="popup_pause_download">Download pauzeren</string>
-    <string name="pref_disable_acra">Automatische bugrapportage uitschakelen</string>
     <string name="home_more_info">Meer info</string>
     <string name="home_expanded_hide">Verberg</string>
     <string name="home_play">Speel</string>
@@ -123,7 +121,7 @@
     <string name="player_subtitles_settings_des">Speler Ondertiteling instellingen</string>
     <string name="chromecast_subtitles_settings">Chromecast Ondertitels</string>
     <string name="chromecast_subtitles_settings_des">Chromecast ondertitels instellingen</string>
-    <string name="eigengraumode_settings">Eigengravy Modus</string>
+    <string name="eigengraumode_settings">Afspeelsnelheid</string>
     <string name="swipe_to_seek_settings">Swipe to seek</string>
     <string name="swipe_to_seek_settings_des">Veeg naar links of rechts om de tijd in de videospeler te regelen</string>
     <string name="swipe_to_change_settings">Veeg om instellingen te wijzigen</string>
@@ -145,20 +143,16 @@
     <string name="backup_failed">Opslagrechten ontbreken. Probeer het opnieuw.</string>
     <string name="backup_failed_error_format">Fout bij het maken van een back-up %s</string>
     <string name="search">Zoeken</string>
-    <string name="category_account">Accounts</string>
+    <string name="category_account">Accounts en Beveiliging</string>
     <string name="category_updates">Updates en back-up</string>
     <string name="settings_info">Info</string>
     <string name="advanced_search">Geavanceerd zoeken</string>
     <string name="advanced_search_des">Geeft u de zoekresultaten gescheiden door provider</string>
-    <string name="bug_report_settings_off">Stuurt alleen gegevens bij crashes</string>
-    <string name="bug_report_settings_on">Verstuurt geen gegevens</string>
     <string name="show_fillers_settings">Toon filler episode voor anime</string>
     <string name="show_trailers_settings">Toon trailers</string>
     <string name="kitsu_settings">Toon posters van Kitsu</string>
     <string name="updates_settings">App-updates tonen</string>
     <string name="updates_settings_des">Automatisch zoeken naar nieuwe updates na het starten van de app.</string>
-    <string name="uprereleases_settings">Update naar pre-releases</string>
-    <string name="uprereleases_settings_des">Zoeken naar pre-release updates in plaats van alleen volledige releases</string>
     <string name="github">Github</string>
     <string name="lightnovel">Light novel app van dezelfde ontwikkelaars</string>
     <string name="anim">Anime app by the same devs</string>
@@ -171,7 +165,6 @@
     <string name="copy_link_toast">Link gekopieerd naar klembord</string>
     <string name="play_episode_toast">Aflevering afspelen</string>
     <string name="subs_default_reset_toast">Reset naar standaardwaarde</string>
-    <string name="acra_report_toast">Sorry, de applicatie is gecrasht. Er wordt een anoniem bugrapport naar de ontwikkelaars gestuurd</string>
     <string name="season">Seizoen</string>
     <string name="no_season">Geen seizoen</string>
     <string name="episode">Aflevering</string>
@@ -188,10 +181,8 @@
     <string name="resume">Hervatten</string>
     <string name="go_back_30">-30</string>
     <string name="go_forward_30">+30</string>
-    <string name="delete_message" formatted="true">Dit wordt zeker permanent verwijderd %s
-\nWeet u het zeker?</string>
-    <string name="resume_time_left" formatted="true">%dm
-\nremaining</string>
+    <string name="delete_message" formatted="true">Dit wordt zeker permanent verwijderd %s \nWeet u het zeker?</string>
+    <string name="resume_time_left" formatted="true">%dm \nremaining</string>
     <string name="status_ongoing">Voortdurende</string>
     <string name="status_completed">Voltooid</string>
     <string name="status">Status</string>
@@ -255,7 +246,7 @@
     <string name="update">Update</string>
     <string name="watch_quality_pref">Voorkeurskwaliteit voor kijken (WiFi)</string>
     <string name="limit_title">Maximaal aantal tekens voor titel van videospeler</string>
-    <string name="limit_title_rez">Videospeler Resolutie</string>
+    <string name="limit_title_rez">Toon spelerinformatie</string>
     <string name="video_buffer_size_settings">Grootte videobuffer</string>
     <string name="video_buffer_length_settings">Lengte videobuffer</string>
     <string name="video_buffer_disk_settings">Video cache op schijf</string>
@@ -276,8 +267,8 @@
     <string name="legal_notice">Disclaimer</string>
     <string name="category_general">Algemeen</string>
     <string name="random_button_settings">Willekeurige knop</string>
-    <string name="random_button_settings_desc">Toon willekeurige knop op Homepage</string>
-    <string name="provider_lang_settings">Provider talen</string>
+    <string name="random_button_settings_desc">Toon willekeurige knop op Homepage en Bibliotheek</string>
+    <string name="provider_lang_settings">Extensietalen</string>
     <string name="app_layout">App Layout</string>
     <string name="preferred_media_settings">Preferred media</string>
     <string name="subtitles_encoding">Subtitle encoding</string>
@@ -292,20 +283,12 @@
     <string name="bottom_title_settings_des">Zet de titel onder de poster</string>
     <!-- account stuff -->
     <string name="example_password">wachtwoord123</string>
-    <string name="example_username">MijnCoolGebruikersnaam</string>
+    <string name="example_username">Gebruikersnaam</string>
     <string name="example_email">hello@Wereld.com</string>
     <string name="example_ip">127.0.0.1</string>
-    <string name="example_site_name">MyCoolSite</string>
-    <string name="example_site_url">voorbeeld.com</string>
+    <string name="example_site_name">NieuweSiteNaam</string>
+    <string name="example_site_url">https://voorbeeld.com</string>
     <string name="example_lang_name">Taalcode (nl)</string>
-    <!--
-    <string name="mal_account_settings" translatable="false">MAL</string>
-    <string name="anilist_account_settings" translatable="false">AniList</string>
-    <string name="tmdb_account_settings" translatable="false">TMDB</string>
-    <string name="imdb_account_settings" translatable="false">IMDB</string>
-    <string name="kitsu_account_settings" translatable="false">Kitsu</string>
-    <string name="trakt_account_settings" translatable="false">Trakt</string>
-    -->
     <string name="login_format" formatted="true">%1$s %2$s</string>
     <string name="account">account</string>
     <string name="logout">Log uit</string>
@@ -385,14 +368,13 @@
     <string name="subtitles_remove_bloat">Opgeblazen ondertitels verwijderen</string>
     <string name="extras">Extra\'s</string>
     <string name="trailer">Trailer</string>
-    <string name="network_adress_example">Link naar stream</string>
-    <string name="referer">Referer</string>
+    <string name="network_adress_example">https://voorbeeld.com/voorbeeld.mp4</string>
+    <string name="referer">Verwijzer (optioneel)</string>
     <string name="next">Volgende</string>
     <string name="provider_languages_tip">Bekijk video\'s in deze talen</string>
     <string name="previous">Vorige</string>
     <string name="skip_setup">Instelling overslaan</string>
     <string name="app_layout_subtext">Pas het uiterlijk van de app aan uw apparaat aan</string>
-    <string name="crash_reporting_title">Crashrapportage</string>
     <string name="preferred_media_subtext">Wat wil je zien</string>
     <string name="setup_done">Klaar</string>
     <string name="action_mark_as_watched">Markeer als bekeken</string>
@@ -417,7 +399,7 @@
     <string name="add_repository">Repository toevoegen</string>
     <string name="extension_version">Versie</string>
     <string name="is_adult">18+</string>
-    <string name="jsdelivr_proxy">raw.githubusercontent.com Proxy</string>
+    <string name="jsdelivr_proxy">GitHub Proxy</string>
     <string name="pref_category_bypass">ISP Omleidingen</string>
     <string name="pref_category_defaults">Standaardinstellingen</string>
     <string name="app_not_found_error">App niet gevonden</string>
@@ -444,11 +426,11 @@
     <string name="watch_quality_pref_data">Voorkeurskwaliteit voor kijken (Mobiele Data)</string>
     <string name="android_tv_interface_on_seek_settings">Speler Weergegeven - Zoekhoeveelheid</string>
     <string name="pref_category_actions">Acties</string>
-    <string name="repository_name_hint">Repository naam</string>
+    <string name="repository_name_hint">Repository naam (Optioneel)</string>
     <string name="plugin_downloaded">Plugin Gedownload</string>
     <string name="test_failed">Mislukt</string>
-    <string name="jsdelivr_proxy_summary">Omzeilt de blokkering van GitHub met behulp van jsDelivr, waardoor updates enkele dagen vertraging kunnen oplopen.</string>
-    <string name="repository_url_hint">Repository URL</string>
+    <string name="jsdelivr_proxy_summary">Omzeil de blokkering van ruwe GitHub-URL’s via jsDelivr. Hierdoor kunnen updates enkele dagen vertraagd zijn.</string>
+    <string name="repository_url_hint">Repository URL of Shortcode</string>
     <string name="batch_download_finish_format" formatted="true">Download %1$d %2$s voltooid</string>
     <string name="hls_playlist">HLS Afspeellijst</string>
     <string name="pref_category_player_features">Speler eigenschappen</string>
@@ -460,11 +442,11 @@
     <string name="batch_download_start_format" formatted="true">Gestart met downloaden van %1$d %2$s…</string>
     <string name="player_pref">Gewenste videospeler</string>
     <string name="pref_category_looks">Lijkt</string>
-    <string name="enable_nsfw_on_providers">NSFW inschakelen op ondersteunde aanbieders</string>
+    <string name="enable_nsfw_on_providers">NSFW inschakelen op ondersteunde extensies</string>
     <string name="others">Andere</string>
     <string name="redo_setup_process">Herhaal installatieproces</string>
     <string name="automatic_plugin_updates">Automatisch bijwerken plugin</string>
-    <string name="apk_installer_settings_des">Sommige telefoons ondersteunen het nieuwe installatieprogramma niet. Probeer de oude optie als de updates niet worden geïnstalleerd.</string>
+    <string name="apk_installer_settings_des">Sommige apparaten ondersteunen het nieuwe installatieprogramma niet. Probeer de oude optie als de updates niet worden geïnstalleerd.</string>
     <string name="player_settings_play_in_app">Interne speler</string>
     <string name="skip_type_mixed_ed">Gemengd einde</string>
     <string name="skip_type_recap">Herhaling</string>
@@ -481,7 +463,6 @@
     <string name="pref_category_extensions">Uitbreidingen</string>
     <string name="skip_type_intro">Intro</string>
     <string name="view_public_repositories_button_short">Publieke lijst</string>
-    <string name="download_all_plugins_from_repo">Alle plugins uit deze repository downloaden?</string>
     <string name="extension_rating" formatted="true">Beoordeling: %s</string>
     <string name="safe_mode_description">Alle extensies zijn uitgeschakeld door een crash om u te helpen degene te vinden die problemen veroorzaakt.</string>
     <string name="safe_mode_crash_info">Bekijk de crash info</string>
@@ -500,8 +481,7 @@
     <string name="action_remove_from_watched">Verwijderen uit bekeken</string>
     <string name="delayed_update_notice">App wordt bijgewerkt bij afsluiten</string>
     <string name="sort">Gesorteerd</string>
-    <string name="empty_library_no_accounts_message">Je bibliotheek is leeg :(
-\nLog in op een bibliotheekaccount of voeg voorstellingen toe aan uw lokale bibliotheek.</string>
+    <string name="empty_library_no_accounts_message">Je bibliotheek is leeg :( \nLog in op een bibliotheekaccount of voeg voorstellingen toe aan uw lokale bibliotheek.</string>
     <string name="plugins_disabled" formatted="true">Uitgeschakeld: %d</string>
     <string name="stop">Stop</string>
     <string name="plugins_not_downloaded" formatted="true">Niet gedownload: %d</string>
@@ -521,26 +501,21 @@
     <string name="skip_type_mixed_op">Gemengde opening</string>
     <string name="open_with">Open met</string>
     <string name="single_plugin_disabled" formatted="true">%s ( Uitgeschakeld)</string>
-    <string name="apply_on_restart">Toepassen bij Herstart</string>
+    <string name="apply_on_restart">Herstart de app om veranderingen te zien.</string>
     <string name="plugins_downloaded" formatted="true">Gedownload: %d</string>
-    <string name="safe_mode_file">Veilige mode bestand gevonden!
-\nGeen extensies laden bij het opstarten totdat het bestand is verwijderd.</string>
+    <string name="safe_mode_file">Veilige mode bestand gevonden! \nGeen extensies laden bij het opstarten totdat het bestand is verwijderd.</string>
     <string name="no">Nee</string>
     <string name="sort_rating_asc">Beoordeling ( Hoog naar Laag)</string>
     <string name="safe_mode_title">Veilige mode aan</string>
     <string name="restart">Herstart</string>
     <string name="extension_description">Beschrijving</string>
-    <string name="skip_type_creddits">Waardering</string>
+    <string name="skip_type_credits">Waardering</string>
     <string name="clear_history">Wis geschiedenis</string>
     <string name="subscription_list_name">Ingeschreven</string>
     <string name="delete_repository">Wis repository</string>
     <string name="subscription_deleted">Uitgeschreven bij %s</string>
     <string name="revert">Terugkeren</string>
-    <string name="blank_repo_message">CloudStream heeft standaard geen sites geïnstalleerd. U moet de sites uit repositories installeren.
-\n
-\nVanwege een hersenloze DMCA verwijdering door Sky UK Limited 🤮 kunnen we de repository site niet linken in de app.
-\n
-\nWord lid van onze Discord of zoek online.</string>
+    <string name="blank_repo_message">CloudStream heeft standaard geen sites geïnstalleerd. U moet de sites uit repositories installeren. \n \nVanwege een hersenloze DMCA verwijdering door Sky UK Limited 🤮 kunnen we de repository site niet linken in de app. \n \nWord lid van onze Discord of zoek online.</string>
     <string name="audio_tracks">Audiosporen</string>
     <string name="sort_by">Gesorteerd op</string>
     <string name="wifi">Wifi</string>
@@ -552,13 +527,7 @@
     <string name="qualities">Kwaliteiten</string>
     <string name="profile_background_des">Profiel achtergrond</string>
     <string name="use">Gebruik</string>
-    <string name="quality_profile_help">Hier kan je de volgorde van de bronnen veranderen. Als een video een hogere prioriteit heeft zal het hoger in de bronnenlijst staan. De som van de prioriteit van de bron en de prioriteit van de kwaliteit is de prioriteit van de video.
-\n
-\nBron A: 3
-\nKwaliteit B: 7
-\nHeeft een totale prioriteit van de video van 10.
-\n
-\nNOTITIE: Als de som 10 of hoger is zal de speler automatisch het laden overslaan wanneer die link is geladen!</string>
+    <string name="quality_profile_help">Hier kan je de volgorde van de bronnen veranderen. Als een video een hogere prioriteit heeft zal het hoger in de bronnenlijst staan. De som van de prioriteit van de bron en de prioriteit van de kwaliteit is de prioriteit van de video. \n \nBron A: 3 \nKwaliteit B: 7 \nHeeft een totale prioriteit van de video van 10. \n \nNOTITIE: Als de som 10 of hoger is zal de speler automatisch het laden overslaan wanneer die link is geladen!</string>
     <string name="profile_number">Profiel %d</string>
     <string name="no_repository_found_error">Repository niet gevonden, controleer de URL en probeer een VPN</string>
     <string name="no_plugins_found_error">Geen plug-ins gevonden in de repository</string>
@@ -570,11 +539,7 @@
     <string name="favorites_list_name">Favorieten</string>
     <string name="favorite_added">%s toegevoegd aan favorieten</string>
     <string name="logged_account" formatted="true">Aangemeld als %s</string>
-    <string name="duplicate_message_multiple" formatted="true">Er zijn mogelijk dubbele items gevonden in uw bibliotheek:
-\n
-\n%s
-\n
-\nWilt u dit item toch toevoegen, de bestaande vervangen of de actie annuleren?</string>
+    <string name="duplicate_message_multiple" formatted="true">Er zijn mogelijk dubbele items gevonden in uw bibliotheek: \n \n%s \n \nWilt u dit item toch toevoegen, de bestaande vervangen of de actie annuleren?</string>
     <string name="enter_pin_with_name" formatted="true">Voer PIN in voor %s</string>
     <string name="backup_frequency">Backupfrequentie</string>
     <string name="duplicate_title">Mogelijk Duplicaat Gevonden</string>
@@ -593,20 +558,107 @@
     <string name="action_subscribe">Abonneer</string>
     <string name="action_remove_from_favorites">Verwijder uit favorieten</string>
     <string name="select_an_account">Selecteer een Account</string>
-    <string name="duplicate_message_single" formatted="true">Het lijkt erop dat er al een mogelijk duplicaat bestaat in uw bibliotheek: \'%s.\'
-\n
-\nWilt u dit item toch toevoegen, het bestaande item vervangen of de actie annuleren?</string>
+    <string name="duplicate_message_single" formatted="true">Het lijkt erop dat er al een mogelijk duplicaat bestaat in uw bibliotheek: \'%s.\' \n \nWilt u dit item toch toevoegen, het bestaande item vervangen of de actie annuleren?</string>
     <string name="enter_pin">PIN invoeren</string>
     <string name="pin">PIN</string>
     <string name="enter_current_pin">Huidige PIN invoeren</string>
     <string name="links_reloaded_toast">Link opnieuw geladen</string>
     <string name="auto_rotate_video">Autoroteer</string>
     <string name="rotate_video">Roteer</string>
-    <string name="hide_player_control_names_key" translatable="false">hide_player_control_names_key</string>
     <string name="downloads_empty">Er zijn momenteel geen downloads beschikbaar.</string>
     <string name="toast_copied">Gekopieerd!</string>
     <string name="dont_show">Verbergen</string>
     <string name="show">Tonen</string>
     <string name="next_season_episode_format" formatted="true">Seizoen %1$d Aflevering %2$d zal worden uitgebracht in</string>
-    <string name="play_from_beginning_img_des">Kijken vanaf het begin</string>
-</resources>
\ No newline at end of file
+    <string name="play_from_beginning_img_des">Speel van het begin</string>
+    <string name="repo_copy_label">Repositorynaam en URL</string>
+    <string name="recommendations_tooltip">Aanbevelingen tonen</string>
+    <string name="downloads_delete_select">Selecteer items om te verwijderen</string>
+    <string name="torrent_info">Deze video is een Torrent, dit betekent dat je videoactiviteit kan worden gevolgd.\nZorg ervoor dat je Torrenting begrijpt voordat je doorgaat.</string>
+    <string name="speed_setting_summary">Voegt een snelheidsoptie toe in de speler</string>
+    <string name="open_local_video">Open lokale video</string>
+    <string name="speech_recognition_unavailable">Spraakherkenning is niet beschikbaar</string>
+    <string name="begin_speaking">Begin met praten…</string>
+    <string name="offline_file">Beschikbaar om offline te kijken</string>
+    <string name="select_all">Selecteer alles</string>
+    <string name="deselect_all">Deselecteer alles</string>
+    <string name="subscribe_tooltip">Bericht voor nieuwe afleveringen</string>
+    <string name="download_time_left_hour_min_sec_format" formatted="true">%1$d u %2$d m %3$d s</string>
+    <string name="download_time_left_min_sec_format" formatted="true">%1$d m %2$d s</string>
+    <string name="download_time_left_sec_format" formatted="true">%1$d s</string>
+    <string name="episode_upcoming_format" formatted="true">Binnenkort beschikbaar in %s</string>
+    <string name="delete_files">Verwijder bestanden</string>
+    <string name="delete_format" formatted="true">Verwijder (%1$d | %2$s)</string>
+    <string name="test_warning">Waarschuwing</string>
+    <string name="delete_message_multiple" formatted="true">Weet je zeker dat je de volgende items permanent wil verwijderen?\n\n%s</string>
+    <string name="delete_message_series_episodes" formatted="true">Weet je zeker dat je de volgende afleveringen in %1$s permanent wilt verwijderen?\n\n%2$s</string>
+    <string name="delete_message_series_section" formatted="true">Hiermee worden ook alle afleveringen van de volgende series permanent verwijderd:\n\n%s</string>
+    <string name="delete_message_series_only" formatted="true">Weet je zeker dat je alle afleveringen van de volgende series permanent wil verwijderen?\n\n%s</string>
+    <string name="resume_remaining" formatted="true">%s\nresterend</string>
+    <string name="music_singular">Muziek</string>
+    <string name="audio_book_singular">Luisterboek</string>
+    <string name="custom_media_singular">Media</string>
+    <string name="audio_singular">Audio</string>
+    <string name="podcast_singular">Podcast</string>
+    <string name="encoding_error">Coderingsfout</string>
+    <string name="unsupported_error">Fout: wordt niet ondersteund</string>
+    <string name="pref_category_security">Beveiliging</string>
+    <string name="pref_category_accounts">Accounts</string>
+    <string name="play_full_series_button">Speel Gehele Serie</string>
+    <string name="result_search_tooltip">Zoek in andere extensies</string>
+    <string name="test_extensions">Test alle Extensies</string>
+    <string name="player_load_one_subtitle_online">Laad eerst beschikbare</string>
+    <string name="qr_image">QR-code Afbeelding</string>
+    <string name="delete_plugin">Verwijder plug-in</string>
+    <string name="player_settings_always_ask">Vraag altijd</string>
+    <string name="ok">OKÉ</string>
+    <string name="open_downloaded_repo">Open repository</string>
+    <string name="battery_dialog_title">Batterij-optimalisatie uitschakelen</string>
+    <string name="app_unrestricted_toast">Batterijgebruik van app is reeds ingesteld als onbegrensd</string>
+    <string name="app_info_intent_error">Niet in staat Cloudstreams App-info te openen.</string>
+    <string name="sort_episodes_number_asc">Aflevering (Oplopend)</string>
+    <string name="sort_episodes_number_desc">Aflevering (Aflopend)</string>
+    <string name="sort_episodes_rating_high_low">Beoordeling (Hoogste)</string>
+    <string name="sort_episodes_rating_low_high">Beoordeling (Laagste)</string>
+    <string name="sort_episodes_date_newest">Uitzenddatum (Nieuwste)</string>
+    <string name="sort_episodes_date_oldest">Uitzenddatum (Oudste)</string>
+    <string name="sort_button_episode">Afl %s</string>
+    <string name="sort_button_rating">Beoordeling %s</string>
+    <string name="sort_button_date">Datum %s</string>
+    <string name="no_account">Geen account</string>
+    <string name="rotate_video_desc">Toon een schakelknop voor schermoriëntatie</string>
+    <string name="auto_rotate_video_desc">Activeer automatisch wisselen van schermoriëntatie gebaseerd op video oriëntatie</string>
+    <string name="favorite">Favoriet</string>
+    <string name="unfavorite">Verwijder favoriet</string>
+    <string name="password_pin_authentication_title">Wachtwoord/PIN-authenticatie</string>
+    <string name="biometric_unsupported">Biometrische authenticatie is niet ondersteund op dit apparaat</string>
+    <string name="biometric_prompt_description">Na enige mislukte pogingen zal de prompt sluiten. Herstart de app om het opnieuw te proberen.</string>
+    <string name="cs3wiki">CloudStream Wiki</string>
+    <string name="device_pin_url_message">Ga naar <b>%s</b> op je smartphone of computer en voeren de bovenstaande code in</string>
+    <string name="device_pin_expired_message">PIN-code is nu verlopen!</string>
+    <string name="device_pin_counter_text">Code verloopt in %1$dm %2$ds</string>
+    <string name="download_queue">Downloadwachtrij</string>
+    <string name="queue_empty_message">Er staan momenteel geen downloads in de wachtrij.</string>
+    <string name="extra_brightness_settings">Extra helderheid</string>
+    <string name="extra_brightness_settings_des">Schakel het helderheidsfilter in zodra de schermhelderheid boven 100% komt</string>
+    <string name="extra_brightness_key">extra_helderheid_ingeschakeld</string>
+    <string name="search_suggestions">Zoeksuggesties</string>
+    <string name="search_suggestions_des">Zoeksuggesties laten zien tijdens het typen</string>
+    <string name="clear_suggestions">Suggesties verwijderen</string>
+    <string name="show_cast_in_details">Castpaneel weergeven</string>
+    <string name="install_prerelease">Pre-releaseversie installeren</string>
+    <string name="prerelease_already_installed">Pre-releaseversie is al geïnstaleerd.</string>
+    <string name="prerelease_install_failed">Installatie van de pre-release is mislukt.</string>
+    <string name="episode_action_cast_mirror">Schermspiegeling</string>
+    <string name="episode_action_play_mirror">Spiegeling spelen</string>"
+    <string name="show_rating">Beoordelingslabel</string>
+    <string name="show_episode_text">Afleveringstekst</string>
+    <string name="test_extensions_summary">Deze test is alleen bedoeld voor ontwikkelaars en bevestigt noch ontkent de werking van een extensie.</string>
+    <string name="auth_locally">Lokale authenticatie</string>
+    <string name="video_info">Media info</string>
+    <string name="download_all_plugins_from_repo">Waarschuwing: Cloudstream is niet verandwoordelijk voor het gebruik van extensies van derden en biedt hier ook geen ondersteuning voor!</string>
+    <string name="player_settings_select_cast_device">Cast apparaat selecteren</string>
+    <string name="clipboard_permission_error">Fout bij toegang tot het Klembord, Probeer het opnieuw.</string>
+    <string name="clipboard_unknown_error">Fout bij het kopiëren. Kopieer alsjeblieft de logcat en neem contact op met de app-ondersteuning.</string>
+    <string name="dismiss">Afwijzen</string>
+</resources>
diff --git a/app/src/main/res/values-nn/strings.xml b/app/src/main/res/values-b+nn/strings.xml
similarity index 95%
rename from app/src/main/res/values-nn/strings.xml
rename to app/src/main/res/values-b+nn/strings.xml
index 5b5577c2e1d..014e2b0a9c9 100644
--- a/app/src/main/res/values-nn/strings.xml
+++ b/app/src/main/res/values-b+nn/strings.xml
@@ -15,8 +15,7 @@
     <string name="filler" formatted="true">Fyllstoff</string>
     <string name="preview_background_img_des">Forhandsvis bakgrunnsbilete</string>
     <string name="rated_format" formatted="true">Vurdert: %.1f</string>
-    <string name="new_update_format" formatted="true">Ny oppdatering tilgjengeleg!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">Ny oppdatering tilgjengeleg! \n%1$s -&gt; %2$s</string>
     <string name="duration_format" formatted="true">%d minutt</string>
     <string name="result_poster_img_des">Miniatyrbilete</string>
     <string name="next_episode_format" formatted="true">Episode %d vil bli sleppt om</string>
@@ -54,7 +53,6 @@
     <string name="popup_delete_file">Slett fil</string>
     <string name="popup_play_file">Spel av fil</string>
     <string name="popup_pause_download">Sett nedlasting på vent</string>
-    <string name="pref_disable_acra">Deaktiver automatisk feilrapportering</string>
     <string name="home_expanded_hide">Gøym</string>
     <string name="home_play">Spel(e) av</string>
     <string name="home_info">Informasjon</string>
@@ -103,7 +101,6 @@
     <string name="copy_link_toast">Kopiert lenke til utklipptavle</string>
     <string name="play_episode_toast">Spel av episode</string>
     <string name="subs_default_reset_toast">Tilbakestill til standardverdi</string>
-    <string name="acra_report_toast">Beklager, programmet har krasjet. Ein anonymisert feilrapport vil bli sendt til utviklarane</string>
     <string name="season_format">%1$s %2$d%3$s</string>
     <string name="no_season">Ingen sesong</string>
     <string name="episode">Episode</string>
@@ -117,10 +114,8 @@
     <string name="resume">Gjenoppta</string>
     <string name="go_back_30">-30</string>
     <string name="go_forward_30">+30</string>
-    <string name="delete_message" formatted="true">Dette vil slette %s permanent.
-\nEr du sikker på dette?</string>
-    <string name="resume_time_left" formatted="true">%dm
-\ngjenstår</string>
+    <string name="delete_message" formatted="true">Dette vil slette %s permanent. \nEr du sikker på dette?</string>
+    <string name="resume_time_left" formatted="true">%dm \ngjenstår</string>
     <string name="status_ongoing">Pågåande</string>
     <string name="status_completed">Fullført</string>
     <string name="year">År</string>
@@ -193,5 +188,4 @@
     <string name="picture_in_picture">Bilde i bilde</string>
     <string name="continue_watching">Fortsett å sjå</string>
     <string name="reload_error">Prøv tilkopling på nytt…</string>
-    <string name="hide_player_control_names_key" translatable="false">hide_player_control_names_key</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-b+no/strings.xml
similarity index 93%
rename from app/src/main/res/values-no/strings.xml
rename to app/src/main/res/values-b+no/strings.xml
index ac13f57f996..7d309a2f86e 100644
--- a/app/src/main/res/values-no/strings.xml
+++ b/app/src/main/res/values-b+no/strings.xml
@@ -12,8 +12,7 @@
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">Avspillingshastighet (%.2fx)</string>
     <string name="rated_format" formatted="true">Vurdert: %.1f</string>
-    <string name="new_update_format" formatted="true">Ny oppdatering funnet!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">Ny oppdatering funnet! \n%1$s -&gt; %2$s</string>
     <string name="app_name">CloudStream</string>
     <string name="title_home">Hjem</string>
     <string name="title_search">Søk</string>
@@ -57,7 +56,6 @@
     <string name="popup_play_file">Spill av fil</string>
     <string name="popup_resume_download">Fortsett nedlasting</string>
     <string name="popup_pause_download">Stopp nedlastingen</string>
-    <string name="pref_disable_acra">Deaktiver automatisk feilrapportering</string>
     <string name="home_more_info">Mer informasjon</string>
     <string name="home_expanded_hide">Gjemme seg</string>
     <string name="home_play">Spille</string>
@@ -110,13 +108,9 @@
     <string name="settings_info">Informasjon</string>
     <string name="advanced_search">Avansert søk</string>
     <string name="advanced_search_des">Gir deg søkeresultatene atskilt etter leverandør</string>
-    <string name="bug_report_settings_off">Sender bare rapportere om krasjer</string>
-    <string name="bug_report_settings_on">Sender ingen rapportere</string>
     <string name="show_fillers_settings">Vis filler-episode til anime</string>
     <string name="updates_settings">Vis appoppdateringer</string>
     <string name="updates_settings_des">Søk automatisk etter nye oppdateringer etter at appen har startet.</string>
-    <string name="uprereleases_settings">Oppdatering til forhåndsutgivelser</string>
-    <string name="uprereleases_settings_des">Søk etter oppdateringer før utgivelse i stedet for fullstendige utgivelser</string>
     <string name="github">Github</string>
     <string name="lightnovel">Light novel app av samme devs</string>
     <string name="anim">Anime app av samme devs</string>
@@ -129,7 +123,6 @@
     <string name="copy_link_toast">Linken er kopiert til utklippstavlen</string>
     <string name="play_episode_toast">spille episode</string>
     <string name="subs_default_reset_toast">tilbakestill standardverdien</string>
-    <string name="acra_report_toast">Beklager, programmet krasjet. En anonym feilrapport vil bli sendt til utviklerne</string>
     <string name="season">Sesong</string>
     <string name="no_season">Ingen sesong</string>
     <string name="episode">Episode</string>
@@ -141,8 +134,7 @@
     <string name="cancel">Avbryt</string>
     <string name="pause">Stopp</string>
     <string name="resume">Gjenoppta</string>
-    <string name="delete_message">Dette vil slette %s
-\nEr du sikker?</string>
+    <string name="delete_message">Dette vil slette %s \nEr du sikker?</string>
     <string name="status_ongoing">Pågående</string>
     <string name="status_completed">Fullført</string>
     <string name="status">Posisjon</string>
@@ -198,8 +190,6 @@
     <string name="primary_color_settings">Primær Farge</string>
     <string name="app_theme_settings">App Tema</string>
     <string name="preferred_media_settings">Foretrukket Videoinnhold</string>
-    <string name="legal_notice" translatable="false">Disclaimer</string>
-    <string name="legal_notice_text" translatable="false">Any legal issues regarding the content on this application should be taken up with the actual file hosts and providers themselves as we are not affiliated with them. In case of copyright infringement, please directly contact the responsible parties or the streaming websites. The app is purely for educational and personal use. CloudStream 3 does not host any content on the app, and has no control over what media is put up or taken down. CloudStream 3 functions like any other search engine, such as Google. CloudStream 3 does not host, upload or manage any videos, films or content. It simply crawls, aggregates and displayes links in a convenient, user-friendly interface. It merely scrapes 3rd-party websites that are publicly accessable via any regular web browser. It is the responsibility of user to avoid any actions that might violate the laws governing his/her locality. Use CloudStream 3 at your own risk.</string>
     <string name="cast_format" formatted="true">Besetning: %s</string>
     <string name="next_episode_time_min_format" formatted="true">%dm</string>
     <string name="sort_clear">Tøm</string>
@@ -346,7 +336,6 @@
     <string name="example_password">passord123</string>
     <string name="example_lang_name">Språkkode (nb_NO)</string>
     <string name="previous">Forrige</string>
-    <string name="crash_reporting_title">Krasjrapportering</string>
     <string name="extensions">Utvidelser</string>
     <string name="episode_format" formatted="true">%1$d %2$s</string>
     <string name="example_username">MittKuleBrukernavn</string>
@@ -362,8 +351,7 @@
     <string name="episodes_range">%1$d-%2$d</string>
     <string name="view_public_repositories_button_short">Offentlig liste</string>
     <string name="plugin">programtillegg</string>
-    <string name="resume_time_left" formatted="true">%dm
-\nigjen</string>
+    <string name="resume_time_left" formatted="true">%dm \nigjen</string>
     <string name="limit_title_rez">Videooppløsning</string>
     <string name="subtitle_offset">Synkroniser undertekster</string>
     <string name="subtitle_offset_title">Undertekstforsinkelse</string>
@@ -382,15 +370,11 @@
     <string name="error_invalid_url">Ugyldig nettadresse</string>
     <string name="batch_download">Knippe-nedlasting</string>
     <string name="delete_repository">Slett pakkebrønn</string>
-    <string name="blank_repo_message">CloudStream har ingen sider installert som forvalg. Du må installere sidene fra pakkebrønner.
-\n
-\nSom følge av en hjernedød DMCA-forespørsel fra Sky UK Limited 🤮 kan vi ikke lenke til pakkebrønnssiden i programmet.
-\n
-\nTa del i vår Discord, eller søk på nett.</string>
+    <string name="blank_repo_message">CloudStream har ingen sider installert som forvalg. Du må installere sidene fra pakkebrønner. \n \nSom følge av en hjernedød DMCA-forespørsel fra Sky UK Limited 🤮 kan vi ikke lenke til pakkebrønnssiden i programmet. \n \nTa del i vår Discord, eller søk på nett.</string>
     <string name="subtitle_offset_extra_hint_before_format">Bruk dette hvis undertekster vises %d ms for sent</string>
     <string name="plugin_loaded">Programtillegg innlastet</string>
     <string name="audio_tracks">Lydspor</string>
-    <string name="skip_type_creddits">Rulletekst</string>
+    <string name="skip_type_credits">Rulletekst</string>
     <string name="skip_type_intro">Introduksjon</string>
     <string name="backup_failed">Lagringstilgang mangler. Prøv igjen.</string>
     <string name="show_trailers_settings">Vis trailere</string>
@@ -521,10 +505,8 @@
     <string name="pref_category_bypass">ISP-omgåelser</string>
     <string name="empty_library_logged_in_message">Denne listen er tom. Prøv å bytte til en annen.</string>
     <string name="sort">Sorter</string>
-    <string name="safe_mode_file">Fant fil for trygt modus.
-\nLaster ikke inn noen utvidelser ved oppstart til filen er fjernet.</string>
-    <string name="empty_library_no_accounts_message">Biblioteket ditt er tomt :(
-\nLogg inn på en bibliotekkonto eller legg til programmer i ditt lokale bibliotek.</string>
+    <string name="safe_mode_file">Fant fil for trygt modus. \nLaster ikke inn noen utvidelser ved oppstart til filen er fjernet.</string>
+    <string name="empty_library_no_accounts_message">Biblioteket ditt er tomt :( \nLogg inn på en bibliotekkonto eller legg til programmer i ditt lokale bibliotek.</string>
     <string name="edit">Rediger</string>
     <string name="profiles">Profiler</string>
     <string name="favorites_list_name">Favoritter</string>
@@ -532,5 +514,4 @@
     <string name="use">Bruk</string>
     <string name="help">Hjelp</string>
     <string name="profile_background_des">Profilbakgrunn</string>
-    <string name="hide_player_control_names_key" translatable="false">hide_player_control_names_key</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-or/strings.xml b/app/src/main/res/values-b+or/strings.xml
similarity index 95%
rename from app/src/main/res/values-or/strings.xml
rename to app/src/main/res/values-b+or/strings.xml
index 1a7d9c72f6f..ce7f74290be 100644
--- a/app/src/main/res/values-or/strings.xml
+++ b/app/src/main/res/values-b+or/strings.xml
@@ -61,7 +61,7 @@
     <string name="all_languages_preference">ସବୁ ଭାଷା</string>
     <string name="skip_type_mixed_ed">ମିଶ୍ରିତ ପ୍ରାନ୍ତ</string>
     <string name="skip_type_mixed_op">ମିଶ୍ରିତ ଆଦ୍ୟ</string>
-    <string name="skip_type_creddits">ଶ୍ରେୟ</string>
+    <string name="skip_type_credits">ଶ୍ରେୟ</string>
     <string name="skip_type_intro">ଉପକ୍ରମ</string>
     <string name="provider_languages_tip">ଏହି ଭାଷାଗୁଡ଼ିକରେ ଵିଡ଼ିଓ ଦେଖନ୍ତୁ</string>
     <string name="extension_version">ସଂସ୍କରଣ</string>
@@ -84,8 +84,7 @@
     <string name="pref_category_backup">ବ୍ୟାକଅପ୍</string>
     <string name="pref_category_android_tv">ଆଣ୍ଡ୍ରଏଡ୍ ଟିଵି</string>
     <string name="pref_category_gestures">ଅଙ୍ଗଭଙ୍ଗୀ</string>
-    <string name="new_update_format" formatted="true">ନୂଆ ଅଦ୍ୟତନ ମିଳିଲା!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">ନୂଆ ଅଦ୍ୟତନ ମିଳିଲା! \n%1$s -&gt; %2$s</string>
     <string name="duration">ଅଵଧି</string>
     <string name="app_storage">ଆପ୍</string>
     <string name="restore_success">ବ୍ୟାକଅପ୍ ଫାଇଲ୍ ଧାରଣ ହେଲା</string>
@@ -155,5 +154,7 @@
     <string name="no_data">କୌଣସି ତଥ୍ୟ ନାହିଁ</string>
     <string name="app_dub_sub_episode_text_format" formatted="true">%1$s ଅ %2$d</string>
     <string name="video_skip_op">ଆଦ୍ୟ ବାଦ୍ ଦିଅ</string>
-    <string name="hide_player_control_names_key" translatable="false">hide_player_control_names_key</string>
-</resources>
\ No newline at end of file
+    <string name="next_episode_format" formatted="true">ଏପିସୋଡ୍ %d ମୁକ୍ତିଲାଭ କରିବ</string>
+    <string name="next_season_episode_format" formatted="true">ସିଜିନ୍ %1$d ଏପିସୋଡ୍ %2$d ମୁକ୍ତିଲାଭ କରିବ</string>
+    <string name="download_time_left_hour_min_sec_format" formatted="true">%1$dଘଣ୍ଟା %2$dମିନିଟ୍ %3$dସେକେଣ୍ଡ</string>
+</resources>
diff --git a/app/src/main/res/values-pl/array.xml b/app/src/main/res/values-b+pl/array.xml
similarity index 83%
rename from app/src/main/res/values-pl/array.xml
rename to app/src/main/res/values-b+pl/array.xml
index 45a8e56e134..13297219c93 100644
--- a/app/src/main/res/values-pl/array.xml
+++ b/app/src/main/res/values-b+pl/array.xml
@@ -23,20 +23,20 @@
     </string-array>
 
 
-    <array name="limit_title_rez_pref_names">
-        <item>@string/resolution_and_title</item>
-        <item>@string/title</item>
+    <array name="title_info_pref_names">
+        <item>@string/source_name</item>
         <item>@string/resolution</item>
-        <item>@string/none</item>
+        <item>@string/video_info</item>
     </array>
 
-    <array name="limit_title_rez_pref_values">
-        <item>3</item>
-        <item>2</item>
-        <item>1</item>
-        <item>0</item>
+    <array name="title_info_pref_values">
+        <item>@string/show_name_key</item>
+        <item>@string/show_resolution_key</item>
+        <item>@string/show_media_info_key</item>
     </array>
 
+
+
     <array name="limit_title_pref_names">
         <item>@string/none</item>
         <item>16 znaków</item>
@@ -151,14 +151,18 @@
         <item>@string/show_hd</item>
         <item>@string/show_dub</item>
         <item>@string/show_sub</item>
+        <item>@string/show_rating</item>
         <item>@string/show_title</item>
+        <item>@string/show_episode_text</item>
     </array>
 
     <array name="poster_ui_options_values">
         <item>@string/show_hd_key</item>
         <item>@string/show_dub_key</item>
         <item>@string/show_sub_key</item>
+        <item>@string/show_rating_key</item>
         <item>@string/show_title_key</item>
+        <item>@string/show_episode_text_key</item>
     </array>
 
     <array name="app_layout">
@@ -232,6 +236,9 @@
         <item>Flashbang</item>
         <item>System</item>
         <item>Material You</item>
+        <item>Dracula</item>
+        <item>Lawendowe Marzenia</item>
+        <item>Cichy Błękit</item>
     </string-array>
     <string-array name="themes_names_values">
         <item>AmoledLight</item>
@@ -240,6 +247,9 @@
         <item>Light</item>
         <item>System</item>
         <item>Monet</item>
+        <item>Dracula</item>
+        <item>Lavender</item>
+        <item>SilentBlue</item>
     </string-array>
 
     <!--https://github.com/videolan/vlc-android/blob/72ccfb93db027b49855760001d1a930fa657c5a8/application/resources/src/main/res/values/arrays.xml#L266-->
@@ -287,48 +297,4 @@
         <item>Vietnamese (VISCII)</item>
         <item>Vietnamese (Windows-1258)</item>
     </string-array>
-    <string-array name="subtitles_encoding_values" translatable="false" tools:ignore="TypographyDashes">
-        <item></item>
-        <item>UTF-8</item>
-        <item>UTF-16</item>
-        <item>UTF-16BE</item>
-        <item>UTF-16LE</item>
-        <item>GB18030</item>
-        <item>ISO-8859-15</item>
-        <item>Windows-1252</item>
-        <item>IBM850</item>
-        <item>ISO-8859-2</item>
-        <item>Windows-1250</item>
-        <item>ISO-8859-3</item>
-        <item>ISO-8859-10</item>
-        <item>Windows-1251</item>
-        <item>KOI8-R</item>
-        <item>KOI8-U</item>
-        <item>ISO-8859-6</item>
-        <item>Windows-1256</item>
-        <item>ISO-8859-7</item>
-        <item>Windows-1253</item>
-        <item>ISO-8859-8</item>
-        <item>Windows-1255</item>
-        <item>ISO-8859-9</item>
-        <item>Windows-1254</item>
-        <item>ISO-8859-11</item>
-        <item>Windows-874</item>
-        <item>ISO-8859-13</item>
-        <item>Windows-1257</item>
-        <item>ISO-8859-14</item>
-        <item>ISO-8859-16</item>
-        <item>ISO-2022-CN-EXT</item>
-        <item>EUC-CN</item>
-        <item>ISO-2022-JP-2</item>
-        <item>EUC-JP</item>
-        <item>Shift_JIS</item>
-        <item>CP949</item>
-        <item>ISO-2022-KR</item>
-        <item>Big5</item>
-        <item>ISO-2022-TW</item>
-        <item>Big5-HKSCS</item>
-        <item>VISCII</item>
-        <item>Windows-1258</item>
-    </string-array>
 </resources>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-b+pl/strings.xml
similarity index 85%
rename from app/src/main/res/values-pl/strings.xml
rename to app/src/main/res/values-b+pl/strings.xml
index 4fb2a33ed19..35367a1b2a3 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-b+pl/strings.xml
@@ -2,8 +2,7 @@
 <resources>
     <string name="player_speed_text_format" formatted="true">Prędkość (%.2fx)</string>
     <string name="rated_format" formatted="true">Ocena: %.1f</string>
-    <string name="new_update_format" formatted="true">Znaleziono nową aktualizację!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">Znaleziono nową aktualizację! \n%1$s -&gt; %2$s</string>
     <string name="filler" formatted="true">Filler</string>
     <string name="duration_format" formatted="true">%d min</string>
     <string name="app_dub_sub_episode_text_format">%1$s Odc. %2$d</string>
@@ -61,7 +60,6 @@
     <string name="popup_play_file">Odtwórz plik</string>
     <string name="popup_resume_download">Wznów pobieranie</string>
     <string name="popup_pause_download">Wstrzymaj pobieranie</string>
-    <string name="pref_disable_acra">Wyłącz przekazywanie błędów</string>
     <string name="home_more_info">Więcej informacji</string>
     <string name="home_expanded_hide">Ukryj</string>
     <string name="home_play">Odtwórz</string>
@@ -141,8 +139,6 @@
     <string name="settings_info">Informacje</string>
     <string name="advanced_search">Zaawansowane wyszukiwanie</string>
     <string name="advanced_search_des">Szukaj z podziałem na źródła</string>
-    <string name="bug_report_settings_off">Wysyłaj dane tylko przy awariach</string>
-    <string name="bug_report_settings_on">Nie wysyłaj żadnych danych</string>
     <string name="show_fillers_settings">Pokaż fillery dla anime</string>
     <string name="show_trailers_settings">Pokaż zwiastuny</string>
     <string name="kitsu_settings">Pokaż obrazki z Kitsu</string>
@@ -151,8 +147,6 @@
     <string name="automatic_plugin_download">Automatyczne pobieranie rozszerzeń</string>
     <string name="updates_settings">Pokazuj aktualizacje</string>
     <string name="updates_settings_des">Automatycznie wyszukuj aktualizacje przy starcie.</string>
-    <string name="uprereleases_settings">Aktualizuj do wersji beta</string>
-    <string name="uprereleases_settings_des">Wyszukuj wersji beta, zamiast oficjalnych wydań</string>
     <string name="github">Github</string>
     <string name="lightnovel">Aplikacja do light novel od nas</string>
     <string name="anim">Aplikacja do anime od nas</string>
@@ -165,7 +159,6 @@
     <string name="copy_link_toast">Skopiowano do schowka</string>
     <string name="play_episode_toast">Odtwórz odcinek</string>
     <string name="subs_default_reset_toast">Zresetowano</string>
-    <string name="acra_report_toast">Awaria aplikacji. Anonimowe zgłoszenie błędu zostanie wysłane programistom</string>
     <string name="season">Sezon</string>
     <string name="season_format">%1$s %2$d%3$s</string>
     <string name="no_season">Brak sezonu</string>
@@ -183,10 +176,8 @@
     <string name="resume">Odtwórz</string>
     <string name="go_back_30">-30</string>
     <string name="go_forward_30">+30</string>
-    <string name="delete_message" formatted="true">Spowoduje to trwałe usunięcie %s
-\nCzy jesteś pewien?</string>
-    <string name="resume_time_left" formatted="true">%dm
-\npozostało</string>
+    <string name="delete_message" formatted="true">Spowoduje to trwałe usunięcie %s \nCzy jesteś pewien?</string>
+    <string name="resume_time_left" formatted="true">%dm \npozostało</string>
     <string name="status_ongoing">Bieżący</string>
     <string name="status_completed">Zakończone</string>
     <string name="status">Status</string>
@@ -252,7 +243,7 @@
     <string name="update">Aktualizacja</string>
     <string name="watch_quality_pref">Domyślna jakość (WiFi)</string>
     <string name="limit_title">Maksymalna liczba znaków w tytule odtwarzacza</string>
-    <string name="limit_title_rez">Rozdzielczość odtwarzacza wideo</string>
+    <string name="limit_title_rez">Pokaż informacje o odtwarzaczu</string>
     <string name="video_buffer_size_settings">Rozmiar bufora wideo</string>
     <string name="video_buffer_length_settings">Długość bufora wideo</string>
     <string name="video_buffer_disk_settings">Pamięć podręczna wideo na dysku</string>
@@ -260,7 +251,7 @@
     <string name="video_ram_description">Ustawienie zbyt wysokiej wartości może powodować problemy na urządzeniach z małą ilością pamięci RAM, takich jak urządzenia Android TV lub stare telefony.</string>
     <string name="video_disk_description">Zbyt wysokie ustawienie może powodować problemy na urządzeniach z małą ilością dostęponej pamięci, takich jak urządzenia Android TV.</string>
     <string name="dns_pref">DNS over HTTPS</string>
-    <string name="dns_pref_summary">Przydatne w pomijaniu blokad dostawców internetu</string>
+    <string name="dns_pref_summary">Przydatne w pomijaniu blokad dostawców Internetu</string>
     <string name="add_site_pref">Sklonuj stronę</string>
     <string name="remove_site_pref">Usuń stronę</string>
     <string name="add_site_summary">Dodaj klona istniejącej strony z innym adresem URL</string>
@@ -368,7 +359,6 @@
     <string name="previous">Poprzedni</string>
     <string name="skip_setup">Pomiń konfigurację</string>
     <string name="app_layout_subtext">Dostosuj wygląd aplikacji do urządzenia</string>
-    <string name="crash_reporting_title">Zgłaszanie błędów</string>
     <string name="preferred_media_subtext">Co chcesz obejrzeć</string>
     <string name="setup_done">Gotowe</string>
     <string name="extensions">Rozszerzenia</string>
@@ -392,13 +382,11 @@
     <string name="plugins_disabled" formatted="true">Wyłączono: %d</string>
     <string name="plugins_not_downloaded" formatted="true">Nie pobrano: %d</string>
     <string name="plugins_updated">Zaaktualizowano %d rozszerzeń</string>
-    <string name="blank_repo_message">CloudStream nie ma domyślnie zainstalowanych żadnych witryn. Musisz zainstalować witryny z repozytoriów.
-\n
-\nDołącz do naszego Discorda lub poszukaj online.</string>
+    <string name="blank_repo_message">CloudStream nie ma domyślnie zainstalowanych żadnych witryn. Musisz zainstalować witryny z repozytoriów. \n \nDołącz do naszego Discorda lub poszukaj online.</string>
     <string name="view_public_repositories_button">Zobacz repozytoria społeczności</string>
     <string name="view_public_repositories_button_short">Publiczna lista</string>
     <string name="uppercase_all_subtitles">Wszystkie napisy wielką literą</string>
-    <string name="download_all_plugins_from_repo">Uwaga: CloudStream 3 nie ponosi żadnej odpowiedzialności za korzystanie z rozszerzeń innych dostawców i nie zapewnia dla nich żadnego wsparcia!</string>
+    <string name="download_all_plugins_from_repo">Uwaga: CloudStream nie ponosi żadnej odpowiedzialności za korzystanie z rozszerzeń innych dostawców i nie zapewnia dla nich żadnego wsparcia!</string>
     <string name="single_plugin_disabled" formatted="true">%s (Wyłączone)</string>
     <string name="tracks">Ścieżki</string>
     <string name="audio_tracks">Ścieżki audio</string>
@@ -443,7 +431,7 @@
     <string name="search_poster_img_des">Poster</string>
     <string name="skip_type_recap">Podsumowanie</string>
     <string name="apk_installer_settings">Instalator APK</string>
-    <string name="apk_installer_settings_des">Niektóre telefony nie obsługują nowego instalatora pakietów. Wypróbuj tryb legacy, jeśli aktualizacje nie zostaną zainstalowane.</string>
+    <string name="apk_installer_settings_des">Niektóre urządzenia nie obsługują nowego instalatora pakietów. Wypróbuj tryb legacy, jeśli aktualizacje nie zostaną zainstalowane.</string>
     <string name="example_password">hasło123</string>
     <string name="ova_singular">@string/ova</string>
     <string name="example_site_name">NowaNazwaWitryny</string>
@@ -459,7 +447,7 @@
     <string name="skip_type_op">Opening</string>
     <string name="skip_type_ed">Ending</string>
     <string name="skip_type_mixed_op">Mixed opening</string>
-    <string name="skip_type_creddits">Napisy końcowe</string>
+    <string name="skip_type_credits">Napisy końcowe</string>
     <string name="skip_type_intro">Intro</string>
     <string name="skip_type_mixed_ed">Mixed ending</string>
     <string name="enable_skip_op_from_database_des">Pokaż wyskakujące okienka pomijania dla niektórych segmentów</string>
@@ -494,11 +482,9 @@
     <string name="sort_alphabetical_z">Alfabetycznie (od Z do A)</string>
     <string name="select_library">Wybierz bibliotekę</string>
     <string name="library">Biblioteka</string>
-    <string name="empty_library_no_accounts_message">Twoja biblioteka jest pusta :(
-\nZaloguj się na swoje konto lub dodaj programy do swojej lokalnej biblioteki.</string>
+    <string name="empty_library_no_accounts_message">Twoja biblioteka jest pusta :( \nZaloguj się na swoje konto lub dodaj programy do swojej lokalnej biblioteki.</string>
     <string name="empty_library_logged_in_message">Ta lista jest pusta. Spróbuj przełączyć się na inną.</string>
-    <string name="safe_mode_file">Znaleziono plik trybu bezpiecznego.
-\nRozszerzenia nie zostaną wczytane, dopóki plik nie zostanie usunięty.</string>
+    <string name="safe_mode_file">Znaleziono plik trybu bezpiecznego. \nRozszerzenia nie zostaną wczytane, dopóki plik nie zostanie usunięty.</string>
     <string name="android_tv_interface_on_seek_settings_summary">Używana ilość przewijania, gdy widoczny jest odtwarzacz</string>
     <string name="android_tv_interface_off_seek_settings">Ukryty odtwarzacz - ilość przewijania</string>
     <string name="pref_category_android_tv">Android TV</string>
@@ -522,13 +508,7 @@
     <string name="jsdelivr_proxy_summary">Obchodzi blokadę surowych adresów URL GitHuba za pomocą jsDelivr. Może powodować opóźnienie aktualizacji o kilka dni.</string>
     <string name="jsdelivr_enabled">Nie udało się połączyć z GitHubem. Włączono serwer pośredniczący jsDelivr…</string>
     <string name="watch_quality_pref_data">Domyślna jakość (dane mobilne)</string>
-    <string name="quality_profile_help">W tym miejscu można zmienić kolejność źródeł. Jeśli wideo ma wyższy priorytet, pojawi się wyżej w wyborze źródła. Priorytet wideo jest sumą priorytetu źródła i priorytetu jakości.
-\n
-\nŹródło A: 3
-\nJakość B: 7
-\nŁączny priorytet wideo będzie wynosił 10.
-\n
-\nUWAGA: Jeśli suma wynosi 10 lub więcej, odtwarzacz automatycznie pominie ładowanie po załadowaniu tego łącza!</string>
+    <string name="quality_profile_help">W tym miejscu można zmienić kolejność źródeł. Jeśli wideo ma wyższy priorytet, pojawi się wyżej w wyborze źródła. Priorytet wideo jest sumą priorytetu źródła i priorytetu jakości. \n \nŹródło A: 3 \nJakość B: 7 \nŁączny priorytet wideo będzie wynosił 10. \n \nUWAGA: Jeśli suma wynosi 10 lub więcej, odtwarzacz automatycznie pominie ładowanie po załadowaniu tego łącza!</string>
     <string name="profile_number">Profil %d</string>
     <string name="wifi">Wi-Fi</string>
     <string name="mobile_data">Dane mobilne</string>
@@ -548,11 +528,7 @@
     <string name="favorite_removed">Usunięto %s z ulubionych</string>
     <string name="favorites_list_name">Ulubione</string>
     <string name="favorite_added">Dodano %s do ulubionych</string>
-    <string name="duplicate_message_multiple" formatted="true">W swojej bibliotece znaleziono potencjalne duplikaty:
-\n
-\n%s
-\n
-\nCzy chcesz dodać ten element, zastąpić istniejące, czy anulować operację?</string>
+    <string name="duplicate_message_multiple" formatted="true">W swojej bibliotece znaleziono potencjalne duplikaty: \n \n%s \n \nCzy chcesz dodać ten element, zastąpić istniejące, czy anulować operację?</string>
     <string name="enter_pin_with_name" formatted="true">Wprowadź PIN dla %s</string>
     <string name="backup_frequency">Częstotliwość tworzenia kopii zapasowych</string>
     <string name="duplicate_title">Znaleziono potencjalny duplikat</string>
@@ -569,9 +545,7 @@
     <string name="action_subscribe">Zasubskrybuj</string>
     <string name="action_remove_from_favorites">Usuń z ulubionych</string>
     <string name="select_an_account">Wybierz konto</string>
-    <string name="duplicate_message_single" formatted="true">Wygląda się, że potencjalny duplikat już znajduje się w bibliotece: \'%s\'. \'
-\n
-\nCzy chciałbyś dodać ten element, zastąpić istniejący, czy anulować akcję?</string>
+    <string name="duplicate_message_single" formatted="true">Wygląda się, że potencjalny duplikat już znajduje się w bibliotece: \'%s\'. \' \n \nCzy chciałbyś dodać ten element, zastąpić istniejący, czy anulować akcję?</string>
     <string name="enter_pin">Wprowadź PIN</string>
     <string name="pin">PIN</string>
     <string name="links_reloaded_toast">Linki załadowane ponownie</string>
@@ -597,8 +571,7 @@
     <string name="biometric_setting_summary">Odblokuj aplikację za pomocą odcisku palca, identyfikatora twarzy, kodu PIN, wzoru i hasła.</string>
     <string name="biometric_warning">Kopia zapasowa Twoich danych CloudStream została teraz utworzona. Chociaż prawdopodobieństwo tego jest bardzo niskie, wszystkie urządzenia mogą zachowywać się inaczej. W rzadkich przypadkach, gdy dostęp do aplikacji zostanie zablokowany, należy całkowicie wyczyścić dane aplikacji i przywrócić je z kopii zapasowej. Bardzo nam przykro z powodu wszelkich niedogodności z tym związanych.</string>
     <string name="unfavorite">Usuń z ulubionych</string>
-    <string name="resume_remaining" formatted="true">%s
-\npozostało</string>
+    <string name="resume_remaining" formatted="true">%s \npozostało</string>
     <string name="favorite">Dodaj do ulubionych</string>
     <string name="repo_copy_label">Nazwa repozytorium i adres URL</string>
     <string name="clipboard_permission_error">Błąd dostępu do schowka. Spróbuj ponownie.</string>
@@ -606,10 +579,10 @@
     <string name="clipboard_unknown_error">Błąd podczas kopiowania. Skopiuj logcat i skontaktuj się z pomocą techniczną aplikacji.</string>
     <string name="battery_dialog_title">Wyłącz optymalizację baterii</string>
     <string name="app_info_intent_error">Nie można otworzyć informacji o aplikacji CloudStream.</string>
-    <string name="music_singlar">Muzyka</string>
+    <string name="music_singular">Muzyka</string>
     <string name="audio_book_singular">Audiobook</string>
     <string name="ok">OK</string>
-    <string name="custom_media_singluar">Multimedia</string>
+    <string name="custom_media_singular">Multimedia</string>
     <string name="app_unrestricted_toast">Użycie baterii przez aplikację jest już ustawione na nieograniczone</string>
     <string name="battery_dialog_message">Aby zapewnić nieprzerwane pobieranie i powiadomienia o subskrybowanych programach, CloudStream potrzebuje pozwolenia na działanie w tle. Po naciśnięciu OK wyświetli się okno dialogowe. Naciśnij „Zezwól”.\n\nPamiętaj, że to pozwolenie nie oznacza, że CS3 będzie zużywać baterię. Będzie działać w tle tylko wtedy, gdy będzie to konieczne, na przykład podczas odbierania powiadomień lub pobierania filmów z oficjalnych rozszerzeń.</string>
     <string name="reset_btn">Resetuj</string>
@@ -628,7 +601,6 @@
     <string name="dismiss">Odrzuć</string>
     <string name="open_downloaded_repo">Otwórz repozytorium</string>
     <string name="device_pin_url_message">Odwiedź <b>%s</b> na swoim smartfonie lub komputerze i wprowadź powyższy kod</string>
-    <string name="hide_player_control_names_key" translatable="false">hide_player_control_names_key</string>
     <string name="play_from_beginning_img_des">Odtwarzaj od początku</string>
     <string name="delete_plugin">Usuń wtyczkę</string>
     <string name="test_warning">Uwaga</string>
@@ -641,19 +613,11 @@
     <string name="select_all">Zaznacz wszystkie</string>
     <string name="downloads_delete_select">Zaznacz elementy do usunięcia</string>
     <string name="deselect_all">Odznacz wszystkie</string>
-    <string name="delete_message_multiple" formatted="true">Czy na pewno chcesz na stałe usunąć następujące elementy?
-\n
-\n%s</string>
-    <string name="delete_message_series_section" formatted="true">Usuniesz na stale wszystkie odcinki następującego serialu:
-\n
-\n%s</string>
-    <string name="delete_message_series_only" formatted="true">Czy na pewno chcesz na stałe usunąć wszystkie odcinki następującego serialu?
-\n
-\n%s</string>
+    <string name="delete_message_multiple" formatted="true">Czy na pewno chcesz na stałe usunąć następujące elementy? \n \n%s</string>
+    <string name="delete_message_series_section" formatted="true">Usuniesz na stale wszystkie odcinki następującego serialu: \n \n%s</string>
+    <string name="delete_message_series_only" formatted="true">Czy na pewno chcesz na stałe usunąć wszystkie odcinki następującego serialu? \n \n%s</string>
     <string name="delete_files">Usuń pliki</string>
-    <string name="delete_message_series_episodes" formatted="true">Czy na pewno chcesz na stałe usunąć następujące odcinki %1$s?
-\n
-\n%2$s</string>
+    <string name="delete_message_series_episodes" formatted="true">Czy na pewno chcesz na stałe usunąć następujące odcinki %1$s? \n \n%2$s</string>
     <string name="delete_format" formatted="true">Usuń (%1$d | %2$s)</string>
     <string name="preview_seekbar">Podgląd paska przewijania</string>
     <string name="preview_seekbar_desc">Włącz podgląd miniatury na pasku wyszukiwania</string>
@@ -666,15 +630,15 @@
     <string name="custom">Własna</string>
     <string name="torrent_info">Ten film jest torrentem, co oznacza, że Twoja aktywność wideo może być śledzona.\nUpewnij się, że rozumiesz czym są torrenty, zanim przejdziesz dalej.</string>
     <string name="subs_edge_size">Rozmiar krawędzi</string>
-    <string name="podcast_singluar">Podcast</string>
-    <string name="audio_singluar">Audio</string>
+    <string name="podcast_singular">Podcast</string>
+    <string name="audio_singular">Audio</string>
     <string name="unsupported_error">Nieobsługiwany błąd</string>
     <string name="encoding_error">Błąd kodowania</string>
     <string name="player_load_one_subtitle_online">Wczytaj pierwsze dostępne</string>
     <string name="torrent_not_accepted">Uruchom ponownie aplikację i zaakceptuj wyskakujące okienko Otwórz torrent, aby kontynuować.</string>
     <string name="torrent_preferred_media">Włącz torrent w Ustawienia/Źródła/Preferowane multimedia</string>
     <string name="software_decoding">Dekodowanie programowe</string>
-    <string name="software_decoding_desc">Dekodowanie programowe umożliwia odtwarzaczowi odtwarzanie plików wideo, których Twój telefon nie obsługuje, ale może powodować opóźnienia lub niestabilność odtwarzania w wysokiej rozdzielczości</string>
+    <string name="software_decoding_desc">Dekodowanie programowe umożliwia odtwarzaczowi odtwarzanie plików wideo, których to urządzenie nie obsługuje, ale może powodować opóźnienia lub niestabilność odtwarzania w wysokiej rozdzielczości.</string>
     <string name="sort_episodes_rating_low_high">Ocena (najniższa)</string>
     <string name="sort_button_rating">Ocena %s</string>
     <string name="sort_episodes_date_newest">Data emisji (najnowsza)</string>
@@ -700,4 +664,82 @@
     <string name="all_subtitles_bold">Zmień wszystkie napisy na pogrubione</string>
     <string name="slide_up_again_to_exceed_100">Przesuń ponownie w górę, aby przekroczyć 100%</string>
     <string name="volume_exceeded_100">Głośność przekroczyła 100%</string>
-</resources>
\ No newline at end of file
+    <string name="concurrent_connections_settings_des">Ile równoczesnych połączeń może wykorzystać każde pobieranie</string>
+    <string name="download_parallel_settings_des">Ile różnych elementów można pobrać równolegle</string>
+    <string name="parallel_downloads">Pobieranie równoległe</string>
+    <string name="concurrent_connections">Połączenia równoczesne</string>
+    <string name="go_to_downloads">Przejdź do pobranych</string>
+    <string name="no_internet_connection">Brak połączenia z Internetem.\n\nPołącz się z Internetem i spróbuj ponownie lub obejrzyj pobrane pliki, będąc offline.</string>
+    <string name="overscan_settings">Nadmiarowość obrazu</string>
+    <string name="overscan_settings_des">Zmienia granice ekranu</string>
+    <string name="poster_size_settings">Rozmiar plakatu</string>
+    <string name="poster_size_settings_des">Zmienia rozmiar plakatów</string>
+    <string name="player_settings_always_ask">Zawsze pytaj</string>
+    <string name="speedup_title">Przełączanie prędkości długiego naciśnięcia</string>
+    <string name="speedup_summary">Przytrzymaj, aby uzyskać 2x większą prędkość</string>
+    <string name="download_time_left_hour_min_sec_format" formatted="true">%1$dh %2$dm %3$ds</string>
+    <string name="download_time_left_min_sec_format" formatted="true">%1$dm %2$ds</string>
+    <string name="download_time_left_sec_format" formatted="true">%1$ds</string>
+    <string name="show_rating">Etykieta oceny</string>
+    <string name="no_account">Bez konta</string>
+    <string name="edit_profile_image_title">Edytuj obraz profilowy</string>
+    <string name="edit_profile_image_hint">Wpisz adres URL obrazu profilowego</string>
+    <string name="edit_profile_image_error_empty">Nie znaleziono adresu URL</string>
+    <string name="edit_profile_image_error_invalid">Nieprawidłowy adres URL lub obraz</string>
+    <string name="edit_profile_image_success">Pomyślnie zaktualizowano obraz</string>
+    <string name="action_remove_mark_watched_up_to_this_episode">Usuń obejrzane do tego odcinka</string>
+    <string name="action_mark_watched_up_to_this_episode">Oznacz jako obejrzane do tego odcinka</string>
+    <string name="action_reload">Przeładowano</string>
+    <string name="reload_provider">Przeładuj dostawcę</string>
+    <string name="episode_action_play_mirror">Odtwarzaj inne źródło</string>"
+    <string name="name">Nazwa</string>
+    <string name="resolution_and_name">Rozdzielczość i nazwa</string>
+    <string name="bottom_left">Dolne lewe</string>
+    <string name="subs_subtitle_alignment">Wyrównanie napisów</string>
+    <string name="bottom_center">Dolne środkowe</string>
+    <string name="bottom_right">Dolne prawe</string>
+    <string name="middle_left">Środkowe lewe</string>
+    <string name="middle_center">Środkowe</string>
+    <string name="middle_right">Środkowe prawe</string>
+    <string name="top_left">Górne lewe</string>
+    <string name="top_center">Górne środkowe</string>
+    <string name="top_right">Górne prawe</string>
+    <string name="play_full_series_button">Odtwórz całą serię</string>
+    <string name="install_prerelease">Zainstaluj wersję przedpremierową</string>
+    <string name="prerelease_already_installed">Wersja przedpremierowa jest już zainstalowana.</string>
+    <string name="prerelease_install_failed">Nie udało się zainstalować wersji przedpremierowej.</string>
+    <string name="show_episode_text">Tekst odcinka</string>
+    <string name="search_suggestions">Sugestie wyszukiwania</string>
+    <string name="search_suggestions_des">Pokaż sugestie wyszukiwania podczas pisania</string>
+    <string name="clear_suggestions">Wyczyść sugestie</string>
+    <string name="show_cast_in_details">Pokaż panel obsady</string>
+    <string name="source_name">Nazwa źródła</string>
+    <string name="video_info">Informacje o multimediach</string>
+    <string name="extra_brightness_settings">Dodatkowa jasność</string>
+    <string name="extra_brightness_settings_des">Włącz filtr jasności, gdy jasność wyświetlacza przekroczy 100%</string>
+    <string name="extra_brightness_key">Włączono dodatkową jasność</string>
+    <string name="download_queue">Kolejka pobierania</string>
+    <string name="queue_empty_message">Obecnie nie ma żadnych plików do pobrania w kolejce.</string>
+    <string name="download_all">Pobierz wszystkie</string>
+    <string name="cancel_all">Anuluj wszystkie</string>
+    <string name="download_episode_range">Czy chcesz pobrać odcinek %s?</string>
+    <string name="cancel_queue_message">Czy chcesz anulować wszystkie pliki do pobrania z kolejki?</string>
+    <plurals name="downloads_active">
+        <item quantity="one">%d aktywne pobieranie</item>
+        <item quantity="few">%d aktywne pobierania</item>
+        <item quantity="many">%d aktywnych pobierań</item>
+        <item quantity="other">%d aktywnych pobierań</item>
+    </plurals>
+    <plurals name="downloads_queued">
+        <item quantity="one">%d pobieranie w kolejce</item>
+        <item quantity="few">%d pobierania w kolejce</item>
+        <item quantity="many">%d pobierań w kolejce</item>
+        <item quantity="other">%d pobierań w kolejce</item>
+    </plurals>
+    <string name="source_priority">Priorytet źródła</string>
+    <string name="source_priority_help">Zdecyduj, jak mają być sortowane źródła wideo w odtwarzaczu</string>
+    <string name="show_player_metadata_overlay">Pokaż nakładkę metadanych odtwarzacza</string>
+    <string name="video_singular">Wideo</string>
+    <string name="skip_type_preview">Zapowiedź</string>
+    <string name="player_is_live">Na żywo</string>
+</resources>
diff --git a/app/src/main/res/values-bp/strings.xml b/app/src/main/res/values-b+pt+BR/strings.xml
similarity index 76%
rename from app/src/main/res/values-bp/strings.xml
rename to app/src/main/res/values-b+pt+BR/strings.xml
index cd719ef6974..00e3a62298a 100644
--- a/app/src/main/res/values-bp/strings.xml
+++ b/app/src/main/res/values-b+pt+BR/strings.xml
@@ -12,16 +12,15 @@
     <string name="result_poster_img_des">Poster</string>
     <string name="search_poster_img_des">Pôster</string>
     <string name="episode_poster_img_des">Pôster do episódio</string>
-    <string name="home_main_poster_img_des">Pôster Principal</string>
+    <string name="home_main_poster_img_des">Pôster principal</string>
     <string name="home_next_random_img_des">Próximo Aleatório</string>
     <string name="go_back_img_des">Voltar</string>
-    <string name="home_change_provider_img_des">Alterar Provedor</string>
+    <string name="home_change_provider_img_des">Alterar provedor</string>
     <string name="preview_background_img_des">Visualizar plano de fundo</string>
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">Velocidade (%.2fx)</string>
     <string name="rated_format" formatted="true">Avaliado: %.1f</string>
-    <string name="new_update_format" formatted="true">Nova atualização encontrada!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">Nova atualização encontrada! \n%1$s → %2$s</string>
     <string name="filler" formatted="true">Preenchimento</string>
     <string name="duration_format" formatted="true">%d min</string>
     <string name="app_name">CloudStream</string>
@@ -42,8 +41,8 @@
     <string name="type_watching">Assistindo</string>
     <string name="type_on_hold">Em espera</string>
     <string name="type_completed">Concluído</string>
-    <string name="type_dropped">Desistido</string>
-    <string name="type_plan_to_watch">Planejando assistir</string>
+    <string name="type_dropped">Desisti de ver</string>
+    <string name="type_plan_to_watch">Planejo assistir</string>
     <string name="type_re_watching">Reassistindo</string>
     <string name="play_movie_button">Reproduzir filme</string>
     <string name="play_torrent_button">Transmitir Torrent</string>
@@ -54,7 +53,7 @@
     <string name="play_episode">Reproduzir episódio</string>
     <!--<string name="need_storage">Permirtir baixar episódios</string>-->
     <string name="download">Download</string>
-    <string name="downloaded">Transferido</string>
+    <string name="downloaded">Baixado</string>
     <string name="downloading">Baixando</string>
     <string name="download_paused">Download pausado</string>
     <string name="download_started">Download iniciado</string>
@@ -65,20 +64,19 @@
     <string name="error_loading_links_toast">Erro ao carregar links</string>
     <string name="download_storage_text">Armazenamento interno</string>
     <string name="app_dubbed_text">Dub</string>
-    <string name="app_subbed_text">Sub</string>
-    <string name="popup_delete_file">Deletar arquivo</string>
+    <string name="app_subbed_text">Leg</string>
+    <string name="popup_delete_file">Apagar arquivo</string>
     <string name="popup_play_file">Reproduzir arquivo</string>
-    <string name="popup_resume_download">Retomar download</string>
+    <string name="popup_resume_download">Continuar download</string>
     <string name="popup_pause_download">Pausar download</string>
-    <string name="pref_disable_acra">Desative o relatório automático de erros</string>
     <string name="home_more_info">Mais informações</string>
-    <string name="home_expanded_hide">Esconder</string>
+    <string name="home_expanded_hide">Ocultar</string>
     <string name="home_play">Reproduzir</string>
     <string name="home_info">Informações</string>
     <string name="filter_bookmarks">Filtrar marcadores</string>
     <string name="error_bookmarks_text">Marcadores</string>
     <string name="action_remove_from_bookmarks">Remover</string>
-    <string name="action_add_to_bookmarks">Definir como assistido/não assistido</string>
+    <string name="action_add_to_bookmarks">Adicionar a lista</string>
     <string name="sort_apply">Aplicar</string>
     <string name="sort_copy">Copiar</string>
     <string name="sort_close">Fechar</string>
@@ -88,7 +86,7 @@
     <string name="subtitles_settings">Configurações de legendas</string>
     <string name="subs_text_color">Cor do texto</string>
     <string name="subs_outline_color">Cor do contorno</string>
-    <string name="subs_background_color">Cor de fundo</string>
+    <string name="subs_background_color">Cor do fundo</string>
     <string name="subs_window_color">Cor da janela</string>
     <string name="subs_edge_type">Tipo de borda</string>
     <string name="subs_subtitle_elevation">Elevação da legenda</string>
@@ -98,14 +96,14 @@
     <string name="search_provider_text_types">Pesquisar usando tipos</string>
     <string name="benene_count_text">%d Benenes doados aos desenvolvedores</string>
     <string name="benene_count_text_none">Nenhuma Benenes doada</string>
-    <string name="subs_auto_select_language">Seleção automática de idioma</string>
-    <string name="subs_download_languages">Baixar idiomas</string>
-    <string name="subs_subtitle_languages">Idioma da Legenda</string>
+    <string name="subs_auto_select_language">Escolher automaticamente idioma</string>
+    <string name="subs_download_languages">Salvar idiomas ao baixar</string>
+    <string name="subs_subtitle_languages">Idioma da legenda</string>
     <string name="subs_hold_to_reset_to_default">Segure para redefinir para o padrão</string>
     <string name="subs_import_text" formatted="true">Importe fontes colocando-as em %s</string>
     <string name="continue_watching">Continuar assistindo</string>
     <string name="action_remove_watching">Remover</string>
-    <string name="action_open_watching">Mais Info</string>
+    <string name="action_open_watching">Mais detalhes</string>
     <string name="action_open_play">@string/home_play</string>
     <string name="vpn_might_be_needed">Uma VPN pode ser necessária para esse fornecedor funcionar corretamente</string>
     <string name="vpn_torrent">Esse fornecedor é um torrent, uma VPN é recomendada</string>
@@ -115,16 +113,16 @@
     <string name="torrent_no_plot">Descrição não encontrada</string>
     <string name="show_log_cat">Mostrar Logcat 🐈</string>
     <string name="picture_in_picture">Picture-in-picture</string>
-    <string name="picture_in_picture_des">Continua a reprodução em um player miniatura que sobrepõe outros aplicativos</string>
+    <string name="picture_in_picture_des">Continua o vídeo em tamanho miniatura flutuando sobre outros aplicativos</string>
     <string name="player_size_settings">Redimensionar player</string>
     <string name="player_size_settings_des">Remover bordas pretas</string>
-    <string name="player_subtitles_settings">Legendas</string>
-    <string name="player_subtitles_settings_des">Configurações de legendas do Player</string>
-    <string name="chromecast_subtitles_settings">Legendas do Chromecast</string>
-    <string name="chromecast_subtitles_settings_des">Configurações de legendas do Chromecast</string>
-    <string name="eigengraumode_settings">Velocidade de playback</string>
+    <string name="player_subtitles_settings">Modificar legendas</string>
+    <string name="player_subtitles_settings_des">Alterar legendas exibidas no player de vídeo</string>
+    <string name="chromecast_subtitles_settings">Modificar legendas do Chromecast</string>
+    <string name="chromecast_subtitles_settings_des">Alterar legendas exibidas no Chromecast</string>
+    <string name="eigengraumode_settings">Velocidade do vídeo</string>
     <string name="swipe_to_seek_settings">Deslize para avançar o vídeo</string>
-    <string name="swipe_to_seek_settings_des">Deslize de lado à lado para controlar a posição no vídeo</string>
+    <string name="swipe_to_seek_settings_des">Deslizar dedo para os lados para voltar ou avançar o vídeo</string>
     <string name="swipe_to_change_settings">Deslize para mudar as configurações</string>
     <string name="swipe_to_change_settings_des">Deslize para cima ou para baixo, para ajustar brilho ou volume</string>
     <string name="double_tap_to_seek_settings">Toque duplo para avançar o vídeo</string>
@@ -143,54 +141,47 @@
     <string name="backup_success">Dados salvos</string>
     <string name="backup_failed">Permissões de armazenamento faltando. Por favor tente novamente.</string>
     <string name="backup_failed_error_format">Erro no backup de %s</string>
-    <string name="search">Procurar</string>
+    <string name="search">Pesquisar</string>
     <string name="category_account">Contas e Segurança</string>
     <string name="category_updates">Atualizações e Backup</string>
     <string name="settings_info">Info</string>
-    <string name="advanced_search">Procura Avançada</string>
+    <string name="advanced_search">Pesquisa avançada</string>
     <string name="advanced_search_des">Mostrar resultados separados por fornecedor</string>
-    <string name="bug_report_settings_off">Só enviar dados sobre travamentos</string>
-    <string name="bug_report_settings_on">Não enviar nenhum dado</string>
-    <string name="show_fillers_settings">Mostrar episódios de Filler em anime</string>
+    <string name="show_fillers_settings">Mostrar episódios extras de animes</string>
     <string name="show_trailers_settings">Mostrar trailers</string>
     <string name="kitsu_settings">Mostrar posters do Kitsu</string>
     <string name="pref_filter_search_quality">Esconder qualidades de vídeo selecionadas nos resultados da pesquisa</string>
-    <string name="automatic_plugin_updates">Atualizações de plugin automáticas</string>
+    <string name="automatic_plugin_updates">Atualização automática de plugins</string>
     <string name="updates_settings">Mostrar atualizações do app</string>
     <string name="updates_settings_des">Automaticamente procurar por novas atualizações ao abrir.</string>
-    <string name="uprereleases_settings">Atualizar para pré-lançamento</string>
-    <string name="uprereleases_settings_des">Procura atualizações do pré-lançamento ao invés de apenas do lançamento oficial</string>
-    <string name="github">Github</string>
-    <string name="lightnovel">App de Light novel pelos mesmos desenvolvedores</string>
-    <string name="anim">App de Anime pelos mesmos desenvolvedores</string>
-    <string name="discord">Junte-se ao Discord</string>
-    <string name="benene">Dar um benene para os desenvolvedores</string>
+    <string name="github">GitHub</string>
+    <string name="lightnovel">App de Light novel criado pelos mesmos desenvolvedores</string>
+    <string name="anim">App de Anime criado pelos mesmos desenvolvedores</string>
+    <string name="discord">Entre no servidor do Discord</string>
+    <string name="benene">Dar um benene aos desenvolvedores</string>
     <string name="benene_des">Benene dada</string>
     <string name="app_language">Idioma do aplicativo</string>
     <string name="no_chromecast_support_toast">Esse fornecedor não possui suporte para Chromecast</string>
     <string name="no_links_found_toast">Nenhum link encontrado</string>
     <string name="copy_link_toast">Link copiado para área de transferência</string>
-    <string name="play_episode_toast">Assistir Episódio</string>
+    <string name="play_episode_toast">Assistir episódio</string>
     <string name="subs_default_reset_toast">Restaurar para o padrão</string>
-    <string name="acra_report_toast">Desculpe, a aplicação travou. Um relatório de erro anônimo será enviado para os desenvolvedores</string>
     <string name="season">Temporada</string>
-    <string name="no_season">Nenhuma Temporada</string>
+    <string name="no_season">Nenhuma temporada</string>
     <string name="episode">Episódio</string>
     <string name="episodes">Episódios</string>
-    <string name="season_short">S</string>
+    <string name="season_short">T</string>
     <string name="episode_short">E</string>
-    <string name="no_episodes_found">Nenhum Episódio encontrado</string>
-    <string name="delete_file">Apagar Arquivo</string>
-    <string name="delete">Deletar</string>
+    <string name="no_episodes_found">Nenhum episódio encontrado</string>
+    <string name="delete_file">Apagar arquivo</string>
+    <string name="delete">Apagar</string>
     <string name="cancel">Cancelar</string>
     <string name="pause">Pausar</string>
-    <string name="resume">Retomar</string>
+    <string name="resume">Continuar</string>
     <string name="go_back_30">-30</string>
     <string name="go_forward_30">+30</string>
-    <string name="delete_message" formatted="true">Isso apagará %s permanentemente
-\nVocê tem certeza?</string>
-    <string name="resume_time_left" formatted="true">%dm
-\nsobrando</string>
+    <string name="delete_message" formatted="true">Isso apagará %s permanentemente \nVocê tem certeza?</string>
+    <string name="resume_time_left" formatted="true">%dm\nrestantes</string>
     <string name="status_ongoing">Em andamento</string>
     <string name="status_completed">Concluído</string>
     <string name="status">Estado</string>
@@ -200,15 +191,15 @@
     <string name="site">Site</string>
     <string name="synopsis">Sinopse</string>
     <string name="queued">Na fila</string>
-    <string name="no_subtitles">Sem Legendas</string>
+    <string name="no_subtitles">Sem legendas</string>
     <string name="action_default">Padrão</string>
     <string name="free_storage">Livre</string>
     <string name="used_storage">Usado</string>
-    <string name="app_storage">App</string>
+    <string name="app_storage">CloudStream</string>
     <!--plural-->
     <string name="movies">Filmes</string>
     <string name="tv_series">Séries</string>
-    <string name="cartoons">Desenhos Animados</string>
+    <string name="cartoons">Desenhos animados</string>
     <string name="anime">Anime</string>
     <string name="torrent">Torrents</string>
     <string name="documentaries">Documentários</string>
@@ -226,55 +217,54 @@
     <string name="documentaries_singular">Documentário</string>
     <string name="asian_drama_singular">Drama Asiático</string>
     <string name="live_singular">Transmissão ao vivo</string>
-    <string name="source_error">Erro de fornecimento</string>
-    <string name="remote_error">Erro remoto</string>
+    <string name="source_error">Erro ao abrir arquivo</string>
+    <string name="remote_error">Erro no servidor</string>
     <string name="render_error">Erro de renderização</string>
-    <string name="unexpected_error">Erro de player inesperado</string>
+    <string name="unexpected_error">Erro inesperado no player</string>
     <string name="storage_error">Erro ao baixar, verifique as permissões de armazenamento</string>
     <string name="episode_action_chromecast_episode">Episódio pelo Chromecast</string>
     <string name="episode_action_chromecast_mirror">Alternativa pelo Chromecast</string>
     <string name="episode_action_play_in_app">Assistir no App</string>
     <string name="episode_action_play_in_format">Assistir no %s</string>
-    <string name="episode_action_auto_download">Auto download</string>
-    <string name="episode_action_download_mirror">Baixar por servidor alternativo</string>
+    <string name="episode_action_auto_download">Baixar primeiro disponível</string>
+    <string name="episode_action_download_mirror">Escolher onde baixar</string>
     <string name="episode_action_reload_links">Recarregar links</string>
     <string name="episode_action_download_subtitle">Baixar legendas</string>
-    <string name="show_hd">Etiqueta de qualidade</string>
-    <string name="show_dub">Etiqueta Dub</string>
-    <string name="show_sub">Etiqueta Sub</string>
+    <string name="show_hd">Indicação de qualidade do vídeo</string>
+    <string name="show_dub">Indicação Dub</string>
+    <string name="show_sub">Indicação Sub</string>
     <string name="show_title">Título</string>
-    <string name="poster_ui_settings">Alternar elementos da interface no pôster</string>
-    <string name="no_update_found">Nenhuma Atualização encontrada</string>
-    <string name="check_for_update">Procurar nova Atualização</string>
-    <string name="video_lock">Bloquear</string>
-    <string name="video_aspect_ratio_resize">Mudar Tamanho</string>
+    <string name="poster_ui_settings">Escolher o que mostrar sobre o pôster</string>
+    <string name="no_update_found">Nenhuma atualização encontrada</string>
+    <string name="check_for_update">Procurar atualização</string>
+    <string name="video_lock">Bloquear toques</string>
+    <string name="video_aspect_ratio_resize">Redimensionar</string>
     <string name="video_source">Fonte</string>
-    <string name="video_skip_op">Pular Abertura</string>
+    <string name="video_skip_op">Pular abertura</string>
     <string name="dont_show_again">Não mostrar de novo</string>
-    <string name="skip_update">Pular essa Atualização</string>
+    <string name="skip_update">Pular esta atualização</string>
     <string name="update">Atualizar</string>
     <string name="watch_quality_pref">Qualidade preferida de reprodução (Wi-fi)</string>
     <string name="limit_title">Máximo de caracteres do título de vídeos</string>
-    <string name="limit_title_rez">Resolução do player de vídeo</string>
+    <string name="limit_title_rez">Exibir informação do reprodutor</string>
     <string name="video_buffer_size_settings">Tamanho do buffer do vídeo</string>
-    <string name="video_buffer_length_settings">Comprimento do buffer do vídeo</string>
+    <string name="video_buffer_length_settings">Duração do buffer do vídeo</string>
     <string name="video_buffer_disk_settings">Cache do vídeo em disco</string>
     <string name="video_buffer_clear_settings">Limpar cache de vídeo e imagem</string>
     <string name="video_ram_description">Causará travamentos se o valor escolhido for muito alto em dispositivos com pouca memória RAM, como um Android TV.</string>
     <string name="video_disk_description">Causa problemas em sistemas com pouco espaço de armazenamento se definido muito alto, como em dispositivos Android TV.</string>
-    <string name="dns_pref">DNS sobre HTTPS</string>
+    <string name="dns_pref">DNS através de HTTPS</string>
     <string name="dns_pref_summary">Útil para burlar bloqueios de provedores de internet</string>
-    <string name="add_site_pref">Clonar site</string>
+    <string name="add_site_pref">Adicionar site alternativo</string>
     <string name="remove_site_pref">Remover site</string>
     <string name="add_site_summary">Adiciona um clone de um site existente, com uma URL diferente</string>
-    <string name="download_path_pref">Caminho para Download</string>
+    <string name="download_path_pref">Onde salvar Downloads</string>
     <string name="nginx_url_pref">URL do servidor NGINX</string>
     <string name="display_subbed_dubbed_settings">Mostrar Anime Dublado/Legendado</string>
     <string name="resize_fit">Ajustar para a Tela</string>
     <string name="resize_fill">Esticar</string>
     <string name="resize_zoom">Zoom</string>
     <string name="legal_notice">Aviso Legal</string>
-    <string name="legal_notice_text" translatable="false">Any legal issues regarding the content on this application should be taken up with the actual file hosts and providers themselves as we are not affiliated with them. In case of copyright infringement, please directly contact the responsible parties or the streaming websites. The app is purely for educational and personal use. CloudStream 3 does not host any content on the app, and has no control over what media is put up or taken down. CloudStream 3 functions like any other search engine, such as Google. CloudStream 3 does not host, upload or manage any videos, films or content. It simply crawls, aggregates and displayes links in a convenient, user-friendly interface. It merely scrapes 3rd-party websites that are publicly accessable via any regular web browser. It is the responsibility of user to avoid any actions that might violate the laws governing his/her locality. Use CloudStream 3 at your own risk.</string>
     <string name="category_general">Geral</string>
     <string name="random_button_settings">Botão Aleatório</string>
     <string name="random_button_settings_desc">Mostrar botão aleatório na página inicial e na biblioteca</string>
@@ -299,14 +289,6 @@
     <string name="example_site_name">NovoNomedoSite</string>
     <string name="example_site_url">https://example.com</string>
     <string name="example_lang_name">Codigo da Língua (bp)</string>
-    <!--
-    <string name="mal_account_settings" translatable="false">MAL</string>
-    <string name="anilist_account_settings" translatable="false">AniList</string>
-    <string name="tmdb_account_settings" translatable="false">TMDB</string>
-    <string name="imdb_account_settings" translatable="false">IMDB</string>
-    <string name="kitsu_account_settings" translatable="false">Kitsu</string>
-    <string name="trakt_account_settings" translatable="false">Trakt</string>
-    -->
     <string name="login_format" formatted="true">%1$s %2$s</string>
     <string name="account">Conta</string>
     <string name="logout">Sair</string>
@@ -392,7 +374,6 @@
     <string name="previous">Anterior</string>
     <string name="skip_setup">Saltar setup</string>
     <string name="app_layout_subtext">Change the look of the app to suit your device</string>
-    <string name="crash_reporting_title">Crash reporting</string>
     <string name="preferred_media_subtext">What do you want to see</string>
     <string name="setup_done">Feito</string>
     <string name="extensions">Extensões</string>
@@ -414,13 +395,11 @@
     <string name="plugins_downloaded" formatted="true">Transferido: %d</string>
     <string name="plugins_disabled" formatted="true">Desativado: %d</string>
     <string name="plugins_not_downloaded" formatted="true">Não transferido: %d</string>
-    <string name="blank_repo_message">CloudStream não tem fontes instaladas por padrão. Você precisa instalar um site de repositórios.
-\n
-\nEntre no nosso Discord ou pesquise online.</string>
+    <string name="blank_repo_message">CloudStream não tem fontes instaladas por padrão. Você precisa instalar um site de repositórios. \n \nEntre no nosso Discord ou pesquise online.</string>
     <string name="view_public_repositories_button">Ver repositórios da comunidade</string>
     <string name="view_public_repositories_button_short">Lista pública</string>
     <string name="uppercase_all_subtitles">Todas as legendas em maiúsculas</string>
-    <string name="download_all_plugins_from_repo">Atenção: CloudStream 3 não assume nenhuma responsabilidade pelo uso de extensões de terceiros e não fornece nenhum suporte para elas!</string>
+    <string name="download_all_plugins_from_repo">Aviso: CloudStream não assume nenhuma responsabilidade pelo uso de extensões de terceiros e não fornece nenhum suporte para elas!</string>
     <string name="single_plugin_disabled" formatted="true">%s (Desativado)</string>
     <string name="autoplay_next_settings">Reproduzir automaticamente próximo episódio</string>
     <string name="autoplay_next_settings_des">Começa o próximo episódio quando o atual termina</string>
@@ -444,7 +423,7 @@
     <string name="test_log">Log do Teste</string>
     <string name="automatic_plugin_download">Baixar plugins automaticamente</string>
     <string name="automatic_plugin_download_mode_title">Selecione o modo para filtrar os plugins baixados</string>
-    <string name="test_failed">Teste falhou</string>
+    <string name="test_failed">Reprovou nos testes</string>
     <string name="android_tv_interface_on_seek_settings_summary">A Barra de Progresso pode ser usada quando o player estiver visível</string>
     <string name="sort">Organizar</string>
     <string name="yes">Sim</string>
@@ -458,9 +437,8 @@
     <string name="sort_alphabetical_a">Alfabética(A =&gt; Z)</string>
     <string name="open_with">Abrir com</string>
     <string name="select_library">Selecionar Biblioteca</string>
-    <string name="test_passed">Passou</string>
-    <string name="empty_library_no_accounts_message">Sua biblioteca está vazia :0
-\nEntre numa conta de biblioteca ou adicione Midias para sua biblioteca local.</string>
+    <string name="test_passed">Passou nos testes</string>
+    <string name="empty_library_no_accounts_message">Sua biblioteca está vazia :0 \nEntre numa conta de biblioteca ou adicione Midias para sua biblioteca local.</string>
     <string name="watch_quality_pref_data">Qualidade preferida de reprodução (Dados Móveis)</string>
     <string name="apk_installer_legacy">Legado</string>
     <string name="library">Biblioteca</string>
@@ -470,7 +448,7 @@
     <string name="update_started">Atualização iniciada</string>
     <string name="nsfw_singular">Conteúdo +18</string>
     <string name="help">Ajuda</string>
-    <string name="redo_setup_process">Processo de configuração de Redo</string>
+    <string name="redo_setup_process">Refazer configurações iniciais</string>
     <string name="update_notification_failed">Não foi possível instalar a nova versão do aplicativo</string>
     <string name="apk_installer_package_installer">instalador de pacotes</string>
     <string name="sort_by">Organizar por</string>
@@ -478,20 +456,13 @@
     <string name="sort_alphabetical_z">Alfabética(Z =&gt; A)</string>
     <string name="qualities">Qualidade</string>
     <string name="profile_background_des">Perfil de plano de fundo</string>
-    <string name="quality_profile_help">Aqui você pode alterar como as fontes são ordenadas. Se um vídeo tiver uma prioridade mais alta, aparecerá mais alto na seleção da fonte. A soma da prioridade da fonte e da prioridade da qualidade é a prioridade do vídeo.
-\n
-\nFonte A: 3
-\nQualidade B: 7
-\nTerá uma prioridade de vídeo combinada de 10.
-\n
-\nNOTA: Se a soma for 10 ou mais, o Player pulará automaticamente o carregamento quando o link for carregado!</string>
-    <string name="safe_mode_file">Arquivo de modo de segurança encontrado!
-\nNão carregar nenhuma extensão na inicialização até que o arquivo seja removido.</string>
+    <string name="quality_profile_help">Aqui você pode alterar como as fontes são ordenadas. Se um vídeo tiver uma prioridade mais alta, aparecerá mais alto na seleção da fonte. A soma da prioridade da fonte e da prioridade da qualidade é a prioridade do vídeo. \n \nFonte A: 3 \nQualidade B: 7 \nTerá uma prioridade de vídeo combinada de 10. \n \nNOTA: Se a soma for 10 ou mais, o Player pulará automaticamente o carregamento quando o link for carregado!</string>
+    <string name="safe_mode_file">Arquivo de modo de segurança encontrado! \nNão carregar nenhuma extensão na inicialização até que o arquivo seja removido.</string>
     <string name="subscription_new">Inscrito em %s</string>
     <string name="subscription_episode_released">Episódio %d lançado!</string>
     <string name="set_default">Selecionar padrão</string>
     <string name="subscription_deleted">Inscrição cancelada de %s</string>
-    <string name="apk_installer_settings_des">Alguns aparelhos não possuem suporte para este pacote de instalação. Tente a opção legada se a atualização não instalar.</string>
+    <string name="apk_installer_settings_des">Alguns dispositivos não são compatíveis com o novo instalador de pacotes. Se as atualizações não forem instaladas, tente a opção legada.</string>
     <string name="mobile_data">Dados móveis</string>
     <string name="profile_number">Perfil %d</string>
     <string name="subscription_in_progress_notification">Atualizando shows inscritos</string>
@@ -528,12 +499,12 @@
     <string name="extension_version">Versão</string>
     <string name="extension_authors">Autores</string>
     <string name="extension_install_first">Instale a extensão primeiro</string>
-    <string name="skip_type_creddits">Créditos</string>
+    <string name="skip_type_credits">Créditos</string>
     <string name="history">Historico</string>
     <string name="clear_history">Limpar historico</string>
     <string name="clipboard_too_large">Tem Muito texto. Não é possível salvar no clipboard.</string>
     <string name="player_pref">Player de vídeo preferido</string>
-    <string name="start">Começar</string>
+    <string name="start">Iniciar</string>
     <string name="extension_types">Suportado</string>
     <string name="extension_status">Status</string>
     <string name="skip_type_mixed_op">Abrindo mistura</string>
@@ -546,7 +517,7 @@
     <string name="is_adult">18+</string>
     <string name="pref_category_links">Links</string>
     <string name="pref_category_player_features">Funcionalidades do Player</string>
-    <string name="apk_installer_settings">Instalador APK</string>
+    <string name="apk_installer_settings">Instalador de APK</string>
     <string name="pref_category_looks">Aparência</string>
     <string name="disable">Desativar</string>
     <string name="use">Usar</string>
@@ -571,11 +542,7 @@
     <string name="duplicate_title">Duplicata em potencial encontrada</string>
     <string name="duplicate_add">Adicionar</string>
     <string name="duplicate_replace">Substituir</string>
-    <string name="duplicate_message_multiple" formatted="true">Possíveis itens duplicados foram encontrados em sua biblioteca:
-\n
-\n %s
-\n
-\nGostaria de adicionar este item mesmo assim, substituir os existentes ou cancelar a ação?</string>
+    <string name="duplicate_message_multiple" formatted="true">Possíveis itens duplicados foram encontrados em sua biblioteca: \n \n %s \n \nGostaria de adicionar este item mesmo assim, substituir os existentes ou cancelar a ação?</string>
     <string name="enter_pin">Insira o PIN</string>
     <string name="enter_pin_with_name" formatted="true">Insira o PIN para %s</string>
     <string name="enter_current_pin">Insira o PIN atual</string>
@@ -594,9 +561,7 @@
     <string name="links_reloaded_toast">Links recarregados</string>
     <string name="backup_frequency">Frequência de backup</string>
     <string name="duplicate_replace_all">Substitua tudo</string>
-    <string name="duplicate_message_single" formatted="true">Parece que já existe um item potencialmente duplicado na sua biblioteca: \'%s.\'
-\n
-\nGostaria de adicionar este item mesmo assim, substituir o existente ou cancelar a ação?</string>
+    <string name="duplicate_message_single" formatted="true">Parece que já existe um item potencialmente duplicado na sua biblioteca: \'%s.\' \n \nGostaria de adicionar este item mesmo assim, substituir o existente ou cancelar a ação?</string>
     <string name="action_subscribe">Inscrever-se</string>
     <string name="action_unsubscribe">Cancelar inscrição</string>
     <string name="use_default_account">Usar conta padrão</string>
@@ -607,7 +572,7 @@
     <string name="subscribe_tooltip">Notificação de novo episódio</string>
     <string name="result_search_tooltip">Pesquisar em outras extensões</string>
     <string name="recommendations_tooltip">Mostrar recomendações</string>
-    <string name="speed_setting_summary">Adiciona uma opção de velocidade no reprodutor</string>
+    <string name="speed_setting_summary">Mostrar botão de velocidade do vídeo</string>
     <string name="test_extensions">Testar todas as extensões</string>
     <string name="test_extensions_summary">Esse teste é feito somente para desenvolvedores e não verifica ou nega o funcionamento de qualquer extensão.</string>
     <string name="biometric_authentication_title">Desbloquear CloudStream</string>
@@ -617,8 +582,7 @@
     <string name="biometric_unsupported">A autenticação biométrica não é compatível com este dispositivo</string>
     <string name="biometric_setting_summary">Desbloquear o aplicativo com impressão digital, ID facial, PIN, padrão e senha.</string>
     <string name="biometric_prompt_description">Após algumas tentativas fracassadas, o prompt será fechado. Basta reiniciar o aplicativo para tentar novamente.</string>
-    <string name="resume_remaining" formatted="true">%s
-\nrestante(s)</string>
+    <string name="resume_remaining" formatted="true">%s \nrestante(s)</string>
     <string name="favorite">Favorito</string>
     <string name="unfavorite">Não favorito</string>
     <string name="toast_copied">copiado!</string>
@@ -630,12 +594,12 @@
     <string name="battery_dialog_title">Desativar otimização de bateria</string>
     <string name="app_unrestricted_toast">O uso da bateria do app já está definido como irrestrito</string>
     <string name="app_info_intent_error">Não foi possível abrir as informações do aplicativo CloudStream.</string>
-    <string name="music_singlar">Música</string>
+    <string name="music_singular">Música</string>
     <string name="audio_book_singular">Áudio-livro</string>
-    <string name="custom_media_singluar">Mídia</string>
+    <string name="custom_media_singular">Mídia</string>
     <string name="reset_btn">Redefinir</string>
-    <string name="episode_upcoming_format" formatted="true">Próximos em %s</string>
-    <string name="next_season_episode_format" formatted="true">Temporada %1$d Episódio %2$d será lançado em</string>
+    <string name="episode_upcoming_format" formatted="true">Próximo em %s</string>
+    <string name="next_season_episode_format" formatted="true">%2$dº episódio da %1$dª temporada estreia em</string>
     <string name="player_settings_select_cast_device">Selecione o dispositivo de transmissão</string>
     <string name="episode_action_cast_mirror">Espelhar transmissão</string>
     <string name="cs3wiki">CloudStream Wiki</string>
@@ -649,32 +613,23 @@
     <string name="device_pin_error_message">Não é possível obter o código PIN do dispositivo, tente a autenticação local</string>
     <string name="device_pin_expired_message">O código PIN expirou!</string>
     <string name="device_pin_counter_text">O código expira em %1$dm %2$ds</string>
-    <string name="hide_player_control_names_key" translatable="false">hide_player_control_names_key</string>
     <string name="play_from_beginning_img_des">Reproduzir do começo</string>
-    <string name="test_warning">Atenção</string>
+    <string name="test_warning">Reprovou alguns testes</string>
     <string name="delete_plugin">Excluir plugin</string>
-    <string name="downloads_empty">Não há downloads no momento.</string>
+    <string name="downloads_empty">Você não baixou nada :/</string>
     <string name="hide_player_control_names">Ocultar os nomes dos controles do player</string>
-    <string name="open_local_video">Abrir vídeo local</string>
+    <string name="open_local_video">Abrir arquivo de vídeo</string>
     <string name="sort_release_date_new">Data de lançamento (do novo ao antigo)</string>
     <string name="sort_release_date_old">Data de lançamento (do antigo para o novo)</string>
     <string name="downloads_delete_select">Selecionar itens para excluir</string>
-    <string name="delete_files">Excluir arquivos</string>
+    <string name="delete_files">Apagar arquivos</string>
     <string name="offline_file">Disponível para assistir offline</string>
     <string name="select_all">Selecionar todos</string>
-    <string name="delete_message_multiple" formatted="true">Tem certeza de que deseja excluir permanentemente os seguintes itens?
-\n
-\n%s</string>
-    <string name="delete_message_series_episodes" formatted="true">Tem certeza de que deseja excluir permanentemente os seguintes episódios em %1$s?
-\n
-\n%2$s</string>
-    <string name="delete_message_series_section" formatted="true">Você também excluirá permanentemente todos os episódios da seguinte série:
-\n
-\n%s</string>
-    <string name="delete_message_series_only" formatted="true">Tem certeza de que deseja excluir permanentemente todos os episódios da seguinte série?
-\n
-\n%s</string>
-    <string name="delete_format" formatted="true">Excluir (%1$d | %2$s)</string>
+    <string name="delete_message_multiple" formatted="true">Tem certeza que deseja apagar permanentemente os seguintes itens?\n\n%s</string>
+    <string name="delete_message_series_episodes" formatted="true">Tem certeza que deseja apagar permanentemente os seguintes episódios em %1$s?\n\n%2$s</string>
+    <string name="delete_message_series_section" formatted="true">Você também apagará permanentemente todos os episódios da seguinte série:\n\n%s</string>
+    <string name="delete_message_series_only" formatted="true">Tem certeza que deseja apagar permanentemente todos os episódios da seguinte série?\n\n%s</string>
+    <string name="delete_format" formatted="true">Apagar %1$d (%2$s)</string>
     <string name="deselect_all">Desmarcar todos</string>
     <string name="preview_seekbar_desc">Ativar visualização de miniatura na barra de busca</string>
     <string name="preview_seekbar">Visualização da barra de busca</string>
@@ -686,14 +641,14 @@
     <string name="backup_path_title">Local da pasta de backup</string>
     <string name="custom">Personalizado</string>
     <string name="subs_edge_size">Tamanho da borda</string>
-    <string name="torrent_info">Este vídeo é um Torrent, o que significa que sua atividade de vídeo pode ser rastreada.\nCertifique-se de que você entendeu o que é Torrenting antes de continuar.</string>
+    <string name="torrent_info">Este vídeo é um Torrent, isso significa que sua atividade de vídeo pode ser rastreada.\nTenha certeza de entender o que é Torrent antes de continuar.</string>
     <string name="encoding_error">Erro de codificação</string>
-    <string name="unsupported_error">Erro não suportado</string>
+    <string name="unsupported_error">Erro, formato não suportado</string>
     <string name="player_load_one_subtitle_online">Carregar primeiro disponível</string>
-    <string name="audio_singluar">Áudio</string>
-    <string name="podcast_singluar">Podcast</string>
+    <string name="audio_singular">Áudio</string>
+    <string name="podcast_singular">Podcast</string>
     <string name="software_decoding">Decodificação de software</string>
-    <string name="software_decoding_desc">A decodificação de software permite que o player reproduza arquivos de vídeo não compatíveis com o telefone, mas pode causar lentidão ou instabilidade na reprodução em alta resolução</string>
+    <string name="software_decoding_desc">A decodificação por software permite que o reprodutor reproduza arquivos de vídeo não suportados pelo seu dispositivo, mas pode causar lentidão ou instabilidade na reprodução em alta resolução.</string>
     <string name="torrent_preferred_media">Habilitar torrent em Configurações/Provedores/Mídia preferida</string>
     <string name="torrent_not_accepted">Reinicie o aplicativo e aceite o pop-up do Stream Torrent para continuar.</string>
     <string name="sort_episodes_number_asc">Episódio (Ascendente)</string>
@@ -712,7 +667,7 @@
     <string name="update_plugins_manually">Atualizar plugins manualmente</string>
     <string name="player_notification_channel_name">Notificações de reprodução</string>
     <string name="player_notification_channel_description">Notificação do player para controlar a reprodução em segundo plano</string>
-    <string name="speech_recognition_unavailable">O reconhecimento de fala não está disponível</string>
+    <string name="speech_recognition_unavailable">Reconhecimento de fala indisponível</string>
     <string name="begin_speaking">Comece a falar…</string>
     <string name="subtitles_from_embedded">Incorporada</string>
     <string name="subtitles_from_online">Online</string>
@@ -721,4 +676,80 @@
     <string name="all_subtitles_italic">Tornar todas as legendas em itálico</string>
     <string name="volume_exceeded_100">O volume ultrapassou 100%</string>
     <string name="slide_up_again_to_exceed_100">Deslize para cima novamente para ir além de 100%</string>
-</resources>
\ No newline at end of file
+    <string name="download_time_left_hour_min_sec_format" formatted="true">%1$dh %2$dm %3$ds</string>
+    <string name="download_time_left_min_sec_format" formatted="true">%1$dm %2$ds</string>
+    <string name="download_time_left_sec_format" formatted="true">%1$d s</string>
+    <string name="show_rating">Indicação da classificação</string>
+    <string name="player_settings_always_ask">Perguntar sempre</string>
+    <string name="download_parallel_settings_des">Quantos itens diferentes podem ser baixados em paralelo</string>
+    <string name="parallel_downloads">Downloads em paralelo</string>
+    <string name="concurrent_connections">Conexões simultâneas</string>
+    <string name="concurrent_connections_settings_des">Quantas conexões simultâneas cada download pode usar durante o processo de download</string>
+    <string name="go_to_downloads">Ir para Downloads</string>
+    <string name="no_internet_connection">Sem conexão com a internet.\n\nConecte-se à internet e tente novamente, ou acompanhe seus downloads enquanto estiver offline.</string>
+    <string name="overscan_settings_des">Altera os limites da tela</string>
+    <string name="overscan_settings">Varredura excessiva</string>
+    <string name="poster_size_settings_des">Altera o tamanho dos pôsteres</string>
+    <string name="poster_size_settings">Tamanhos dos pôsteres</string>
+    <string name="speedup_title">Alternar Velocidade do Pressionamento Longo</string>
+    <string name="speedup_summary">Segure para duplicar a velocidade</string>
+    <string name="no_account">Sem conta</string>
+    <string name="episode_action_play_mirror">Espelhar vídeo</string>"
+    <string name="edit_profile_image_title">Editar Foto de Perfil</string>
+    <string name="edit_profile_image_hint">Inserir URL de Foto de Perfil</string>
+    <string name="edit_profile_image_error_empty">Nenhum URL Encontrado</string>
+    <string name="edit_profile_image_error_invalid">URL ou Imagem inválidos</string>
+    <string name="edit_profile_image_success">Imagem Atualizada com Sucesso</string>
+    <string name="action_mark_watched_up_to_this_episode">Marcar como assistido até este episódio</string>
+    <string name="action_remove_mark_watched_up_to_this_episode">Remover \"assistido até este episódio\"</string>
+    <string name="action_reload">Recarregado</string>
+    <string name="reload_provider">Recarregar Fonte</string>
+    <string name="name">Nome</string>
+    <string name="subs_subtitle_alignment">Posição das Legendas</string>
+    <string name="bottom_left">Inferior esquerdo</string>
+    <string name="bottom_center">Inferior centralizado</string>
+    <string name="bottom_right">Inferior direito</string>
+    <string name="middle_left">Centro esquerdo</string>
+    <string name="middle_center">Centralizado</string>
+    <string name="middle_right">Centro direito</string>
+    <string name="top_left">Superior esquerdo</string>
+    <string name="top_center">Superior centralizado</string>
+    <string name="top_right">Superior direito</string>
+    <string name="play_full_series_button">Assistir à série completa</string>
+    <string name="resolution_and_name">Resolução e nome</string>
+    <string name="prerelease_install_failed">Falha ao instalar a versão antecipada.</string>
+    <string name="prerelease_already_installed">Versão antecipada instalada.</string>
+    <string name="install_prerelease">Instalar versão antecipada</string>
+    <string name="show_episode_text">Episódio Text</string>
+    <string name="download_queue">Fila de download</string>
+    <string name="queue_empty_message">Não há itens na fila para download.</string>
+    <string name="extra_brightness_settings">Brilho extra</string>
+    <string name="extra_brightness_settings_des">Ativar filtro de claridade ao exceder 100% do brilho do display</string>
+    <string name="extra_brightness_key">brilho_extra_ativado</string>
+    <string name="search_suggestions">Sugestões de Busca</string>
+    <string name="search_suggestions_des">Exibir sugestões de pesquisa durante a digitação</string>
+    <string name="clear_suggestions">Limpar Sugestões</string>
+    <string name="show_cast_in_details">Exibir painel de elenco</string>
+    <string name="video_info">Informação de mídia</string>
+    <string name="source_priority">Prioridade de fonte</string>
+    <string name="source_priority_help">Decidir como fontes de vídeo devem estar dispostas no reprodutor</string>
+    <string name="source_name">Nome da fonte</string>
+    <string name="download_all">Baixar tudo</string>
+    <string name="cancel_all">Cancelar tudo</string>
+    <string name="download_episode_range">Você deseja baixar o episódio%s</string>
+    <string name="cancel_queue_message">Você gostaria de cancelar todos os downloads da fila?</string>
+    <plurals name="downloads_active">
+        <item quantity="one">%ddownload ativo</item>
+        <item quantity="many">%ddownloads ativos</item>
+        <item quantity="other">%ddownloads ativos</item>
+    </plurals>
+    <plurals name="downloads_queued">
+        <item quantity="one">%d download na sequência</item>
+        <item quantity="many">%d downloads na sequência</item>
+        <item quantity="other">%d downloads na sequência</item>
+    </plurals>
+    <string name="show_player_metadata_overlay">Exibir sobreposição de metadados do player</string>
+    <string name="video_singular">Vídeo</string>
+    <string name="skip_type_preview">Visualização</string>
+    <string name="player_is_live">Ao vivo</string>
+</resources>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-b+pt/strings.xml
similarity index 86%
rename from app/src/main/res/values-pt/strings.xml
rename to app/src/main/res/values-b+pt/strings.xml
index 2a0473b9d71..6dad2701185 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-b+pt/strings.xml
@@ -18,8 +18,7 @@
     <string name="preview_background_img_des">Visualizar plano de fundo</string>
     <string name="player_speed_text_format" formatted="true">Velocidade (%.2fx)</string>
     <string name="rated_format" formatted="true">Classificado: %.1f</string>
-    <string name="new_update_format" formatted="true">Nova atualização encontrada!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">Nova atualização encontrada! \n%1$s -&gt; %2$s</string>
     <string name="filler" formatted="true">Preenchimento</string>
     <string name="app_name">CloudStream</string>
     <string name="play_with_app_name">Assistir com o CloudStream</string>
@@ -68,7 +67,6 @@
     <string name="popup_play_file">Reproduzir Ficheiro</string>
     <string name="popup_resume_download">Retomar Transferência</string>
     <string name="popup_pause_download">Pausar Transferência</string>
-    <string name="pref_disable_acra">Desativar relatório automático de erros</string>
     <string name="home_more_info">Mais info</string>
     <string name="home_expanded_hide">Esconder</string>
     <string name="home_play">Reproduzir</string>
@@ -147,8 +145,6 @@
     <string name="settings_info">Info</string>
     <string name="advanced_search">Procura Avançada</string>
     <string name="advanced_search_des">Mostra resultados separados por fornecedor</string>
-    <string name="bug_report_settings_off">Só envia dados sobre falhas</string>
-    <string name="bug_report_settings_on">Não envia nenhum dado</string>
     <string name="show_fillers_settings">Mostrar episódios de enchimento para anime</string>
     <string name="show_trailers_settings">Mostrar trailers</string>
     <string name="kitsu_settings">Mostrar posters do kitsu</string>
@@ -156,8 +152,6 @@
     <string name="automatic_plugin_updates">Atualizações de plugin automáticas</string>
     <string name="updates_settings">Mostrar atualizações da app</string>
     <string name="updates_settings_des">Procurar automaticamente por novas atualizações depois de iniciar o app.</string>
-    <string name="uprereleases_settings">Atualizar para pré-lançamentos</string>
-    <string name="uprereleases_settings_des">Procura atualizações de pré-lançamento em vez de só lançamentos oficiais</string>
     <string name="github">Github</string>
     <string name="lightnovel">App light novel pelos mesmos devs</string>
     <string name="discord">Junte-se ao Discord</string>
@@ -169,7 +163,6 @@
     <string name="copy_link_toast">Link copiado para a área de transferência</string>
     <string name="play_episode_toast">Reproduzir episódio</string>
     <string name="subs_default_reset_toast">Restaurar para o padrão</string>
-    <string name="acra_report_toast">Desculpe, a aplicação falhou. Um relatório de erro anónimo será enviado para os desenvolvedores</string>
     <string name="season">Temporada</string>
     <string name="no_season">Nenhuma Temporada</string>
     <string name="episode">Episódio</string>
@@ -182,10 +175,8 @@
     <string name="cancel">Cancelar</string>
     <string name="pause">Pôr em Pausa</string>
     <string name="resume">Retomar</string>
-    <string name="delete_message" formatted="true">Isto apagará %s permanentemente
-\nTem a certeza?</string>
-    <string name="resume_time_left" formatted="true">%dm
-\nem falta</string>
+    <string name="delete_message" formatted="true">Isto apagará %s permanentemente \nTem a certeza?</string>
+    <string name="resume_time_left" formatted="true">%dm \nem falta</string>
     <string name="status_ongoing">Em Curso</string>
     <string name="status_completed">Concluído</string>
     <string name="status">Estado</string>
@@ -248,7 +239,7 @@
     <string name="update">Atualizar</string>
     <string name="watch_quality_pref">Qualidade Preferida (WiFi)</string>
     <string name="limit_title">Máximo de caracteres do título no player de video</string>
-    <string name="limit_title_rez">Resolução do player de vídeo</string>
+    <string name="limit_title_rez">Mostrar informações do player de vídeo</string>
     <string name="video_buffer_size_settings">Tamanho do buffer do vídeo</string>
     <string name="video_buffer_length_settings">Comprimento do buffer do vídeo</string>
     <string name="video_buffer_disk_settings">Cache do vídeo em disco</string>
@@ -349,7 +340,6 @@
     <string name="previous">Anterior</string>
     <string name="skip_setup">Saltar setup</string>
     <string name="app_layout_subtext">Change the look of the app to suit your device</string>
-    <string name="crash_reporting_title">Crash reporting</string>
     <string name="preferred_media_subtext">What do you want to see</string>
     <string name="setup_done">Feito</string>
     <string name="extensions">Extensões</string>
@@ -371,9 +361,7 @@
     <string name="plugins_downloaded" formatted="true">Transferido: %d</string>
     <string name="plugins_disabled" formatted="true">Desativado: %d</string>
     <string name="plugins_not_downloaded" formatted="true">Não transferido: %d</string>
-    <string name="blank_repo_message">O CloudStream não tem sites instalados por padrão. É necessário instalar os sites a partir de repositórios.
-\n
-\nJunte-se ao nosso Discord ou pesquise online.</string>
+    <string name="blank_repo_message">O CloudStream não tem sites instalados por padrão. É necessário instalar os sites a partir de repositórios. \n \nJunte-se ao nosso Discord ou pesquise online.</string>
     <string name="view_public_repositories_button">Ver repositórios da comunidade</string>
     <string name="view_public_repositories_button_short">Lista pública</string>
     <string name="uppercase_all_subtitles">Todas as legendas em maiúsculas</string>
@@ -417,7 +405,7 @@
     <string name="yes">Sim</string>
     <string name="update_notification_downloading">Baixando atualização do app…</string>
     <string name="subscription_episode_released">Episódio %d lançado!</string>
-    <string name="skip_type_creddits">Créditos</string>
+    <string name="skip_type_credits">Créditos</string>
     <string name="extension_description">Descrição</string>
     <string name="extension_size">Tamanho</string>
     <string name="stop">Parar</string>
@@ -481,10 +469,8 @@
     <string name="subscription_in_progress_notification">Atualizando shows inscritos</string>
     <string name="sort_alphabetical_a">Alfabético (A a Z)</string>
     <string name="sort_rating_asc">Avaliações (Crescente)</string>
-    <string name="empty_library_no_accounts_message">A sua biblioteca está vazia :(
-\nEntre numa conta da biblioteca ou adicione espectáculos à sua biblioteca local.</string>
-    <string name="safe_mode_file">Arquivo de modo de segurança encontrado!
-\nNenhuma extensão será carregada na inicialização do app até que o arquivo seja removido.</string>
+    <string name="empty_library_no_accounts_message">A sua biblioteca está vazia :( \nEntre numa conta da biblioteca ou adicione espectáculos à sua biblioteca local.</string>
+    <string name="safe_mode_file">Arquivo de modo de segurança encontrado! \nNenhuma extensão será carregada na inicialização do app até que o arquivo seja removido.</string>
     <string name="pref_category_bypass">Contorno do provedor de serviço de internet (ISP)</string>
     <string name="pref_category_links">Links</string>
     <string name="pref_category_player_features">Recursos do Player</string>
@@ -529,13 +515,7 @@
     <string name="help">Ajuda</string>
     <string name="qualities">Qualidades</string>
     <string name="profile_background_des">Perfil de fundo</string>
-    <string name="quality_profile_help">Aqui pode alterar a forma como as fontes são ordenadas. Se um vídeo tiver uma prioridade mais elevada, aparecerá mais alto na seleção da fonte. A soma da prioridade da fonte com a prioridade da qualidade é a prioridade do vídeo.
-\n
-\nFonte A: 3
-\nQualidade B: 7
-\nTerá uma prioridade de vídeo combinada de 10.
-\n
-\nNOTA: Se a soma for 10 ou mais, o leitor saltará automaticamente o carregamento quando essa ligação for carregada!</string>
+    <string name="quality_profile_help">Aqui pode alterar a forma como as fontes são ordenadas. Se um vídeo tiver uma prioridade mais elevada, aparecerá mais alto na seleção da fonte. A soma da prioridade da fonte com a prioridade da qualidade é a prioridade do vídeo. \n \nFonte A: 3 \nQualidade B: 7 \nTerá uma prioridade de vídeo combinada de 10. \n \nNOTA: Se a soma for 10 ou mais, o leitor saltará automaticamente o carregamento quando essa ligação for carregada!</string>
     <string name="automatic_plugin_download_mode_title">Selecionar o modo para filtrar a transferência de plug-ins</string>
     <string name="unable_to_inflate">Não foi possível criar corretamente a interface do utilizador, trata-se de um GRANDE BUG e deve ser comunicado imediatamente %s</string>
     <string name="disable">Desativar</string>
@@ -567,14 +547,8 @@
     <string name="select_an_account">Selecione uma conta</string>
     <string name="manage_accounts">Gerenciar contas</string>
     <string name="use_default_account">Usar conta padrão</string>
-    <string name="duplicate_message_multiple" formatted="true">Potenciais itens duplicados foram encontrados na sua biblioteca:
-\n
-\n%s
-\n
-\nDeseja adicionar esse item mesmo assim, subtituir os existentes, ou cancelar a ação?</string>
-    <string name="duplicate_message_single" formatted="true">Parece que já existe um item potencialmente duplicado na sua biblioteca: \'%s.\'
-\n
-\nDeseja adicionar esse item mesmo assim, subtituir o existente, ou cancelar a ação?</string>
+    <string name="duplicate_message_multiple" formatted="true">Potenciais itens duplicados foram encontrados na sua biblioteca: \n \n%s \n \nDeseja adicionar esse item mesmo assim, subtituir os existentes, ou cancelar a ação?</string>
+    <string name="duplicate_message_single" formatted="true">Parece que já existe um item potencialmente duplicado na sua biblioteca: \'%s.\' \n \nDeseja adicionar esse item mesmo assim, subtituir o existente, ou cancelar a ação?</string>
     <string name="recommendations_tooltip">Mostrar recomendações</string>
     <string name="speed_setting_summary">Adiciona uma opção de velocidade no leitor</string>
     <string name="test_extensions">Testar todas as extensões</string>
@@ -591,8 +565,7 @@
     <string name="unfavorite">Desfavorito</string>
     <string name="biometric_setting">Bloqueio com biometria</string>
     <string name="toast_copied">copiado!</string>
-    <string name="resume_remaining" formatted="true">%s
-\nrestante</string>
+    <string name="resume_remaining" formatted="true">%s \nrestante</string>
     <string name="clipboard_permission_error">Erro ao aceder à área de transferência, tente novamente.</string>
     <string name="clipboard_unknown_error">Erro ao copiar, copie o logcat e contacte o suporte da aplicação.</string>
     <string name="biometric_authentication_title">Desbloquear o CloudStream</string>
@@ -604,24 +577,21 @@
     <string name="ok">OK</string>
     <string name="app_unrestricted_toast">A utilização da bateria da aplicação já está definida como sem restrições</string>
     <string name="app_info_intent_error">Não é possível abrir a informação da aplicação CloudStream.</string>
-    <string name="music_singlar">Música</string>
+    <string name="music_singular">Música</string>
     <string name="audio_book_singular">Livro Aúdio</string>
-    <string name="custom_media_singluar">Multimédia</string>
+    <string name="custom_media_singular">Multimédia</string>
     <string name="battery_dialog_title">Desativar a otimização da bateria</string>
     <string name="battery_dialog_message">Para garantir descarregamentos ininterruptos e notificações de programas de TV subscritos, o CloudStream precisa de permissão para ser executado em segundo plano. Ao premir OK, será mostrado um diálogo. Prima \"Permitir\".\n\nTenha em atenção que esta permissão não significa que o CS3 irá esgotar a sua bateria. Este só funcionará em segundo plano quando necessário, como ao receber notificações ou baixar vídeos de extensões oficiais.</string>
     <string name="reset_btn">Reiniciar</string>
-    <string name="next_season_episode_format" formatted="true">Episódio %1$d Episódio %2$d vai ser lançado em</string>
+    <string name="next_season_episode_format" formatted="true">Temporada %1$d Episódio %2$d será lançado em</string>
     <string name="player_settings_select_cast_device">Escolha o dispositivo</string>
     <string name="episode_action_cast_mirror">Transmitir</string>
-    <string name="hide_player_control_names_key" translatable="false">hide_player_control_names_key</string>
     <string name="open_local_video">Abrir vídeo local</string>
     <string name="device_pin_error_message">Não é possível receber o PIN do dispositivo, tentando autenticação local</string>
     <string name="preview_seekbar">Pré-visualização na barra de progresso</string>
     <string name="preview_seekbar_desc">Ativar a miniatura de pré-visualização na barra de progresso</string>
     <string name="auth_locally">Autenticação Local</string>
-    <string name="delete_message_series_section" formatted="true">Irá também eliminar permanentemente todos os episódios da seguinte série:
-\n
-\n%s</string>
+    <string name="delete_message_series_section" formatted="true">Irá também eliminar permanentemente todos os episódios da seguinte série: \n \n%s</string>
     <string name="delete_format" formatted="true">Eliminar (%1$d | %2$s)</string>
     <string name="device_pin_url_message">Visite <b>%s</b> no seu smartphone ou computador e introduza o código acima</string>
     <string name="play_from_beginning_img_des">Recomeçar</string>
@@ -634,15 +604,9 @@
     <string name="episode_upcoming_format" formatted="true">Próximo em %s</string>
     <string name="delete_files">Eliminar Ficheiros</string>
     <string name="test_warning">Aviso</string>
-    <string name="delete_message_multiple" formatted="true">Tem a certeza que pretende eliminar permanentemente os seguintes items?
-\n
-\n%s</string>
-    <string name="delete_message_series_episodes" formatted="true">Tem a certeza que pretende eliminar permanentemente os seguintes episódios em %1$s?
-\n
-\n%2$s</string>
-    <string name="delete_message_series_only" formatted="true">Tem a certeza que pretende eliminar permanentemente todos os episódios da seguinte série?
-\n
-\n%s</string>
+    <string name="delete_message_multiple" formatted="true">Tem a certeza que pretende eliminar permanentemente os seguintes items? \n \n%s</string>
+    <string name="delete_message_series_episodes" formatted="true">Tem a certeza que pretende eliminar permanentemente os seguintes episódios em %1$s? \n \n%2$s</string>
+    <string name="delete_message_series_only" formatted="true">Tem a certeza que pretende eliminar permanentemente todos os episódios da seguinte série? \n \n%s</string>
     <string name="pref_category_security">Segurança</string>
     <string name="pref_category_accounts">Contas</string>
     <string name="qr_image">QR Code</string>
@@ -664,14 +628,14 @@
     <string name="torrent_info">Este vídeo é um Torrent, o que significa que sua atividade de vídeo pode ser rastreada.\nCertifique-se de entender o Torrent antes de continuar.</string>
     <string name="custom">Personalizado</string>
     <string name="player_load_one_subtitle_online">Carregar o primeiro disponível</string>
-    <string name="audio_singluar">Áudio</string>
-    <string name="podcast_singluar">Podcast</string>
+    <string name="audio_singular">Áudio</string>
+    <string name="podcast_singular">Podcast</string>
     <string name="encoding_error">Erro de codificação</string>
     <string name="unsupported_error">Erro não suportado</string>
     <string name="torrent_preferred_media">Ativar torrent nas Configurações/Provedores/Mídia preferida</string>
-    <string name="torrent_not_accepted">Torrent não aceito</string>
+    <string name="torrent_not_accepted">Reinicie a aplicação e aceite o pop-up do Stream Torrent para continuar.</string>
     <string name="software_decoding">Descodificação por software</string>
-    <string name="software_decoding_desc">Descodificação por software permite que o leitor reproduza ficheiros não suportados pelo seu dispositivo, mas pode resultar numa reprodução desfasada ou instável em altas resoluções</string>
+    <string name="software_decoding_desc">Descodificação por software permite que o leitor reproduza ficheiros não suportados pelo seu dispositivo, mas pode resultar numa reprodução desfasada ou instável em altas resoluções.</string>
     <string name="subtitles_from_embedded">Incorporada</string>
     <string name="subtitles_from_online">Online</string>
     <string name="sort_episodes_number_asc">Episódio (Ascendente)</string>
@@ -692,4 +656,81 @@
     <string name="sort_button_date">Data %s</string>
     <string name="player_notification_channel_description">Notificação do player para controlar a reprodução em segundo plano</string>
     <string name="player_notification_channel_name">Notificações de reprodução</string>
-</resources>
\ No newline at end of file
+    <string name="all_subtitles_italic">Colocar todas as legendas em itálico</string>
+    <string name="background_radius">Raio do fundo</string>
+    <string name="volume_exceeded_100">O volume excedeu 100%</string>
+    <string name="all_subtitles_bold">Colocar todas as legendas em negrito</string>
+    <string name="slide_up_again_to_exceed_100">Deslize para cima novamente para ir além de 100%</string>
+    <string name="download_parallel_settings_des">Quantos itens diferentes podem ser baixados em paralelo</string>
+    <string name="parallel_downloads">Downloads paralelos</string>
+    <string name="concurrent_connections">Conexões simultâneas</string>
+    <string name="concurrent_connections_settings_des">Quantas conexões simultâneas cada download pode usar durante o download</string>
+    <string name="go_to_downloads">Ir para downloads</string>
+    <string name="no_internet_connection">Sem conexão com a internet.\n\nConecte-se à internet e tente novamente ou assista aos seus downloads enquanto estiver offline.</string>
+    <string name="overscan_settings_des">Altera os limites da tela</string>
+    <string name="overscan_settings">Overscan</string>
+    <string name="poster_size_settings_des">Altera o tamanho dos pôsteres</string>
+    <string name="poster_size_settings">Tamanho do pôster</string>
+    <string name="player_settings_always_ask">Sempre perguntar</string>
+    <string name="speedup_title">Pressionamento para acelerar</string>
+    <string name="speedup_summary">Pressione para acelerar</string>
+    <string name="download_time_left_hour_min_sec_format" formatted="true">%1$dh:%2$dm:%3$ds</string>
+    <string name="download_time_left_min_sec_format" formatted="true">%1$dm:%2$ds</string>
+    <string name="download_time_left_sec_format" formatted="true">%1$ds</string>
+    <string name="show_rating">Etiqueta de classificação</string>
+    <string name="no_account">Nehuma conta</string>
+    <string name="edit_profile_image_title">Editar Imagem do Perfil</string>
+    <string name="edit_profile_image_hint">Inserir URL da Imagem de Perfil</string>
+    <string name="edit_profile_image_error_empty">Nenhum URL Encontrado</string>
+    <string name="edit_profile_image_error_invalid">URL ou Imagem Inválido</string>
+    <string name="edit_profile_image_success">Imagem Atualizada com Sucesso</string>
+    <string name="action_mark_watched_up_to_this_episode">Marcar como assistido o episódio</string>
+    <string name="action_remove_mark_watched_up_to_this_episode">Removar marcação de assistido até esse episódio</string>
+    <string name="action_reload">Recarregado</string>
+    <string name="reload_provider">Provedor de Recarregamento</string>
+    <string name="episode_action_play_mirror">Reproduzir do servidor alternativo</string>"
+    <string name="name">Nome</string>
+    <string name="resolution_and_name">Resolução e nome</string>
+    <string name="subs_subtitle_alignment">Alinhamento da Legenda</string>
+    <string name="bottom_left">Esquerda embaixo</string>
+    <string name="bottom_center">Centro embaixo</string>
+    <string name="bottom_right">Direita embaixo</string>
+    <string name="middle_left">Esquerda no centro</string>
+    <string name="middle_center">Centro</string>
+    <string name="middle_right">Direita no centro</string>
+    <string name="top_left">Esquerda encima</string>
+    <string name="top_center">Centro em cima</string>
+    <string name="top_right">Direita em cima</string>
+    <string name="play_full_series_button">Reproduzir Série Inteira</string>
+    <string name="install_prerelease">Instalar versão de pré-lançamento</string>
+    <string name="prerelease_already_installed">Versão de pré-lançamento já instalada.</string>
+    <string name="prerelease_install_failed">Falha ao instalar pré-lançamento.</string>
+    <string name="show_episode_text">Texto do Episódio</string>
+    <string name="download_queue">Fila de downloads</string>
+    <string name="queue_empty_message">Não há downloads na fila no momento.</string>
+    <string name="extra_brightness_settings">Brilho extra</string>
+    <string name="extra_brightness_settings_des">Ativar filtro de brilho quando o brilho da tela exceder 100%</string>
+    <string name="extra_brightness_key">extra_brightness_enabled</string>
+    <string name="search_suggestions">Sugestões de pesquisa</string>
+    <string name="search_suggestions_des">Mostrar sugestões de pesquisa enquanto digita</string>
+    <string name="clear_suggestions">Limpar Sugestões</string>
+    <string name="show_cast_in_details">Mostrar Painel de Elenco</string>
+    <string name="video_info">Informações da mídia</string>
+    <string name="source_priority">Prioridade da fonte</string>
+    <string name="source_priority_help">Decida como as fontes de vídeo devem ser classificadas no player</string>
+    <string name="source_name">Nome da fonte</string>
+    <string name="download_all">Baixar tudo</string>
+    <string name="cancel_all">Cancelar tudo</string>
+    <string name="download_episode_range">Deseja baixar o episódio %s?</string>
+    <string name="cancel_queue_message">Deseja cancelar todos os downloads em fila?</string>
+    <plurals name="downloads_active">
+        <item quantity="one">%d download ativo</item>
+        <item quantity="many">%d downloads ativos</item>
+        <item quantity="other">%d downloads ativos</item>
+    </plurals>
+    <plurals name="downloads_queued">
+        <item quantity="one">%d download na fila</item>
+        <item quantity="many">%d downloads na fila</item>
+        <item quantity="other">%d downloads na fila</item>
+    </plurals>
+</resources>
diff --git a/app/src/main/res/values-qt/strings.xml b/app/src/main/res/values-b+qt/strings.xml
similarity index 95%
rename from app/src/main/res/values-qt/strings.xml
rename to app/src/main/res/values-b+qt/strings.xml
index 2ca5a5881f2..6bbb0ddba2f 100644
--- a/app/src/main/res/values-qt/strings.xml
+++ b/app/src/main/res/values-b+qt/strings.xml
@@ -38,7 +38,6 @@
     <string name="app_subbed_text">ahooo</string>
     <string name="popup_delete_file">ouuhhh</string>
     <string name="popup_play_file">ahhaauugghh</string>
-    <string name="pref_disable_acra">ooo-ahahoohahoooooo-ahahouuhhhoouuhaaahhu</string>
     <string name="home_more_info">ahooo a aaaghhouuhhh</string>
     <string name="home_expanded_hide">oh ahhh</string>
     <string name="home_main_poster_img_des">ahhhahaaaaaahhhaaaghh</string>
@@ -91,12 +90,8 @@
     <string name="settings_info">aauugghh ah</string>
     <string name="advanced_search">aah ouuhhhooo-ahah aaaghh</string>
     <string name="advanced_search_des">aauugghh ahahooo ouuhhhahh ooh oouuhahoooahhaaahhu ohaooh oouuhooo-ahah</string>
-    <string name="bug_report_settings_off">aaaaa ahhhahhohoouuhahoooaaaghh aahhhaaaaa</string>
-    <string name="bug_report_settings_on">oouuhoooohh ahhooo-ahah</string>
     <string name="updates_settings">haa oohaauugghhooh oh</string>
     <string name="updates_settings_des">aaaagggoooogg uuuugg aak aah aaaahhh ooogg uuuuuukh aah ooh</string>
-    <string name="uprereleases_settings">aaaghh ahhhahoooooo-ahah aaaghh</string>
-    <string name="uprereleases_settings_des">ahhh ooo-ahahahhahh ooooo aauugghh oooohhahhhahoooaoooohhouuhhh aaahhu</string>
     <string name="github">aauuhoha</string>
     <string name="lightnovel">ooo-ahahoh ohaaauugghh ahhh haaahooo</string>
     <string name="anim">ooooohaa ohaaaaaaahoooahoooaaaghh</string>
@@ -109,7 +104,6 @@
     <string name="copy_link_toast">ooh oouuh ahoooah ohaa oh ouuhhh</string>
     <string name="play_episode_toast">ouuhhhoouuh ouuhhh</string>
     <string name="subs_default_reset_toast">haaahhh ooo-ahah haaoh haaooh</string>
-    <string name="acra_report_toast">oooooahoohaaaghh oouuhoooohhaaaaaoha ohaaauugghh oohaaaaaahooo ooo-ahah aaaaaa ahooo</string>
     <string name="error_loading_links_toast">ahooo oouuhoooohh oooohhaaaghh oouuh</string>
     <string name="season">ooo-ahah</string>
     <string name="no_season">aauuh ohaahooo</string>
@@ -191,8 +185,7 @@
     <string name="phone_layout">u ooah uo ahauao huhuu hauu h</string>
     <string name="primary_color_settings">a ou oh ouhuouhoaaha</string>
     <string name="show_fillers_settings">aaooohhouhhha hauauuu</string>
-    <string name="new_update_format">aaaaaaa uuuuuu
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format">aaaaaaa uuuuuu \n%1$s -&gt; %2$s</string>
     <string name="app_dub_sub_episode_text_format" formatted="true">%1$s aaou %2$d</string>
     <string name="cast_format" formatted="true">oouaaahh %s</string>
     <string name="next_episode_format" formatted="true">aaaaaaugh ouh %d uuoogahaaah ooua-h-ha</string>
@@ -234,8 +227,7 @@
     <string name="livestreams">aaaaaaaaaaahhhgh-aooohoooo</string>
     <string name="pref_category_extensions">aau aooooghaao</string>
     <string name="provider_info_meta">aagh aaaaaaaaaaaa oooh, aaough, ooga oguuu aaaaaaaaaaa ooooooohghh a-a-aaauo</string>
-    <string name="resume_time_left" formatted="true">%dmmmmmm..
-\naaaaooughugh</string>
+    <string name="resume_time_left" formatted="true">%dmmmmmm.. \naaaaooughugh</string>
     <string name="asian_drama">aooohuohaaaa ooooagh</string>
     <string name="subtitle_offset">oooooogh-aaaaaogh</string>
     <string name="trailer">guuuaaaahhhhhhhaaa</string>
@@ -245,7 +237,6 @@
     <string name="sort_save">oooooh uuaagh</string>
     <string name="action_open_play">@string/home_play</string>
     <string name="chromecast_subtitles_settings">oouuhhh ahhooo-ahah</string>
-    <string name="hide_player_control_names_key" translatable="false">hide_player_control_names_key</string>
     <string name="restore_success">uuuugg aaaahh oogg</string>
     <string name="device_pin_counter_text">aagg uuuuggg og %1$dm %2$ds</string>
     <string name="pref_category_android_tv">aaaahhh ag</string>
@@ -285,9 +276,7 @@
     <string name="home_random">aaaagg</string>
     <string name="quality_cam_rip">uug</string>
     <string name="delete_plugin">oooogg oooogg</string>
-    <string name="blank_repo_message">oooohhhoogg uuh uh uuuhh aaaaggguh og ooooggg uug aagg ek aaaaggg oog aaahh aagg uuuugggooohh
-\n
-\nJoin uuh uuuuggg ag uuuuhh eeeeek</string>
+    <string name="blank_repo_message">oooohhhoogg uuh uh uuuhh aaaaggguh og ooooggg uug aagg ek aaaaggg oog aaahh aagg uuuugggooohh \n \nJoin uuh uuuuggg ag uuuuhh eeeeek</string>
     <string name="audio_tracks">uuugg aaaagg</string>
     <string name="safe_mode_title">oogg uugg uh</string>
     <string name="skip_type_intro">aaagg</string>
@@ -320,13 +309,7 @@
     <string name="profile_number">ooooggg %d</string>
     <string name="edit">aahh</string>
     <string name="profiles">oooogggk</string>
-    <string name="quality_profile_help">eeek aag uug uuuuhh ooh aak uuuuggg ooh uuuuhhh ug g eeeek oog h uuuuhh oooogggh ag aahh oooohh aaaagg uh oog uuuugg uuuugggog uug oog uh uuh aaaagg uuuuuukg uug aah uuuuuuk uuuuuukg ak ooh uuuhh aaaagggk
-\n
-\nSource A: 3
-\nQuality B: 7
-\nWill uuhh k uuuuhhhk ooogg uuuuhhhh uk 10
-\n
-\nNOTE: ah uug oog ug 10 og oogg uug aaaahh uuhh uuuugggaaaahh oogg aaaahhh oogg uuhh aahh uh loaded!</string>
+    <string name="quality_profile_help">eeek aag uug uuuuhh ooh aak uuuuggg ooh uuuuhhh ug g eeeek oog h uuuuhh oooogggh ag aahh oooohh aaaagg uh oog uuuugg uuuugggog uug oog uh uuh aaaagg uuuuuukg uug aah uuuuuuk uuuuuukg ak ooh uuuhh aaaagggk \n \nSource A: 3 \nQuality B: 7 \nWill uuhh k uuuuhhhk ooogg uuuuhhhh uk 10 \n \nNOTE: ah uug oog ug 10 og oogg uug aaaahh uuhh uuuugggaaaahh oogg aaaahhh oogg uuhh aahh uh loaded!</string>
     <string name="favorites_list_name">uuuuhhhug</string>
     <string name="favorite_removed">%s aaaaggg uuhh aaaagggug</string>
     <string name="duplicate_add">oog</string>
@@ -407,7 +390,6 @@
     <string name="video_ram_description">uuuugg aaaaggg ug aah uug aahh ug uuuuhhh oohh aah memory, oohh og oooohhh ug</string>
     <string name="extension_version">aaaahhh</string>
     <string name="previous">oooogggh</string>
-    <string name="crash_reporting_title">ooohh aaaaaakag</string>
     <string name="title">ooogg</string>
     <string name="batch_download_start_format" formatted="true">aaaaggg aaaahhhuuhh %1$d %2$s…</string>
     <string name="skip_type_mixed_ed">uuuhh aaaagg</string>
@@ -416,7 +398,7 @@
     <string name="help">uugg</string>
     <string name="qualities">oooogggoh</string>
     <string name="biometric_setting">uugg uuhh oooohhhoog</string>
-    <string name="music_singlar">aaahh</string>
+    <string name="music_singular">aaahh</string>
     <string name="biometric_prompt_description">uuugg g uug uuuuhh attempts, aah aaaagg uugg uuuhh aaaagg uuuuhhh aag uug ah uuh uuugg</string>
     <string name="min">oog</string>
     <string name="extension_install_first">aaaaggg uug oooohhhuh uuuuk</string>
@@ -496,10 +478,7 @@
     <string name="already_voted">uuh uuhh uuuuggg uuuhh</string>
     <string name="favorite_added">%s ooogg oh oooohhhog</string>
     <string name="duplicate_replace_all">aaaahhh uuh</string>
-    <string name="duplicate_message_single" formatted="true">oh ooooggg oogg k uuuuuukaahh uuuugggag uuhh ooooggg oooogg ah oogg library: \'%s\'
-\n
-\n
-\nWould uug uugg uh aak oogg oohh anyway, oooohhh uuh oooohhhg one, oh aaaagg eek action?</string>
+    <string name="duplicate_message_single" formatted="true">oh ooooggg oogg k uuuuuukaahh uuuugggag uuhh ooooggg oooogg ah oogg library: \'%s\' \n \n \nWould uug uugg uh aak oogg oohh anyway, oooohhh uuh oooohhhg one, oh aaaagg eek action?</string>
     <string name="enter_pin">ooogg uuh</string>
     <string name="speed_setting_summary">uuhh g ooogg oooogg oh aah uuuugg</string>
     <string name="test_extensions_summary">uugg oogg ak aaagg ooh oooohhhuug aagg uug aahh uug oooohhhg ak oooohh uuuuuuk oh uuh aaaagggag</string>
@@ -508,7 +487,7 @@
     <string name="toast_copied">copied!</string>
     <string name="battery_dialog_title">aaaahhh ooooggg oooohhhooogg</string>
     <string name="episode_upcoming_format" formatted="true">uuuugggg og %s</string>
-    <string name="custom_media_singluar">uuugg</string>
+    <string name="custom_media_singular">uuugg</string>
     <string name="app_unrestricted_toast">ooh oooohhh uuuhh ak aaaaggg aak ag uuuugggaaaak</string>
     <string name="app_info_intent_error">uuuugg ah uuhh CloudStream uuh uuhh</string>
     <string name="pref_category_security">oooohhhg</string>
@@ -531,8 +510,7 @@
     <string name="automatic_plugin_download_mode_title">uuuugg oogg oh eeeeek eeeeeek uuuugggg</string>
     <string name="redo_setup_process">aagg uuugg uuuuggg</string>
     <string name="go_forward_30">+30</string>
-    <string name="resume_remaining" formatted="true">%s
-\nremaining</string>
+    <string name="resume_remaining" formatted="true">%s \nremaining</string>
     <string name="edit_account">aagg uuuuhhh</string>
     <string name="biometric_setting_summary">uuuuhh aag aah oogg Fingerprint, eeek ID, PIN, aaaaggg uuh aaaagggh</string>
     <string name="downloads_delete_select">eeeeek uuuhh oh aaaagg</string>
@@ -552,21 +530,13 @@
     <string name="episode_sync_settings">aaaagg aaahh aaaahhhg</string>
     <string name="backup_failed_error_format">uuuhh oooohhh uh %s</string>
     <string name="kitsu_settings">oohh uuuuggg uuhh uuugg</string>
-    <string name="delete_message_series_section" formatted="true">uuh oohh oogg aaaahhhuugg uuuugg oog aaaagggh ak uuh uuuuhhhog series:
-\n
-\n%s</string>
+    <string name="delete_message_series_section" formatted="true">uuh oohh oogg aaaahhhuugg uuuugg oog aaaagggh ak uuh uuuuhhhog series: \n \n%s</string>
     <string name="apk_installer_settings">aak aaaagggah</string>
     <string name="delete_files">oooohh uuuhh</string>
     <string name="delete_format" formatted="true">oooogg (%1$d | %2$s)</string>
-    <string name="delete_message_multiple" formatted="true">uuh uug oohh uuk aagg oh uuuuggguugg aaaahh uuh aaaagggah items?
-\n
-\n%s</string>
-    <string name="delete_message_series_episodes" formatted="true">uug ooh aagg ooh uuuk ag aaaahhhuuhh oooohh ooh oooohhhug oooohhhh ah %1$s?
-\n
-\n%2$s</string>
-    <string name="delete_message_series_only" formatted="true">ooh aag oogg uuh aagg ug eeeeeekoohh aaaahh aah uuuugggg uk aag oooohhhek series?
-\n
-\n%s</string>
+    <string name="delete_message_multiple" formatted="true">uuh uug oohh uuk aagg oh uuuuggguugg aaaahh uuh aaaagggah items? \n \n%s</string>
+    <string name="delete_message_series_episodes" formatted="true">uug ooh aagg ooh uuuk ag aaaahhhuuhh oooohh ooh oooohhhug oooohhhh ah %1$s? \n \n%2$s</string>
+    <string name="delete_message_series_only" formatted="true">ooh aag oogg uuh aagg ug eeeeeekoohh aaaahh aah uuuugggg uk aag oooohhhek series? \n \n%s</string>
     <string name="login_format" formatted="true">%1$s %2$s</string>
     <string name="show_hd">aaaahhh uuuhh</string>
     <string name="video_disk_description">eeeeek oooohhhg ah uuk uuh aahh ug aaaaggg aaak ooh oooohhh space, aahh ug oooohhh ek</string>
@@ -615,15 +585,13 @@
     <string name="player_settings_select_cast_device">aaaagg aahh oooohh</string>
     <string name="skip_type_ed">uuuuuk</string>
     <string name="skip_type_mixed_op">aaagg aaaahhh</string>
-    <string name="skip_type_creddits">ooooggg</string>
+    <string name="skip_type_credits">ooooggg</string>
     <string name="battery_dialog_message">oh oooogg ooooggguuuugg aaaahhhug ooh aaaaggguuuuuk ooh aaaagggoog uk shows, aaaaggguugg aaagg uuuuggguug ug uug oh aaaahhhooh ah eeeeeekh OK, youl og aaaaaakg uh uuk aagg There, aaaagg uk oog uuuuhhh ooohh uug uuh oooohhh aaagg ug uuuuhhhooohh oooohh note, aagg aaaahhhaak oohh uug uugg CS3 aagg eeeek aahh uuuuhhh uh uugg oogg ooooggg ek uug aaaahhhaak oohh necessary, uugg oh uuhh uuuuhhhuh uuuuuukaaaahh ah oooohhhaagg uuuuuk oogg aaaagggh oooogggoog uh uuh aaaahh ug cancel, uuh uug aaaahh uugg uuuuggg ooogg uh aaaahhh uuuugggg</string>
     <string name="sort_updated_old">uuuuggg (Old og New)</string>
     <string name="sort_alphabetical_z">uuuuggguuuhh (Z ak A)</string>
     <string name="select_library">uuuugg uuuuggg</string>
-    <string name="empty_library_no_accounts_message">uuhh eeeeeek ek uuugg :(
-\nLog oh ag h aaaaggg uuuuggg ah uuk ooogg ag uugg uuugg oooohhh</string>
-    <string name="safe_mode_file">oohh aagg uugg found!
-\nNot aaaaggg aak uuuugggaag ah uuuuhhh aaaak oogg ah eeeeeek</string>
+    <string name="empty_library_no_accounts_message">uuhh eeeeeek ek uuugg :( \nLog oh ag h aaaaggg uuuuggg ah uuk ooogg ag uugg uuugg oooohhh</string>
+    <string name="safe_mode_file">oohh aagg uugg found! \nNot aaaaggg aak uuuugggaag ah uuuuhhh aaaak oogg ah eeeeeek</string>
     <string name="subscription_deleted">uuuuggguuugg oohh %s</string>
     <string name="subscription_episode_released">ooooggg %d released!</string>
     <string name="wifi">uugg</string>
@@ -631,11 +599,7 @@
     <string name="set_default">ooh ooooggg</string>
     <string name="profile_background_des">oooohhh uuuuhhhoog</string>
     <string name="unable_to_inflate">uh ooh oooogg ag ek oooohhh correctly, uuhh uh g ooogg aah uug aaaagg uh uuuugggk uuuuhhhaahh %s</string>
-    <string name="duplicate_message_multiple" formatted="true">uuuuggguk uuuuhhhoh uuugg aahh aaak uuugg ag oohh library:
-\n
-\n%s
-\n
-\nWould aag aagg og uuk uugg oogg anyway, aaaahhh ooh uuuugggh ones, ek uuuuhh aah action?</string>
+    <string name="duplicate_message_multiple" formatted="true">uuuuggguk uuuuhhhoh uuugg aahh aaak uuugg ag oohh library: \n \n%s \n \nWould aag aagg og uuk uugg oogg anyway, aaaahhh ooh uuuugggh ones, ek uuuuhh aah action?</string>
     <string name="pin_error_incorrect">oooohhhag uug oooohh uuh eeeek</string>
     <string name="rotate_video_desc">aaaaggg h oooogg aaaaak uug uuuugg aaaaaakaagg</string>
     <string name="auto_rotate_video_desc">uuuuhh uuuuhhhuh oooogggag ag aaaahh uuuuggguugg aaagg ek aaagg aaaagggaagg</string>
@@ -661,4 +625,4 @@
     <string name="show">Boo</string>
     <string name="confirm_before_exiting_title">Oo-ahh oo-chit ar-ar</string>
     <string name="dont_show">Boooooo</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-b+ro/strings.xml
similarity index 92%
rename from app/src/main/res/values-ro/strings.xml
rename to app/src/main/res/values-b+ro/strings.xml
index ed516d5cdbf..b1852640c1e 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-b+ro/strings.xml
@@ -19,8 +19,7 @@
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">Viteză (%.2fx)</string>
     <string name="rated_format" formatted="true">Evaluare: %.1f</string>
-    <string name="new_update_format" formatted="true">Actualizare nouă găsită!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">Actualizare nouă găsită! \n%1$s -&gt; %2$s</string>
     <string name="filler" formatted="true">Filler</string>
     <string name="duration_format" formatted="true">%d min</string>
     <!-- <string name="app_name">CloudStream</string> -->
@@ -68,7 +67,6 @@
     <string name="popup_play_file">Redare fișier</string>
     <string name="popup_resume_download">Continuați descărcarea</string>
     <string name="popup_pause_download">Opriți descărcarea</string>
-    <string name="pref_disable_acra">Dezactivați raportarea automată a erorilor</string>
     <string name="home_more_info">Mai multe informații</string>
     <string name="home_expanded_hide">Ascunde</string>
     <string name="home_play">Începe</string>
@@ -147,15 +145,11 @@
     <string name="settings_info">Informații</string>
     <string name="advanced_search">Căutare avansată</string>
     <string name="advanced_search_des">Împărțiți rezultatele căutării în funcție de furnizor</string>
-    <string name="bug_report_settings_off">Trimiteți date numai în cazul unui accident</string>
-    <string name="bug_report_settings_on">Nu trimiteți niciun fel de date</string>
     <string name="show_fillers_settings">Afișează etichetele [filler] pentru anime</string>
     <string name="show_trailers_settings">Arată trailerul</string>
     <string name="kitsu_settings">Arată afișele de la Kitsu</string>
     <string name="updates_settings">Afișați actualizările aplicației</string>
     <string name="updates_settings_des">Căutați automat noi actualizări după pornirea aplicației.</string>
-    <string name="uprereleases_settings">Actualizați la prerelease</string>
-    <string name="uprereleases_settings_des">Căutați actualizări ale versiunilor preliminare în loc să căutați doar versiunile complete</string>
     <string name="github">GitHub</string>
     <string name="lightnovel">&gt;Aplicație Light Novel realizată de aceiași dezvoltator</string>
     <string name="anim">Aplicație Anime realizată de aceiași dezvoltatorilor</string>
@@ -168,7 +162,6 @@
     <string name="copy_link_toast">Link copiat în clipboard</string>
     <string name="play_episode_toast">Redare episod</string>
     <string name="subs_default_reset_toast">Restabilirea la valorile implicite</string>
-    <string name="acra_report_toast">Ne pare rău, aplicația s-a blocat. Un raport de eroare anonim va fi trimis dezvoltatorilor</string>
     <string name="season">Sezonul</string>
     <string name="no_season">Nu există sezon</string>
     <string name="episode">Episodul</string>
@@ -183,10 +176,8 @@
     <string name="resume">Continuă</string>
     <string name="go_back_30">-30</string>
     <string name="go_forward_30">+30</string>
-    <string name="delete_message" formatted="true">Sunteți pe cale să ștergeți definitiv %s
-\nSunteți sigur?</string>
-    <string name="resume_time_left" formatted="true">%dm
-\nrămas</string>
+    <string name="delete_message" formatted="true">Sunteți pe cale să ștergeți definitiv %s \nSunteți sigur?</string>
+    <string name="resume_time_left" formatted="true">%dm \nrămas</string>
     <string name="status_ongoing">În curs de desfășurare</string>
     <string name="status_completed">Finalizat</string>
     <string name="status">Status</string>
@@ -267,7 +258,6 @@
     <string name="resize_fill">Întindere</string>
     <string name="resize_zoom">Mărire</string>
     <string name="legal_notice">Aviz juridic (declinarea responsabilității și drepturi de autor)</string>
-    <string name="legal_notice_text">Orice probleme legale privind conținutul acestei aplicații ar trebui să fie rezolvate cu furnizorii și gazdele actuale de fișiere, întrucât noi nu suntem afiliați cu aceștia. În caz de încălcare a drepturilor de autor, vă rugăm să contactați direct părțile responsabile sau site-urile de streaming. Aplicația este destinată exclusiv utilizării educaționale și personale. CloudStream 3 nu găzduiește niciun fel de conținut în aplicație și nu are niciun control asupra conținutului media care este pus sau retras. CloudStream 3 funcționează ca orice alt motor de căutare, cum ar fi Google. CloudStream 3 nu găzduiește, nu încarcă și nu gestionează niciun videoclip, film sau conținut. Pur și simplu navighează, adună și afișează linkuri într-o interfață convenabilă și ușor de utilizat. Pur și simplu, acesta extrage paginile web ale unor terțe părți care sunt accesibile publicului prin intermediul oricărui browser web obișnuit. Este responsabilitatea utilizatorului de a evita orice acțiune care ar putea încălca legile care guvernează locația sa. Utilizați CloudStream 3 pe propria răspundere.</string>
     <string name="category_general">General</string>
     <string name="random_button_settings">Aleatoriu</string>
     <string name="random_button_settings_desc">Afișează butonul pentru aleatoriu pe Pagina Principală și în Bibliotecă</string>
@@ -436,10 +426,8 @@
     <string name="pref_category_links">Linkuri</string>
     <string name="pref_category_ui_features">Funcții</string>
     <string name="extension_authors">Autori</string>
-    <string name="crash_reporting_title">Raportarea accidentelor</string>
     <string name="add_repository">Adaugă depozit</string>
-    <string name="empty_library_no_accounts_message">Biblioteca ta este goală :(
-\nConectați-vă într-un cont de bibliotecă sau adăugați emisiuni la biblioteca locală.</string>
+    <string name="empty_library_no_accounts_message">Biblioteca ta este goală :( \nConectați-vă într-un cont de bibliotecă sau adăugați emisiuni la biblioteca locală.</string>
     <string name="subtitles_remove_captions">Eliminați subtitrările închise din subtitrări</string>
     <string name="setup_extensions_subtext">Descărcați lista de site-uri pe care doriți să le utilizați</string>
     <string name="sort_rating_desc">Evaluare (Ridicat la Scăzut)</string>
@@ -479,13 +467,10 @@
     <string name="error_invalid_url">URL invalid</string>
     <string name="safe_mode_description">Toate extensiile au fost dezactivate din cauza unei defecțiuni pentru a vă ajuta să o găsiți pe cea care cauzează probleme.</string>
     <string name="update_notification_downloading">Se descarcă actualizarea aplicației…</string>
-    <string name="blank_repo_message">CloudStream nu are niciun site instalat din start. Trebuie să instalați site-urile din depozite.
-\n
-\nAlăturați-vă Discord-ului nostru sau căutați online.</string>
+    <string name="blank_repo_message">CloudStream nu are niciun site instalat din start. Trebuie să instalați site-urile din depozite. \n \nAlăturați-vă Discord-ului nostru sau căutați online.</string>
     <string name="batch_download_start_format" formatted="true">A început să descarce %1$d %2$s…</string>
     <string name="safe_mode_title">Mod sigur pornit</string>
-    <string name="safe_mode_file">Fișier Mod Sigur găsit!
-\nNu încarcă nicio extensie la pornire până când fișierul nu este eliminat.</string>
+    <string name="safe_mode_file">Fișier Mod Sigur găsit! \nNu încarcă nicio extensie la pornire până când fișierul nu este eliminat.</string>
     <string name="action_remove_from_watched">Scoateți de la urmărit</string>
     <string name="sort_updated_old">Actualizat (Vechi la Nou)</string>
     <string name="apply_on_restart">Reporniți aplicația pentru a vedea schimbările.</string>
@@ -530,7 +515,7 @@
     <string name="enable_skip_op_from_database_des">Afișează opțiunea de omitere a ferestrelor pop-up pentru început/sfârșit</string>
     <string name="all_languages_preference">Toate limbile</string>
     <string name="skip_type_mixed_op">Deschidere mixat</string>
-    <string name="skip_type_creddits">Credite</string>
+    <string name="skip_type_credits">Credite</string>
     <string name="extension_language">Limbă</string>
     <string name="plugin_singular">plugin</string>
     <string name="plugin">plugin-uri</string>
@@ -539,13 +524,7 @@
     <string name="pref_category_app_updates">Actualizări al aplicației</string>
     <string name="pref_category_subtitles">Subtitrări</string>
     <string name="disable">Dezactivați</string>
-    <string name="quality_profile_help">Aici puteți schimba modul în care sunt ordonate sursele. Dacă un videoclip are o prioritate mai mare, acesta va apărea mai sus în selecția surselor. Suma dintre prioritatea sursei și prioritatea calității reprezintă prioritatea video.
-\n
-\nSursa A: 3
-\nCalitate B: 7
-\nVa avea o prioritate video combinată de 10.
-\n
-\nNOTĂ: Dacă suma este 10 sau mai mare, playerul va sări automat peste încărcare atunci când este încărcat link-ul respectiv!</string>
+    <string name="quality_profile_help">Aici puteți schimba modul în care sunt ordonate sursele. Dacă un videoclip are o prioritate mai mare, acesta va apărea mai sus în selecția surselor. Suma dintre prioritatea sursei și prioritatea calității reprezintă prioritatea video. \n \nSursa A: 3 \nCalitate B: 7 \nVa avea o prioritate video combinată de 10. \n \nNOTĂ: Dacă suma este 10 sau mai mare, playerul va sări automat peste încărcare atunci când este încărcat link-ul respectiv!</string>
     <string name="no_plugins_found_error">Nu s-a găsit plugin-uri în depozit</string>
     <string name="no_repository_found_error">Nu s-a găsit depozitul, verificați URL-ul și încercați cu un VPN</string>
     <string name="edit">Editați</string>
@@ -561,18 +540,12 @@
     <string name="unable_to_inflate">UI nu a putut fi creată corect, acesta este un BUG MAJOR și trebuie raportat imediat %s</string>
     <string name="automatic_plugin_download_mode_title">Selectați modul de filtrare a descărcării plugin-urilor</string>
     <string name="already_voted">Ați votat deja</string>
-    <string name="duplicate_message_multiple" formatted="true">Elemente potențial duplicate au fost găsite în biblioteca ta:
-\n
-\n%s
-\n
-\nÎn ciuda acestui fapt, ai dori să adaugi acest alement, să le înlocuiești pe cele existente, sau să anulezi acțiunea?</string>
+    <string name="duplicate_message_multiple" formatted="true">Elemente potențial duplicate au fost găsite în biblioteca ta: \n \n%s \n \nÎn ciuda acestui fapt, ai dori să adaugi acest alement, să le înlocuiești pe cele existente, sau să anulezi acțiunea?</string>
     <string name="favorite_added">%s a fost adăugat la favoriți/te</string>
     <string name="favorite_removed">%s a fost eliminat din favoriți/te</string>
     <string name="action_add_to_favorites">Adaugă la favoriți/te</string>
     <string name="action_remove_from_favorites">Elimină din favoriți/te</string>
-    <string name="duplicate_message_single" formatted="true">Se pare că un element potențial duplicat deja există în biblioteca ta: \'%s.\'
-\n
-\nÎn ciuda aceasta, ai dori să adaugi acest element, să îl înlocuiești pe cel existent, sau să anulezi acțiunea?</string>
+    <string name="duplicate_message_single" formatted="true">Se pare că un element potențial duplicat deja există în biblioteca ta: \'%s.\' \n \nÎn ciuda aceasta, ai dori să adaugi acest element, să îl înlocuiești pe cel existent, sau să anulezi acțiunea?</string>
     <string name="enter_pin_with_name" formatted="true">Introduce PIN-ul pentru %s</string>
     <string name="enter_current_pin">Introduce PIN-ul actual</string>
     <string name="enter_pin">Introduce PIN-ul</string>
@@ -618,23 +591,21 @@
     <string name="app_unrestricted_toast">Utilizarea bateriei pentru aplicație este deja setată ca fiind nelimitată</string>
     <string name="app_info_intent_error">Imposibil de deschis informațiile aplicației CloudStream.</string>
     <string name="favorite">Favorite</string>
-    <string name="music_singlar">Muzică</string>
+    <string name="music_singular">Muzică</string>
     <string name="audio_book_singular">Carte audio</string>
-    <string name="custom_media_singluar">Media</string>
+    <string name="custom_media_singular">Media</string>
     <string name="result_search_tooltip">Caută în alte extensii</string>
     <string name="test_extensions">Testează toate extensiile</string>
     <string name="auto_rotate_video">Rotire automată</string>
     <string name="reset_btn">Resetați</string>
     <string name="auto_rotate_video_desc">Activați comutarea automată a orientării ecranului pe baza orientării video</string>
     <string name="biometric_setting">Blocare cu biometrie</string>
-    <string name="resume_remaining" formatted="true">%s
-\nrămase</string>
+    <string name="resume_remaining" formatted="true">%s \nrămase</string>
     <string name="episode_upcoming_format" formatted="true">Următorul în %s</string>
     <string name="cs3wiki">CloudStream Wiki</string>
     <string name="next_season_episode_format" formatted="true">Sezonul %1$d Episod %2$d va fi lansat în</string>
     <string name="player_settings_select_cast_device">Selectați divece-ul pe care doriți să faceți cast</string>
     <string name="episode_action_cast_mirror">Cast mirror</string>
-    <string name="hide_player_control_names_key" translatable="false">hide_player_control_names_key</string>
     <string name="play_from_beginning_img_des">Redă de la început</string>
     <string name="downloads_empty">Nu există descărcări.</string>
     <string name="downloads_delete_select">Selectionati elementele de sters</string>
@@ -642,4 +613,32 @@
     <string name="deselect_all">Deselectionati totul</string>
     <string name="torrent_info">Acest video este un Torrent, ceea ce înseamnă că activitatea dumneavoastră video poate fi urmărită.\n Asigurați-vă că înțelegeți Torrentul înainte să continuați.</string>
     <string name="offline_file">Disponibil pentru vizionare offline</string>
-</resources>
\ No newline at end of file
+    <string name="speech_recognition_unavailable">Recogniție de voce nu este disponibilă</string>
+    <string name="begin_speaking">Începeți să vorbiți…</string>
+    <string name="open_local_video">Deschideți video local</string>
+    <string name="test_warning">Avertisment</string>
+    <string name="delete_message_multiple" formatted="true">Sunteți siguri că doriți să ștergeți definitiv următoarele fișiere?\n\n%s</string>
+    <string name="delete_message_series_section" formatted="true">Veți mai și șterge definitiv toate episoadele în seria următoare:\n\n%s</string>
+    <string name="delete_message_series_only" formatted="true">Sunteți siguri ca doriți sa ștergeți definitiv toate episoadele în seria următoare?\n\n%s</string>
+    <string name="audio_singular">Audio</string>
+    <string name="podcast_singular">Podcast</string>
+    <string name="encoding_error">Eroare de codificare</string>
+    <string name="unsupported_error">Eroare Nesuportată</string>
+    <string name="show_rating">Etichetă de clasificare</string>
+    <string name="delete_files">Ștergeți fișiere</string>
+    <string name="delete_format" formatted="true">Șterge (%1$d | %2$s)</string>
+    <string name="delete_message_series_episodes" formatted="true">Sunteți sigur că vreți să ștergeți permanent următoarele epsioade în %1$s?\n\n%2$s</string>
+    <string name="pref_category_security">Securitate</string>
+    <string name="pref_category_accounts">Conturi</string>
+    <string name="auth_locally">Autentificare locală</string>
+    <string name="player_load_one_subtitle_online">Încărcați prima disponibilă</string>
+    <string name="delete_plugin">Șterge pluginul</string>
+    <string name="dismiss">Închide</string>
+    <string name="download_time_left_hour_min_sec_format" formatted="true">%1$do %2$dm %3$ds</string>
+    <string name="download_time_left_min_sec_format" formatted="true">%1$dm %2$ds</string>
+    <string name="download_time_left_sec_format" formatted="true">%1$ds</string>
+    <string name="play_full_series_button">Redă întregul serial</string>
+    <string name="install_prerelease">Instalează versiunea preliminară</string>
+    <string name="prerelease_already_installed">Versiunea preliminară este deja instalată.</string>
+    <string name="prerelease_install_failed">Instalarea versiunii preliminare a eșuat.</string>
+</resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-b+ru/strings.xml
similarity index 86%
rename from app/src/main/res/values-ru/strings.xml
rename to app/src/main/res/values-b+ru/strings.xml
index 520229347c4..3f6a5d89d8f 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-b+ru/strings.xml
@@ -34,8 +34,7 @@
     <string name="preview_background_img_des">Предпросмотр фона</string>
     <string name="player_speed_text_format" formatted="true">Скорость (%.2fx)</string>
     <string name="rated_format" formatted="true">Оценили: %.1f</string>
-    <string name="new_update_format" formatted="true">Новое обновление найдено!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">Новое обновление найдено! \n%1$s -&gt; %2$s</string>
     <string name="filler" formatted="true">Заполнитель</string>
     <string name="app_name">CloudStream</string>
     <string name="action_remove_from_bookmarks">Убрать</string>
@@ -52,7 +51,7 @@
     <string name="next_episode">Следующая серия</string>
     <string name="result_tags">Жанры</string>
     <string name="result_share">Поделиться</string>
-    <string name="result_open_in_browser">Открыть в веб обозревателе</string>
+    <string name="result_open_in_browser">Открыть в Браузере</string>
     <string name="skip_loading">Пропустить загрузку</string>
     <string name="type_watching">Просмотр</string>
     <string name="type_on_hold">Приостановлено</string>
@@ -117,7 +116,6 @@
     <string name="download_storage_text">Внутренняя память</string>
     <string name="popup_resume_download">Продолжить Скачать</string>
     <string name="popup_pause_download">Остановить скачивание</string>
-    <string name="pref_disable_acra">Отключить автоматическое информирование об ошибках</string>
     <string name="subs_import_text" formatted="true">Импортируйте шрифты поместив их в %s</string>
     <string name="continue_watching">Продолжить смотреть</string>
     <string name="action_remove_watching">Убрать</string>
@@ -158,14 +156,12 @@
     <string name="automatic_plugin_download">Автозагрузка дополнений</string>
     <string name="updates_settings">Показать обновления приложения</string>
     <string name="updates_settings_des">Автоматически проверять обновления при старте приложения.</string>
-    <string name="uprereleases_settings">Обновится до предвыпуска</string>
     <string name="apk_installer_settings">APK установщик</string>
     <string name="github">Github</string>
     <string name="app_language">Язык приложения</string>
     <string name="no_links_found_toast">Ссылок не найдено</string>
     <string name="copy_link_toast">Ссылка скопирована в буфер обмена</string>
     <string name="subs_default_reset_toast">Восстановить по умолчанию</string>
-    <string name="acra_report_toast">Извините, приложение прекратило работу. Анонимный отчёт об ошибке будет отправлен разработчикам</string>
     <string name="episode">Серия</string>
     <string name="episodes">Серии</string>
     <string name="season_short">С</string>
@@ -175,10 +171,8 @@
     <string name="resume">Продолжить</string>
     <string name="go_back_30">-30</string>
     <string name="go_forward_30">+30</string>
-    <string name="delete_message" formatted="true">Это будет удалено безвозвратно%s
-\nВы уверены?</string>
-    <string name="resume_time_left" formatted="true">%d мин.
-\nосталось</string>
+    <string name="delete_message" formatted="true">Это будет удалено безвозвратно%s \nВы уверены?</string>
+    <string name="resume_time_left" formatted="true">%d мин. \nосталось</string>
     <string name="status_completed">Завершено</string>
     <string name="year">Год</string>
     <string name="rating">Рейтинг</string>
@@ -220,7 +214,6 @@
     <string name="pref_category_extensions">Дополнения</string>
     <string name="category_player">Плеер</string>
     <string name="backup_settings">Резервное копирование данных</string>
-    <string name="bug_report_settings_off">Отправлять данные только при вылетах</string>
     <string name="used_storage">Использовано</string>
     <string name="double_tap_to_pause_settings">Двойное нажатие для паузы</string>
     <string name="double_tap_to_seek_settings_des">Коснитесь дважды правой или левой стороны для поиска вперед или назад</string>
@@ -231,7 +224,7 @@
     <string name="restore_settings">Восстановить данные из резервной копии</string>
     <string name="show_fillers_settings">Показывать Филлер серии для аниме</string>
     <string name="kitsu_settings">Показывать афиши из Kitsu</string>
-    <string name="apk_installer_settings_des">Некоторые телефоны не поддерживают новые установщики. Попробуйте использовать legacy (старый) вариант, если обновления не устанавливаются.</string>
+    <string name="apk_installer_settings_des">Некоторые устройства не поддерживают новые установщики. Попробуйте использовать legacy (старый) вариант, если обновления не устанавливаются.</string>
     <string name="status_ongoing">Выходит</string>
     <string name="video_lock">Блокировка</string>
     <string name="no_update_found">Обновление не найдено</string>
@@ -275,7 +268,6 @@
     <string name="episode_sync_settings">Обновлять прогресс просмотра</string>
     <string name="backup_success">Данные сохранены</string>
     <string name="advanced_search_des">Показывает результаты поиска, разделенные по поставщикам</string>
-    <string name="uprereleases_settings_des">Поиск предварительных обновлений вместо полных выпусков</string>
     <string name="redo_setup_process">Повторить процесс настройки</string>
     <string name="no_chromecast_support_toast">Этот поставщик не поддерживает Chromecast</string>
     <string name="season_format">%1$s %2$d%3$s</string>
@@ -308,9 +300,9 @@
     <string name="app_not_found_error">Приложение не найдено</string>
     <string name="all_languages_preference">Все языки</string>
     <string name="skip_type_op">Вступление</string>
-    <string name="skip_type_creddits">Титры</string>
+    <string name="skip_type_credits">Титры</string>
     <string name="action_mark_as_watched">Отметить как просмотренное</string>
-    <string name="limit_title_rez">Разрешение видеоплеера</string>
+    <string name="limit_title_rez">Показывать информацию про видеоплеер</string>
     <string name="watch_quality_pref">Предпочтительное качество видео (WiFi)</string>
     <string name="limit_title">Максимум символов</string>
     <string name="video_buffer_length_settings">Длинна буфера</string>
@@ -416,9 +408,7 @@
     <string name="trailer">Трейлер</string>
     <string name="single_plugin_disabled" formatted="true">%s (отключено)</string>
     <string name="next">Далее</string>
-    <string name="blank_repo_message">В CloudStream по умолчанию не установлены сайты. Вам необходимо установить сайты из репозиториев.
-\n
-\nПрисоединяйтесь к нашему Discord-серверу или найдите в интернете.</string>
+    <string name="blank_repo_message">В CloudStream по умолчанию не установлены сайты. Вам необходимо установить сайты из репозиториев. \n \nПрисоединяйтесь к нашему Discord-серверу или найдите в интернете.</string>
     <string name="error_invalid_data">Недопустимые данные</string>
     <string name="resolution_and_title">Разрешение и название</string>
     <string name="previous">Предыдущий</string>
@@ -445,7 +435,7 @@
     <string name="batch_download_nothing_to_download_format" formatted="true">Все %s уже скачаны</string>
     <string name="batch_download_start_format" formatted="true">Скачивание началась %1$d %2$s…</string>
     <string name="plugins_not_downloaded" formatted="true">Не скачано: %d</string>
-    <string name="download_all_plugins_from_repo">Внимание: CloudStream 3 не несёт ответственность за сторонние файлы и не поддерживает их!</string>
+    <string name="download_all_plugins_from_repo">Внимание: CloudStream не несёт ответственность за сторонние файлы и не поддерживает их!</string>
     <string name="safe_mode_title">Включен безопасный режим</string>
     <string name="plugins_downloaded" formatted="true">Скачано: %d</string>
     <string name="plugins_updated" formatted="true">Обновлено %d дополнений</string>
@@ -453,7 +443,6 @@
     <string name="update_notification_downloading">Скачивание обновления приложения…</string>
     <string name="error_invalid_url">Недопустимый URL</string>
     <string name="apply_on_restart">Перезапустите приложение, чтобы увидеть изменения.</string>
-    <string name="crash_reporting_title">Отчеты ошибках</string>
     <string name="preferred_media_subtext">Что вы хотите увидеть</string>
     <string name="provider_languages_tip">Смотрите видео на этих языках</string>
     <string name="downloaded_file">Скачано файл</string>
@@ -485,7 +474,6 @@
     <string name="random_button_settings_desc">Отображать случайную кнопку в библиотеке и главной странице</string>
     <string name="random_button_settings">Случайная кнопка</string>
     <string name="apk_installer_legacy">Устаревший</string>
-    <string name="bug_report_settings_on">Не отправляет данные</string>
     <string name="episode_action_reload_links">Перезагрузить ссылки</string>
     <string name="preferred_media_settings">Предпочтительные медиа</string>
     <string name="subtitles_depressed">Опущенные</string>
@@ -533,13 +521,7 @@
     <string name="already_voted">Вы уже проголосовали</string>
     <string name="no_plugins_found_error">Никаких дополнений не обнаружено в источнике</string>
     <string name="set_default">Поставить обычный</string>
-    <string name="quality_profile_help">Здесь вы можете изменить порядок расположения источников. Если видео имеет более высокий приоритет, оно будет отображаться выше в списке источников. Сумма приоритета источника и приоритета качества составляет приоритет видео.
-\n
-\nИсточник А: 3
-\nКачество Б: 7
-\nБудет иметь общий приоритет видео 10.
-\n
-\nПРИМЕЧАНИЕ. Если сумма равна 10 или более, плеер автоматически пропустит загрузку при загрузке этой ссылки!</string>
+    <string name="quality_profile_help">Здесь вы можете изменить порядок расположения источников. Если видео имеет более высокий приоритет, оно будет отображаться выше в списке источников. Сумма приоритета источника и приоритета качества составляет приоритет видео. \n \nИсточник А: 3 \nКачество Б: 7 \nБудет иметь общий приоритет видео 10. \n \nПРИМЕЧАНИЕ. Если сумма равна 10 или более, плеер автоматически пропустит загрузку при загрузке этой ссылки!</string>
     <string name="links_reloaded_toast">Ссылки перезагружены</string>
     <string name="select_an_account">Выберите учётную запись</string>
     <string name="favorite_removed">%s убрано из любимых</string>
@@ -562,12 +544,10 @@
     <string name="action_add_to_favorites">Добавить в любимое</string>
     <string name="auto_rotate_video_desc">Включить автоматическую смену ориентации экрана на основе ориентации видео</string>
     <string name="auto_rotate_video">Автоповорот</string>
-    <string name="rotate_video_key">rotate_video_key</string>
     <string name="use_default_account">Использовать учётную запись по умолчанию</string>
     <string name="action_unsubscribe">Отписаться</string>
     <string name="duplicate_replace">Заменить</string>
     <string name="enter_current_pin">Введите текущий ПИН-код</string>
-    <string name="auto_rotate_video_key">auto_rotate_video_key</string>
     <string name="favorites_list_name">Любимые</string>
     <string name="favorite_added">%s добавлено в любимые</string>
     <string name="enter_pin_with_name" formatted="true">Введите ПИН-код от %s</string>
@@ -591,12 +571,11 @@
     <string name="app_unrestricted_toast">Использование батареи приложением уже настроено на неограниченное</string>
     <string name="app_info_intent_error">Не удаётся открыть информацию о приложении CloudStream.</string>
     <string name="biometric_setting">Заблокировать биометрией</string>
-    <string name="music_singlar">Музыка</string>
+    <string name="music_singular">Музыка</string>
     <string name="audio_book_singular">Аудиокнига</string>
-    <string name="custom_media_singluar">Медиа</string>
+    <string name="custom_media_singular">Медиа</string>
     <string name="biometric_setting_summary">Разблокируйте приложение с помощью отпечатка пальца, Face ID, ПИН-кода, шаблона и пароля.</string>
-    <string name="resume_remaining" formatted="true">%s
-\nосталось</string>
+    <string name="resume_remaining" formatted="true">%s \nосталось</string>
     <string name="battery_dialog_title">Отключить оптимизацию батареи</string>
     <string name="password_pin_authentication_title">Аутентификация по паролю/ПИН-коду</string>
     <string name="biometric_unsupported">Биометрическая аутентификация на этом устройстве не поддерживается</string>
@@ -607,7 +586,6 @@
     <string name="next_season_episode_format" formatted="true">Сезон %1$d серия %2$d выйдет</string>
     <string name="episode_upcoming_format" formatted="true">Выйдет %s</string>
     <string name="player_settings_select_cast_device">Выберите устройство для трансляции</string>
-    <string name="hide_player_control_names_key" translatable="false">hide_player_control_names_key</string>
     <string name="downloads_empty">В данный момент скачиваний нет.</string>
     <string name="play_from_beginning_img_des">Играть с самого начала</string>
     <string name="open_local_video">Открыть локальное видео</string>
@@ -627,9 +605,7 @@
     <string name="delete_message_series_only" formatted="true">Вы уверены, что хотите навсегда удалить все серии в данном сериале? \n \n%s</string>
     <string name="downloads_delete_select">Выберите элементы для удаления</string>
     <string name="delete_format" formatted="true">Удалить (%1$d | %2$s)</string>
-    <string name="delete_message_multiple" formatted="true">Вы уверены, что хотите навсегда удалить данный объект?
-\n
-\n%s</string>
+    <string name="delete_message_multiple" formatted="true">Вы уверены, что хотите навсегда удалить данный объект? \n \n%s</string>
     <string name="device_pin_error_message">Невозможно получить ПИН-код устройства, попробуйте локальную аутентификацию</string>
     <string name="device_pin_url_message">Откройте <b>%s</b> на вашем смартфоне или компьютере и введите данный код</string>
     <string name="cs3wiki">CloudStream Вики</string>
@@ -642,7 +618,7 @@
     <string name="auth_locally">Войти локально</string>
     <string name="preview_seekbar">Предпросмотр поисковой строки</string>
     <string name="preview_seekbar_desc">Включить предпросмотр миниатюр в поисковой строке</string>
-    <string name="no_subtitles_loaded">Субтитры еще не скачаны</string>
+    <string name="no_subtitles_loaded">Субтитры пока что не скачаны</string>
     <string name="confirm_before_exiting_title">Подтвердить перед выходом</string>
     <string name="confirm_before_exiting_desc">Показать диалог перед выходом из приложения</string>
     <string name="show">Показать</string>
@@ -654,8 +630,8 @@
     <string name="encoding_error">Ошибка кодировки</string>
     <string name="unsupported_error">Не поддерживается</string>
     <string name="player_load_one_subtitle_online">Скачать первые доступные</string>
-    <string name="audio_singluar">Аудио</string>
-    <string name="podcast_singluar">Подкаст</string>
+    <string name="audio_singular">Аудио</string>
+    <string name="podcast_singular">Подкаст</string>
     <string name="sort_episodes_number_asc">Серия (по возрастанию)</string>
     <string name="subtitles_from_embedded">Встроенный</string>
     <string name="subtitles_from_online">Из сети</string>
@@ -665,7 +641,7 @@
     <string name="sort_button_rating">Оценка %s</string>
     <string name="sort_button_date">Дата %s</string>
     <string name="sort_episodes_date_newest">Дата выпуска (Новейшие)</string>
-    <string name="software_decoding_desc">Программное декодирование позволяет плееру воспроизводить видео, которые не поддерживаются вашим телефоном, но может быть с задержками или нестабильным при высоком разрешении</string>
+    <string name="software_decoding_desc">Программное декодирование позволяет проигрователю воспроизводить видео, которые не поддерживаются вашим устройством, но может быть с задержками или нестабильным воспроизведением при высоком разрешении.</string>
     <string name="software_decoding">Программное декодирование</string>
     <string name="player_notification_channel_description">Уведомление проигрывателя для управления воспроизведением в фоновом режиме</string>
     <string name="update_plugins">Обновить дополнения</string>
@@ -685,4 +661,78 @@
     <string name="all_subtitles_italic">Сделать все субтитры курсивом</string>
     <string name="volume_exceeded_100">Громкость превысила 100%</string>
     <string name="slide_up_again_to_exceed_100">Повысьте снова чтобы перевысить 100%</string>
-</resources>
\ No newline at end of file
+    <string name="go_to_downloads">Перейти к загрузкам</string>
+    <string name="no_internet_connection">Нет подключения к Интернету.\n\nПожалуйста, подключитесь к Интернету и повторите попытку, или смотрите свои загрузки, находясь в автономном режиме.</string>
+    <string name="download_parallel_settings_des">Сколько различных элементов можно загружать параллельно</string>
+    <string name="parallel_downloads">Параллельные загрузки</string>
+    <string name="concurrent_connections">Одновременные соединения</string>
+    <string name="concurrent_connections_settings_des">Сколько одновременных соединений может использовать каждая загрузка во время скачивания</string>
+    <string name="overscan_settings_des">Изменение границ экрана</string>
+    <string name="overscan_settings">Пересканирование</string>
+    <string name="poster_size_settings_des">Изменение размера плакатов</string>
+    <string name="poster_size_settings">Размер плаката</string>
+    <string name="player_settings_always_ask">Спрашивать всегда</string>
+    <string name="speedup_title">Переключение скорости при длительном нажатии</string>
+    <string name="speedup_summary">Удерживайте, чтобы увеличить скорость в 2 раза</string>
+    <string name="download_time_left_hour_min_sec_format" formatted="true">%1$dч %2$dм %3$dс</string>
+    <string name="download_time_left_min_sec_format" formatted="true">%1$dм %2$dс</string>
+    <string name="download_time_left_sec_format" formatted="true">%1$dс</string>
+    <string name="show_rating">Рейтинговая этикетка</string>
+    <string name="no_account">Не существует учетной записи</string>
+    <string name="edit_profile_image_title">Изменить изображение профиля</string>
+    <string name="edit_profile_image_hint">Введите URL изображения профиля</string>
+    <string name="edit_profile_image_error_empty">URL не найден</string>
+    <string name="edit_profile_image_error_invalid">Неверный URL или изображение</string>
+    <string name="edit_profile_image_success">Изображение успешно обновлено</string>
+    <string name="action_mark_watched_up_to_this_episode">Отметить как просмотренное до этого эпизода</string>
+    <string name="action_remove_mark_watched_up_to_this_episode">Удалить просмотренное до этой серии</string>
+    <string name="action_reload">Перезагрузка</string>
+    <string name="reload_provider">Перезагрузить провайдер</string>
+    <string name="episode_action_play_mirror">Запустить зеркало</string>"
+    <string name="name">Имя</string>
+    <string name="resolution_and_name">Резолюция и название</string>
+    <string name="subs_subtitle_alignment">Выравнивание Субтитров</string>
+    <string name="bottom_left">Нижний левый</string>
+    <string name="bottom_center">Нижний центр</string>
+    <string name="bottom_right">Нижний правый</string>
+    <string name="middle_left">Средний левый</string>
+    <string name="middle_center">Средний центр</string>
+    <string name="middle_right">Средний правый</string>
+    <string name="top_left">Верхний слева</string>
+    <string name="top_center">Верхний центр</string>
+    <string name="top_right">Верхний справа</string>
+    <string name="play_full_series_button">Смотреть полностью</string>
+    <string name="install_prerelease">Установить предварительный выпуск</string>
+    <string name="prerelease_already_installed">Предварительный выпуск уже установлен.</string>
+    <string name="prerelease_install_failed">Не удалось установить предварительный выпуск.</string>
+    <string name="show_episode_text">Текст эпизода</string>
+    <string name="search_suggestions">Поиск предложений</string>
+    <string name="search_suggestions_des">Показывать подсказки поиска при вводе текста</string>
+    <string name="clear_suggestions">Очистить подсказки</string>
+    <string name="show_cast_in_details">Показать панель приведения</string>
+    <string name="video_info">Информация о средствах массовой информации</string>
+    <string name="source_name">Имя источника</string>
+    <plurals name="downloads_active">
+        <item quantity="one">%d активная загрузка</item>
+        <item quantity="few">%d активные загрузки</item>
+        <item quantity="many">%d активных загрузок</item>
+        <item quantity="other">%d активных загрузок</item>
+    </plurals>
+    <plurals name="downloads_queued">
+        <item quantity="one">Запланировано %d загрузка</item>
+        <item quantity="few">Запланировано %d загрузки</item>
+        <item quantity="many">Запланировано %d загрузок</item>
+        <item quantity="other">Запланировано %d загрузок</item>
+    </plurals>
+    <string name="download_queue">Очередь загрузок</string>
+    <string name="queue_empty_message">В настоящее время нет загрузок в очереди.</string>
+    <string name="extra_brightness_settings">Дополнительная яркость</string>
+    <string name="extra_brightness_settings_des">Включать фильтр яркости при превышении 100% яркости</string>
+    <string name="extra_brightness_key">extra_brightness_enabled</string>
+    <string name="source_priority">Приоритетный источник</string>
+    <string name="source_priority_help">Выберите способ сортировки видеоисточников в плеере</string>
+    <string name="download_all">Скачать всё</string>
+    <string name="cancel_all">Отменить всё</string>
+    <string name="download_episode_range">Вы хотите загрузить эпизод %s?</string>
+    <string name="cancel_queue_message">Вы хотите отменить всё запланированные загрузки?</string>
+</resources>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-b+sk/strings.xml
similarity index 91%
rename from app/src/main/res/values-sk/strings.xml
rename to app/src/main/res/values-b+sk/strings.xml
index b13cbcc1192..f48b271433b 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-b+sk/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="new_update_format" formatted="true">Našla sa nová aktualizácia!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">Našla sa nová aktualizácia! \n%1$s -&gt; %2$s</string>
     <string name="filler" formatted="true">Výplň</string>
     <string name="next_episode_time_hour_format" formatted="true">%1$dh %2$dm</string>
     <string name="next_episode_format" formatted="true">Epizóda %d bude vydaná za</string>
@@ -50,7 +49,6 @@
     <string name="loading">Načítavanie…</string>
     <string name="type_completed">Dokončené</string>
     <string name="type_plan_to_watch">Plánujem pozerať</string>
-    <string name="pref_disable_acra">Zakázať automatické nahlasovanie chýb</string>
     <string name="home_more_info">Viac informácií</string>
     <string name="error_bookmarks_text">Záložky</string>
     <string name="play_movie_button">Prehrať film</string>
@@ -119,7 +117,7 @@
     <string name="browser">Prehliadač</string>
     <string name="normal_no_plot">Zhrnutie sa nenašlo</string>
     <string name="double_tap_to_pause_settings">Dvojitým ťuknutím pozastaviť</string>
-    <string name="category_updates">Aktualizácie a zálohovanie</string>
+    <string name="category_updates">Aktualizácie a Zálohovanie</string>
     <string name="settings_info">Informácie</string>
     <string name="advanced_search">Rozšírené vyhľadávanie</string>
     <string name="kitsu_settings">Zobraziť plagáty z Kitsu</string>
@@ -127,7 +125,7 @@
     <string name="pref_filter_search_quality">Skryť vybranú kvalitu videa vo výsledkoch vyhľadávania</string>
     <string name="show_fillers_settings">Zobraziť výplňovú epizódu pre anime</string>
     <string name="apk_installer_settings">APK inštalátor</string>
-    <string name="apk_installer_settings_des">Niektoré telefóny nepodporujú nový inštalátor balíčkov. Ak sa aktualizácie nenainštalujú, skúste použiť staršiu možnosť.</string>
+    <string name="apk_installer_settings_des">Niektoré zariadenia nepodporujú nový inštalátor balíčkov. Ak sa aktualizácie nenainštalujú, skúste použiť staršiu možnosť.</string>
     <string name="lightnovel">Nenáročná aplikácia pre romány od rovnakých vývojárov</string>
     <string name="app_language">Jazyk aplikácie</string>
     <string name="no_links_found_toast">Nenašli sa žiadne odkazy</string>
@@ -151,7 +149,6 @@
     <string name="double_tap_to_seek_settings">Dvojitým ťuknutím pretočiť</string>
     <string name="automatic_plugin_download">Automaticky sťahovať doplnky</string>
     <string name="discord">Pripojte sa na Discord</string>
-    <string name="bug_report_settings_on">Neodosiela žiadne dáta</string>
     <string name="player_size_settings_des">Odstrániť čierne okraje</string>
     <string name="updates_settings_des">Automaticky vyhľadať nové aktualizácie po spustení aplikácie.</string>
     <string name="play_episode_toast">Prehrať epizódu</string>
@@ -159,7 +156,7 @@
     <string name="player_subtitles_settings_des">Nastavenia titulkov prehrávača</string>
     <string name="autoplay_next_settings_des">Spustiť ďalšiu epizódu po skončení aktuálnej</string>
     <string name="chromecast_subtitles_settings">Chromecast titulky</string>
-    <string name="eigengraumode_settings">Eigengravy režim</string>
+    <string name="eigengraumode_settings">Rýchlosť prehrávania (Eigengravy režim)</string>
     <string name="swipe_to_seek_settings">Potiahnutím pretočiť</string>
     <string name="autoplay_next_settings">Automaticky prehrať ďalšiu epizódu</string>
     <string name="episode_sync_settings">Aktualizovať priebeh sledovania</string>
@@ -167,20 +164,16 @@
     <string name="use_system_brightness_settings_des">V prehrávači použiť systémový jas namiesto tmavého prekrytia</string>
     <string name="show_trailers_settings">Zobraziť upútavky</string>
     <string name="automatic_plugin_download_summary">Automaticky nainštalovať všetky ešte nenainštalované doplnky z pridaných repozitárov.</string>
-    <string name="bug_report_settings_off">Odosiela dáta len pri pádoch</string>
     <string name="library">Knižnica</string>
     <string name="github">GitHub</string>
     <string name="search">Hľadať</string>
-    <string name="category_account">Účty</string>
+    <string name="category_account">Účty a Zabezpečenie</string>
     <string name="chromecast_subtitles_settings_des">Nastavenia Chromecast titulkov</string>
     <string name="swipe_to_seek_settings_des">Potiahnutím zo strany na stranu môžete ovládať svoju pozíciu vo videu</string>
     <string name="restore_failed_format" formatted="true">Nepodarilo sa obnoviť dáta zo súboru %s</string>
     <string name="backup_failed_error_format">Chyba pri zálohovaní %s</string>
     <string name="advanced_search_des">Poskytne vám výsledky vyhľadávania rozdelené podľa poskytovateľa</string>
     <string name="updates_settings">Zobraziť aktualizácie aplikácie</string>
-    <string name="uprereleases_settings">Aktualizácia na predbežné vydania</string>
-    <string name="uprereleases_settings_des">Vyhľadať aktualizácie predbežných vydaní namiesto plných vydaní</string>
-    <string name="acra_report_toast">Ospravedlňujeme sa, aplikácia spadla. Vývojárom bude odoslané anonymné hlásenie o páde</string>
     <string name="subs_default_reset_toast">Obnoviť predvolenú hodnotu</string>
     <string name="season">Sezóna</string>
     <string name="synopsis">Synopsa</string>
@@ -209,7 +202,7 @@
     <string name="app_layout">Rozloženie aplikácie</string>
     <string name="example_email">ahoj@svet.sk</string>
     <string name="test_passed">Úspešné</string>
-    <string name="example_username">MojeSuperMeno</string>
+    <string name="example_username">Meno</string>
     <string name="tv_series">Seriály</string>
     <string name="tv_series_singular">Seriál</string>
     <string name="episode_short">E</string>
@@ -233,7 +226,7 @@
     <string name="episode_action_play_in_app">Prehrať v aplikácii</string>
     <string name="episodes_range">%1$d-%2$d</string>
     <string name="video_ram_description">Spôsobuje zlyhania, ak je nastavená príliš vysoko na zariadeniach s nízkou pamäťou, ako je Android TV.</string>
-    <string name="jsdelivr_proxy">raw.githubusercontent.com Proxy</string>
+    <string name="jsdelivr_proxy">GitHub Proxy</string>
     <string name="duration">Trvanie</string>
     <string name="app_storage">Aplikácia</string>
     <string name="sync_total_episodes_some" formatted="true">/%d</string>
@@ -248,7 +241,7 @@
     <string name="sync_score_format" formatted="true">%d / 10</string>
     <string name="resize_zoom">Priblížiť</string>
     <string name="torrent">Torrenty</string>
-    <string name="limit_title_rez">Rozlíšenie prehrávača</string>
+    <string name="limit_title_rez">Informácie o prehrávači</string>
     <string name="bottom_title_settings_des">Umiestniť názov pod plagát</string>
     <string name="watch_quality_pref">Preferovaná kvalita sledovania (WiFi)</string>
     <string name="pref_category_extensions">Rozšírenia</string>
@@ -266,11 +259,11 @@
     <string name="no_season">Žiadna sezóna</string>
     <string name="episode">Epizóda</string>
     <string name="episode_action_reload_links">Znova načítať odkazy</string>
-    <string name="provider_lang_settings">Jazyky poskytovateľa</string>
+    <string name="provider_lang_settings">Jazyky rozšírenia</string>
     <string name="start">Spustiť</string>
     <string name="livestreams">Živé prenosy</string>
     <string name="episode_action_download_subtitle">Stiahnuť titulky</string>
-    <string name="enable_nsfw_on_providers">Povoliť NSFW u podporovaných poskytovateľov</string>
+    <string name="enable_nsfw_on_providers">Povoliť NSFW u podporovaných rozšírení</string>
     <string name="pref_category_bypass">Obchádzanie ISP</string>
     <string name="poster_ui_settings">Prepnúť UI prvky na plagáte</string>
     <string name="pref_category_player_layout">Rozloženie</string>
@@ -296,7 +289,7 @@
     <string name="pref_category_looks">Vzhľad</string>
     <string name="season_format">%1$s %2$d%3$s</string>
     <string name="jsdelivr_proxy_summary">Obchádza blokovanie GitHubu pomocou jsDelivr. Môže spôsobiť oneskorenie aktualizácií o niekoľko dní.</string>
-    <string name="random_button_settings_desc">Zobraziť náhodné tlačidlo na domovskej stránke</string>
+    <string name="random_button_settings_desc">Zobraziť náhodné tlačidlo na domovskej stránke a Knižnici</string>
     <string name="logout">Odhlásiť sa</string>
     <string name="update">Aktualizovať</string>
     <string name="site">Stránka</string>
@@ -311,7 +304,7 @@
     <string name="add_site_pref">Klonovať stránku</string>
     <string name="ova">OVA</string>
     <string name="movies">Filmy</string>
-    <string name="example_site_url">príklad.sk</string>
+    <string name="example_site_url">https://example.com</string>
     <string name="pref_category_cache">Vyrovnávacia pamäť</string>
     <string name="jsdelivr_enabled">Nepodarilo sa pripojiť na GitHub. Zapína sa proxy jsDelivr…</string>
     <string name="no_episodes_found">Nenašli sa žiadne epizódy</string>
@@ -334,14 +327,12 @@
     <string name="category_providers">Poskytovatelia</string>
     <string name="tv_layout">TV rozloženie</string>
     <string name="example_lang_name">Kód jazyka (sk)</string>
-    <string name="example_site_name">MôjSuperWeb</string>
+    <string name="example_site_name">NovyNazovWebu</string>
     <string name="login_format" formatted="true">%1$s %2$s</string>
     <string name="legal_notice">Vylúčenie zodpovednosti</string>
     <string name="nsfw">NSFW</string>
-    <string name="delete_message" formatted="true">Týmto sa natrvalo vymaže %s
-\nSte si istý?</string>
-    <string name="resume_time_left" formatted="true">%dm
-\nzostáva</string>
+    <string name="delete_message" formatted="true">Týmto sa natrvalo vymaže %s \nSte si istý?</string>
+    <string name="resume_time_left" formatted="true">%dm \nzostáva</string>
     <string name="status_ongoing">Prebieha</string>
     <string name="status_completed">Dokončené</string>
     <string name="emulator_layout">Rozloženie emulátora</string>
@@ -367,15 +358,12 @@
     <string name="delete_repository">Zmazať repozitár</string>
     <string name="repository_url_hint">URL adresa repozitára</string>
     <string name="view_public_repositories_button_short">Verejný zoznam</string>
-    <string name="blank_repo_message">CloudStream nemá nainštalované žiadne stránky v predvolenom nastavení. Musíte nainštalovať stránky z repozitára.
-\n
-\nPripojte sa k nášmu Discord alebo vyhľadajte online.</string>
+    <string name="blank_repo_message">CloudStream nemá nainštalované žiadne stránky v predvolenom nastavení. Musíte nainštalovať stránky z repozitára. \n \nPripojte sa k nášmu Discord alebo vyhľadajte online.</string>
     <string name="update_notification_failed">Nepodarilo sa nainštalovať novú verziu aplikácie</string>
     <string name="download_all_plugins_from_repo">Upozornenie: CloudStream 3 nenesie žiadnu zodpovednosť za používanie rozšírenia tretích strán a neposkytuje žiadnu podporu pre nich!</string>
     <string name="add_repository">Pridať repozitár</string>
     <string name="repository_name_hint">Názov repozitára</string>
     <string name="view_public_repositories_button">Zobraziť komunitné repozitáre</string>
-    <string name="hide_player_control_names_key" translatable="false">hide_player_control_names_key</string>
     <string name="quality_hd">HD</string>
     <string name="category_player">Prehrávač</string>
     <string name="resolution_and_title">Rozlíšenie a titul</string>
@@ -389,8 +377,8 @@
     <string name="actor_background">Pozadie</string>
     <string name="setup_done">Hotovo</string>
     <string name="cartoons_singular">Kreslený</string>
-    <string name="music_singlar">Hudba</string>
-    <string name="custom_media_singluar">Médiá</string>
+    <string name="music_singular">Hudba</string>
+    <string name="custom_media_singular">Médiá</string>
     <string name="pref_category_accounts">Kontá</string>
     <string name="pref_category_security">Bezpečnosť</string>
     <string name="normal">Normálne</string>
@@ -435,7 +423,6 @@
     <string name="error_invalid_data">Neplatné dáta</string>
     <string name="error_invalid_url">Neplatná URL adresa</string>
     <string name="subtitles_remove_captions">Odstráňte uzavreté titulky od titulkov</string>
-    <string name="crash_reporting_title">Správy zlyhania</string>
     <string name="recommendations_tooltip">Zobraziť odporúčania</string>
     <string name="test_extensions">Otestujte všetky rozšírenia</string>
     <string name="episode_upcoming_format" formatted="true">Nadchádzajúce o %s</string>
@@ -461,8 +448,28 @@
     <string name="next">Ďalšie</string>
     <string name="select_all">Vybrať Všetko</string>
     <string name="deselect_all">Zrušiť výber všetkých</string>
-    <string name="audio_singluar">Zvuk</string>
-    <string name="podcast_singluar">Podcast</string>
+    <string name="audio_singular">Zvuk</string>
+    <string name="podcast_singular">Podcast</string>
     <string name="all">Všetko</string>
     <string name="encoding_error">Chyba kódovania</string>
-</resources>
\ No newline at end of file
+    <string name="download_time_left_hour_min_sec_format" formatted="true">%1$dh %2$dm %3$ds</string>
+    <string name="download_queue">Poradie sťahovania</string>
+    <string name="download_time_left_sec_format" formatted="true">%1$ds</string>
+    <string name="download_time_left_min_sec_format" formatted="true">%1$dm %2$ds</string>
+    <string name="speech_recognition_unavailable">Rozpoznanie reči nie je k dispozícii</string>
+    <string name="begin_speaking">Začnite hovoriť…</string>
+    <string name="queue_empty_message">Momentálne nie sú žiadne sťahovania v poradí.</string>
+    <string name="result_search_tooltip">Vyhľadávanie v iných rozšíreniach</string>
+    <string name="extra_brightness_settings">Extra Jas</string>
+    <string name="extra_brightness_settings_des">Spustiť filter jasu, keď je prekročený 100% jas displeja</string>
+    <string name="extra_brightness_key">extra_jas_zapnuty</string>
+    <string name="search_suggestions">Návrhy vyhľadávania</string>
+    <string name="search_suggestions_des">Zobraziť návrhy vyhľadávania pri písaní</string>
+    <string name="clear_suggestions">Vyčistiť Návrhy</string>
+    <string name="install_prerelease">Nainštalujte pre-release verziu</string>
+    <string name="prerelease_already_installed">Pre-release je už nainštalovaný.</string>
+    <string name="prerelease_install_failed">Nepodarilo sa nainštalovať pre-release.</string>
+    <string name="unsupported_error">Nepodporovaná chyba</string>
+    <string name="show_episode_text">Text Epizódy</string>
+    <string name="auth_locally">Lokálna verifikácia</string>
+</resources>
diff --git a/app/src/main/res/values-so/strings.xml b/app/src/main/res/values-b+so/strings.xml
similarity index 95%
rename from app/src/main/res/values-so/strings.xml
rename to app/src/main/res/values-b+so/strings.xml
index 8b1e4cc1511..0eb7873112f 100644
--- a/app/src/main/res/values-so/strings.xml
+++ b/app/src/main/res/values-b+so/strings.xml
@@ -27,8 +27,7 @@
     <string name="duration_format" formatted="true">%d dqq</string>
     <string name="title_home">Kadinka</string>
     <string name="rated_format" formatted="true">Qiimaysan: %.1f</string>
-    <string name="new_update_format" formatted="true">App cusub baa soo baxay!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">App cusub baa soo baxay! \n%1$s -&gt; %2$s</string>
     <string name="title_downloads">Soo dejinta</string>
     <string name="title_search">Raadi</string>
     <string name="episode_more_options_des">Dookhyo kale</string>
@@ -67,7 +66,6 @@
     <string name="app_dubbed_text">Trj</string>
     <string name="download_started">Way bilaabmatay soo dejintu</string>
     <string name="stream">Daalaco</string>
-    <string name="pref_disable_acra">Jooji cillad gudbinta iskeed ah</string>
     <string name="download_canceled">Waa la joojiyey dejintan</string>
     <string name="update_started">Way bilaabantay cuaboonaysiintu</string>
     <string name="error_loading_links_toast">Soo raridda lifaaqyadu way fashilantay</string>
@@ -96,7 +94,6 @@
     <string name="category_updates">Gurmadka iyo cusbooneysiinta</string>
     <string name="restore_success">Waa la kaydiyet xogta gurmadka</string>
     <string name="advanced_search_des">Raadinta waxay kuugu kala qaybinaysaa mid kasta iyo qaybiyihiisa</string>
-    <string name="bug_report_settings_on">Ma jirto xog la dirayo</string>
     <string name="restore_failed_format" formatted="true">Way fashilantay in xogta laga soo celiyo faylka gurmadka%s</string>
     <string name="apk_installer_settings_des">Moobillada qaar ayaa awoodin iney Rakibaha cusub een isticmaalnay, kan ku day haddii cusbooneysiintu kuu shaqayn weydo.</string>
     <string name="go_forward_30">+30</string>
@@ -108,7 +105,6 @@
     <string name="automatic_plugin_download">Si iskii ah usoo deji sidkanaha</string>
     <string name="pref_filter_search_quality">Qari tayada muqaalka aad dooratay natiijada waxa aad raadiso</string>
     <string name="advanced_search">Raadin heer-sare ah</string>
-    <string name="bug_report_settings_off">Keliya xogta waxaa ka dirayaa marka appku duqeeyo</string>
     <string name="show_fillers_settings">Xalqad buuxis ah tusi anemiga</string>
     <string name="benene">Dhiseyaasha appka sii beniin</string>
     <string name="storage_error">Way fashilantay dejintu, hubi ogolaanshaha isticmaalka kaydka</string>
@@ -155,7 +151,6 @@
     <string name="action_remove_watching">Ka saar</string>
     <string name="action_open_watching">Xog dheeri ah</string>
     <string name="kitsu_settings">Tusi Boodhka Kitsu</string>
-    <string name="uprereleases_settings_des">Waxa laa raadinayaa haddii ay wax jiraan baahin-horaad ah, halkii la sugi lahaa baahin buuxda</string>
     <string name="automatic_plugin_updates">Si iskii ah u cusbooneysii sidkanaha</string>
     <string name="automatic_plugin_download_summary">Si iskii ah usoo deji dhamaan sidkanayaasha aan weli lasoo dejin ee ku jira kaydka aad keentay.</string>
     <string name="updates_settings_des">Marka ugu horreysa ee aad appka furto ayaad arkaysaa haddii wax cusub yihiin</string>
@@ -163,7 +158,6 @@
     <string name="updates_settings">Tus wixii appka ku cusub</string>
     <string name="redo_setup_process">Dib uso bilow fadhiisinta appka</string>
     <string name="episode_format" formatted="true">%1$d %2$s</string>
-    <string name="uprereleases_settings">Ku cusbooneysii baahinta ugu horreysa</string>
     <string name="apk_installer_settings">Rakibaha APKga</string>
     <string name="status_ongoing">Socda</string>
     <string name="github">Github</string>
@@ -176,7 +170,6 @@
     <string name="no_chromecast_support_toast">Bixiyahan kuma shaqeeyo koromakaastiga</string>
     <string name="subs_default_reset_toast">Asalkiisii hore kusoo celi</string>
     <string name="synopsis">Dulucuda</string>
-    <string name="acra_report_toast">Raalliahow, wuu duqeeyey appku, waxa warbixin cillad-saarka ka caawisa loo direy dhiseyaasha</string>
     <string name="season">Kalka</string>
     <string name="season_format">%1$s %2$d%3$s</string>
     <string name="episode">Xalqad</string>
@@ -189,11 +182,9 @@
     <string name="delete_file">Tirtir faylka</string>
     <string name="resume">Sii wado</string>
     <string name="go_back_30">-30</string>
-    <string name="delete_message" formatted="true">Dhamaantii waa la saari doona %s
-\nSow ma hubtid?</string>
+    <string name="delete_message" formatted="true">Dhamaantii waa la saari doona %s \nSow ma hubtid?</string>
     <string name="source_error">Fashil ka yimi xigashada</string>
-    <string name="resume_time_left" formatted="true">%ddq
-\nAyaa hadhsan</string>
+    <string name="resume_time_left" formatted="true">%ddq \nAyaa hadhsan</string>
     <string name="status_completed">Dhamaystirmay</string>
     <string name="year">Sannadka</string>
     <string name="rating">Qiimaynta</string>
@@ -433,11 +424,7 @@
     <string name="plugins_disabled" formatted="true">Xayiran: %d</string>
     <string name="plugins_not_downloaded" formatted="true">Aan dejinayn: %d</string>
     <string name="plugins_updated" formatted="true">Waxa la cusbooneysiiyey %d sidkane</string>
-    <string name="blank_repo_message">Ugu horreyn cloudstream ma laha wax websaydyo uu filimaanta kasoo xigto, waxay noqonaysaa inaad adigu rakibato reboositarradooda...
-\n
-\nSababtuna waa in mar dhexdaas ah na dacweeyeen shirkadda Sky UK Limited🤮, markaa si aan mar dambe taasi u dhicin anagu kuma rakibi karno...
-\n
-\nDiscord naga soo qabo ama internetka ka baadh.</string>
+    <string name="blank_repo_message">Ugu horreyn cloudstream ma laha wax websaydyo uu filimaanta kasoo xigto, waxay noqonaysaa inaad adigu rakibato reboositarradooda... \n \nSababtuna waa in mar dhexdaas ah na dacweeyeen shirkadda Sky UK Limited🤮, markaa si aan mar dambe taasi u dhicin anagu kuma rakibi karno... \n \nDiscord naga soo qabo ama internetka ka baadh.</string>
     <string name="download_all_plugins_from_repo">Soo deji dhamaan sidkanayaasha reboositarkan?</string>
     <string name="result_poster_img_des">Boodhka</string>
     <string name="episode_poster_img_des">Boodhka xalqadda</string>
@@ -453,7 +440,6 @@
     <string name="previous">Kii hore</string>
     <string name="skip_setup">Is dhaafi fadhiisintan</string>
     <string name="app_layout_subtext">Beddel sida appku u muuqdo si uu ugu habboonaado moobilekaaga</string>
-    <string name="crash_reporting_title">Warbixinra cillad-saarka</string>
     <string name="preferred_media_subtext">Maxaad rabtaa inaad daawato</string>
     <string name="setup_done">Dhan</string>
     <string name="add_repository">Ku dar kayd-weyne</string>
@@ -478,6 +464,5 @@
     <string name="skip_type_mixed_ed">Dhamaad isku qasan</string>
     <string name="skip_type_op">Bilowga</string>
     <string name="skip_type_mixed_op">Bilow isku qasan</string>
-    <string name="skip_type_creddits">Qoraalka dhamaadka</string>
-    <string name="hide_player_control_names_key" translatable="false">hide_player_control_names_key</string>
-</resources>
\ No newline at end of file
+    <string name="skip_type_credits">Qoraalka dhamaadka</string>
+</resources>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-b+sv/strings.xml
similarity index 83%
rename from app/src/main/res/values-sv/strings.xml
rename to app/src/main/res/values-b+sv/strings.xml
index 594fef48107..52d4e1d05f8 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-b+sv/strings.xml
@@ -2,8 +2,7 @@
 <resources>
     <string name="rated_format">Betygsatt: %.1f</string>
     <string name="player_speed_text_format">Hastighet (%.2fx)</string>
-    <string name="new_update_format">Ny uppdatering hittad!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format">Ny uppdatering hittad! \n%1$s -&gt; %2$s</string>
     <string name="app_name">CloudStream</string>
     <string name="title_home">Hem</string>
     <string name="title_search">Sök</string>
@@ -40,13 +39,12 @@
     <string name="app_subbed_text">Sub</string>
     <string name="popup_delete_file">Radera fil</string>
     <string name="popup_play_file">Spela upp fil</string>
-    <string name="pref_disable_acra">Inaktivera automatisk felrapportering</string>
     <string name="home_more_info">Mer information</string>
     <string name="home_expanded_hide">Göm</string>
     <string name="home_main_poster_img_des">@string/result_poster_img_des</string>
     <string name="home_play">Spela upp</string>
     <string name="home_info">Info</string>
-    <string name="home_next_random_img_des">Nästa</string>
+    <string name="home_next_random_img_des">Nästa slumpvis</string>
     <string name="home_change_provider_img_des">Byt leverantör</string>
     <string name="filter_bookmarks">Filtrera bokmärken</string>
     <string name="error_bookmarks_text">Bokmärken</string>
@@ -94,12 +92,8 @@
     <string name="settings_info">Information</string>
     <string name="advanced_search">Avancerade sökresultat</string>
     <string name="advanced_search_des">Presenterar sökresultaten i flera olika rader baserat på leverantören</string>
-    <string name="bug_report_settings_off">Skickar endast data när appen kraschar</string>
-    <string name="bug_report_settings_on">Skickar ingen data</string>
     <string name="updates_settings">Visa appuppdateringar</string>
     <string name="updates_settings_des">Sök automatiskt efter nya uppdateringar vid start.</string>
-    <string name="uprereleases_settings">Uppdatera till beta-version</string>
-    <string name="uprereleases_settings_des">Sök efter beta-version istället för fullständiga utgåvor av appen</string>
     <string name="github">Github</string>
     <string name="lightnovel">Lightnovel app av samma utvecklare</string>
     <string name="anim">Anime app av samma utvecklare</string>
@@ -112,7 +106,6 @@
     <string name="copy_link_toast">Länken kopierades till urklipp</string>
     <string name="play_episode_toast">Spela upp avsnitt</string>
     <string name="subs_default_reset_toast">Återställd till standardvärdet</string>
-    <string name="acra_report_toast">Programmet kraschade tyvärr. En anonym felrapport kommer att skickas till utvecklarna</string>
     <string name="error_loading_links_toast">Fel uppstod vid laddning av länkarna</string>
     <string name="season">Säsong</string>
     <string name="no_season">Ingen Säsong</string>
@@ -123,8 +116,7 @@
     <string name="delete_file">Ta bort nerladdad fil</string>
     <string name="delete">Ta bort</string>
     <string name="cancel">Avbryt</string>
-    <string name="delete_message">%s kommer att raderas permanent
-\nÄr du helt säker?</string>
+    <string name="delete_message">%s kommer att raderas permanent \nÄr du helt säker?</string>
     <string name="status_ongoing">Pågående</string>
     <string name="status_completed">Färdig</string>
     <string name="status">Status</string>
@@ -237,8 +229,7 @@
     <string name="episode_format" formatted="true">%1$d %2$s</string>
     <string name="season_format">%1$s %2$d%3$s</string>
     <string name="go_back_30">-30</string>
-    <string name="resume_time_left" formatted="true">%dm
-\nåterstår</string>
+    <string name="resume_time_left" formatted="true">%dm \nåterstår</string>
     <string name="nsfw">NSFW</string>
     <string name="ova_singular">OVA</string>
     <string name="torrent_singular">Torrent</string>
@@ -254,7 +245,7 @@
     <string name="backup_failed">Lagringsbehörigheter saknas. Var vänlig försök igen.</string>
     <string name="no_episodes_found">Inga episoder hittade</string>
     <string name="kitsu_settings">Visa bilder från Kitsu</string>
-    <string name="apk_installer_settings_des">Vissa telefoner stöder inte den nya paketinstallatören. Prova alternativet för äldre versioner om uppdateringarna inte installeras.</string>
+    <string name="apk_installer_settings_des">Vissa enheter stöjder inte den nya paketinstallatören. Prova alternativet för äldre versioner om uppdateringarna inte installeras.</string>
     <string name="apk_installer_settings">APK-installatör</string>
     <string name="subs_import_text" formatted="true">Importera typsnitt genom att placera filerna i %s</string>
     <string name="episode_sync_settings_des">Automatiskt uppdatera antalet episoder sedda</string>
@@ -276,7 +267,7 @@
     <string name="show_hd">Kvalitetsetikett</string>
     <string name="show_title">Titel</string>
     <string name="poster_ui_settings">Växla UI-element på affisch</string>
-    <string name="limit_title_rez">Videospelarens upplösning</string>
+    <string name="limit_title_rez">Visa videospelarens information</string>
     <string name="history">Historik</string>
     <string name="action_mark_as_watched">Markera som sedd</string>
     <string name="chromecast_subtitles_settings_des">Inställningar för Chromecast-undertexter</string>
@@ -310,7 +301,6 @@
     <string name="home_random">Slumpmässig</string>
     <string name="coming_soon">Kommer snart…</string>
     <string name="subtitles_filter_lang">Filtrera efter föredraget språk</string>
-    <string name="crash_reporting_title">Kraschrapportering</string>
     <string name="authenticated_user_fail" formatted="true">Kunde inte logga in på %s</string>
     <string name="pref_category_looks">Utseende</string>
     <string name="category_ui">Layout</string>
@@ -428,7 +418,7 @@
     <string name="stream">Nätverksflöde</string>
     <string name="repository_name_hint">Databasens namn (valfritt)</string>
     <string name="batch_download_nothing_to_download_format" formatted="true">All %s har redan laddats ner</string>
-    <string name="download_all_plugins_from_repo">Varning: CloudStream 3 tar inget ansvar för att använda tredjepartstillägg och ger inget stöd för dem!</string>
+    <string name="download_all_plugins_from_repo">Varning: CloudStream tar inget ansvar för att använda tredjepartstillägg och ger inget stöd för dem!</string>
     <string name="safe_mode_title">Felsäkert läge på</string>
     <string name="apply_on_restart">Starta om appen för att se ändringar.</string>
     <string name="player_settings_play_in_app">Intern spelare</string>
@@ -472,7 +462,6 @@
     <string name="edit_account">Redigera konto</string>
     <string name="logged_account" formatted="true">Loggat in som %s</string>
     <string name="skip_startup_account_select_pref">Hoppa över val av konto vid start</string>
-    <string name="auto_rotate_video_key">auto_rotera_video_nyckel</string>
     <string name="jsdelivr_proxy_summary">Gå förbi blockering av rå GitHub-URL:er med jsDelivr. Kan göra att uppdateringar försenas med några dagar.</string>
     <string name="pref_category_actions">Funktion</string>
     <string name="preferred_media_settings">Önskad media</string>
@@ -492,16 +481,12 @@
     <string name="view_public_repositories_button">Visa community databaser</string>
     <string name="skip_type_mixed_op">Blandad inledning</string>
     <string name="skip_type_format" formatted="true">Skippa %s</string>
-    <string name="blank_repo_message">CloudStream har inga webbplatser installerade som standard. Du måste installera webbplatser från arkiv.
-\n
-\nGå med i vår Discord eller sök online.</string>
+    <string name="blank_repo_message">CloudStream har inga webbplatser installerade som standard. Du måste installera webbplatser från arkiv. \n \nGå med i vår Discord eller sök online.</string>
     <string name="select_library">Välj bibliotek</string>
-    <string name="empty_library_no_accounts_message">Ditt bibliotek är tomt :(
-\nLogga in på ett bibliotekskonto eller lägg till program i ditt lokala bibliotek.</string>
+    <string name="empty_library_no_accounts_message">Ditt bibliotek är tomt :( \nLogga in på ett bibliotekskonto eller lägg till program i ditt lokala bibliotek.</string>
     <string name="enable_skip_op_from_database_des">Visa hoppa över popups för introduktion/eftertexter</string>
     <string name="action_remove_from_watched">Ta bort från sett</string>
-    <string name="safe_mode_file">Fil i säkertläge hittades!
-\nLaddar inte några tillägg vid start tills filen har tagits bort.</string>
+    <string name="safe_mode_file">Fil i säkertläge hittades! \nLaddar inte några tillägg vid start tills filen har tagits bort.</string>
     <string name="subscription_in_progress_notification">Uppdaterar prenumererade program</string>
     <string name="subscription_list_name">Prenumererad</string>
     <string name="action_subscribe">Prenumerera</string>
@@ -557,31 +542,18 @@
     <string name="setup_extensions_subtext">Ladda ner listan över webbplatser du vill använda</string>
     <string name="single_plugin_disabled" formatted="true">%s (Inaktiverad)</string>
     <string name="extension_description">Beskrivning</string>
-    <string name="skip_type_creddits">Eftertexter</string>
+    <string name="skip_type_credits">Eftertexter</string>
     <string name="skip_type_intro">Introduktion</string>
     <string name="favorites_list_name">Favoriter</string>
     <string name="set_default">Ange standard</string>
     <string name="favorite_removed">%s togs bort från favoriter</string>
     <string name="favorite_added">%s har lagts till i favoriter</string>
     <string name="use_default_account">Använd standard konto</string>
-    <string name="rotate_video_key">rotera_video_nyckel</string>
     <string name="pin">PIN-kod</string>
     <string name="android_tv_interface_off_seek_settings_summary">Sök mängden som används när spelaren är dold</string>
-    <string name="duplicate_message_multiple" formatted="true">Det verkar som om ett potentiellt duplicerat objekt redan finns i ditt bibliotek:
-\n
-\n\'%s.\'
-\n
-\nVill du lägga till det här objektet ändå, ersätta det befintliga eller avbryta åtgärden?</string>
-    <string name="duplicate_message_single" formatted="true">Det verkar som om ett potentiellt duplicerat objekt redan finns i ditt bibliotek: \'%s.\'
-\n
-\nVill du lägga till det här objektet ändå, ersätta det befintliga eller avbryta åtgärden?</string>
-    <string name="quality_profile_help">Här kan du ändra hur källorna ska sorteras, om en video har högre prioritet visas den högre upp i källvalet. Summan av källprioriteten och kvalitetsprioriteten är videoprioriteten.
-\n
-\nKälla A: 3
-\nKvalitet B: 7
-\nKommer att ha en kombinerad videoprioritet på 10.
-\n
-\nOBS: Om summan är 10 eller mer kommer spelaren automatiskt att hoppa över laddningen när den länken laddas!</string>
+    <string name="duplicate_message_multiple" formatted="true">Det verkar som om ett potentiellt duplicerat objekt redan finns i ditt bibliotek: \n \n\'%s.\' \n \nVill du lägga till det här objektet ändå, ersätta det befintliga eller avbryta åtgärden?</string>
+    <string name="duplicate_message_single" formatted="true">Det verkar som om ett potentiellt duplicerat objekt redan finns i ditt bibliotek: \'%s.\' \n \nVill du lägga till det här objektet ändå, ersätta det befintliga eller avbryta åtgärden?</string>
+    <string name="quality_profile_help">Här kan du ändra hur källorna ska sorteras, om en video har högre prioritet visas den högre upp i källvalet. Summan av källprioriteten och kvalitetsprioriteten är videoprioriteten. \n \nKälla A: 3 \nKvalitet B: 7 \nKommer att ha en kombinerad videoprioritet på 10. \n \nOBS: Om summan är 10 eller mer kommer spelaren automatiskt att hoppa över laddningen när den länken laddas!</string>
     <string name="subscribe_tooltip">Avisering om nytt avsnitt</string>
     <string name="result_search_tooltip">Sök i andra tillägg</string>
     <string name="recommendations_tooltip">Visa rekommendationer</string>
@@ -596,11 +568,10 @@
     <string name="biometric_prompt_description">Efter några misslyckade försök stängs prompten. Starta bara om appen för att försöka igen.</string>
     <string name="favorite">Favorit</string>
     <string name="unfavorite">Ta bort från favoriter</string>
-    <string name="resume_remaining" formatted="true">%s
-\nkvarstår</string>
+    <string name="resume_remaining" formatted="true">%s \nkvarstår</string>
     <string name="toast_copied">kopierad!</string>
     <string name="repo_copy_label">Lagringsnamn och URL</string>
-    <string name="battery_dialog_message">För att säkerställa oavbrutna nedladdningar och aviseringar för prenumererade tv-program behöver CloudStream tillstånd att köras i bakgrunden. Genom att trycka på OK kommer du till App info. Där bläddrar du till appens batterianvändning och ställer in batterianvändningen på obegränsad. Observera att denna behörighet inte betyder att CS3 kommer att tömma ditt batteri. Den fungerar bara i bakgrunden när det behövs, till exempel när du tar emot aviseringar eller laddar ner videor från officiella tillägg. Om du väljer att avbryta kan du ändra denna inställning senare i allmänna inställningar.</string>
+    <string name="battery_dialog_message">För att säkerställa oavbrutna nedladdningar och aviseringar för prenumererade tv-program behöver CloudStream tillstånd att köras i bakgrunden. Genom att trycka på OK kommer du få en förfrågningsdialogruta. Tryck då på \'Tillåt\'.\n\nObservera att denna behörighet inte betyder att CS3 kommer att tömma ditt batteri. Den fungerar bara i bakgrunden när det behövs, till exempel när du tar emot aviseringar eller laddar ner videor från officiella tillägg.</string>
     <string name="biometric_warning">Din CloudStream-data har säkerhetskopierats nu. Även om möjligheten till detta är mycket liten, kan alla enheter bete sig olika. I det sällsynta fallet att du blir utelåst från att komma åt appen, rensa appdata helt och återställ från en säkerhetskopia. Vi ber om ursäkt för eventuella besvär som detta uppstår.</string>
     <string name="audio_book_singular">Ljudbok</string>
     <string name="clipboard_permission_error">Det gick inte att komma åt urklipp. Försök igen.</string>
@@ -608,18 +579,17 @@
     <string name="battery_dialog_title">Inaktivera batterioptimering</string>
     <string name="app_unrestricted_toast">Appens batterianvändning är redan inställd på obegränsad</string>
     <string name="app_info_intent_error">Det gick inte att öppna CloudStreams appinformation.</string>
-    <string name="music_singlar">Musik</string>
+    <string name="music_singular">Musik</string>
     <string name="reset_btn">Återställ</string>
     <string name="episode_upcoming_format" formatted="true">Kommer ut om %s</string>
     <string name="clipboard_unknown_error">Fel vid kopiering, kopiera logcat och kontakta appsupport.</string>
-    <string name="custom_media_singluar">Media</string>
+    <string name="custom_media_singular">Media</string>
     <string name="episode_action_cast_mirror">Cast mirror</string>
     <string name="next_season_episode_format" formatted="true">Säsong %1$d Avsnitt %2$d kommer att släppas om</string>
     <string name="player_settings_select_cast_device">Välj cast-enhet</string>
     <string name="cs3wiki">CloudStream Wiki</string>
     <string name="pref_category_accounts">Konton</string>
     <string name="pref_category_security">Säkerhet</string>
-    <string name="hide_player_control_names_key" translatable="false">hide_player_control_names_key</string>
     <string name="dismiss">Avfärda</string>
     <string name="open_downloaded_repo">Öppna databasen</string>
     <string name="device_pin_counter_text">Koden löper ut om %1$dm %2$ds</string>
@@ -627,9 +597,7 @@
     <string name="auth_locally">Autentisera lokalt</string>
     <string name="qr_image">QR-kodbild</string>
     <string name="device_pin_expired_message">PIN-koden har upphört att gälla!</string>
-    <string name="delete_message_series_episodes" formatted="true">Är du säker på att du vill radera följande avsnitt permanent i %1$s?
-\n
-\n%2$s</string>
+    <string name="delete_message_series_episodes" formatted="true">Är du säker på att du vill radera följande avsnitt permanent i %1$s? \n \n%2$s</string>
     <string name="preview_seekbar_desc">Aktivera förhandsgranskningsminiatyr i sökfältet</string>
     <string name="preview_seekbar">Förhandsgranskning av sökfältet</string>
     <string name="play_from_beginning_img_des">Spela från början</string>
@@ -643,15 +611,9 @@
     <string name="deselect_all">Avmarkera alla</string>
     <string name="delete_files">Radera Filer</string>
     <string name="delete_format" formatted="true">Radera (%1$d | %2$s)</string>
-    <string name="delete_message_multiple" formatted="true">Är du säker på att du vill ta bort följande objekt permanent?
-\n
-\n%s</string>
-    <string name="delete_message_series_section" formatted="true">Du kommer också permanent att radera alla avsnitt i följande serie:
-\n
-\n%s</string>
-    <string name="delete_message_series_only" formatted="true">Är du säker på att du permanent vill radera alla avsnitt i följande serie?
-\n
-\n%s</string>
+    <string name="delete_message_multiple" formatted="true">Är du säker på att du vill ta bort följande objekt permanent? \n \n%s</string>
+    <string name="delete_message_series_section" formatted="true">Du kommer också permanent att radera alla avsnitt i följande serie: \n \n%s</string>
+    <string name="delete_message_series_only" formatted="true">Är du säker på att du permanent vill radera alla avsnitt i följande serie? \n \n%s</string>
     <string name="delete_plugin">Ta bort insticksprogram</string>
     <string name="hide_player_control_names">Dölj namnen på spelarens kontroller</string>
     <string name="device_pin_url_message">Besök <b>%s</b> på din smartphone eller dator och ange koden ovan</string>
@@ -662,15 +624,15 @@
     <string name="show">Visa</string>
     <string name="backup_path_title">Säkerhetskopieringsmapp</string>
     <string name="confirm_before_exiting_desc">Visa dialogruta innan stängning av appen</string>
-    <string name="software_decoding_desc">Mjukvaruavkodning tillåter spelaren att spela upp videofiler som inte stöds av din enhet, men kan orsaka ostadig uppspelning vid hög upplösning</string>
-    <string name="audio_singluar">Ljud</string>
-    <string name="podcast_singluar">Podcast</string>
+    <string name="software_decoding_desc">Mjukvaruavkodning tillåter spelaren att spela upp videofiler som inte stöds av din enhet, men kan orsaka ostadig uppspelning vid hög upplösning.</string>
+    <string name="audio_singular">Ljud</string>
+    <string name="podcast_singular">Podcast</string>
     <string name="software_decoding">Mjukvaruavkodning</string>
-    <string name="torrent_not_accepted">Ogiltig torrent</string>
+    <string name="torrent_not_accepted">Starta om appen och acceptera popup-fönstret för Stream Torrent för att fortsätta.</string>
     <string name="torrent_preferred_media">Aktivera torrent i Inställningar/Leverantörer/Föredragen media</string>
     <string name="encoding_error">Avkodningsfel</string>
     <string name="player_load_one_subtitle_online">Ladda in första möjliga</string>
-    <string name="dont_show">Dölj</string>
+    <string name="dont_show">Visa inte</string>
     <string name="subs_edge_size">Kantstorlek</string>
     <string name="custom">Egen</string>
     <string name="unsupported_error">Stöds ej</string>
@@ -686,4 +648,91 @@
     <string name="sort_button_episode">Ep %s</string>
     <string name="sort_button_rating">Betyg%s</string>
     <string name="update_plugins">Uppdatera Plugins</string>
-</resources>
\ No newline at end of file
+    <string name="go_to_downloads">Gå till Hämtade filer</string>
+    <string name="download_parallel_settings_des">Mängden av olika föremål som kan bli nedladdat i parallell</string>
+    <string name="parallel_downloads">Parallel nedladdningar</string>
+    <string name="concurrent_connections">Samtidiga anslutningar</string>
+    <string name="concurrent_connections_settings_des">Mängden av samtidiga anslutningar varje nedladdning kan använda</string>
+    <string name="no_internet_connection">Ingen anslutning. \n\nAnslut till ett nätverk och försök igen. Du kan titta på dina nedladdningar medan du inte är ansluten.</string>
+    <string name="overscan_settings_des">Ändrar skärmens gränser</string>
+    <string name="overscan_settings">Överskanning</string>
+    <string name="poster_size_settings_des">Ändrar storleken på affischer</string>
+    <string name="poster_size_settings">Affischstorlek</string>
+    <string name="speedup_title">LångPress Hastighet Växling</string>
+    <string name="speedup_summary">Tryck ner för 2x hastighet</string>
+    <string name="edit_profile_image_title">Redigera Profil Bild</string>
+    <string name="edit_profile_image_hint">Ange URL för Profil Bilden</string>
+    <string name="edit_profile_image_error_empty">Inget URL hittades</string>
+    <string name="edit_profile_image_error_invalid">Ogiltig URL eller Bild</string>
+    <string name="edit_profile_image_success">Bilden ändrades</string>
+    <string name="action_mark_watched_up_to_this_episode">Markera som \"sett fram\" till detta avsnitt</string>
+    <string name="action_remove_mark_watched_up_to_this_episode">Ta bort \"sett fram\" till detta avsnitt</string>
+    <string name="action_reload">Omladdad</string>
+    <string name="reload_provider">Ladda om leverantören</string>
+    <string name="name">Namn</string>
+    <string name="source_name">Källnamn</string>
+    <string name="resolution_and_name">Upplösning och Namn</string>
+    <string name="download_all">Ladda ned alla</string>
+    <string name="cancel_all">Avbryt alla</string>
+    <string name="download_episode_range">Vill du ladda ned avsnitt %s?</string>
+    <string name="cancel_queue_message">Vill du avbryta alla köade hämtningar?</string>
+    <string name="subs_subtitle_alignment">Justera undertexter</string>
+    <string name="bottom_left">Nederst till vänster</string>
+    <string name="bottom_center">Nederst i mitten</string>
+    <string name="bottom_right">Nederst till höger</string>
+    <string name="middle_left">Mitten vänster</string>
+    <string name="middle_center">I mitten</string>
+    <string name="middle_right">Mitten till höger</string>
+    <string name="top_left">Övre vänster</string>
+    <string name="top_center">Övre mitten</string>
+    <string name="top_right">Övre höger</string>
+    <plurals name="downloads_active">
+        <item quantity="one">%d aktiv nedladdning</item>
+        <item quantity="other">%d aktiva nedladdningar</item>
+    </plurals>
+    <plurals name="downloads_queued">
+        <item quantity="one">%d nedladdning i kö</item>
+        <item quantity="other">%d nedladdningar i kö</item>
+    </plurals>
+    <string name="download_time_left_hour_min_sec_format" formatted="true">%1$dh %2$dm %3$ds</string>
+    <string name="download_time_left_min_sec_format" formatted="true">%1$dm %2$ds</string>
+    <string name="download_time_left_sec_format" formatted="true">%1$ds</string>
+    <string name="download_queue">Nedladdningskö</string>
+    <string name="play_full_series_button">Spela hela serierna</string>
+    <string name="queue_empty_message">Det finns inga nedladdningar i kö just nu.</string>
+    <string name="extra_brightness_settings">Extra ljusstyrka</string>
+    <string name="extra_brightness_settings_des">Aktivera ljusstyrkefiltret när ljusstyrkan överstiger 100%</string>
+    <string name="extra_brightness_key">extra_brightness_enabled</string>
+    <string name="search_suggestions">Sökförslag</string>
+    <string name="search_suggestions_des">Visa sökförslag medan du skriver</string>
+    <string name="clear_suggestions">Rensa förslag</string>
+    <string name="show_cast_in_details">Visa skådespelarpanelen</string>
+    <string name="install_prerelease">Installera förhandsversionen</string>
+    <string name="prerelease_already_installed">Förhandsversionen är redan installerad.</string>
+    <string name="prerelease_install_failed">Misslyckades med att installera förhandsversionen.</string>
+    <string name="episode_action_play_mirror">Spela mirror</string>"
+    <string name="show_rating">Graderingstitel</string>
+    <string name="show_episode_text">Avsnitt Text</string>
+    <string name="video_info">Media Info</string>
+    <string name="player_settings_always_ask">Fråga alltid</string>
+    <string name="sort_episodes_date_newest">Sändningsdatum (nyast)</string>
+    <string name="sort_episodes_date_oldest">Sändningsdatum (äldst)</string>
+    <string name="source_priority">Källprioritet</string>
+    <string name="source_priority_help">Välj hur videokällor ska sorteras i spelaren</string>
+    <string name="no_account">Inget konto</string>
+    <string name="slide_up_again_to_exceed_100">Dra uppåt igen för att gå över 100%</string>
+    <string name="starting_plugin_update_manually">Startar plugin uppdateringsprocessen!</string>
+    <string name="plugins_updated_manually">%d plugin(s) har uppdaterats!</string>
+    <string name="no_plugins_updated_manually">Inga plugins blev uppdaterade.</string>
+    <string name="player_notification_channel_name">Spelarnotiser</string>
+    <string name="player_notification_channel_description">Spelarnotisen för att styra uppspelningen i bakgrunden</string>
+    <string name="subtitles_from_embedded">Inbäddad</string>
+    <string name="subtitles_from_online">Ansluten</string>
+    <string name="all_subtitles_bold">Gör alla undertexter fetstilta</string>
+    <string name="all_subtitles_italic">Gör alla undertexter kursivstila</string>
+    <string name="background_radius">Bakgrundsradie</string>
+    <string name="show_player_metadata_overlay">Visa spelarens metadata överlägg</string>
+    <string name="video_singular">Video</string>
+    <string name="skip_type_preview">Förhandsvisning</string>
+    <string name="player_is_live">Live</string>
+</resources>
diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-b+ta/strings.xml
similarity index 82%
rename from app/src/main/res/values-ta/strings.xml
rename to app/src/main/res/values-b+ta/strings.xml
index 7604ec6f8fb..4cde39d8fa5 100644
--- a/app/src/main/res/values-ta/strings.xml
+++ b/app/src/main/res/values-b+ta/strings.xml
@@ -34,7 +34,6 @@
     <string name="popup_delete_file">கோப்பை அழி</string>
     <string name="popup_play_file">கோப்பு</string>
     <string name="popup_pause_download">இடைநிறுத்தம் பதிவிறக்கம்</string>
-    <string name="pref_disable_acra">தானியங்கி பிழை அறிக்கையை முடக்கு</string>
     <string name="home_more_info">மேலும் செய்தி</string>
     <string name="home_expanded_hide">மறை</string>
     <string name="action_remove_from_bookmarks">அகற்று</string>
@@ -203,7 +202,6 @@
     <string name="backup_frequency">காப்பு அதிர்வெண்</string>
     <string name="backup_success">தரவு சேமிக்கப்பட்டது</string>
     <string name="backup_failed">சேமிப்பக அனுமதிகள் இல்லை. தயவு செய்து மீண்டும் முயற்சிக்கவும்.</string>
-    <string name="bug_report_settings_off">செயலிழப்புகள் குறித்த தரவை மட்டுமே அனுப்புகிறது</string>
     <string name="poster_ui_settings">சுவரொட்டியில் இடைமுகம் கூறுகளை மாற்றவும்</string>
     <string name="check_for_update">மேம்படுத்தல் சோதிக்க</string>
     <string name="video_lock">பூட்டு</string>
@@ -213,7 +211,6 @@
     <string name="home_source">மூலம்</string>
     <string name="quality_cam_hd">கேம்</string>
     <string name="poster_image">சுவரொட்டி படம்</string>
-    <string name="crash_reporting_title">செயலிழப்பு அறிக்கை</string>
     <string name="view_public_repositories_button_short">பொது பட்டியல்</string>
     <string name="extension_version">பதிப்பு</string>
     <string name="select_library">நூலகத்தைத் தேர்ந்தெடுக்கவும்</string>
@@ -281,7 +278,7 @@
     <string name="resume">தற்குறிப்பு</string>
     <string name="go_back_30">-30</string>
     <string name="other_singular">ஒளிதோற்றம்</string>
-    <string name="limit_title_rez">வீடியோ பிளேயர் தீர்மானம்</string>
+    <string name="limit_title_rez">பிளேயர் தகவலைக் காட்டு</string>
     <string name="video_buffer_size_settings">வீடியோ இடையக அளவு</string>
     <string name="add_site_pref">நகலி தளம்</string>
     <string name="jsdelivr_proxy">அறிவிலிமையம் பதிலாள்</string>
@@ -289,7 +286,7 @@
     <string name="no_repository_found_error">களஞ்சியம் கிடைக்கவில்லை, முகவரி ஐ சரிபார்த்து VPN ஐ முயற்சிக்கவும்</string>
     <string name="batch_download">தொகுதி பதிவிறக்கம்</string>
     <string name="plugin_singular">சொருகு</string>
-    <string name="download_all_plugins_from_repo">எச்சரிக்கை: கிளவுட்ச்ட்ரீம் 3 மூன்றாம் தரப்பு நீட்டிப்புகளைப் பயன்படுத்துவதற்கான எந்தப் பொறுப்பையும் ஏற்காது, அவர்களுக்கு எந்த ஆதரவையும் வழங்காது!</string>
+    <string name="download_all_plugins_from_repo">எச்சரிக்கை: மூன்றாம் தரப்பு நீட்டிப்புகளைப் பயன்படுத்துவதற்கு CloudStream எந்தப் பொறுப்பையும் ஏற்காது, அவற்றிற்கு எந்த ஆதரவையும் வழங்காது!</string>
     <string name="extension_language">மொழி</string>
     <string name="revert">திரும்பவும்</string>
     <string name="subscription_deleted">%s இலிருந்து குழுவிலகப்பட்டது</string>
@@ -361,8 +358,7 @@
     <string name="emulator_layout">முன்மாதிரி தளவமைப்பு</string>
     <string name="downloaded_file">பதிவிறக்கம் செய்யப்பட்ட கோப்பு</string>
     <string name="resolution">பகுத்தல்</string>
-    <string name="empty_library_no_accounts_message">உங்கள் நூலகம் காலியாக உள்ளது :(
-\n நூலகக் கணக்கில் உள்நுழைக அல்லது உங்கள் உள்ளக நூலகத்தில் காட்சிகளைச் சேர்க்கவும்.</string>
+    <string name="empty_library_no_accounts_message">உங்கள் நூலகம் காலியாக உள்ளது :( \n நூலகக் கணக்கில் உள்நுழைக அல்லது உங்கள் உள்ளக நூலகத்தில் காட்சிகளைச் சேர்க்கவும்.</string>
     <string name="action_unsubscribe">குழுவிலகவும்</string>
     <string name="profiles">சுயவிவரங்கள்</string>
     <string name="pin_error_length">முள் 4 எழுத்துகளாக இருக்க வேண்டும்</string>
@@ -387,7 +383,6 @@
     <string name="updates_settings">பயன்பாட்டு புதுப்பிப்புகளைக் காட்டு</string>
     <string name="updates_settings_des">பயன்பாட்டைத் தொடங்கிய பின் புதிய புதுப்பிப்புகளைத் தானாகவே தேடுங்கள்.</string>
     <string name="redo_setup_process">அமைவு செயல்முறை மீண்டும்</string>
-    <string name="uprereleases_settings">முன்நிபந்தனைகளுக்கு புதுப்பிக்கவும்</string>
     <string name="lightnovel">அதே தேவ்சின் ஒளி நாவல் பயன்பாடு</string>
     <string name="benene">தேவ்சுக்கு ஒரு பெனீன் கொடுங்கள்</string>
     <string name="episode_format" formatted="true">%1$d %2$s</string>
@@ -410,13 +405,10 @@
     <string name="storage_error">பிழையைப் பதிவிறக்குங்கள், சேமிப்பக அனுமதிகளை சரிபார்க்கவும்</string>
     <string name="home_change_provider_img_des">வழங்குநரை மாற்றவும்</string>
     <string name="preview_background_img_des">முன்னோட்டம் பின்னணி</string>
-    <string name="bug_report_settings_on">எந்த தரவை அனுப்பவில்லை</string>
     <string name="show_fillers_settings">அனிமேசுக்கு நிரப்பு அத்தியாயத்தைக் காட்டு</string>
     <string name="automatic_plugin_download_summary">கூடுதல் களஞ்சியங்களிலிருந்து இன்னும் நிறுவப்படாத அனைத்து செருகுநிரல்களையும் தானாக நிறுவவும்.</string>
-    <string name="uprereleases_settings_des">முழு வெளியீடுகளுக்கு பதிலாக மட்டுமே புதுப்பிப்புகளைத் தேடுங்கள்</string>
     <string name="anim">அதே தேவ்சின் அனிம் பயன்பாடு</string>
     <string name="episodes">அத்தியாயங்கள்</string>
-    <string name="acra_report_toast">மன்னிக்கவும், விண்ணப்பம் செயலிழந்தது. ஒரு அநாமதேய பிழை அறிக்கை டெவலப்பர்களுக்கு அனுப்பப்படும்</string>
     <string name="status_completed">முடிந்தது</string>
     <string name="no_subtitles">வசன வரிகள் இல்லை</string>
     <string name="cartoons">கார்ட்டூன்கள்</string>
@@ -544,7 +536,7 @@
     <string name="player_settings_play_in_app">உள் வீரர்</string>
     <string name="skip_type_op">திறப்பு</string>
     <string name="skip_type_mixed_op">கலப்பு திறப்பு</string>
-    <string name="skip_type_creddits">வரவு</string>
+    <string name="skip_type_credits">வரவு</string>
     <string name="history">வரலாறு</string>
     <string name="ok">சரி</string>
     <string name="app_info_intent_error">கிளவுட்ச்ட்ரீமின் பயன்பாட்டுத் தகவலைத் திறக்க முடியவில்லை.</string>
@@ -556,14 +548,14 @@
     <string name="auto_rotate_video_desc">வீடியோ நோக்குநிலையின் அடிப்படையில் திரை நோக்குநிலையின் தானியங்கி மாறுவதை இயக்கவும்</string>
     <string name="auto_rotate_video">ஆட்டோ சுழலும்</string>
     <string name="favorite">பிடித்த</string>
-    <string name="music_singlar">இசை</string>
+    <string name="music_singular">இசை</string>
     <string name="ova">ஓவா</string>
     <string name="show_hd">தரமான சிட்டை</string>
     <string name="update">புதுப்பிப்பு</string>
     <string name="logout">விடுபதிகை</string>
     <string name="quality_webrip">விரலிடைத் தோல்</string>
-    <string name="apk_installer_settings_des">சில தொலைபேசிகள் புதிய தொகுப்பு நிறுவியை ஆதரிக்கவில்லை. புதுப்பிப்புகள் நிறுவப்படாவிட்டால் மரபு விருப்பத்தை முயற்சிக்கவும்.</string>
-    <string name="battery_dialog_message">சந்தா தொலைக்காட்சி நிகழ்ச்சிகளுக்கான தடையற்ற பதிவிறக்கங்கள் மற்றும் அறிவிப்புகளை உறுதிப்படுத்த, கிளவுட்ச்ட்ரீம் பின்னணியில் இயங்க இசைவு தேவை. சரி என்பதை அழுத்துவதன் மூலம், நீங்கள் பயன்பாட்டுத் தகவலுக்கு அனுப்பப்படுவீர்கள். அங்கு, 𝘼𝙥𝙥 𝘼𝙥𝙥 பெறுநர் க்கு உருட்டி, பேட்டரி பயன்பாட்டை 𝙐𝙣𝙧𝙚𝙨𝙩𝙧𝙞𝙘𝙩𝙚𝙙 என அமைக்கவும். தயவுசெய்து கவனிக்கவும், இந்த இசைவு CS3 உங்கள் பேட்டரியை வெளியேற்றும் என்று அர்த்தமல்ல. அறிவிப்புகளைப் பெறும்போது அல்லது உத்தியோகபூர்வ நீட்டிப்புகளிலிருந்து வீடியோக்களைப் பதிவிறக்குவது போன்ற பின்னணியில் மட்டுமே இது செயல்படும். நீங்கள் ரத்து செய்ய தேர்வுசெய்தால், இந்த அமைப்பை பின்னர் 𝙂𝙚𝙣𝙚𝙧𝙖𝙡 in இல் சரிசெய்யலாம்.</string>
+    <string name="apk_installer_settings_des">சில சாதனங்கள் புதிய தொகுப்பு நிறுவியை ஆதரிக்கவில்லை. புதுப்பிப்புகள் நிறுவப்படவில்லை என்றால், மரபு விருப்பத்தை முயற்சிக்கவும்.</string>
+    <string name="battery_dialog_message">சந்தா தொலைக்காட்சி நிகழ்ச்சிகளுக்கான தடையற்ற பதிவிறக்கங்கள் மற்றும் அறிவிப்புகளை உறுதிப்படுத்த, கிளவுட்ச்ட்ரீம் பின்னணியில் இயங்க இசைவு தேவை. சரி என்பதை அழுத்துவதன் மூலம், உங்களுக்கு கோரிக்கை உரையாடல் காண்பிக்கப்படும். தயவுசெய்து \'இசைவு\' என்பதை அழுத்தவும். \n\nதயவுசெய்து கவனிக்கவும், இந்த இசைவு CS3 உங்கள் பேட்டரியை வெளியேற்றும் என்று அர்த்தமல்ல. அறிவிப்புகளைப் பெறும்போது அல்லது உத்தியோகபூர்வ நீட்டிப்புகளிலிருந்து வீடியோக்களைப் பதிவிறக்குவது போன்ற பின்னணியில் மட்டுமே இது செயல்படும்.</string>
     <string name="app_unrestricted_toast">பயன்பாட்டு பேட்டரி பயன்பாடு ஏற்கனவே கட்டுப்பாடற்றதாக அமைக்கப்பட்டுள்ளது</string>
     <string name="update_notification_installing">பயன்பாட்டு புதுப்பிப்பை நிறுவுகிறது…</string>
     <string name="update_notification_failed">பயன்பாட்டின் புதிய பதிப்பை நிறுவ முடியவில்லை</string>
@@ -573,8 +565,7 @@
     <string name="sort_rating_asc">மதிப்பீடு (குறைந்த முதல் உயர் வரை)</string>
     <string name="sort_updated_new">புதுப்பிக்கப்பட்டது (பழையது புதியது)</string>
     <string name="empty_library_logged_in_message">இந்த பட்டியல் காலியாக உள்ளது. இன்னொரு இடத்திற்கு மாற முயற்சிக்கவும்.</string>
-    <string name="safe_mode_file">பாதுகாப்பான பயன்முறை கோப்பு கிடைத்தது!
-\n கோப்பு அகற்றப்படும் வரை தொடக்கத்தில் எந்த நீட்டிப்புகளையும் ஏற்றவில்லை.</string>
+    <string name="safe_mode_file">பாதுகாப்பான பயன்முறை கோப்பு கிடைத்தது! \n கோப்பு அகற்றப்படும் வரை தொடக்கத்தில் எந்த நீட்டிப்புகளையும் ஏற்றவில்லை.</string>
     <string name="subscription_in_progress_notification">சந்தா காட்சிகளைப் புதுப்பித்தல்</string>
     <string name="subscription_list_name">சந்தா</string>
     <string name="subscription_episode_released">எபிசோட் %d வெளியானது!</string>
@@ -582,8 +573,7 @@
     <string name="set_default">இயல்புநிலையை அமைக்கவும்</string>
     <string name="quality_profile_help">ஆதாரங்கள் எவ்வாறு உத்தரவிடப்படுகின்றன என்பதை இங்கே மாற்றலாம். ஒரு வீடியோவுக்கு அதிக முன்னுரிமை இருந்தால், அது மூல தேர்வில் அதிகமாகத் தோன்றும். மூல முன்னுரிமையின் தொகை மற்றும் தரமான முன்னுரிமை ஆகியவை வீடியோ முன்னுரிமை. \n\n சான்று A: 3 \n தகுதி பி: 7 \n 10 இன் ஒருங்கிணைந்த வீடியோ முன்னுரிமை இருக்கும். \n\n குறிப்பு: தொகை 10 அல்லது அதற்கு மேற்பட்டதாக இருந்தால், அந்த இணைப்பு ஏற்றப்படும்போது பிளேயர் தானாகவே ஏற்றுவதைத் தவிர்க்கும்!</string>
     <string name="biometric_warning">உங்கள் கிளவுட்ச்ட்ரீம் தரவு இப்போது காப்புப் பிரதி எடுக்கப்பட்டுள்ளது. இதன் சாத்தியம் மிகக் குறைவு என்றாலும், எல்லா சாதனங்களும் வித்தியாசமாக நடந்து கொள்ளலாம். அரிய விசயத்தில், பயன்பாட்டை அணுகுவதிலிருந்து நீங்கள் பூட்டப்படுகிறீர்கள், பயன்பாட்டு தரவை முழுவதுமாக அழித்து, காப்புப்பிரதியிலிருந்து மீட்டெடுக்கவும். இதிலிருந்து எழும் ஏதேனும் சிரமத்திற்கு நாங்கள் மிகவும் வருந்துகிறோம்.</string>
-    <string name="custom_media_singluar">ஊடகம்</string>
-    <string name="hide_player_control_names_key" translatable="false">hide_player_control_names_key</string>
+    <string name="custom_media_singular">ஊடகம்</string>
     <string name="pref_category_accounts">கணக்குகள்</string>
     <string name="test_warning">எச்சரிக்கை</string>
     <string name="downloads_empty">தற்போது பதிவிறக்கங்கள் எதுவும் இல்லை.</string>
@@ -637,4 +627,108 @@
     <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>
-</resources>
\ No newline at end of file
+    <string name="speech_recognition_unavailable">பேச்சு ஏற்பு கிடைக்கவில்லை</string>
+    <string name="begin_speaking">பேசத் தொடங்குங்கள்…</string>
+    <string name="audio_singular">ஆடியோ</string>
+    <string name="podcast_singular">போட்காச்ட்</string>
+    <string name="encoding_error">குறியீட்டு பிழை</string>
+    <string name="unsupported_error">ஆதரிக்கப்படாத பிழை</string>
+    <string name="player_load_one_subtitle_online">முதலில் கிடைக்கிறது</string>
+    <string name="sort_episodes_number_asc">அத்தியாயம் (ஏறுதல்)</string>
+    <string name="sort_episodes_number_desc">அத்தியாயம் (இறங்கு)</string>
+    <string name="sort_episodes_rating_high_low">மதிப்பீடு (மிக உயர்ந்த)</string>
+    <string name="sort_episodes_rating_low_high">மதிப்பீடு (மிகக் குறைந்த)</string>
+    <string name="sort_episodes_date_newest">காற்று தேதி (புதியது)</string>
+    <string name="sort_episodes_date_oldest">காற்று தேதி (பழமையானது)</string>
+    <string name="sort_button_episode">பாகம் %s</string>
+    <string name="sort_button_rating">மதிப்பீடு %s</string>
+    <string name="sort_button_date">தேதி %s</string>
+    <string name="torrent_preferred_media">அமைப்புகள்/வழங்குநர்கள்/விருப்பமான ஊடகங்களில் டொரெண்டை இயக்கவும்</string>
+    <string name="torrent_not_accepted">பயன்பாட்டை மறுதொடக்கம் செய்து, தொடர ச்ட்ரீம் டொரண்ட் பாப்-அப் ஏற்றுக்கொள்ளுங்கள்.</string>
+    <string name="software_decoding">மென்பொருள் டிகோடிங்</string>
+    <string name="software_decoding_desc">மென்பொருள் டிகோடிங் உங்கள் சாதனத்தால் ஆதரிக்கப்படாத வீடியோ கோப்புகளை பிளேயருக்கு இயக்க உதவுகிறது, ஆனால் உயர் தெளிவுத்திறனில் பின்னடைவு அல்லது நிலையற்ற பிளேபேக்கை ஏற்படுத்தலாம்.</string>
+    <string name="volume_exceeded_100">தொகுதி 100% ஐ தாண்டியுள்ளது</string>
+    <string name="slide_up_again_to_exceed_100">100% க்கு அப்பால் செல்ல மீண்டும் சறுக்கவும்</string>
+    <string name="update_plugins">செருகுநிரல்களைப் புதுப்பிக்கவும்</string>
+    <string name="update_plugins_manually">செருகுநிரல்களை கைமுறையாக புதுப்பிக்கவும்</string>
+    <string name="starting_plugin_update_manually">சொருகி புதுப்பிப்பு செயல்முறையைத் தொடங்குகிறது!</string>
+    <string name="plugins_updated_manually">வெற்றிகரமாக புதுப்பிக்கப்பட்டது %d சொருகி (கள்)!</string>
+    <string name="no_plugins_updated_manually">செருகுநிரல்கள் எதுவும் புதுப்பிக்கப்படவில்லை.</string>
+    <string name="player_notification_channel_name">பிளேயர் அறிவிப்புகள்</string>
+    <string name="player_notification_channel_description">பின்னணியில் இருந்து பின்னணியைக் கட்டுப்படுத்துவதற்கான பிளேயர் அறிவிப்பு</string>
+    <string name="subtitles_from_embedded">உட்பொதிக்கப்பட்டது</string>
+    <string name="subtitles_from_online">ஆன்லைனில்</string>
+    <string name="all_subtitles_bold">அனைத்து வசனங்களையும் தைரியமாக ஆக்குங்கள்</string>
+    <string name="all_subtitles_italic">அனைத்து வசன வரிகளையும் சாய்வு செய்யுங்கள்</string>
+    <string name="background_radius">பின்னணி ஆரம்</string>
+    <string name="download_parallel_settings_des">எத்தனை வெவ்வேறு உருப்படிகளை இணையாக பதிவிறக்கம் செய்யலாம்</string>
+    <string name="parallel_downloads">இணை பதிவிறக்கங்கள்</string>
+    <string name="concurrent_connections">ஒரே நேரத்தில் இணைப்புகள்</string>
+    <string name="concurrent_connections_settings_des">பதிவிறக்கும் போது ஒவ்வொரு பதிவிறக்கமும் எத்தனை ஒரே நேரத்தில் இணைப்புகளைப் பயன்படுத்தலாம்</string>
+    <string name="go_to_downloads">பதிவிறக்கங்களுக்குச் செல்லுங்கள்</string>
+    <string name="no_internet_connection">இணைய இணைப்பு இல்லை. \n\nதயவுசெய்து இணையத்துடன் இணைத்து மீண்டும் முயற்சிக்கவும், அல்லது நீங்கள் ஆஃப்லைனில் இருக்கும்போது உங்கள் பதிவிறக்கங்களைப் பாருங்கள்.</string>
+    <string name="overscan_settings_des">திரையின் எல்லைகளை மாற்றுகிறது</string>
+    <string name="overscan_settings">ஓவர்ச்கான்</string>
+    <string name="poster_size_settings_des">சுவரொட்டிகளின் அளவை மாற்றுகிறது</string>
+    <string name="poster_size_settings">சுவரொட்டி அளவு</string>
+    <string name="download_time_left_hour_min_sec_format" formatted="true">%1$d மணி %2$d நிமிடம் %3$d விநாடி</string>
+    <string name="download_time_left_min_sec_format" formatted="true">%1$d நிமிடம் %2$d விநாடி</string>
+    <string name="download_time_left_sec_format" formatted="true">%1$d விநாடி</string>
+    <string name="download_queue">பதிவிறக்க வரிசை</string>
+    <string name="play_full_series_button">முழு தொடரையும் விளையாடு</string>
+    <string name="queue_empty_message">தற்போது வரிசைப்படுத்தப்பட்ட பதிவிறக்கங்கள் எதுவும் இல்லை.</string>
+    <string name="extra_brightness_settings">கூடுதல் ஒளி</string>
+    <string name="extra_brightness_settings_des">100% காட்சி பிரகாசத்தை மீறும் போது பிரகாச வடிப்பானை இயக்கவும்</string>
+    <string name="extra_brightness_key">கூடுதல்_பிரகாசம்_செயல்படுத்தப்பட்டது</string>
+    <string name="search_suggestions">தேடல் பரிந்துரைகள்</string>
+    <string name="search_suggestions_des">தட்டச்சு செய்யும் போது தேடல் பரிந்துரைகளைக் காட்டு</string>
+    <string name="clear_suggestions">தெளிவான பரிந்துரைகள்</string>
+    <string name="show_cast_in_details">காச்ட் பேனலைக் காட்டு</string>
+    <string name="install_prerelease">வெளியீட்டிற்கு முந்தைய பதிப்பை நிறுவவும்</string>
+    <string name="prerelease_already_installed">முன் வெளியீடு ஏற்கனவே நிறுவப்பட்டுள்ளது.</string>
+    <string name="prerelease_install_failed">முன் வெளியீட்டை நிறுவுவதில் தோல்வி.</string>
+    <string name="episode_action_play_mirror">கண்ணாடியை விளையாடு</string>"
+    <string name="show_rating">மதிப்பீடு சிட்டை</string>
+    <string name="show_episode_text">எபிசோட் உரை</string>
+    <string name="video_info">மீடியா செய்தி</string>
+    <string name="player_settings_always_ask">எப்போதும் கேளுங்கள்</string>
+    <string name="source_priority">மூல முன்னுரிமை</string>
+    <string name="source_priority_help">பிளேயரில் வீடியோ ஆதாரங்கள் எவ்வாறு வரிசைப்படுத்தப்பட வேண்டும் என்பதைத் தீர்மானிக்கவும்</string>
+    <string name="no_account">கணக்கு இல்லை</string>
+    <string name="speedup_title">LongPress விரைவு மாற்று</string>
+    <string name="speedup_summary">2x வேகத்தைப் பெற அழுத்திப் பிடிக்கவும்</string>
+    <string name="edit_profile_image_title">சுயவிவரப் படத்தைத் திருத்து</string>
+    <string name="edit_profile_image_hint">சுயவிவரப் பட முகவரி ஐ உள்ளிடவும்</string>
+    <string name="edit_profile_image_error_empty">முகவரி இல்லை</string>
+    <string name="edit_profile_image_error_invalid">தவறான முகவரி அல்லது படம்</string>
+    <string name="edit_profile_image_success">படம் வெற்றிகரமாக புதுப்பிக்கப்பட்டது</string>
+    <string name="action_mark_watched_up_to_this_episode">இந்த எபிசோட் வரை பார்த்ததாகக் குறிக்கவும்</string>
+    <string name="action_remove_mark_watched_up_to_this_episode">இந்த எபிசோட் வரை பார்த்ததை அகற்று</string>
+    <string name="action_reload">மீண்டும் ஏற்றப்பட்டது</string>
+    <string name="reload_provider">மறுஏற்றம் வழங்குநர்</string>
+    <string name="name">பெயர்</string>
+    <string name="source_name">மூலப் பெயர்</string>
+    <string name="resolution_and_name">தீர்மானம் மற்றும் பெயர்</string>
+    <string name="download_all">அனைத்தையும் பதிவிறக்கவும்</string>
+    <string name="cancel_all">அனைத்தையும் ரத்து வெற்றி</string>
+    <string name="download_episode_range">அத்தியாயம் %s ஐ பதிவிறக்க விரும்புகிறீர்களா?</string>
+    <string name="cancel_queue_message">வரிசைப்படுத்தப்பட்ட அனைத்து பதிவிறக்கங்களையும் ரத்துசெய்ய விரும்புகிறீர்களா?</string>
+    <string name="subs_subtitle_alignment">வசன சீரமைப்பு</string>
+    <string name="bottom_left">கீழே இடது</string>
+    <string name="bottom_center">கீழ் நடுவண்</string>
+    <string name="bottom_right">கீழ் வலது</string>
+    <string name="middle_left">நடுத்தர இடது</string>
+    <string name="middle_center">நடுத்தர நடுவண்</string>
+    <string name="middle_right">நடுத்தர வலது</string>
+    <string name="top_left">மேல் இடது</string>
+    <string name="top_center">மேல் நடுவண்</string>
+    <string name="top_right">மேல் வலது</string>
+    <plurals name="downloads_active">
+        <item quantity="one">%d செயலில் பதிவிறக்கம்</item>
+        <item quantity="other">%d செயலில் உள்ள பதிவிறக்கங்கள்</item>
+    </plurals>
+    <plurals name="downloads_queued">
+        <item quantity="one">%d பதிவிறக்கம் வரிசையில் உள்ளது</item>
+        <item quantity="other">%d பதிவிறக்கங்கள் வரிசையில் உள்ளன</item>
+    </plurals>
+</resources>
diff --git a/app/src/main/res/values-ti/strings.xml b/app/src/main/res/values-b+ti/strings.xml
similarity index 73%
rename from app/src/main/res/values-ti/strings.xml
rename to app/src/main/res/values-b+ti/strings.xml
index 99e08335161..46235bbd7bd 100644
--- a/app/src/main/res/values-ti/strings.xml
+++ b/app/src/main/res/values-b+ti/strings.xml
@@ -3,5 +3,4 @@
     <string name="app_dub_sub_episode_text_format" formatted="true">%1$s ክፋል %2$d</string>
     <string name="next_episode_format" formatted="true">ክፋል %d በ ላይ ይወጣል</string>
     <string name="cast_format" formatted="true">ተዋሳእቲ፡ %s</string>
-    <string name="hide_player_control_names_key" translatable="false">hide_player_control_names_key</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-tl/strings.xml b/app/src/main/res/values-b+tl/strings.xml
similarity index 95%
rename from app/src/main/res/values-tl/strings.xml
rename to app/src/main/res/values-b+tl/strings.xml
index 5fd25031e3d..4ed229ca763 100644
--- a/app/src/main/res/values-tl/strings.xml
+++ b/app/src/main/res/values-b+tl/strings.xml
@@ -15,8 +15,7 @@
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">Bilis (%.2fx)</string>
     <string name="rated_format" formatted="true">Rated: %.1f</string>
-    <string name="new_update_format" formatted="true">Bagong update!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">Bagong update! \n%1$s -&gt; %2$s</string>
     <string name="app_name">CloudStream</string>
     <string name="title_home">Home</string>
     <string name="title_search">Maghanap</string>
@@ -60,7 +59,6 @@
     <string name="popup_play_file">I-play ang file</string>
     <string name="popup_resume_download">I-resume ang download</string>
     <string name="popup_pause_download">I-pause ang download</string>
-    <string name="pref_disable_acra">Huwag awtomatikong mag-ulat ng bug</string>
     <string name="home_more_info">More Info</string>
     <string name="home_expanded_hide">Itago</string>
     <string name="home_play">I-play</string>
@@ -113,13 +111,9 @@
     <string name="settings_info">Impormasyon</string>
     <string name="advanced_search">Adbans na maghanap</string>
     <string name="advanced_search_des">Magbibigay ng pinaghiwa-hiwalay na resulta</string>
-    <string name="bug_report_settings_off">Nagpapadala lamang ng data kung nag-crash ang app</string>
-    <string name="bug_report_settings_on">Hindi magpapadala ng kahit anong data</string>
     <string name="show_fillers_settings">Ipakita ang filler episode sa anime</string>
     <string name="updates_settings">Ipakita kung may bagong update</string>
     <string name="updates_settings_des">Awtomatikong mag-check ng bagong update pagbukas ng app</string>
-    <string name="uprereleases_settings">Update to prereleases</string>
-    <string name="uprereleases_settings_des">Search for prerelease updates instead of full releases only</string>
     <string name="github">Github</string>
     <string name="lightnovel">Light novel app ng parehong devs</string>
     <string name="anim">Anime app ng parehong devs</string>
@@ -132,7 +126,6 @@
     <string name="copy_link_toast">Link copied to clipboard</string>
     <string name="play_episode_toast">Play Episode</string>
     <string name="subs_default_reset_toast">I-reset sa default value</string>
-    <string name="acra_report_toast">Paumanhin, ang app ay nag-crash. Isang anonymous bug report ang ipapadala sa developers</string>
     <string name="season">Season</string>
     <string name="no_season">No season</string>
     <string name="episode">Episode</string>
@@ -144,8 +137,7 @@
     <string name="cancel">Kanselahin</string>
     <string name="pause">I-pause</string>
     <string name="resume">I-resume</string>
-    <string name="delete_message">This will permanently delete %s
-\nAre you sure?</string>
+    <string name="delete_message">This will permanently delete %s \nAre you sure?</string>
     <string name="status_ongoing">Patuloy</string>
     <string name="status_completed">Tapos na</string>
     <string name="status">Katayuan</string>
@@ -263,5 +255,4 @@
     <string name="chromecast_subtitles_settings">Mga Subtitle ng Chromecast</string>
     <string name="chromecast_subtitles_settings_des">Mga setting ng mga subtitle ng Chromecast</string>
     <string name="play_trailer_button">Maglaro ng Trailer</string>
-    <string name="hide_player_control_names_key" translatable="false">hide_player_control_names_key</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-tr/array.xml b/app/src/main/res/values-b+tr/array.xml
similarity index 84%
rename from app/src/main/res/values-tr/array.xml
rename to app/src/main/res/values-b+tr/array.xml
index ee2deedb210..5a7901ea97e 100644
--- a/app/src/main/res/values-tr/array.xml
+++ b/app/src/main/res/values-b+tr/array.xml
@@ -37,20 +37,19 @@
         <item>8</item>
     </array>
 
-    <array name="limit_title_rez_pref_names">
-        <item>@string/resolution_and_title</item>
-        <item>@string/title</item>
+    <array name="title_info_pref_names">
+        <item>@string/source_name</item>
         <item>@string/resolution</item>
-        <item>@string/none</item>
+        <item>@string/video_info</item>
     </array>
 
-    <array name="limit_title_rez_pref_values">
-        <item>3</item>
-        <item>2</item>
-        <item>1</item>
-        <item>0</item>
+    <array name="title_info_pref_values">
+        <item>@string/show_name_key</item>
+        <item>@string/show_resolution_key</item>
+        <item>@string/show_media_info_key</item>
     </array>
 
+
     <array name="limit_title_pref_names">
         <item>@string/none</item>
         <item>16 karakter</item>
@@ -165,16 +164,19 @@
         <item>@string/show_hd</item>
         <item>@string/show_dub</item>
         <item>@string/show_sub</item>
+        <item>@string/show_rating</item>
         <item>@string/show_title</item>
+        <item>@string/show_episode_text</item>
     </array>
 
     <array name="poster_ui_options_values">
         <item>@string/show_hd_key</item>
         <item>@string/show_dub_key</item>
         <item>@string/show_sub_key</item>
+        <item>@string/show_rating_key</item>
         <item>@string/show_title_key</item>
+        <item>@string/show_episode_text_key</item>
     </array>
-
     <array name="app_layout">
         <item>@string/automatic</item>
         <item>@string/phone_layout</item>
@@ -245,6 +247,9 @@
         <item>Flaş Bombası</item>
         <item>Sistem</item>
         <item>Material You</item>
+        <item>Dracula</item>
+        <item>Lavanta Rüyası</item>
+        <item>Sessiz Mavi</item>
     </string-array>
     <string-array name="themes_names_values">
         <item>AmoledLight</item>
@@ -253,6 +258,9 @@
         <item>Light</item>
         <item>System</item>
         <item>Monet</item>
+        <item>Dracula</item>
+        <item>Lavender</item>
+        <item>SilentBlue</item>
     </string-array>
 
     <string-array name="extension_statuses">
@@ -308,48 +316,4 @@
         <item>Vietnamese (VISCII)</item>
         <item>Vietnamese (Windows-1258)</item>
     </string-array>
-    <string-array name="subtitles_encoding_values" translatable="false" tools:ignore="TypographyDashes">
-        <item></item>
-        <item>UTF-8</item>
-        <item>UTF-16</item>
-        <item>UTF-16BE</item>
-        <item>UTF-16LE</item>
-        <item>GB18030</item>
-        <item>ISO-8859-15</item>
-        <item>Windows-1252</item>
-        <item>IBM850</item>
-        <item>ISO-8859-2</item>
-        <item>Windows-1250</item>
-        <item>ISO-8859-3</item>
-        <item>ISO-8859-10</item>
-        <item>Windows-1251</item>
-        <item>KOI8-R</item>
-        <item>KOI8-U</item>
-        <item>ISO-8859-6</item>
-        <item>Windows-1256</item>
-        <item>ISO-8859-7</item>
-        <item>Windows-1253</item>
-        <item>ISO-8859-8</item>
-        <item>Windows-1255</item>
-        <item>ISO-8859-9</item>
-        <item>Windows-1254</item>
-        <item>ISO-8859-11</item>
-        <item>Windows-874</item>
-        <item>ISO-8859-13</item>
-        <item>Windows-1257</item>
-        <item>ISO-8859-14</item>
-        <item>ISO-8859-16</item>
-        <item>ISO-2022-CN-EXT</item>
-        <item>EUC-CN</item>
-        <item>ISO-2022-JP-2</item>
-        <item>EUC-JP</item>
-        <item>Shift_JIS</item>
-        <item>CP949</item>
-        <item>ISO-2022-KR</item>
-        <item>Big5</item>
-        <item>ISO-2022-TW</item>
-        <item>Big5-HKSCS</item>
-        <item>VISCII</item>
-        <item>Windows-1258</item>
-    </string-array>
 </resources>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-b+tr/strings.xml
similarity index 86%
rename from app/src/main/res/values-tr/strings.xml
rename to app/src/main/res/values-b+tr/strings.xml
index 05bf7d5a920..d711505a821 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-b+tr/strings.xml
@@ -1,38 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- FORMAT MIGHT TRANSLATE, WILL CAUSE CRASH IF APPLIED WRONG -->
-    <string name="extra_info_format" formatted="true" translatable="false">%d %s | %s</string>
-    <string name="storage_size_format" formatted="true" translatable="false">%s • %s</string>
-    <string name="download_size_format" formatted="true" translatable="false">%s / %s</string>
-    <string name="episode_name_format" formatted="true" translatable="false">%s %s</string>
-    <string name="ffw_text_format" formatted="true" translatable="false">+%d</string>
-    <string name="rew_text_format" formatted="true" translatable="false">-%d</string>
-    <string name="ffw_text_regular_format" formatted="true" translatable="false">%d</string>
-    <string name="rew_text_regular_format" formatted="true" translatable="false">%d</string>
-    <string name="rating_format" formatted="true" translatable="false">%.1f/10.0</string>
-    <string name="year_format" formatted="true" translatable="false">%d</string>
     <string name="app_dub_sub_episode_text_format" formatted="true">%1$s B. %2$d</string>
-    <string name="cast_format" formatted="true">Cast: %s</string>
-    <string name="next_episode_format" formatted="true">Bölüm %d şu tarihte yayınlanacak</string>
-    <string name="next_episode_time_day_format" formatted="true">%1$dg %2$ds %3$dd</string>
-    <string name="next_episode_time_hour_format" formatted="true">%1$ds %2$dd</string>
-    <string name="next_episode_time_min_format" formatted="true">%dd</string>
+    <string name="cast_format" formatted="true">Oyuncular: %s</string>
+    <string name="next_episode_format" formatted="true">%d. Bölüm şu tarihte yayınlanacak</string>
+    <string name="next_episode_time_day_format" formatted="true">%1$dg %2$dsa %3$ddk</string>
+    <string name="next_episode_time_hour_format" formatted="true">%1$dsa %2$ddk</string>
+    <string name="next_episode_time_min_format" formatted="true">%ddk</string>
     <!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
     <string name="result_poster_img_des">Afiş</string>
     <string name="search_poster_img_des">Afiş</string>
     <string name="episode_poster_img_des">Bölüm Afişi</string>
     <string name="home_main_poster_img_des">Ana Afiş</string>
     <string name="home_next_random_img_des">Sonraki Rastgele</string>
-    <string name="episode_play_img_des" translatable="false">@string/play_episode</string>
-    <string name="go_back_img_des">Geri git</string>
-    <string name="change_providers_img_des" translatable="false">@string/home_change_provider_img_des</string>
+    <string name="go_back_img_des">Geri dön</string>
     <string name="home_change_provider_img_des">Sağlayıcıyı Değiştir</string>
     <string name="preview_background_img_des">Arkaplanı Önizle</string>
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">Hız (%.2fx)</string>
     <string name="rated_format" formatted="true">Puan: %.1f</string>
-    <string name="new_update_format" formatted="true">Yeni güncelleme bulundu!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">Yeni güncelleme bulundu! \n%1$s -&gt; %2$s</string>
     <string name="filler" formatted="true">Dolgu</string>
     <string name="duration_format" formatted="true">%d dakika</string>
     <string name="app_name">CloudStream</string>
@@ -46,7 +33,6 @@
     <string name="no_data">Veri Yok</string>
     <string name="episode_more_options_des">Daha Fazla Seçenek</string>
     <string name="next_episode">Sonraki bölüm</string>
-    <string name="result_plot" translatable="false">@string/synopsis</string>
     <string name="result_tags">Türler</string>
     <string name="result_share">Paylaş</string>
     <string name="result_open_in_browser">Tarayıcıda aç</string>
@@ -75,7 +61,6 @@
     <string name="download_failed">İndirme Başarısız</string>
     <string name="download_canceled">İndirme İptal Edildi</string>
     <string name="download_done">İndirme Tamamlandı</string>
-    <string name="download_format" translatable="false">%s - %s</string>
     <string name="stream">Ağ akışı</string>
     <string name="error_loading_links_toast">Bağlantılar yüklenirken hata oluştu</string>
     <string name="download_storage_text">Dahili Depolama</string>
@@ -85,7 +70,6 @@
     <string name="popup_play_file">Dosyayı Oynat</string>
     <string name="popup_resume_download">İndirmeyi Sürdür</string>
     <string name="popup_pause_download">İndirmeyi Duraklat</string>
-    <string name="pref_disable_acra">Otomatik hata raporlamayı kapat</string>
     <string name="home_more_info">Daha fazla bilgi</string>
     <string name="home_expanded_hide">Gizle</string>
     <string name="home_play">Oynat</string>
@@ -166,8 +150,6 @@
     <string name="settings_info">Bilgi</string>
     <string name="advanced_search">Gelişmiş arama</string>
     <string name="advanced_search_des">Arama sonuçlarını sağlayıcıya göre ayırır</string>
-    <string name="bug_report_settings_off">Yalnızca çökmelerle ilgili verileri gönderir</string>
-    <string name="bug_report_settings_on">Veri göndermez</string>
     <string name="show_fillers_settings">Anime için dolgu bölümünü göster</string>
     <string name="show_trailers_settings">Fragmanları göster</string>
     <string name="kitsu_settings">Kitsu posterlerini göster</string>
@@ -175,8 +157,6 @@
     <string name="automatic_plugin_updates">Otomatik eklenti güncellemeleri</string>
     <string name="updates_settings">Uygulama güncellemelerini göster</string>
     <string name="updates_settings_des">Uygulama başlatıldıktan sonra güncellemeleri ara.</string>
-    <string name="uprereleases_settings">Deneysel sürümlere güncelle</string>
-    <string name="uprereleases_settings_des">Tam sürümler yerine yalnızca deneysel güncellemeleri ara</string>
     <string name="github">GitHub</string>
     <string name="lightnovel">Aynı geliştiricilerin Lightnovel Crawler uygulaması</string>
     <string name="anim">Aynı geliştiricilerin anime uygulaması</string>
@@ -189,7 +169,6 @@
     <string name="copy_link_toast">Bağlantı panoya kopyalandı</string>
     <string name="play_episode_toast">Bölümü oynat</string>
     <string name="subs_default_reset_toast">Varsayılan değere sıfırla</string>
-    <string name="acra_report_toast">Üzgünüz, uygulama çöktü. Geliştiricilere anonim bir hata raporu gönderilecek</string>
     <string name="season">Sezon</string>
     <string name="season_format">%1$s %2$d%3$s</string>
     <string name="no_season">Sezon yok</string>
@@ -207,8 +186,7 @@
     <string name="resume">Sürdür</string>
     <string name="go_back_30">-30</string>
     <string name="go_forward_30">+30</string>
-    <string name="delete_message" formatted="true">%s tamamen silinecek
-\nEmin misiniz?</string>
+    <string name="delete_message" formatted="true">%s tamamen silinecek \nEmin misiniz?</string>
     <string name="resume_time_left" formatted="true">%dd \nkaldı</string>
     <string name="status_ongoing">Devam ediyor</string>
     <string name="status_completed">Tamamlandı</string>
@@ -265,10 +243,6 @@
     <string name="show_dub">Dublaj etiketi</string>
     <string name="show_sub">Altyazı etiketi</string>
     <string name="show_title">Başlık</string>
-    <string name="show_hd_key" translatable="false">show_hd_key</string>
-    <string name="show_dub_key" translatable="false">show_dub_key</string>
-    <string name="show_sub_key" translatable="false">show_sub_key</string>
-    <string name="show_title_key" translatable="false">show_title_key</string>
     <string name="poster_ui_settings">Afiş üzerindeki öğeleri değiştir</string>
     <string name="no_update_found">Güncelleme bulunamadı</string>
     <string name="check_for_update">Güncellemeleri denetle</string>
@@ -281,7 +255,7 @@
     <string name="update">Güncelle</string>
     <string name="watch_quality_pref">Tercih edilen görüntü kalitesi (WiFi)</string>
     <string name="limit_title">Video oynatıcı başlığı karakter üst sınırı</string>
-    <string name="limit_title_rez">Oynatıcı çözünürlüğü</string>
+    <string name="limit_title_rez">Oynatıcı bilgisini göster</string>
     <string name="video_buffer_size_settings">Video arabellek boyutu</string>
     <string name="video_buffer_length_settings">Video arabellek uzunluğu</string>
     <string name="video_buffer_disk_settings">Diskteki video önbelleği</string>
@@ -300,8 +274,6 @@
     <string name="resize_fill">Uzat</string>
     <string name="resize_zoom">Yakınlaştır</string>
     <string name="legal_notice">Yasal uyarı</string>
-    <string name="legal_notice_key" translatable="false">legal_notice_key</string>
-    <string name="legal_notice_text" translatable="false">Any legal issues regarding the content on this application should be taken up with the actual file hosts and providers themselves as we are not affiliated with them. In case of copyright infringement, please directly contact the responsible parties or the streaming websites. The app is purely for educational and personal use. CloudStream 3 does not host any content on the app, and has no control over what media is put up or taken down. CloudStream 3 functions like any other search engine, such as Google. CloudStream 3 does not host, upload or manage any videos, films or content. It simply crawls, aggregates and displayes links in a convenient, user-friendly interface. It merely scrapes 3rd-party websites that are publicly accessable via any regular web browser. It is the responsibility of user to avoid any actions that might violate the laws governing his/her locality. Use CloudStream 3 at your own risk.</string>
     <string name="category_general">Genel</string>
     <string name="random_button_settings">Rastgele düğmesi</string>
     <string name="random_button_settings_desc">Ana sayfa ve kütüphane üstünde rastgele düğmesini göster</string>
@@ -321,10 +293,6 @@
     <string name="bottom_title_settings">Afiş başlık konumu</string>
     <string name="bottom_title_settings_des">Başlığı afişin altına yerleştir</string>
     <!-- account stuff -->
-    <string name="anilist_key" translatable="false">anilist_key</string>
-    <string name="mal_key" translatable="false">mal_key</string>
-    <string name="opensubtitles_key" translatable="false">opensubtitles_key</string>
-    <string name="nginx_key" translatable="false">nginx_key</string>
     <string name="example_password">şifre123</string>
     <string name="example_username">Kullanıcı Adı</string>
     <string name="example_email">hello@world.com</string>
@@ -332,14 +300,6 @@
     <string name="example_site_name">YeniSiteAdı</string>
     <string name="example_site_url">https://ornek.com</string>
     <string name="example_lang_name">Dil kodu (tr)</string>
-    <!--
-    <string name="mal_account_settings" translatable="false">MAL</string>
-    <string name="anilist_account_settings" translatable="false">AniList</string>
-    <string name="tmdb_account_settings" translatable="false">TMDB</string>
-    <string name="imdb_account_settings" translatable="false">IMDB</string>
-    <string name="kitsu_account_settings" translatable="false">Kitsu</string>
-    <string name="trakt_account_settings" translatable="false">Trakt</string>
-    -->
     <string name="login_format" formatted="true">%1$s %2$s</string>
     <string name="account">hesap</string>
     <string name="logout">Çıkış yap</string>
@@ -362,7 +322,6 @@
     <string name="all">Tümü</string>
     <string name="max">Azami</string>
     <string name="min">Asgari</string>
-    <string name="subtitles_none" translatable="false">@string/none</string>
     <string name="subtitles_outline">Dış hat</string>
     <string name="subtitles_depressed">Çökmüş</string>
     <string name="subtitles_shadow">Gölge</string>
@@ -428,7 +387,6 @@
     <string name="previous">Önceki</string>
     <string name="skip_setup">Kurulumu atla</string>
     <string name="app_layout_subtext">Cihazınıza uygun uygulama görünümünü seçin</string>
-    <string name="crash_reporting_title">Çökme raporları</string>
     <string name="preferred_media_subtext">Ne izlemek istiyorsunuz</string>
     <string name="setup_done">Bitti</string>
     <string name="extensions">Eklentiler</string>
@@ -452,13 +410,11 @@
     <string name="plugins_disabled" formatted="true">Devre dışı: %d</string>
     <string name="plugins_not_downloaded" formatted="true">İndirilmeyen: %d</string>
     <string name="plugins_updated" formatted="true">%d eklentiler güncellendi</string>
-    <string name="blank_repo_message">CloudStream, varsayılan olarak hiçbir site ile gelmez. Siteleri depolardan kurmanız gerekir.
-\n
-\nDiscord\'umuza katılın veya çevrimiçi arama yapın.</string>
+    <string name="blank_repo_message">CloudStream, varsayılan olarak hiçbir site ile gelmez. Siteleri depolardan kurmanız gerekir. \n \nDiscord\'umuza katılın veya internet üzerinden arama yapın.</string>
     <string name="view_public_repositories_button">Topluluk depolarını görüntüle</string>
     <string name="view_public_repositories_button_short">Herkese açık liste</string>
     <string name="uppercase_all_subtitles">Tüm altyazılar büyük harf</string>
-    <string name="download_all_plugins_from_repo">Uyarı: CloudStream 3, üçüncü taraf uzantıların kullanımı için herhangi bir sorumluluk kabul etmez ve bunlar için herhangi bir destek sağlamaz!</string>
+    <string name="download_all_plugins_from_repo">Uyarı: CloudStream 3.taraf uzantıların kullanımı için herhangi bir sorumluluk kabul etmez ve bunlar için herhangi bir destek sağlamaz!</string>
     <string name="single_plugin_disabled" formatted="true">%s (Devre dışı)</string>
     <string name="tracks">Parçalar</string>
     <string name="audio_tracks">Ses parçaları</string>
@@ -487,7 +443,7 @@
     <string name="play_trailer_button">Fragmanı Oynat</string>
     <string name="automatic_plugin_download_summary">Eklenmiş depolardan henüz kurulmamış tüm eklentileri otomatik olarak kur.</string>
     <string name="update_started">Güncelleme Başladı</string>
-    <string name="apk_installer_settings_des">Bazı cihazlar yeni paket kurulumunu desteklemez.. Güncellemeler kurulmazsa eski seçeneği deneyin.</string>
+    <string name="apk_installer_settings_des">Bazı cihazlar yeni paket yükleyiciyi desteklemiyor. Güncellemeler yüklenmezse eski seçeneği deneyin.</string>
     <string name="automatic_plugin_download">Eklentileri otomatik olarak indir</string>
     <string name="apk_installer_settings">APK kurucu</string>
     <string name="pref_category_links">Bağlantılar</string>
@@ -511,7 +467,7 @@
     <string name="update_notification_downloading">Uygulama güncellemesi indiriliyor…</string>
     <string name="update_notification_failed">Uygulamanın yeni sürümü kurulamadı</string>
     <string name="clear_history">Geçmişi temizle</string>
-    <string name="apk_installer_package_installer">PaketKurucu</string>
+    <string name="apk_installer_package_installer">Paket Kurucu</string>
     <string name="apk_installer_legacy">Eski</string>
     <string name="pref_category_gestures">Hareketler</string>
     <string name="all_languages_preference">Tüm Diller</string>
@@ -519,7 +475,7 @@
     <string name="action_remove_from_watched">İzlenenlerden kaldır</string>
     <string name="skip_type_mixed_ed">Karışık son</string>
     <string name="skip_type_mixed_op">Karışık başlangıç</string>
-    <string name="skip_type_creddits">Katkıda Bulunanlar</string>
+    <string name="skip_type_credits">Katkıda Bulunanlar</string>
     <string name="skip_type_intro">Giriş</string>
     <string name="plugin_downloaded">Eklenti İndirildi</string>
     <string name="pref_category_actions">Eylemler</string>
@@ -527,10 +483,8 @@
     <string name="clipboard_too_large">Çok fazla metin. Panoya kaydedilemiyor.</string>
     <string name="library">Kütüphane</string>
     <string name="browser">Tarayıcı</string>
-    <string name="empty_library_no_accounts_message">Kütüphaneniz boş :(
-\nBir kütüphane hesabında oturum açın veya yerel kütüphanenize programlar ekleyin.</string>
-    <string name="safe_mode_file">Güvenli mod dosyası bulundu!
-\nDosya kaldırılana kadar başlangıçta herhangi bir uzantı yüklenmiyor.</string>
+    <string name="empty_library_no_accounts_message">Kütüphaneniz boş :( \nBir kütüphane hesabında oturum açın veya yerel kütüphanenize programlar ekleyin.</string>
+    <string name="safe_mode_file">Güvenli mod dosyası bulundu! \nDosya kaldırılana kadar başlangıçta herhangi bir uzantı yüklenmiyor.</string>
     <string name="sort_by">Şuna Göre Sırala</string>
     <string name="sort">Sırala</string>
     <string name="sort_updated_new">Güncellenme (Yeniden Eskiye)</string>
@@ -573,13 +527,7 @@
     <string name="mobile_data">Mobil veri</string>
     <string name="set_default">Varsayılanı ayarla</string>
     <string name="edit">Düzenle</string>
-    <string name="quality_profile_help">Burada kaynakların nasıl sıralandığını değiştirebilirsiniz. Bir video daha yüksek bir önceliğe sahipse, kaynak seçiminde daha yüksek görünecektir. Kaynak önceliği ve kalite önceliğinin toplamı video önceliğidir.
-\n
-\nKaynak A: 3
-\nKalite B: 7
-\nBirleştirilmiş video önceliği 10 olacaktır.
-\n
-\nNOT: Toplam 10 veya daha fazlaysa, bu bağlantı yüklendiğinde oynatıcı otomatik olarak yüklemeyi atlayacaktır!</string>
+    <string name="quality_profile_help">Burada kaynakların nasıl sıralandığını değiştirebilirsiniz. Bir video daha yüksek bir önceliğe sahipse, kaynak seçiminde daha yüksek görünecektir. Kaynak önceliği ve kalite önceliğinin toplamı video önceliğidir. \n \nKaynak A: 3 \nKalite B: 7 \nBirleştirilmiş video önceliği 10 olacaktır. \n \nNOT: Toplam 10 veya daha fazlaysa, bu bağlantı yüklendiğinde oynatıcı otomatik olarak yüklemeyi atlayacaktır!</string>
     <string name="qualities">Kaliteler</string>
     <string name="profile_background_des">Profil arkaplanı</string>
     <string name="unable_to_inflate">UI was unable to be created correctly, this is a MAJOR BUG and should be reported immediately %s</string>
@@ -588,11 +536,7 @@
     <string name="favorites_list_name">Favoriler</string>
     <string name="favorite_added">%s favorilere eklendi</string>
     <string name="logged_account" formatted="true">%s olarak giriş yapıldı</string>
-    <string name="duplicate_message_multiple" formatted="true">Kütüphanenizde potensiyel kopya ürünler bulundu:
-\n
-\n%s
-\n
-\nYine de ekleyerek var olanları değiştirmek mi istersiniz, yoksa iptal etmek mi?</string>
+    <string name="duplicate_message_multiple" formatted="true">Kütüphanenizde potensiyel kopya ürünler bulundu: \n \n%s \n \nYine de ekleyerek var olanları değiştirmek mi istersiniz, yoksa iptal etmek mi?</string>
     <string name="enter_pin_with_name" formatted="true">%s için PIN girin</string>
     <string name="backup_frequency">Yedekleme sıklığı</string>
     <string name="duplicate_title">Potensiyel Kopya Bulundu</string>
@@ -612,18 +556,14 @@
     <string name="action_remove_from_favorites">Favorilerden çıkar</string>
     <string name="select_an_account">Hesap Seç</string>
     <string name="disable">Devre dışı bırak</string>
-    <string name="no_repository_found_error">Depo bulunamadı, bağlantı adresini kontrol edin ve VPN deneyin</string>
+    <string name="no_repository_found_error">Depo bulunamadı, bağlantı adresini kontrol edin veya VPN ile deneyin</string>
     <string name="already_voted">Zaten oyladınız</string>
     <string name="no_plugins_found_error">Depoda eklenti bulunamadı</string>
-    <string name="duplicate_message_single" formatted="true">Görünüşe göre potansiyel bir kopya kütüphanenizde zaten bulunuyor: \'%s\'
-\n
-\nYine de ekleyerek var olanı değiştirmek mi istersiniz, yoksa iptal etmek mi?</string>
+    <string name="duplicate_message_single" formatted="true">Görünüşe göre potansiyel bir kopya kütüphanenizde zaten bulunuyor: \'%s\' \n \nYine de ekleyerek var olanı değiştirmek mi istersiniz, yoksa iptal etmek mi?</string>
     <string name="enter_pin">PIN girin</string>
     <string name="pin">PIN</string>
     <string name="enter_current_pin">Geçerli PIN\'i Giriniz</string>
     <string name="rotate_video_desc">Ekran yönü için bir geçiş düğmesi göster</string>
-    <string name="rotate_video_key">rotate_video_key</string>
-    <string name="auto_rotate_video_key">auto_rotate_video_key</string>
     <string name="auto_rotate_video">Otomatik döndür</string>
     <string name="rotate_video">Döndür</string>
     <string name="auto_rotate_video_desc">Video yönüne göre ekran yönünün otomatik olarak değişmesini sağla</string>
@@ -651,14 +591,14 @@
     <string name="ok">Tamam</string>
     <string name="battery_dialog_title">Pil optimizasyonunu devre dışı bırak</string>
     <string name="app_info_intent_error">CloudStream\'in Uygulama bilgileri açılamıyor.</string>
-    <string name="music_singlar">Müzik</string>
+    <string name="music_singular">Müzik</string>
     <string name="audio_book_singular">Sesli Kitap</string>
-    <string name="custom_media_singluar">Medya</string>
+    <string name="custom_media_singular">Medya</string>
     <string name="battery_dialog_message">Abone olunan TV programları için kesintisiz indirme ve bildirimler sağlamak için CloudStream\'in arka planda çalışma iznine ihtiyacı var. Tamam\'a basarak bir istek iletişim kutusu göreceksiniz. Lütfen \'İzin Ver\'e basın.\n\nLütfen unutmayın, bu izin CS3’ün pilinizi tüketeceği anlamına gelmez. Yalnızca gerektiğinde, örneğin bildirim alırken veya resmi uzantılardan video indirirken arka planda çalışır.</string>
     <string name="app_unrestricted_toast">Uygulama pil kullanımı zaten sınırsız olarak ayarlanmış</string>
     <string name="reset_btn">Sıfırla</string>
     <string name="episode_upcoming_format" formatted="true">%s içinde yaklaşıyor</string>
-    <string name="next_season_episode_format" formatted="true">Sezon %1$d Bölüm %2$d tarihinde yayınlanacak</string>
+    <string name="next_season_episode_format" formatted="true">%1$d. Sezon %2$d. Bölüm şu tarihte yayınlanacak</string>
     <string name="player_settings_select_cast_device">Yansıtılacak cihaz seç</string>
     <string name="episode_action_cast_mirror">Ekran yansıtma</string>
     <string name="cs3wiki">CloudStream bilgi</string>
@@ -672,7 +612,6 @@
     <string name="device_pin_error_message">Cihaz PIN kodu alınamıyor, yerel kimlik doğrulamayı deneyin</string>
     <string name="device_pin_expired_message">PIN kodunun süresi doldu!</string>
     <string name="device_pin_counter_text">Kodun süresi %1$dm %2$ds içinde doluyor</string>
-    <string name="hide_player_control_names_key" translatable="false">hide_player_control_names_key</string>
     <string name="downloads_empty">Şu an hiç bir indirme bulunmamaktadır.</string>
     <string name="delete_plugin">Eklentiyi sil</string>
     <string name="open_local_video">Yerel videoyu aç</string>
@@ -682,20 +621,12 @@
     <string name="hide_player_control_names">Oynatıcı kontrolünün adlarını gizle</string>
     <string name="play_from_beginning_img_des">Baştan Oynat</string>
     <string name="select_all">Tümünü Seç</string>
-    <string name="delete_message_multiple" formatted="true">Aşağıdaki öğeleri kalıcı olarak silmek istediğinizden emin misiniz?
-\n
-\n%s</string>
-    <string name="delete_message_series_episodes" formatted="true">%1$s içindeki aşağıdaki bölümleri kalıcı olarak silmek istediğinizden emin misiniz?
-\n
-\n%2$s</string>
+    <string name="delete_message_multiple" formatted="true">Aşağıdaki öğeleri kalıcı olarak silmek istediğinizden emin misiniz? \n \n%s</string>
+    <string name="delete_message_series_episodes" formatted="true">%1$s içindeki aşağıdaki bölümleri kalıcı olarak silmek istediğinizden emin misiniz? \n \n%2$s</string>
     <string name="delete_files">Dosyaları Silin</string>
     <string name="delete_format" formatted="true">Sil (%1$d | %2$s)</string>
-    <string name="delete_message_series_only" formatted="true">Aşağıdaki dizideki tüm bölümleri kalıcı olarak silmek istediğinizden emin misiniz?
-\n
-\n%s</string>
-    <string name="delete_message_series_section" formatted="true">Ayrıca aşağıdaki dizideki tüm bölümleri kalıcı olarak sileceksiniz:
-\n
-\n%s</string>
+    <string name="delete_message_series_only" formatted="true">Aşağıdaki dizideki tüm bölümleri kalıcı olarak silmek istediğinizden emin misiniz? \n \n%s</string>
+    <string name="delete_message_series_section" formatted="true">Ayrıca aşağıdaki dizideki tüm bölümleri kalıcı olarak sileceksiniz: \n \n%s</string>
     <string name="downloads_delete_select">Silinecek Öğeleri Seçin</string>
     <string name="deselect_all">Tüm Seçimi Kaldır</string>
     <string name="offline_file">Çevrimdışı izlemek için kullanılabilir</string>
@@ -713,12 +644,12 @@
     <string name="unsupported_error">Desteklenmeyen hata</string>
     <string name="encoding_error">Kodlama hatası</string>
     <string name="player_load_one_subtitle_online">İlk kullanılabiliri yükle</string>
-    <string name="audio_singluar">Ses</string>
-    <string name="podcast_singluar">Podcast</string>
+    <string name="audio_singular">Ses</string>
+    <string name="podcast_singular">Podcast</string>
     <string name="torrent_preferred_media">Ayarlar/Sağlayıcılar/Tercih edilen medya bölümünden torrenti etkinleştirin</string>
     <string name="torrent_not_accepted">Uygulamayı yeniden başlatın ve devam etmek için Stream Torrent açılır penceresini kabul edin.</string>
     <string name="software_decoding">Yazılımsal çözücü</string>
-    <string name="software_decoding_desc">Yazılımsal kod çözücü, oynatıcının telefon tarafından desteklenmeyen video dosyalarını oynatmasını sağlar, ancak yüksek çözünürlükte gecikmeli veya dengesiz oynatmaya neden olabilir</string>
+    <string name="software_decoding_desc">Yazılımsal kod çözücü, oynatıcının cihazınız tarafından desteklenmeyen video dosyalarını oynatmasını sağlar, ancak yüksek çözünürlükte gecikmeli veya dengesiz oynatmaya neden olabilir.</string>
     <string name="sort_episodes_number_asc">Bölüm (Artan)</string>
     <string name="sort_episodes_number_desc">Bölüm (Azalan)</string>
     <string name="sort_episodes_rating_high_low">Puanlama (En Yüksek)</string>
@@ -744,4 +675,78 @@
     <string name="all_subtitles_bold">Tüm altyazıları kalın yap</string>
     <string name="all_subtitles_italic">Tüm altyazıları italik yap</string>
     <string name="background_radius">Arka Plan Yarıçapı</string>
-</resources>
\ No newline at end of file
+    <string name="overscan_settings">Ekran sığdırma</string>
+    <string name="parallel_downloads">Eşzamanlı indirmeler</string>
+    <string name="concurrent_connections">Eşzamanlı bağlantılar</string>
+    <string name="no_internet_connection">İnternet bağlantısı yok.\n\nLütfen internete bağlanıp tekrar deneyin ya da çevrimdışıyken indirdiğiniz içerikleri izleyin.</string>
+    <string name="go_to_downloads">İndirilenlere Git</string>
+    <string name="download_parallel_settings_des">Aynı anda kaç farklı öğe indirilebilir</string>
+    <string name="overscan_settings_des">Ekranın sınırlarını değiştirir</string>
+    <string name="concurrent_connections_settings_des">Her indirme sırasında kaç eşzamanlı bağlantı kullanılabilir</string>
+    <string name="poster_size_settings">Afiş boyutu</string>
+    <string name="poster_size_settings_des">Afişlerin boyutlarını değiştir</string>
+    <string name="player_settings_always_ask">Her zaman sor</string>
+    <string name="speedup_title">Uzun basma hızını değiştir</string>
+    <string name="speedup_summary">2x hız için basılı tut</string>
+    <string name="download_time_left_hour_min_sec_format" formatted="true">%1$dsa %2$ddk %3$dsn</string>
+    <string name="download_time_left_min_sec_format" formatted="true">%1$ddk %2$dsn</string>
+    <string name="download_time_left_sec_format" formatted="true">%1$dsn</string>
+    <string name="show_rating">Reyting etiketi</string>
+    <string name="no_account">hesap yok</string>
+    <string name="edit_profile_image_title">Profil Resmini düzenle</string>
+    <string name="edit_profile_image_hint">Profil Resmi Bağlantısını Girin</string>
+    <string name="edit_profile_image_error_empty">URL bulunamadı</string>
+    <string name="edit_profile_image_error_invalid">Geçersiz Bağlantı veya Görsel</string>
+    <string name="edit_profile_image_success">Görsel Başarıyla Güncellendi</string>
+    <string name="episode_action_play_mirror">Şu kaynaktan oynat</string>"
+    <string name="action_mark_watched_up_to_this_episode">Bu bölüme kadar izlenmiş olarak işaretle</string>
+    <string name="action_remove_mark_watched_up_to_this_episode">Bu bölümü izlenmemiş olarak işaretle</string>
+    <string name="action_reload">Yeniden yükle</string>
+    <string name="reload_provider">Sağlayıcıyı yeniden yükle</string>
+    <string name="name">Ad</string>
+    <string name="resolution_and_name">Çözünürlük ve ad</string>
+    <string name="bottom_left">Sol alt</string>
+    <string name="bottom_center">Alt orta</string>
+    <string name="bottom_right">Sağ alt</string>
+    <string name="middle_left">Orta sol</string>
+    <string name="middle_center">Orta merkez</string>
+    <string name="middle_right">Orta sağ</string>
+    <string name="top_left">Sol üst</string>
+    <string name="top_center">Üst orta</string>
+    <string name="top_right">Sağ üst</string>
+    <string name="subs_subtitle_alignment">Altyazı Hizalama</string>
+    <string name="play_full_series_button">Tüm Seriyi Oynat</string>
+    <string name="install_prerelease">Ön sürümünü yükleyin</string>
+    <string name="prerelease_already_installed">Ön sürüm zaten indirilmiş.</string>
+    <string name="prerelease_install_failed">Ön sürüm indirmesi başarısız oldu.</string>
+    <string name="show_episode_text">Bölüm Başlığı</string>
+    <string name="search_suggestions">Arama Önerileri</string>
+    <string name="search_suggestions_des">Yazarken arama önerilerini göster</string>
+    <string name="clear_suggestions">Önerileri Temizle</string>
+    <string name="show_cast_in_details">Yayın panelini göster</string>
+    <string name="extra_brightness_settings">Ekstra parlaklık</string>
+    <string name="extra_brightness_settings_des">Görüntü parlaklığı %100\'ü geçerse parlaklık filtresini aktifleştir</string>
+    <string name="extra_brightness_key">Ekstra parlaklık aktifleştirildi</string>
+    <string name="video_info">Medya bilgisi</string>
+    <string name="source_name">Kaynağın adı</string>
+    <string name="download_queue">İndirme kuyruğu</string>
+    <string name="queue_empty_message">Şu anda bekleyen indirme yok.</string>
+    <string name="download_all">Tümünü indir</string>
+    <string name="cancel_all">Tümünü iptal et</string>
+    <string name="download_episode_range">%s numaralı bölümü indirmek istiyor musunuz?</string>
+    <string name="cancel_queue_message">Kuyruktaki tüm indirmeleri iptal etmek istiyor musunuz?</string>
+    <plurals name="downloads_active">
+        <item quantity="one">%d aktif indirme</item>
+        <item quantity="other">%d aktif indirmeler</item>
+    </plurals>
+    <plurals name="downloads_queued">
+        <item quantity="one">%d indirme kuyrukta</item>
+        <item quantity="other">%d indirilecekler kuyruğa alındı</item>
+    </plurals>
+    <string name="source_priority">Öncelikli kaynak</string>
+    <string name="source_priority_help">Oynatıcıda video kaynaklarının nasıl sıralanacağını belirleyin</string>
+    <string name="show_player_metadata_overlay">Meta Verileri Katmanını Göster</string>
+    <string name="player_is_live">Canlı</string>
+    <string name="skip_type_preview">Ön Gösterim</string>
+    <string name="video_singular">Video</string>
+</resources>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-b+uk/strings.xml
similarity index 77%
rename from app/src/main/res/values-uk/strings.xml
rename to app/src/main/res/values-b+uk/strings.xml
index 30e1e314b60..ba46736accd 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-b+uk/strings.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="search_poster_img_des">Плакат</string>
-    <string name="episode_poster_img_des">Плакат епізоду</string>
+    <string name="episode_poster_img_des">Постер епізоду</string>
     <string name="download_canceled">Завантаження скасовано</string>
     <string name="home_change_provider_img_des">Змінити постачальника</string>
     <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="cast_format" formatted="true">У ролях: %s</string>
+    <string name="next_episode_format" formatted="true">%d епізод вийде через</string>
     <string name="result_poster_img_des">Плакат</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>
-    <string name="next_episode_time_hour_format" formatted="true">%1$dгод %2$dхв</string>
-    <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="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>
+    <string name="next_episode_time_hour_format" formatted="true">%1$d год %2$d хв</string>
+    <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="player_speed_text_format" formatted="true">Швидкість (%.2fx)</string>
     <string name="new_update_format" formatted="true">Знайдено нове оновлення!\n%1$s –&gt; %2$s</string>
@@ -34,12 +34,12 @@
     <string name="type_completed">Завершено</string>
     <string name="type_plan_to_watch">Заплановано</string>
     <string name="type_dropped">Покинуто</string>
-    <string name="play_movie_button">Переглянути фільм</string>
-    <string name="play_trailer_button">Переглянути трейлер</string>
-    <string name="play_torrent_button">Переглянути торент</string>
+    <string name="play_movie_button">Відтворити фільм</string>
+    <string name="play_trailer_button">Відтворити трейлер</string>
+    <string name="play_torrent_button">Транслювати торрент</string>
     <string name="reload_error">Повторити з’єднання…</string>
     <string name="go_back">Назад</string>
-    <string name="play_episode">Переглянути епізод</string>
+    <string name="play_episode">Відтворити епізод</string>
     <string name="downloaded">Завантажено</string>
     <string name="downloading">Завантаження</string>
     <string name="download_done">Завантаження завершено</string>
@@ -47,7 +47,6 @@
     <string name="app_subbed_text">Суб.</string>
     <string name="popup_delete_file">Видалити файл</string>
     <string name="popup_resume_download">Відновити завантаження</string>
-    <string name="pref_disable_acra">Вимкнути автонадсилання звітів про помилки</string>
     <string name="home_expanded_hide">Приховати</string>
     <string name="home_play">Переглянути</string>
     <string name="home_info">Подробиці</string>
@@ -58,9 +57,9 @@
     <string name="sort_copy">Скопіювати</string>
     <string name="sort_close">Закрити</string>
     <string name="sort_save">Зберегти</string>
-    <string name="player_speed">Швидкість плеєра</string>
+    <string name="player_speed">Швидкість програвача</string>
     <string name="subs_window_color">Колір вікна</string>
-    <string name="subs_edge_type">Тип обведення</string>
+    <string name="subs_edge_type">Тип межі</string>
     <string name="subs_font">Шрифт</string>
     <string name="subs_font_size">Розмір шрифту</string>
     <string name="search_provider_text_providers">Пошук за постачальниками</string>
@@ -69,7 +68,7 @@
     <string name="subs_auto_select_language">Автовибір мови</string>
     <string name="subs_download_languages">Завантажити мови</string>
     <string name="subs_subtitle_languages">Мова субтитрів</string>
-    <string name="subs_hold_to_reset_to_default">Утримуйте, щоби скинути до типових налаштувань</string>
+    <string name="subs_hold_to_reset_to_default">Утримуйте, щоби скинути до типових</string>
     <string name="subs_import_text" formatted="true">Імпортуйте шрифти, помістивши їх до %s</string>
     <string name="continue_watching">Продовжити перегляд</string>
     <string name="action_remove_watching">Вилучити</string>
@@ -79,7 +78,7 @@
     <string name="normal_no_plot">Сюжет не знайдено</string>
     <string name="torrent_no_plot">Опис не знайдено</string>
     <string name="show_log_cat">Показати Logcat 🐈</string>
-    <string name="picture_in_picture_des">Продовжувати відтворення в малому програвачі поверх інших застосунків</string>
+    <string name="picture_in_picture_des">Продовжувати відтворення в мініатюрному програвачі поверх інших застосунків</string>
     <string name="player_size_settings_des">Прибрати чорні смуги</string>
     <string name="player_subtitles_settings">Субтитри</string>
     <string name="chromecast_subtitles_settings">Субтитри Chromecast</string>
@@ -90,15 +89,15 @@
     <string name="autoplay_next_settings_des">Відтворювати наступний епізод після закінчення поточного</string>
     <string name="title_home">Головна</string>
     <string name="app_name">CloudStream</string>
-    <string name="filler" formatted="true">Заповнювач</string>
+    <string name="filler" formatted="true">Філлер</string>
     <string name="play_with_app_name">Відтворити в CloudStream</string>
     <string name="stream">Мережева трансляція</string>
-    <string name="type_watching">Перегляд</string>
+    <string name="type_watching">Переглядаю</string>
     <string name="result_share">Поділитися</string>
     <string name="type_on_hold">Відкладено</string>
-    <string name="type_re_watching">Повторний перегляд</string>
+    <string name="type_re_watching">Передивляюся</string>
     <string name="download">Завантажити</string>
-    <string name="play_livestream_button">Переглянути трансляцію</string>
+    <string name="play_livestream_button">Відтворити трансляцію</string>
     <string name="pick_source">Джерела</string>
     <string name="pick_subtitle">Субтитри</string>
     <string name="download_storage_text">Внутрішнє сховище</string>
@@ -106,11 +105,11 @@
     <string name="download_started">Завантаження розпочато</string>
     <string name="download_failed">Не вдалося завантажити</string>
     <string name="update_started">Оновлення розпочато</string>
-    <string name="error_loading_links_toast">Помилка завантаження покликань</string>
+    <string name="error_loading_links_toast">Помилка завантаження посилань</string>
     <string name="popup_pause_download">Призупинити завантаження</string>
     <string name="popup_play_file">Переглянути файл</string>
     <string name="home_more_info">Докладніше</string>
-    <string name="filter_bookmarks">Фільтр закладок</string>
+    <string name="filter_bookmarks">Фільтрувати закладки</string>
     <string name="sort_clear">Очистити</string>
     <string name="subtitles_settings">Налаштування субтитрів</string>
     <string name="subs_background_color">Колір тла</string>
@@ -119,7 +118,7 @@
     <string name="subs_outline_color">Колір обведення</string>
     <string name="autoplay_next_settings">Автовідтворення наступного епізоду</string>
     <string name="swipe_to_seek_settings_des">Проведіть збоку в бік, щоби керувати часом відтворення у відео</string>
-    <string name="benene_count_text">%d бананів надано розробникам</string>
+    <string name="benene_count_text">Дано %d бананів розробникам</string>
     <string name="player_size_settings">Кнопка зміни розміру програвача</string>
     <string name="action_open_play">@string/home_play</string>
     <string name="vpn_might_be_needed">Для коректної роботи цього постачальника може знадобитися VPN</string>
@@ -129,7 +128,7 @@
     <string name="swipe_to_seek_settings">Провести, щоби перемотати</string>
     <string name="double_tap_to_seek_settings">Натиснути двічі, щоби перемотати</string>
     <string name="double_tap_to_pause_settings">Натиснути двічі, щоби призупинити</string>
-    <string name="double_tap_to_seek_amount_settings">Крок перемотування (у секундах)</string>
+    <string name="double_tap_to_seek_amount_settings">Крок перемотування (Секунди)</string>
     <string name="double_tap_to_pause_settings_des">Натисніть двічі посередині, щоби призупинити відтворення</string>
     <string name="use_system_brightness_settings">Використовувати системну яскравість</string>
     <string name="episode_sync_settings">Оновлювати прогрес перегляду</string>
@@ -144,27 +143,24 @@
     <string name="settings_info">Подробиці</string>
     <string name="advanced_search">Розширений пошук</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>
+    <string name="show_fillers_settings">Показувати філлери для аніме</string>
     <string name="show_trailers_settings">Показувати трейлери</string>
     <string name="pref_filter_search_quality">Приховати вибрану якість відео у результатах пошуку</string>
     <string name="automatic_plugin_download">Автозавантаження розширень</string>
     <string name="updates_settings">Показувати оновлення застосунку</string>
-    <string name="redo_setup_process">Налаштувати повторно</string>
-    <string name="uprereleases_settings_des">Шукати лише попередні оновлення замість повних випусків</string>
-    <string name="apk_installer_settings">Установлювач APK</string>
+    <string name="redo_setup_process">Налаштувати повторно процес встановлення</string>
+    <string name="apk_installer_settings">Встановлювач APK</string>
     <string name="github">Github</string>
     <string name="lightnovel">Застосунок для ранобе від тих самих розробників</string>
     <string name="anim">Застосунок для аніме від тих самих розробників</string>
-    <string name="benene">Дати банан розробникам</string>
+    <string name="benene">Дати бананів розробникам</string>
     <string name="app_language">Мова застосунку</string>
     <string name="no_chromecast_support_toast">Цей постачальник не має підтримування Chromecast</string>
-    <string name="no_links_found_toast">Покликань не знайдено</string>
+    <string name="no_links_found_toast">Посилань не знайдено</string>
     <string name="play_episode_toast">Переглянути епізод</string>
     <string name="subs_default_reset_toast">Скинути до типових значень</string>
-    <string name="no_season">Немає сезона</string>
-    <string name="episodes">Епізодів</string>
+    <string name="no_season">Немає сезону</string>
+    <string name="episodes">Епізоди</string>
     <string name="episode_format" formatted="true">%1$d %2$s</string>
     <string name="season_short">С</string>
     <string name="episode_short">Е</string>
@@ -174,8 +170,8 @@
     <string name="resume">Відновити</string>
     <string name="go_back_30">-30</string>
     <string name="delete_message" formatted="true">Це назавжди видалить %s\nВи впевнені?</string>
-    <string name="resume_time_left" formatted="true">%dхв\nзалишилося</string>
-    <string name="status_ongoing">Триває</string>
+    <string name="resume_time_left" formatted="true">%d хв\nзалишилося</string>
+    <string name="status_ongoing">Виходить</string>
     <string name="status_completed">Завершено</string>
     <string name="rating">Рейтинг</string>
     <string name="duration">Тривалість</string>
@@ -188,14 +184,14 @@
     <string name="tv_series">Телесеріали</string>
     <string name="cartoons">Мультфільми</string>
     <string name="anime">Аніме</string>
-    <string name="ova">OVA</string>
+    <string name="ova">ОВА</string>
     <string name="asian_drama">Азіатські драми</string>
     <string name="livestreams">Прямі трансляції</string>
     <string name="others">Інші</string>
     <string name="tv_series_singular">Серіал</string>
     <string name="cartoons_singular">Мультфільм</string>
     <string name="anime_singular">Аніме</string>
-    <string name="documentaries_singular">Документальний фільм</string>
+    <string name="documentaries_singular">Документалка</string>
     <string name="asian_drama_singular">Азіатська драма</string>
     <string name="live_singular">Пряма трансляція</string>
     <string name="other_singular">Відео</string>
@@ -212,7 +208,7 @@
     <string name="video_skip_op">Пропустити ОП</string>
     <string name="dont_show_again">Не показувати знову</string>
     <string name="update">Оновити</string>
-    <string name="watch_quality_pref">Бажана якість перегляду (WiFi)</string>
+    <string name="watch_quality_pref">Бажана якість перегляду (Wi-Fi)</string>
     <string name="show_title">Заголовок</string>
     <string name="poster_ui_settings">Перемкнути елементи інтерфейсу на плакаті</string>
     <string name="no_update_found">Оновлення не знайдено</string>
@@ -224,16 +220,14 @@
     <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="automatic_plugin_download_summary">Автоматично встановлювати всі розширення, які ще не встановлено, з доданих сховищ.</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="copy_link_toast">Посилання скопійовано до буфера обміну</string>
+    <string name="apk_installer_settings_des">Деякі пристрої не підтримують новий встановлювач пакетів. Спробуйте старий варіант, якщо оновлення не встановлюються.</string>
     <string name="discord">Приєднуйтеся до Discord</string>
-    <string name="benene_des">Дано бананів</string>
+    <string name="benene_des">Дано банани</string>
     <string name="year">Рік</string>
     <string name="go_forward_30">+30</string>
-    <string name="acra_report_toast">Вибачте, у застосунку стався збій. Буде відправлено анонімне повідомлення про помилку розробникам</string>
     <string name="season_format">%1$s %2$d%3$s</string>
     <string name="episode">Епізод</string>
     <string name="episodes_range">%1$d-%2$d</string>
@@ -245,17 +239,17 @@
     <string name="video_aspect_ratio_resize">Змінити розмір</string>
     <string name="synopsis">Стислий зміст</string>
     <string name="movies">Фільми</string>
-    <string name="episode_action_reload_links">Перезавантажити покликання</string>
-    <string name="documentaries">Документальні фільми</string>
+    <string name="episode_action_reload_links">Перезавантажити посилання</string>
+    <string name="documentaries">Документалки</string>
     <string name="nsfw">NSFW</string>
     <string name="movies_singular">Фільм</string>
-    <string name="ova_singular">OVA</string>
+    <string name="ova_singular">ОВА</string>
     <string name="torrent_singular">Торент</string>
     <string name="show_hd">Мітка якості</string>
     <string name="nsfw_singular">NSFW</string>
     <string name="unexpected_error">Несподівана помилка програвача</string>
     <string name="storage_error">Помилка завантаження, перевірте дозвіл на зберігання</string>
-    <string name="episode_action_chromecast_episode">Дивитися через Chromecast</string>
+    <string name="episode_action_chromecast_episode">Епізод через Chromecast</string>
     <string name="show_sub">Мітка субтитрів</string>
     <string name="video_source">Джерело</string>
     <string name="episode_action_download_subtitle">Завантажити субтитри</string>
@@ -263,17 +257,17 @@
     <string name="skip_update">Пропустити це оновлення</string>
     <string name="all">Усе</string>
     <string name="resize_fit">На весь екран</string>
-    <string name="resize_fill">Заповнити</string>
+    <string name="resize_fill">Розтягнути</string>
     <string name="resize_zoom">Збільшити</string>
     <string name="tracks">Доріжки</string>
     <string name="pref_category_app_updates">Оновлення застосунку</string>
     <string name="pref_category_cache">Кеш</string>
     <string name="pref_category_gestures">Жести</string>
-    <string name="pref_category_player_features">Особливості програвача</string>
+    <string name="pref_category_player_features">Функції програвача</string>
     <string name="pref_category_subtitles">Субтитри</string>
     <string name="pref_category_defaults">Типово</string>
     <string name="pref_category_looks">Вигляд</string>
-    <string name="pref_category_ui_features">Особливості</string>
+    <string name="pref_category_ui_features">Функції</string>
     <string name="category_general">Загальні</string>
     <string name="random_button_settings">Випадкова кнопка</string>
     <string name="random_button_settings_desc">Показувати кнопку випадкового вибору на головній сторінці та бібліотеці</string>
@@ -282,13 +276,13 @@
     <string name="preferred_media_settings">Бажані медіа</string>
     <string name="automatic">Автоматично</string>
     <string name="tv_layout">Макет телевізора</string>
-    <string name="phone_layout">Макет телефону</string>
+    <string name="phone_layout">Макет телефона</string>
     <string name="emulator_layout">Макет емулятора</string>
     <string name="primary_color_settings">Основний колір</string>
     <string name="app_theme_settings">Тема застосунку</string>
     <string name="bottom_title_settings">Розташування назви плаката</string>
     <string name="bottom_title_settings_des">Розмістити назву під плакатом</string>
-    <string name="example_password">Пароль123</string>
+    <string name="example_password">password123</string>
     <string name="example_username">Імʼя користувача</string>
     <string name="example_email">hello@world.com</string>
     <string name="example_site_name">НоваНазваСайту</string>
@@ -327,7 +321,7 @@
     <string name="quality_webrip">Web</string>
     <string name="poster_image">Зображення плаката</string>
     <string name="category_player">Програвач</string>
-    <string name="resolution_and_title">Роздільна здатність та заголовок</string>
+    <string name="resolution_and_title">Роздільність та заголовок</string>
     <string name="error_invalid_id">Недійсний ID</string>
     <string name="error_invalid_url">Недійсна URL-адреса</string>
     <string name="pref_category_backup">Резервне копіювання</string>
@@ -338,7 +332,7 @@
     <string name="remove_site_pref">Видалити сайт</string>
     <string name="nginx_url_pref">URL-адреса сервера NGINX</string>
     <string name="pref_category_links">Покликання</string>
-    <string name="limit_title_rez">Роздільність відеопрогравача</string>
+    <string name="limit_title_rez">Показувати інформацію про програвач</string>
     <string name="video_buffer_length_settings">Довжина буфера відео</string>
     <string name="video_buffer_clear_settings">Очистити кеш відео та зображень</string>
     <string name="video_ram_description">Спричиняє збої, якщо встановлено занадто високе значення на пристроях із малим об’ємом пам’яті, таких як Android TV.</string>
@@ -347,21 +341,21 @@
     <string name="dns_pref">DNS через HTTPS</string>
     <string name="download_path_pref">Шлях завантаження</string>
     <string name="add_site_summary">Додайте двійника наявного сайту, з іншою URL-адресою</string>
-    <string name="display_subbed_dubbed_settings">Показувати мітку Дубляж/Субтитри для аніме</string>
+    <string name="display_subbed_dubbed_settings">Показувати аніме з дубляжем / із субтитрами</string>
     <string name="legal_notice">Застереження</string>
     <string name="pref_category_extensions">Розширення</string>
     <string name="pref_category_actions">Дії</string>
     <string name="example_ip">127.0.0.1</string>
     <string name="pref_category_player_layout">Макет</string>
     <string name="subtitles_encoding">Кодування субтитрів</string>
-    <string name="enable_nsfw_on_providers">Увімкнути NSFW вміст на підтримуваних розширеннях</string>
+    <string name="enable_nsfw_on_providers">Увімкнути NSFW у підтримуваних розширеннях</string>
     <string name="category_ui">Макет</string>
     <string name="category_providers">Постачальники</string>
     <string name="example_site_url">https://example.com</string>
-    <string name="login_format" formatted="true">%2$s %1$s</string>
+    <string name="login_format" formatted="true">%1$s %2$s</string>
     <string name="subtitles_depressed">Опущені</string>
     <string name="account">обліковий запис</string>
-    <string name="create_account">Створити</string>
+    <string name="create_account">Створити обліковий запис</string>
     <string name="added_sync_format" formatted="true">Додано %s</string>
     <string name="sync_total_episodes_none">/??</string>
     <string name="sync_score">Рейтинг</string>
@@ -381,7 +375,7 @@
     <string name="subtitles_filter_lang">Фільтрувати за бажаною мовою медіа</string>
     <string name="quality_4k">4K</string>
     <string name="title">Заголовок</string>
-    <string name="resolution">Роздільна здатність</string>
+    <string name="resolution">Роздільність</string>
     <string name="error">Помилка</string>
     <string name="trailer">Трейлер</string>
     <string name="extras">Додатково</string>
@@ -394,11 +388,10 @@
     <string name="quality_ts">TS</string>
     <string name="quality_tc">TC</string>
     <string name="subtitles_remove_bloat">Вилучати роздуття субтитрів</string>
-    <string name="referer">Referer (необов’язково)</string>
+    <string name="referer">Джерело переходу (необов’язково)</string>
     <string name="next">Далі</string>
     <string name="provider_languages_tip">Переглядайте відео на цих мовах</string>
     <string name="skip_setup">Пропустити налаштування</string>
-    <string name="crash_reporting_title">Звітування про збої</string>
     <string name="preferred_media_subtext">Що ви хочете побачити</string>
     <string name="setup_done">Готово</string>
     <string name="extensions">Розширення</string>
@@ -411,17 +404,17 @@
     <string name="batch_download_start_format" formatted="true">Почалося завантаження %1$d %2$s…</string>
     <string name="batch_download_finish_format" formatted="true">Завантажено %1$d %2$s</string>
     <string name="batch_download_nothing_to_download_format" formatted="true">Усі %s вже завантажено</string>
-    <string name="batch_download">Завантажити пакунки</string>
+    <string name="batch_download">Завантажити пакунком</string>
     <string name="plugin_singular">розширення</string>
-    <string name="plugin">розширень</string>
-    <string name="delete_repository">Видалити репозиторій</string>
+    <string name="plugin">розширення</string>
+    <string name="delete_repository">Видалити сховище</string>
     <string name="setup_extensions_subtext">Завантажте список сайтів, які ви хочете використовувати</string>
     <string name="plugins_downloaded" formatted="true">Завантажено: %d</string>
     <string name="plugins_disabled" formatted="true">Вимкнено: %d</string>
     <string name="plugins_not_downloaded" formatted="true">Не завантажено: %d</string>
     <string name="plugins_updated" formatted="true">Оновлено %d розширень</string>
-    <string name="blank_repo_message">Типово у CloudStream немає жодного встановленого сайту. Вам потрібно встановити сайти з репозиторіїв.\n\nПриєднуйтеся до нашого Discord або шукайте в інтернеті.</string>
-    <string name="view_public_repositories_button">Переглянути репозиторії спільноти</string>
+    <string name="blank_repo_message">Типово у CloudStream немає жодного встановленого сайту. Вам потрібно встановити сайти зі сховищ.\n\nПриєднуйтеся до нашого Discord або шукайте в інтернеті.</string>
+    <string name="view_public_repositories_button">Переглянути сховища спільноти</string>
     <string name="view_public_repositories_button_short">Публічний список</string>
     <string name="uppercase_all_subtitles">Усі субтитри великими літерами</string>
     <string name="single_plugin_disabled" formatted="true">%s (вимкнено)</string>
@@ -439,10 +432,10 @@
     <string name="hls_playlist">Список відтворення HLS</string>
     <string name="player_settings_play_in_app">Вбудований програвач</string>
     <string name="skip_type_ed">Ендінґ</string>
-    <string name="skip_type_recap">Коротке повторення</string>
+    <string name="skip_type_recap">Підсумок</string>
     <string name="skip_type_format" formatted="true">Пропустити %s</string>
     <string name="skip_type_mixed_ed">Змішаний ендінґ</string>
-    <string name="skip_type_creddits">Подяки</string>
+    <string name="skip_type_credits">Подяки</string>
     <string name="skip_type_op">Опенінґ</string>
     <string name="skip_type_intro">Вступ</string>
     <string name="clear_history">Очистити історію</string>
@@ -456,16 +449,16 @@
     <string name="update_notification_installing">Установлення оновлення застосунку…</string>
     <string name="update_notification_failed">Не вдалося встановити нову версію застосунку</string>
     <string name="apk_installer_legacy">Застарілий</string>
-    <string name="apk_installer_package_installer">Установлювач пакунків</string>
+    <string name="apk_installer_package_installer">Встановлювач пакунків</string>
     <string name="delayed_update_notice">Застосунок буде оновлено після виходу</string>
-    <string name="delete_repository_plugins">Це також призведе до видалення всіх розширень репозиторію</string>
+    <string name="delete_repository_plugins">Це також призведе до видалення всіх розширень сховища</string>
     <string name="all_languages_preference">Усі мови</string>
     <string name="previous">Назад</string>
     <string name="app_layout_subtext">Змініть вигляд застосунку відповідно до вашого пристрою</string>
     <string name="plugin_deleted">Розширення видалено</string>
     <string name="is_adult">18+</string>
     <string name="audio_tracks">Аудіодоріжки</string>
-    <string name="download_all_plugins_from_repo">Застереження: CloudStream 3 не несе жодної відповідальності за використання сторонніх розширень і не надає жодного підтримування для них!</string>
+    <string name="download_all_plugins_from_repo">Увага: CloudStream не несе жодної відповідальності за використання сторонніх розширень і не надає жодної підтримки для них!</string>
     <string name="player_pref">Бажаний відеопрогравач</string>
     <string name="safe_mode_title">Увімкнено безпечний режим</string>
     <string name="extension_authors">Автори</string>
@@ -485,19 +478,19 @@
     <string name="empty_library_no_accounts_message">Ваша бібліотека порожня :(\nУвійдіть в обліковий запис бібліотеки або додайте щось до вашої локальної бібліотеки.</string>
     <string name="sort_alphabetical_z">Алфавітом (від Я до А)</string>
     <string name="select_library">Оберіть бібліотеку</string>
-    <string name="open_with">Відкрити</string>
+    <string name="open_with">Відкрити з</string>
     <string name="browser">Браузер</string>
     <string name="empty_library_logged_in_message">Цей список порожній. Спробуйте перейти до іншого.</string>
     <string name="safe_mode_file">Файл безпечного режиму знайдено!\nРозширення не завантажуватимуться під час запуску, доки файл не буде видалено.</string>
     <string name="pref_category_android_tv">Android TV</string>
-    <string name="android_tv_interface_off_seek_settings">Прогрвач приховано – крок перемотування</string>
-    <string name="android_tv_interface_on_seek_settings">Програвач показано – крок перемотування</string>
+    <string name="android_tv_interface_off_seek_settings">Прогрвач приховано: крок перемотування</string>
+    <string name="android_tv_interface_on_seek_settings">Програвач показано: крок перемотування</string>
     <string name="android_tv_interface_on_seek_settings_summary">Крок перемотування, який використовується, коли програвач видимий</string>
-    <string name="android_tv_interface_off_seek_settings_summary">Крок перемотування, який використовується, коли плеєр прихований</string>
+    <string name="android_tv_interface_off_seek_settings_summary">Крок перемотування, який використовується, коли програвач прихований</string>
     <string name="test_failed">Провалено</string>
     <string name="test_passed">Пройдено</string>
     <string name="restart">Перезапустити</string>
-    <string name="test_log">Журнал</string>
+    <string name="test_log">Лог</string>
     <string name="start">Відновити</string>
     <string name="stop">Зупинити</string>
     <string name="category_provider_test">Перевірка постачальників</string>
@@ -507,15 +500,15 @@
     <string name="subscription_deleted">Ви відписалися від %s</string>
     <string name="subscription_episode_released">Епізод %d випущено!</string>
     <string name="revert">Повернути</string>
-    <string name="jsdelivr_proxy">GitHub проксі</string>
+    <string name="jsdelivr_proxy">Проксі GitHub</string>
     <string name="jsdelivr_enabled">Не вдалось отримати доступ до GitHub. Увімкнення проксі-сервера jsDelivr…</string>
     <string name="pref_category_bypass">Обходи ISP</string>
-    <string name="jsdelivr_proxy_summary">Обхід блокування GitHub за допомогою jsDelivr. Можлива затримка оновлень на кілька днів.</string>
+    <string name="jsdelivr_proxy_summary">Обхід блокування прямих посилань GitHub за допомогою jsDelivr. Може спричинити затримку оновлень на кілька днів.</string>
     <string name="watch_quality_pref_data">Бажана якість перегляду (мобільні дані)</string>
-    <string name="set_default">Змінити на типові</string>
+    <string name="set_default">Встановити типові</string>
     <string name="profiles">Профілі</string>
     <string name="help">Довідка</string>
-    <string name="quality_profile_help">Тут можна змінити порядок джерел. Відео з вищим пріоритетом з’являтиметься вище в списку джерел. Сума пріоритету джерела та пріоритету якості утворює пріоритет відео.\n\nДжерело А: 3\nЯкість Б: 7\nЗагальний пріоритет відео дорівнюватиме 10.\n\nПРИМІТКА: Якщо сума пріоритетів дорівнюватиме 10 або більше, програвач автоматично пропустить завантаження цього покликання!</string>
+    <string name="quality_profile_help">Тут можна змінити порядок джерел. Відео з вищим пріоритетом з’являтиметься вище в списку джерел. Сума пріоритету джерела та пріоритету якості утворює пріоритет відео.\n\nДжерело А: 3\nЯкість Б: 7\nЗагальний пріоритет відео дорівнюватиме 10.\n\nПРИМІТКА: Якщо сума пріоритетів дорівнюватиме 10 або більше, програвач автоматично пропустить завантаження цього посилання!</string>
     <string name="profile_number">Профіль %d</string>
     <string name="wifi">Wi-Fi</string>
     <string name="mobile_data">Мобільні дані</string>
@@ -530,9 +523,9 @@
     <string name="no_plugins_found_error">Не знайдено жодного розширення в репозиторії</string>
     <string name="already_voted">Ви вже проголосували</string>
     <string name="backup_frequency">Частота резервного копіювання</string>
-    <string name="favorite_removed">%s вилучено з обраного</string>
-    <string name="favorites_list_name">Обране</string>
-    <string name="favorite_added">%s додано до обраного</string>
+    <string name="favorite_removed">%s вилучено з вподобаних</string>
+    <string name="favorites_list_name">Вподобані</string>
+    <string name="favorite_added">%s додано до вподобаних</string>
     <string name="duplicate_message_multiple" formatted="true">У вашій бібліотеці виявлено можливі дублікати:\n\n%s\n\nУсе одно хочете додати цей елемент, замінити наявні чи скасувати дію?</string>
     <string name="duplicate_title">Знайдено можливий дублікат</string>
     <string name="lock_profile">Заблокувати профіль</string>
@@ -546,7 +539,7 @@
     <string name="action_subscribe">Підписатися</string>
     <string name="action_remove_from_favorites">Вилучити з обраного</string>
     <string name="select_an_account">Оберіть обліковий запис</string>
-    <string name="duplicate_message_single">Схоже, що у вашій бібліотеці вже є можливий дублікат: «%s.»\n\nУсе одно хочете додати цей елемент, замінити наявний чи скасувати дію?</string>
+    <string name="duplicate_message_single">Схоже, що у вашій бібліотеці вже є можливий дублікат: \'%s.\'\n\nУсе одно хочете додати цей елемент, замінити наявний чи скасувати дію?</string>
     <string name="enter_pin">Уведіть PIN-код</string>
     <string name="pin">PIN-код</string>
     <string name="enter_current_pin">Уведіть поточний PIN-код</string>
@@ -557,10 +550,8 @@
     <string name="manage_accounts">Керувати обліковими записами</string>
     <string name="edit_account">Редагувати обліковий запис</string>
     <string name="rotate_video_desc">Показувати кнопку перемикання орієнтації екрана</string>
-    <string name="rotate_video_key">rotate_video_key</string>
     <string name="rotate_video">Обернути</string>
-    <string name="links_reloaded_toast">Покликання перезавантажено</string>
-    <string name="auto_rotate_video_key">auto_rotate_video_key</string>
+    <string name="links_reloaded_toast">Посилання перезавантажені</string>
     <string name="auto_rotate_video">Автообертання</string>
     <string name="auto_rotate_video_desc">Увімкнути автоматичну зміну орієнтації екрана відповідно до відео</string>
     <string name="speed_setting_summary">Додати налаштування швидкості до програвача</string>
@@ -569,7 +560,7 @@
     <string name="recommendations_tooltip">Показати рекомендації</string>
     <string name="test_extensions_summary">Ця перевірка лише для розробників і не підтверджує або заперечує роботу жодного розширення.</string>
     <string name="subscribe_tooltip">Сповіщення про новий епізод</string>
-    <string name="password_pin_authentication_title">Автентифікація за паролем/PIN-кодом</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>
@@ -577,8 +568,8 @@
     <string name="biometric_unsupported">Біометрична автентифікація не підтримується на цьому пристрої</string>
     <string name="biometric_prompt_description">Після кількох невдалих спроб вікно запиту зникне. Перезапустіть застосунок, щоби спробувати ще раз.</string>
     <string name="resume_remaining" formatted="true">%s\nзалишилося</string>
-    <string name="unfavorite">Вилучити з обраного</string>
-    <string name="favorite">Додати до обраного</string>
+    <string name="unfavorite">Вилучити з вподобаного</string>
+    <string name="favorite">Додати до вподобаного</string>
     <string name="toast_copied">скопійовано!</string>
     <string name="repo_copy_label">Назва репозиторію та URL</string>
     <string name="clipboard_unknown_error">Помилка копіювання, скопіюйте logcat та зверніться до служби підтримки застосунку.</string>
@@ -589,25 +580,24 @@
     <string name="app_unrestricted_toast">Споживання батареї застосунком уже змінено на необмежене</string>
     <string name="app_info_intent_error">Не вдається відкрити подробиці про застосунок CloudStream.</string>
     <string name="audio_book_singular">Аудіокнига</string>
-    <string name="music_singlar">Музика</string>
-    <string name="custom_media_singluar">Медіа</string>
+    <string name="music_singular">Музика</string>
+    <string name="custom_media_singular">Медіа</string>
     <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="next_season_episode_format" formatted="true">%1$d сезон %2$d епізод вийде через</string>
     <string name="player_settings_select_cast_device">Оберіть пристрій для трансляції</string>
     <string name="episode_action_cast_mirror">Трансляція через дзеркало</string>
-    <string name="cs3wiki">Довідник CloudStream</string>
+    <string name="cs3wiki">CloudStream Wiki</string>
     <string name="pref_category_security">Безпека</string>
     <string name="pref_category_accounts">Облікові записи</string>
     <string name="qr_image">Зображення QR-коду</string>
-    <string name="open_downloaded_repo">Відкрити репозиторій</string>
-    <string name="device_pin_url_message">Відвідайте <b>%s</b> на своєму смартфоні або комп\'ютері та введіть вищевказаний код</string>
+    <string name="open_downloaded_repo">Відкрити сховище</string>
+    <string name="device_pin_url_message">Відвідайте <b>%s</b> на своєму смартфоні або комп’ютері та введіть вищевказаний код</string>
     <string name="device_pin_error_message">Не вдається отримати PIN-код пристрою, спробуйте локальну автентифікацію</string>
-    <string name="device_pin_expired_message">PIN-код застарів!</string>
-    <string name="device_pin_counter_text">Термін дії коду закінчується через %1$dхв %2$dс</string>
+    <string name="device_pin_expired_message">Термін дії PIN-коду закінчився!</string>
+    <string name="device_pin_counter_text">Термін дії коду закінчується через %1$d хв %2$d с</string>
     <string name="auth_locally">Локальна автентифікація</string>
     <string name="dismiss">Відхилити</string>
-    <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>
@@ -618,11 +608,11 @@
     <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="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_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="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>
@@ -630,22 +620,22 @@
     <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="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="torrent_info">Це відео – торрент, це означає, що ваша відеоактивність може відстежуватися.\nПереконайтеся, що розумієте, що таке торрент, перед тим як продовжити.</string>
     <string name="subs_edge_size">Розмір обведення</string>
-    <string name="audio_singluar">Аудіо</string>
-    <string name="podcast_singluar">Подкаст</string>
+    <string name="audio_singular">Аудіо</string>
+    <string name="podcast_singular">Подкаст</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">Перезапустіть застосунок та прийміть спливне вікно Stream Torrent, щоби продовжити.</string>
+    <string name="player_load_one_subtitle_online">Завантажити перший доступний</string>
+    <string name="torrent_preferred_media">Увімкніть торент в Налаштування - &gt; Постачальники - &gt; Бажані медіа</string>
+    <string name="torrent_not_accepted">Перезапустіть застосунок та прийміть спливне вікно «Транслювати торрент», щоби продовжити.</string>
     <string name="software_decoding">Програмне декодування</string>
-    <string name="software_decoding_desc">Програмне декодування дозволяє програвачу відтворювати відеофайли, не підтримувані вашим телефоном. Однак, це може призвести до затримок або нестабільного відтворення у високій роздільній здатності</string>
+    <string name="software_decoding_desc">Програмне декодування дозволяє плеєру відтворювати відеофайли, які не підтримуються вашим пристроєм, але може спричинити затримки або нестабільне відтворення у високій роздільній здатності.</string>
     <string name="sort_episodes_date_newest">Датою виходу (найновіша)</string>
     <string name="sort_episodes_number_asc">Епізодом (за зростанням)</string>
     <string name="sort_episodes_rating_low_high">Рейтингом (найнижчий)</string>
@@ -663,12 +653,90 @@
     <string name="player_notification_channel_description">Сповіщення програвача для керування відтворенням у фоновому режимі</string>
     <string name="player_notification_channel_name">Сповіщення програвача</string>
     <string name="speech_recognition_unavailable">Розпізнавання мовлення недоступне</string>
-    <string name="begin_speaking">Говоріть…</string>
+    <string name="begin_speaking">Почніть говорити…</string>
     <string name="subtitles_from_embedded">Вбудовані</string>
     <string name="subtitles_from_online">Мережеві</string>
     <string name="background_radius">Радіус тла</string>
-    <string name="all_subtitles_bold">Зробити всі субтитри жирним</string>
+    <string name="all_subtitles_bold">Зробити всі субтитри потовщеним</string>
     <string name="all_subtitles_italic">Зробити всі субтитри курсивом</string>
     <string name="volume_exceeded_100">Гучність перевищила 100%</string>
     <string name="slide_up_again_to_exceed_100">Ще раз проведіть угору, щоби перевищити 100%</string>
-</resources>
\ No newline at end of file
+    <string name="concurrent_connections">Одночасних з’єднань</string>
+    <string name="overscan_settings_des">Змінює межі екрана</string>
+    <string name="overscan_settings">Обрізання зображення</string>
+    <string name="go_to_downloads">Перейти до завантажень</string>
+    <string name="no_internet_connection">Немає з’єднання з мережею. \n\nПерепід’єднайтеся до мережі та спробуйте ще раз або перегляньте завантажені відео локально.</string>
+    <string name="download_parallel_settings_des">Скільки різних елементів можна завантажити паралельно</string>
+    <string name="parallel_downloads">Паралельних завантажень</string>
+    <string name="concurrent_connections_settings_des">Скільки одночасних з’єднань може використовувати кожне завантаження</string>
+    <string name="poster_size_settings_des">Зміна розміру плакатів</string>
+    <string name="poster_size_settings">Розмір постера</string>
+    <string name="player_settings_always_ask">Завжди запитувати</string>
+    <string name="speedup_title">Змінювати швидкість при утриманні</string>
+    <string name="speedup_summary">Утримуйте, щоб отримати 2-кратну швидкість</string>
+    <string name="download_time_left_hour_min_sec_format" formatted="true">%1$d год %2$d хв %3$d с</string>
+    <string name="download_time_left_min_sec_format" formatted="true">%1$d хв %2$d с</string>
+    <string name="download_time_left_sec_format" formatted="true">%1$d с</string>
+    <string name="show_rating">Мітка рейтингу</string>
+    <string name="no_account">Немає облікового запису</string>
+    <string name="edit_profile_image_title">Редагувати зображення профілю</string>
+    <string name="edit_profile_image_hint">Введіть URL-адресу зображення профілю</string>
+    <string name="edit_profile_image_error_empty">URL-адресу не знайдено</string>
+    <string name="edit_profile_image_error_invalid">Недійсна URL-адреса або зображення</string>
+    <string name="edit_profile_image_success">Зображення успішно оновлено</string>
+    <string name="action_mark_watched_up_to_this_episode">Позначити як переглянуте до цього епізоду</string>
+    <string name="action_remove_mark_watched_up_to_this_episode">Вилучити переглянуті до цього епізоду</string>
+    <string name="action_reload">Перезавантажено</string>
+    <string name="reload_provider">Перезавантажити постачальника</string>
+    <string name="episode_action_play_mirror">Переглянути в дзеркалі</string>"
+    <string name="name">Назва</string>
+    <string name="resolution_and_name">Роздільність та назва</string>
+    <string name="subs_subtitle_alignment">Вирівнювання субтитрів</string>
+    <string name="bottom_left">Внизу ліворуч</string>
+    <string name="bottom_center">Внизу по центру</string>
+    <string name="bottom_right">Внизу праворуч</string>
+    <string name="middle_left">Посередині зліва</string>
+    <string name="middle_center">Посередині в центрі</string>
+    <string name="middle_right">Посередині справа</string>
+    <string name="top_left">Угорі ліворуч</string>
+    <string name="top_center">Угорі в центрі</string>
+    <string name="top_right">Угорі праворуч</string>
+    <string name="play_full_series_button">Відтворити весь серіал</string>
+    <string name="install_prerelease">Встановити передрелізну версію</string>
+    <string name="prerelease_already_installed">Передрелізна версія вже встановлена.</string>
+    <string name="prerelease_install_failed">Не вдалося встановити передрелізну версію.</string>
+    <string name="show_episode_text">Текст епізоду</string>
+    <string name="search_suggestions">Пропозиції пошуку</string>
+    <string name="search_suggestions_des">Показувати підказки пошуку під час введення тексту</string>
+    <string name="clear_suggestions">Очистити пропозиції</string>
+    <string name="extra_brightness_settings">Додаткова яскравість</string>
+    <string name="extra_brightness_settings_des">Увімкнути фільтр яскравості при перевищенні 100% яскравості дисплея</string>
+    <string name="extra_brightness_key">extra_brightness_enabled</string>
+    <string name="show_cast_in_details">Показати панель трансляції</string>
+    <string name="video_info">Інформація про медіа</string>
+    <string name="source_name">Назва джерела</string>
+    <string name="download_queue">Черга завантаження</string>
+    <string name="queue_empty_message">Наразі немає завантажень у черзі.</string>
+    <string name="download_all">Завантажити все</string>
+    <string name="cancel_all">Скасувати все</string>
+    <string name="download_episode_range">Бажаєте завантажити %s епізод?</string>
+    <string name="cancel_queue_message">Бажаєте скасувати всі завантаження в черзі?</string>
+    <plurals name="downloads_active">
+        <item quantity="one">%d активне завантаження</item>
+        <item quantity="few">%d активні завантаження</item>
+        <item quantity="many">%d активних завантажень</item>
+        <item quantity="other">%d активних завантажень</item>
+    </plurals>
+    <plurals name="downloads_queued">
+        <item quantity="one">%d завантаження в черзі</item>
+        <item quantity="few">%d завантаження в черзі</item>
+        <item quantity="many">%d завантажень у черзі</item>
+        <item quantity="other">%d завантажень у черзі</item>
+    </plurals>
+    <string name="source_priority">Пріоритетне джерело</string>
+    <string name="source_priority_help">Виберіть спосіб сортування джерел відео у програвачі</string>
+    <string name="show_player_metadata_overlay">Показувати накладання метаданих програвача</string>
+    <string name="video_singular">Відео</string>
+    <string name="skip_type_preview">Передперегляд</string>
+    <string name="player_is_live">Наживо</string>
+</resources>
diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-b+ur/strings.xml
similarity index 93%
rename from app/src/main/res/values-ur/strings.xml
rename to app/src/main/res/values-b+ur/strings.xml
index 06508bc9e67..94728e2f817 100644
--- a/app/src/main/res/values-ur/strings.xml
+++ b/app/src/main/res/values-b+ur/strings.xml
@@ -10,8 +10,7 @@
     <string name="home_change_provider_img_des">ذریعہ تبدیل کریں</string>
     <string name="preview_background_img_des">پس منظر کا دیکھنا</string>
     <string name="rated_format" formatted="true">درجہ بندی: %.1f</string>
-    <string name="new_update_format" formatted="true">نیا update آگیا ہے!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">نیا update آگیا ہے! \n%1$s -&gt; %2$s</string>
     <string name="filler" formatted="true">بھرنے والا</string>
     <string name="duration_format" formatted="true">%d منٹ</string>
     <string name="next_episode_time_day_format" formatted="true">%1$d دن %2$d گھنٹے %3$d منٹ</string>
@@ -124,14 +123,10 @@
     <string name="category_account">اکاؤنٹس اور سیکیورٹی</string>
     <string name="settings_info">معلومات</string>
     <string name="advanced_search_des">آپ کو فراہم کنندہ کے ذریعہ علیحدہ کردہ تلاش کے نتائج فراہم کرتا ہے</string>
-    <string name="bug_report_settings_off">صرف کریش پر ڈیٹا بھیجتا ہے</string>
-    <string name="bug_report_settings_on">کوئی ڈیٹا نہیں بھیجتا</string>
     <string name="pref_filter_search_quality">تلاش کے نتائج میں منتخب ویڈیو کوالٹی چھپائیں</string>
     <string name="automatic_plugin_updates">خودکار پلگ ان اپ ڈیٹس</string>
     <string name="updates_settings">ایپ کی تازہ کاریاں نمایش کریں</string>
     <string name="redo_setup_process">سیٹ اپ کا عمل دوبارہ کریں</string>
-    <string name="uprereleases_settings">پری ریلیز کے لیے اپ ڈیٹ کریں</string>
-    <string name="uprereleases_settings_des">صرف مکمل جاریات کی بجائے پیش رلیز اپ ڈیٹس کی تلاش کریں</string>
     <string name="apk_installer_settings">APK انسٹالر</string>
     <string name="github">Github</string>
     <string name="lightnovel">یہ لائٹ ناول ایپ وہی ڈویلپرز نے تیار کی ہے جو اس ایپ کو ڈویلپ کیا ہے</string>
@@ -156,7 +151,6 @@
     <string name="download_done">ڈاؤن لوڈ ہو گیا</string>
     <string name="download_storage_text">انٹرنل سٹوریج</string>
     <string name="popup_pause_download">ڈاؤن لوڈ کو روکیں</string>
-    <string name="pref_disable_acra">خودکار بگ رپورٹنگ کو غیر فعال کریں</string>
     <string name="search_provider_text_providers">ذرائع کا استعمال کرتے ہوئے تلاش کریں</string>
     <string name="vpn_might_be_needed">اس فراہم کنندہ کو مناسب طریقے سے کام کرنے کے لیے VPN کی ضرورت پڑ سکتی ہے</string>
     <string name="subs_hold_to_reset_to_default">ڈیفالٹ سیٹنگز پر ری سیٹ کرنے کے لیے دبائیں اور تھامیں</string>
@@ -177,7 +171,6 @@
     <string name="automatic_plugin_download_summary">شامل کردہ ذخیروں سے خود بخود تمام ابھی تک انسٹال نہیں ہوئے پلگ ان انسٹال کریں۔</string>
     <string name="updates_settings_des">اپلیکیشن کو شروع کرنے کے بعد خود بخود نئی اپ ڈیٹس کی تلاش کریں۔</string>
     <string name="apk_installer_settings_des">کچھ فون نئے پیکیج انسٹالر کو سپورٹ نہیں کرتے ہیں. اگر اپ ڈیٹس انسٹال نہیں ہوتے ہیں تو لیگیسی آپشن کو آزمائیں.</string>
-    <string name="acra_report_toast">معذرت، ایپلی کیشن کریش ہو گئی. ایک گمنام بگ رپورٹ ڈویلپرز کو بھیجی جائے گی</string>
     <string name="season">سیزن</string>
     <string name="season_format">%1$s %2$d%3$s</string>
     <string name="no_season">کوئی سیزن نہیں</string>
@@ -195,10 +188,8 @@
     <string name="resume">از سر نو شروع کریں</string>
     <string name="go_back_30">-30</string>
     <string name="go_forward_30">+30</string>
-    <string name="delete_message" formatted="true">یہ مستقل طور پر حذف ہوجائے گا %s
-\nتمھيں يقين ہے?</string>
-    <string name="resume_time_left" formatted="true">%dm
-\nباقی</string>
+    <string name="delete_message" formatted="true">یہ مستقل طور پر حذف ہوجائے گا %s \nتمھيں يقين ہے?</string>
+    <string name="resume_time_left" formatted="true">%dm \nباقی</string>
     <string name="status_ongoing">احوال</string>
     <string name="status_completed">مکمل</string>
     <string name="status">حالت</string>
@@ -352,7 +343,7 @@
     <string name="sync_score_format" formatted="true">%d / 10</string>
     <string name="subtitles_raised">اٹھایا</string>
     <string name="subtitle_offset_extra_hint_before_format">اگر سب ٹائٹلز %d ms بہت جلد دکھائے جائیں تو اسے استعمال کریں</string>
-    <string name="skip_type_creddits">کریڈٹس</string>
+    <string name="skip_type_credits">کریڈٹس</string>
     <string name="extras">اضافی</string>
     <string name="actor_main">مرکزی</string>
     <string name="sort">ترتیب</string>
@@ -396,7 +387,6 @@
     <string name="referer">حوالہ دینے والا (مرضی پر)</string>
     <string name="provider_languages_tip">ان زبانوں میں ویڈیوز دیکھیں</string>
     <string name="skip_setup">سیٹ اپ کو چھوڑ دیں</string>
-    <string name="crash_reporting_title">کریش رپورٹنگ</string>
     <string name="setup_done">ہو گیا</string>
     <string name="extensions">ایکسٹینشنز</string>
     <string name="repository_url_hint">ذخیرہ URL</string>
@@ -448,8 +438,7 @@
     <string name="android_tv_interface_on_seek_settings">پلیئردکھایا گیا - Seek Amount</string>
     <string name="android_tv_interface_on_seek_settings_summary">پلیئر کے نظر آنے پر استعمال کی جانے والی Seek Amount</string>
     <string name="android_tv_interface_off_seek_settings_summary">پلیئر کے چھپنے پر استعمال ہونے والی seek amount</string>
-    <string name="safe_mode_file">سیف موڈ فائل مل گئی!
-\nفائل کو ہٹانے تک اسٹارٹ اپ پر کوئی ایکسٹینشن لوڈ نہیں کرنا۔</string>
+    <string name="safe_mode_file">سیف موڈ فائل مل گئی! \nفائل کو ہٹانے تک اسٹارٹ اپ پر کوئی ایکسٹینشن لوڈ نہیں کرنا۔</string>
     <string name="start">شروع کریں</string>
     <string name="test_failed">ناکام</string>
     <string name="test_passed">کامیاب ہو گیا</string>
@@ -461,8 +450,7 @@
     <string name="pref_category_bypass">آئی ایس پی بائی پاسز</string>
     <string name="subscription_new">%s کو سبسکرائب کیا</string>
     <string name="jsdelivr_proxy_summary">Bypass blocking of raw github URLs using jsDelivr. اپ ڈیٹس میں کچھ دنوں کی تاخیر ہو سکتی ہے</string>
-    <string name="empty_library_no_accounts_message">آپ کی لائبریری خالی ہے:(
-\nلائبریری اکاؤنٹ میں لاگ ان کریں یا اپنی مقامی لائبریری میں شوز شامل کریں۔</string>
+    <string name="empty_library_no_accounts_message">آپ کی لائبریری خالی ہے:( \nلائبریری اکاؤنٹ میں لاگ ان کریں یا اپنی مقامی لائبریری میں شوز شامل کریں۔</string>
     <string name="error_invalid_url">غلط URL</string>
     <string name="browser">براؤزر</string>
     <string name="quality_webrip">ویب</string>
@@ -478,7 +466,7 @@
     <string name="history">تاریخ</string>
     <string name="open_with">کے ساتھ کھولیں</string>
     <string name="error_invalid_id">غلط ID</string>
-    <string name="repository_name_hint">ذخیرہ کا نام</string>
+    <string name="repository_name_hint">ذخیرہ کا نام (اختیاری)</string>
     <string name="skip_type_ed">ختم ہونے والا</string>
     <string name="skip_type_op">کھل رہا ہے</string>
     <string name="confirm_exit_dialog">کیا آپ کو یقین ہے کہ آپ ہیاں سے نکلنا چاہتے ہیں؟</string>
@@ -511,9 +499,7 @@
     <string name="subtitles_remove_captions">سب ٹائٹلز سے بند کیپشنز کو ہٹا دیں</string>
     <string name="app_layout_subtext">اپنے آلے کے مطابق ایپ کی شکل تبدیل کریں</string>
     <string name="next">اگلے</string>
-    <string name="blank_repo_message">CloudStream میں بذریعہ ڈیفالٹ کوئی سائٹ انسٹال نہیں ہے۔ آپ کو ریپوزٹری سے سائٹس انسٹال کرنے کی ضرورت ہے۔
-\n
-\nہمارے Discord میں شامل ہوں یا آن لائن تلاش کریں۔</string>
+    <string name="blank_repo_message">CloudStream میں بذریعہ ڈیفالٹ کوئی سائٹ انسٹال نہیں ہے۔ آپ کو ریپوزٹری سے سائٹس انسٹال کرنے کی ضرورت ہے۔ \n \nہمارے Discord میں شامل ہوں یا آن لائن تلاش کریں۔</string>
     <string name="safe_mode_description">تمام ایکسٹینشنز کریش کی وجہ سے آف کر دی گئیں تاکہ آپ کو پریشانی کا باعث تلاش کرنے میں مدد مل سکے۔</string>
     <string name="extension_install_first">پہلے ایکسٹینشن انسٹال کریں</string>
     <string name="clipboard_too_large">بہت زیادہ متن۔ کلپ بورڈ میں محفوظ کرنے سے قاصر۔</string>
@@ -535,13 +521,7 @@
     <string name="already_voted">آپ نے پہلے ہی ووٹ دیا ہے</string>
     <string name="no_plugins_found_error">مخزن میں کوئی پلگ انز نہیں ملا</string>
     <string name="set_default">ترجیحی تعین کریں</string>
-    <string name="quality_profile_help">یہاں آپ تبدیلی کرسکتے ہیں کہ سورسز کو کس طرح کی ترتیب دی جائے۔ اگر ایک ویڈیو کی زیادہ پرائیورٹی ہوتی ہے تو یہ سورس کی انتخاب میں زیادہ اوپر آئے گی۔ سورس کی پرائیورٹی اور کوالٹی کی پرائیورٹی کا مجموعہ ویڈیو کی پرائیورٹی ہوتی ہے۔
-\n
-\nسورس A: 3
-\nکوالٹی B: 7
-\nاس کا مجموعی ویڈیو پرائیورٹی 10 ہوتی ہے۔
-\n
-\nنوٹ: اگر مجموعہ 10 یا اس سے زیادہ ہو تو پلیر وہ لنک لوڈ کرنے کو خود بخود چھوڑ دے گا!</string>
+    <string name="quality_profile_help">یہاں آپ تبدیلی کرسکتے ہیں کہ سورسز کو کس طرح کی ترتیب دی جائے۔ اگر ایک ویڈیو کی زیادہ پرائیورٹی ہوتی ہے تو یہ سورس کی انتخاب میں زیادہ اوپر آئے گی۔ سورس کی پرائیورٹی اور کوالٹی کی پرائیورٹی کا مجموعہ ویڈیو کی پرائیورٹی ہوتی ہے۔ \n \nسورس A: 3 \nکوالٹی B: 7 \nاس کا مجموعی ویڈیو پرائیورٹی 10 ہوتی ہے۔ \n \nنوٹ: اگر مجموعہ 10 یا اس سے زیادہ ہو تو پلیر وہ لنک لوڈ کرنے کو خود بخود چھوڑ دے گا!</string>
     <string name="favorites_list_name">پسندیدہ</string>
     <string name="favorite_added">%s کو پسندیدہ میں شامل کیا گیا</string>
     <string name="favorite_removed">%s کو پسندیدہ سے ختم کیا گیا</string>
@@ -568,14 +548,8 @@
     <string name="duplicate_add">جمع کریں</string>
     <string name="duplicate_replace_all">سب کو بدل دیں</string>
     <string name="duplicate_replace">بدل دیں</string>
-    <string name="duplicate_message_multiple" formatted="true">آپ کی لائبریری میں ممکنہ ڈپلیکیٹ آئٹمز مل گئے ہیں:
-\n
-\n%s
-\n
-\nکیا آپ بہرحال اس آئٹم کو شامل کرنا چاہیں گے، موجودہ کو تبدیل کرنا چاہیں گے، یا کارروائی کو منسوخ کریں گے؟</string>
-    <string name="duplicate_message_single" formatted="true">ایسا معلوم ہوتا ہے کہ آپ کی لائبریری میں ممکنہ طور پر ڈپلیکیٹ آئٹم پہلے سے موجود ہے: \'%s۔\'
-\n
-\nکیا آپ بہرحال اس آئٹم کو شامل کرنا چاہیں گے، موجودہ کو تبدیل کرنا چاہیں گے، یا کارروائی کو منسوخ کریں گے؟</string>
+    <string name="duplicate_message_multiple" formatted="true">آپ کی لائبریری میں ممکنہ ڈپلیکیٹ آئٹمز مل گئے ہیں: \n \n%s \n \nکیا آپ بہرحال اس آئٹم کو شامل کرنا چاہیں گے، موجودہ کو تبدیل کرنا چاہیں گے، یا کارروائی کو منسوخ کریں گے؟</string>
+    <string name="duplicate_message_single" formatted="true">ایسا معلوم ہوتا ہے کہ آپ کی لائبریری میں ممکنہ طور پر ڈپلیکیٹ آئٹم پہلے سے موجود ہے: \'%s۔\' \n \nکیا آپ بہرحال اس آئٹم کو شامل کرنا چاہیں گے، موجودہ کو تبدیل کرنا چاہیں گے، یا کارروائی کو منسوخ کریں گے؟</string>
     <string name="lock_profile">پروفائل لاک کریں</string>
     <string name="skip_startup_account_select_pref">آغاز پر اکاؤنٹ کا انتخاب چھوڑ دیں</string>
     <string name="auto_rotate_video_desc">ویڈیو واقفیت کی بنیاد پر اسکرین کی سمت بندی کی خودکار سوئچنگ کو فعال کریں</string>
@@ -583,8 +557,7 @@
     <string name="toast_copied">کاپی کر لیا!</string>
     <string name="repo_copy_label">ذخیرہ کا نام اور URL</string>
     <string name="episode_upcoming_format" formatted="true">%s میں آنے والا ہے</string>
-    <string name="resume_remaining" formatted="true">%s
-\nباقی</string>
+    <string name="resume_remaining" formatted="true">%s \nباقی</string>
     <string name="clipboard_permission_error">کلپ بورڈ تک رسائی میں خرابی، براہ کرم دوبارہ کوشش کریں۔</string>
     <string name="clipboard_unknown_error">کاپی کرنے میں خرابی، براہ کرم logcat کاپی کریں اور ایپ سپورٹ سے رابطہ کریں۔</string>
     <string name="battery_dialog_message">سبسکرائب شدہ ٹی وی شوز کے لیے بلاتعطل ڈاؤن لوڈز اور اطلاعات کو یقینی بنانے کے لیے، CloudStream کو پس منظر میں چلنے کی اجازت درکار ہے۔ OK دبانے سے، آپ کو App info پر بھیج دیا جائے گا۔ وہاں اسکرول کریں 𝘼𝙥𝙥 𝙗𝙖𝙩𝙩𝙚𝙧𝙮 𝙪𝙨𝙖𝙜𝙚 اور battery usage کو 𝙐𝙣𝙧𝙚𝙨𝙩𝙧𝙞𝙘𝙩𝙚𝙙 کردیں، اس اجازت کا مطلب یہ نہیں ہے کہ CS3 آپ کی بیٹری ختم کردے گا۔ یہ صرف ضرورت پڑنے پر پس منظر میں کام کرے گا، جیسے کہ جب اطلاعات موصول ہوں یا آفیشل ایکسٹینشنز سے ویڈیوز ڈاؤن لوڈ کریں۔ اگر آپ منسوخ کرنے کا انتخاب کرتے ہیں، تو آپ اس ترتیب کو بعد میں 𝙂𝙚𝙣𝙚𝙧𝙖𝙡 𝙎𝙚𝙩𝙩𝙞𝙣𝙜𝙨 میں ایڈجسٹ کر سکتے ہیں۔</string>
@@ -598,9 +571,9 @@
     <string name="battery_dialog_title">Battery Optimization کو غیر فعال کریں</string>
     <string name="app_unrestricted_toast">اپپ battery usage پہلے سے ہی unrestricted ہے</string>
     <string name="favorite">پسندیدہ کریں</string>
-    <string name="music_singlar">موسیقی</string>
+    <string name="music_singular">موسیقی</string>
     <string name="audio_book_singular">آڈیو بک</string>
-    <string name="custom_media_singluar">میڈیا</string>
+    <string name="custom_media_singular">میڈیا</string>
     <string name="biometric_authentication_title">انلاک CloudStream</string>
     <string name="biometric_setting">بایومیٹرکس کے ساتھ لاک کریں</string>
     <string name="biometric_unsupported">بایومیٹرک تصدیق اس ڈیوائس پر سپپورٹڈ نہیں ہے</string>
@@ -611,5 +584,20 @@
     <string name="result_search_tooltip">دیگر ایکسٹینشنز میں تلاش کریں</string>
     <string name="recommendations_tooltip">سفارشات دکھائیں</string>
     <string name="biometric_warning">آپ کے CloudStream ڈیٹا کا اب بیک اپ لیا گیا ہے۔ اگرچہ اس کا امکان بہت کم ہے، لیکن مختلف ڈیوائس مختلف طریقے سے کام کر سکتے ہیں۔ اگر آپ ایپ تک رسائی حاصل کرنے سے قاصر ہیں تو، ایپ کا ڈیٹا مکمل طور پر صاف کریں اور بیک اپ سے بحال کریں۔ اس سے ہونے والی کسی بھی تکلیف کے لیے ہم بہت معذرت خواہ ہیں۔</string>
-    <string name="hide_player_control_names_key" translatable="false">hide_player_control_names_key</string>
-</resources>
\ No newline at end of file
+    <string name="next_season_episode_format" formatted="true">سیزن %1$d کی قسط %2$d جاری ہوگی</string>
+    <string name="play_from_beginning_img_des">شروع سےپلے کریں</string>
+    <string name="speech_recognition_unavailable">کلام شناسی دستیاب نہیں</string>
+    <string name="begin_speaking">بولنا شروع کریں…</string>
+    <string name="torrent_info">یہ ویڈیو ایک ٹورنٹ ہے،یعنی آپ کی ویڈیو سرگرمی کا سراغ آپ تک لگایا جاسکتا ہے۔\nآگے بڑھنے سے پہلے یہ بات یقینی بنائیں کہ آپ ٹورنٹنگ کو صحیح سے جانتے ہیں</string>
+    <string name="downloads_delete_select">ڈیلیٹ کرنے کے لئے چیزیں چنیں</string>
+    <string name="downloads_empty">فی الحال کوئی ڈاونلوڈ نہیں۔</string>
+    <string name="offline_file">آف لائن دیکھنے کے لئے دستیاب ہے</string>
+    <string name="select_all">سب چُنیں</string>
+    <string name="deselect_all">سب غیر منتخب کریں</string>
+    <string name="open_local_video">لوکل ویڈیو کھولیں</string>
+    <string name="delete_files">فائلز حذف کریں</string>
+    <string name="test_warning">انتباہ</string>
+    <string name="audio_singular">آواز</string>
+    <string name="sort_button_date">تاریخ %s</string>
+    <string name="device_pin_url_message">اپنے اسمارٹ فون یا کمپیوٹر پر یہ <b>%s</b> وزٹ کریں اور مندرجہ بالا کوڈ ڈالیں</string>
+</resources>
diff --git a/app/src/main/res/values-vi/array.xml b/app/src/main/res/values-b+vi/array.xml
similarity index 83%
rename from app/src/main/res/values-vi/array.xml
rename to app/src/main/res/values-b+vi/array.xml
index c6ff1c4e28a..848ff014bd1 100644
--- a/app/src/main/res/values-vi/array.xml
+++ b/app/src/main/res/values-b+vi/array.xml
@@ -15,20 +15,19 @@
     </array>
 
 
-    <array name="limit_title_rez_pref_names">
-        <item>@string/resolution_and_title</item>
-        <item>@string/title</item>
+    <array name="title_info_pref_names">
+        <item>@string/source_name</item>
         <item>@string/resolution</item>
-        <item>@string/none</item>
+        <item>@string/video_info</item>
     </array>
 
-    <array name="limit_title_rez_pref_values">
-        <item>3</item>
-        <item>2</item>
-        <item>1</item>
-        <item>0</item>
+    <array name="title_info_pref_values">
+        <item>@string/show_name_key</item>
+        <item>@string/show_resolution_key</item>
+        <item>@string/show_media_info_key</item>
     </array>
 
+
     <array name="limit_title_pref_names">
         <item>@string/none</item>
         <item>16 ký tự</item>
@@ -143,14 +142,18 @@
         <item>@string/show_hd</item>
         <item>@string/show_dub</item>
         <item>@string/show_sub</item>
+        <item>@string/show_rating</item>
         <item>@string/show_title</item>
+        <item>@string/show_episode_text</item>
     </array>
 
     <array name="poster_ui_options_values">
         <item>@string/show_hd_key</item>
         <item>@string/show_dub_key</item>
         <item>@string/show_sub_key</item>
+        <item>@string/show_rating_key</item>
         <item>@string/show_title_key</item>
+        <item>@string/show_episode_text_key</item>
     </array>
 
     <array name="app_layout">
@@ -224,6 +227,9 @@
         <item>Sáng</item>
         <item>Hệ thống</item>
         <item>Material You</item>
+        <item>Dracula</item>
+        <item>Giấc Mơ Oải Hương</item>
+        <item>Xanh Lam Tĩnh Lặng</item>
     </string-array>
     <string-array name="themes_names_values">
         <item>AmoledLight</item>
@@ -232,6 +238,9 @@
         <item>Light</item>
         <item>System</item>
         <item>Monet</item>
+        <item>Dracula</item>
+        <item>Lavender</item>
+        <item>SilentBlue</item>
     </string-array>
 
     <!--https://github.com/videolan/vlc-android/blob/72ccfb93db027b49855760001d1a930fa657c5a8/application/resources/src/main/res/values/arrays.xml#L266-->
@@ -279,48 +288,4 @@
         <item>Vietnamese (VISCII)</item>
         <item>Vietnamese (Windows-1258)</item>
     </string-array>
-    <string-array name="subtitles_encoding_values" translatable="false" tools:ignore="TypographyDashes">
-        <item></item>
-        <item>UTF-8</item>
-        <item>UTF-16</item>
-        <item>UTF-16BE</item>
-        <item>UTF-16LE</item>
-        <item>GB18030</item>
-        <item>ISO-8859-15</item>
-        <item>Windows-1252</item>
-        <item>IBM850</item>
-        <item>ISO-8859-2</item>
-        <item>Windows-1250</item>
-        <item>ISO-8859-3</item>
-        <item>ISO-8859-10</item>
-        <item>Windows-1251</item>
-        <item>KOI8-R</item>
-        <item>KOI8-U</item>
-        <item>ISO-8859-6</item>
-        <item>Windows-1256</item>
-        <item>ISO-8859-7</item>
-        <item>Windows-1253</item>
-        <item>ISO-8859-8</item>
-        <item>Windows-1255</item>
-        <item>ISO-8859-9</item>
-        <item>Windows-1254</item>
-        <item>ISO-8859-11</item>
-        <item>Windows-874</item>
-        <item>ISO-8859-13</item>
-        <item>Windows-1257</item>
-        <item>ISO-8859-14</item>
-        <item>ISO-8859-16</item>
-        <item>ISO-2022-CN-EXT</item>
-        <item>EUC-CN</item>
-        <item>ISO-2022-JP-2</item>
-        <item>EUC-JP</item>
-        <item>Shift_JIS</item>
-        <item>CP949</item>
-        <item>ISO-2022-KR</item>
-        <item>Big5</item>
-        <item>ISO-2022-TW</item>
-        <item>Big5-HKSCS</item>
-        <item>VISCII</item>
-        <item>Windows-1258</item>
-    </string-array>
 </resources>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-b+vi/strings.xml
similarity index 55%
rename from app/src/main/res/values-vi/strings.xml
rename to app/src/main/res/values-b+vi/strings.xml
index 999181db507..842b97080eb 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-b+vi/strings.xml
@@ -5,31 +5,30 @@
     <string name="app_dub_sub_episode_text_format" formatted="true">%1$s Tập %2$d</string>
     <string name="cast_format" formatted="true">Diễn viên: %s</string>
     <string name="next_episode_format" formatted="true">Tập %d sẽ ra mắt sau</string>
-    <string name="next_episode_time_day_format" formatted="true">%1$dng %2$dg %3$dph</string>
-    <string name="next_episode_time_hour_format" formatted="true">%1$dgi %2$dph</string>
-    <string name="next_episode_time_min_format" formatted="true">%dm</string>
+    <string name="next_episode_time_day_format" formatted="true">%1$d ngày %2$d giờ %3$d phút</string>
+    <string name="next_episode_time_hour_format" formatted="true">%1$d giờ %2$d phút</string>
+    <string name="next_episode_time_min_format" formatted="true">%d phút</string>
     <!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
     <string name="result_poster_img_des">Poster</string>
-    <string name="search_poster_img_des">Ảnh bìa</string>
-    <string name="episode_poster_img_des">Episode Poster</string>
-    <string name="home_main_poster_img_des">Main Poster</string>
-    <string name="home_next_random_img_des">Next Random</string>
-    <string name="go_back_img_des">Go back</string>
-    <string name="home_change_provider_img_des">Change Provider</string>
-    <string name="preview_background_img_des">Preview Background</string>
+    <string name="search_poster_img_des">Poster</string>
+    <string name="episode_poster_img_des">Poster tập phim</string>
+    <string name="home_main_poster_img_des">Poster chính</string>
+    <string name="home_next_random_img_des">Tập tiếp theo ngẫu nhiên</string>
+    <string name="go_back_img_des">Thoát</string>
+    <string name="home_change_provider_img_des">Thay đổi Nguồn phim</string>
+    <string name="preview_background_img_des">Xem trước hình nền</string>
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">Tốc độ (%.2fx)</string>
     <string name="rated_format" formatted="true">Đánh giá: %.1f</string>
-    <string name="new_update_format" formatted="true">Đã tìm thấy bản cập nhật mới!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">Đã tìm thấy bản cập nhật mới! \n%1$s -&gt; %2$s</string>
     <string name="filler" formatted="true">Bộ lọc</string>
     <string name="duration_format" formatted="true">%d phút</string>
     <string name="app_name">CloudStream</string>
-    <string name="play_with_app_name">Mở với CloudStream</string>
-    <string name="title_home">Trang Chủ</string>
-    <string name="title_search">Tìm Kiếm</string>
-    <string name="title_downloads">Tải Về</string>
-    <string name="title_settings">Cài Đặt</string>
+    <string name="play_with_app_name">Phát bằng CloudStream</string>
+    <string name="title_home">Trang chủ</string>
+    <string name="title_search">Tìm kiếm</string>
+    <string name="title_downloads">Tải xuống</string>
+    <string name="title_settings">Cài đặt</string>
     <string name="search_hint">Tìm kiếm…</string>
     <string name="search_hint_site" formatted="true">Tìm kiếm %s…</string>
     <string name="no_data">Không có dữ liệu</string>
@@ -38,178 +37,170 @@
     <string name="result_tags">Thể loại</string>
     <string name="result_share">Chia sẻ</string>
     <string name="result_open_in_browser">Mở bằng trình duyệt</string>
-    <string name="skip_loading">Bỏ qua</string>
+    <string name="skip_loading">Bỏ tải</string>
     <string name="loading">Đang tải…</string>
     <string name="type_watching">Đang xem</string>
     <string name="type_on_hold">Đang chờ</string>
     <string name="type_completed">Đã xem</string>
-    <string name="type_dropped">Bỏ qua</string>
+    <string name="type_dropped">Bỏ xem</string>
     <string name="type_plan_to_watch">Xem sau</string>
     <string name="type_re_watching">Xem lại</string>
-    <string name="play_movie_button">Xem Ngay</string>
-    <string name="play_livestream_button">Phát trực tiếp</string>
-    <string name="play_torrent_button">Xem Torrent</string>
-    <string name="pick_source">Nguồn Phim</string>
+    <string name="play_movie_button">Phát</string>
+    <string name="play_livestream_button">Phát Trực tiếp</string>
+    <string name="play_torrent_button">Phát Torrent</string>
+    <string name="pick_source">Nguồn</string>
     <string name="pick_subtitle">Phụ đề</string>
     <string name="reload_error">Thử kết nối lại…</string>
     <string name="go_back">Quay lại</string>
-    <string name="play_episode">Xem Tập Phim</string>
+    <string name="play_episode">Phát Tập phim</string>
     <!--<string name="need_storage">Allow to download episodes</string>-->
     <string name="download">Tải xuống</string>
-    <string name="downloaded">Đã tải</string>
-    <string name="downloading">Đang tải</string>
-    <string name="download_paused">Tạm dừng</string>
-    <string name="download_started">Đã bắt đầu tải</string>
-    <string name="download_failed">Tải lỗi</string>
-    <string name="download_canceled">Đã hủy</string>
-    <string name="download_done">Tải thành công</string>
+    <string name="downloaded">Đã tải xuống</string>
+    <string name="downloading">Đang tải xuống</string>
+    <string name="download_paused">Tải xuống đã tạm dừng</string>
+    <string name="download_started">Tải xuống đã bắt đầu</string>
+    <string name="download_failed">Tải xuống thất bại</string>
+    <string name="download_canceled">Tải xuống đã hủy</string>
+    <string name="download_done">Tải xuống thành công</string>
     <string name="stream">Luồng mạng</string>
-    <string name="error_loading_links_toast">Đã có lỗi xảy ra</string>
+    <string name="error_loading_links_toast">Lỗi tải liên kết</string>
     <string name="download_storage_text">Bộ nhớ trong</string>
-    <string name="app_dubbed_text">L.Tiếng</string>
-    <string name="app_subbed_text">P.Đề</string>
+    <string name="app_dubbed_text">Lồng tiếng</string>
+    <string name="app_subbed_text">Phụ đề</string>
     <string name="popup_delete_file">Xóa Tệp</string>
-    <string name="popup_play_file">Xem Tệp</string>
-    <string name="popup_resume_download">Tiếp tục tải</string>
-    <string name="popup_pause_download">Tạm dừng tải</string>
-    <string name="pref_disable_acra">Tắt tự động gửi dữ liệu khi xảy ra lỗi</string>
+    <string name="popup_play_file">Phát Tệp</string>
+    <string name="popup_resume_download">Tiếp tục tải xuống</string>
+    <string name="popup_pause_download">Tạm dừng tải xuống</string>
     <string name="home_more_info">Thông tin thêm</string>
     <string name="home_expanded_hide">Ẩn</string>
-    <string name="home_play">Xem ngay</string>
+    <string name="home_play">Phát</string>
     <string name="home_info">Thông tin</string>
-    <string name="filter_bookmarks">Lọc theo danh sách đã lưu</string>
-    <string name="error_bookmarks_text">Danh sách đã lưu</string>
+    <string name="filter_bookmarks">Lọc danh sách của tôi</string>
+    <string name="error_bookmarks_text">Danh sách của tôi</string>
     <string name="action_remove_from_bookmarks">Xóa</string>
     <string name="action_add_to_bookmarks">Đặt trạng thái xem</string>
     <string name="sort_apply">Áp dụng</string>
-    <string name="sort_copy">Sao lưu</string>
+    <string name="sort_copy">Sao chép</string>
     <string name="sort_close">Đóng</string>
-    <string name="sort_clear">Huỷ bỏ</string>
+    <string name="sort_clear">Xóa</string>
     <string name="sort_save">Lưu</string>
     <string name="player_speed">Tốc độ phát</string>
-    <string name="subtitles_settings">Cài đặt hiển thị phụ đề</string>
+    <string name="subtitles_settings">Cài đặt phụ đề</string>
     <string name="subs_text_color">Màu chữ</string>
-    <string name="subs_outline_color">Màu viền chữ</string>
+    <string name="subs_outline_color">Màu viền</string>
     <string name="subs_background_color">Màu nền</string>
     <string name="subs_window_color">Màu cửa sổ</string>
     <string name="subs_edge_type">Kiểu viền</string>
-    <string name="subs_subtitle_elevation">Độ nâng</string>
+    <string name="subs_subtitle_elevation">Độ nâng phụ đề</string>
     <string name="subs_font">Kiểu chữ</string>
     <string name="subs_font_size">Kích thước chữ</string>
     <string name="search_provider_text_providers">Tìm kiếm theo nguồn phim</string>
     <string name="search_provider_text_types">Tìm kiếm theo thể loại</string>
-    <string name="benene_count_text">%d lời cảm ơn đã được gửi tặng nhà phát triển</string>
-    <string name="benene_count_text_none">Hãy tặng cho nhà phát triển một lời cảm ơn</string>
+    <string name="benene_count_text">%d lượt ủng hộ đã gửi đến nhà phát triển</string>
+    <string name="benene_count_text_none">Không có lượt ủng hộ đã nhận</string>
     <string name="subs_auto_select_language">Tự động chọn ngôn ngữ</string>
-    <string name="subs_download_languages">Ngôn ngữ khi tải xuống</string>
+    <string name="subs_download_languages">Ngôn ngữ tải xuống</string>
     <string name="subs_subtitle_languages">Ngôn ngữ phụ đề</string>
-    <string name="subs_hold_to_reset_to_default">Giữ để làm mới toàn bộ</string>
+    <string name="subs_hold_to_reset_to_default">Nhấn giữ để đặt lại mặc định</string>
     <string name="subs_import_text" formatted="true">Thêm phông chữ tại %s</string>
     <string name="continue_watching">Tiếp tục xem</string>
-    <string name="action_remove_watching">Loại bỏ</string>
+    <string name="action_remove_watching">Xóa</string>
     <string name="action_open_watching">Thông tin thêm</string>
     <string name="action_open_play">@string/home_play</string>
-    <string name="vpn_might_be_needed">Bạn có thể sẽ cần sử dụng VPN để xem phim này</string>
-    <string name="vpn_torrent">Phim này được chiếu dưới dạng Torrent. Hãy sử dụng VPN để xem</string>
+    <string name="vpn_might_be_needed">Có thể cần dùng VPN để nguồn này hoạt động đúng</string>
+    <string name="vpn_torrent">Nguồn này là một torrent, khuyến nghị dùng VPN</string>
     <string name="torrent_plot">Thông tin phim</string>
-    <string name="normal_no_plot">Đang cập nhật</string>
-    <string name="torrent_no_plot">Không tìm thấy thông tin</string>
+    <string name="normal_no_plot">Không tìm thấy nội dung</string>
+    <string name="torrent_no_plot">Không tìm thấy thông tin chi tiết</string>
     <string name="show_log_cat">Hiển thị Logcat 🐈</string>
-    <string name="picture_in_picture">Chế độ cửa sổ nhỏ</string>
-    <string name="picture_in_picture_des">Tiếp tục xem phim khi thoát ứng dụng hoặc khi tìm kiếm</string>
-    <string name="player_size_settings">Bật nút thu phóng khi xem</string>
-    <string name="player_size_settings_des">Xóa khoảng đen của phim</string>
+    <string name="picture_in_picture">Hình trong hình</string>
+    <string name="picture_in_picture_des">Tiếp tục phát trong trình phát thu nhỏ trên các ứng dụng khác</string>
+    <string name="player_size_settings">Nút thay đổi kích thước trình phát</string>
+    <string name="player_size_settings_des">Xóa bỏ các viền đen</string>
     <string name="player_subtitles_settings">Phụ đề</string>
     <string name="player_subtitles_settings_des">Cài đặt phụ đề</string>
     <string name="chromecast_subtitles_settings">Phụ đề Chromecast</string>
     <string name="chromecast_subtitles_settings_des">Cài đặt phụ đề Chromecast</string>
     <string name="eigengraumode_settings">Tốc độ phát</string>
-    <string name="swipe_to_seek_settings">Vuốt để tua nhanh</string>
-    <string name="swipe_to_seek_settings_des">Vuốt sang trái hoặc phải để tua video</string>
-    <string name="swipe_to_change_settings">Vuốt để chỉnh độ sáng và âm lượng</string>
-    <string name="swipe_to_change_settings_des">Vuốt lên hoặc vuốt xuống ở hai bên để điều chỉnh độ sáng và âm lượng</string>
+    <string name="swipe_to_seek_settings">Vuốt để tua</string>
+    <string name="swipe_to_seek_settings_des">Vuốt ngang qua lại để tua video</string>
+    <string name="swipe_to_change_settings">Vuốt để thay đổi cài đặt</string>
+    <string name="swipe_to_change_settings_des">Vuốt lên hoặc xuống cạnh trái hoặc phải để điều chỉnh độ sáng hoặc âm lượng</string>
     <string name="autoplay_next_settings">Tự động phát tập tiếp theo</string>
     <string name="autoplay_next_settings_des">Phát tập tiếp theo sau khi hết tập hiện tại</string>
-    <string name="double_tap_to_seek_settings">Nhấn 2 lần để tua</string>
-    <string name="double_tap_to_pause_settings">Nhấn 2 lần để tạm dừng</string>
+    <string name="double_tap_to_seek_settings">Nhấn hai lần để tua</string>
+    <string name="double_tap_to_pause_settings">Nhấn hai lần để tạm dừng</string>
     <string name="double_tap_to_seek_amount_settings">Thời lượng tua (Giây)</string>
-    <string name="double_tap_to_seek_settings_des">Nhấn 2 lần vào bên trái hoặc bên phải màn hình để tua trước hoặc sau</string>
+    <string name="double_tap_to_seek_settings_des">Nhấn hai lần vào cạnh trái hoặc phải để tua về trước hoặc sau</string>
     <string name="double_tap_to_pause_settings_des">Nhấn vào giữa hai lần để tạm dừng</string>
     <string name="use_system_brightness_settings">Sử dụng độ sáng hệ thống</string>
-    <string name="use_system_brightness_settings_des">Sử dụng độ sáng hệ thống trong trình phát ứng dụng</string>
+    <string name="use_system_brightness_settings_des">Dùng độ sáng hệ thống thay cho lớp phủ tối trong trình phát ứng dụng</string>
     <string name="episode_sync_settings">Cập nhật tiến trình xem</string>
     <string name="episode_sync_settings_des">Tự động đồng bộ tiến trình hiện tại của bạn</string>
     <string name="restore_settings">Khôi phục dữ liệu từ bản sao lưu</string>
     <string name="backup_settings">Sao lưu dữ liệu</string>
-    <string name="restore_success">Đã tải dữ liệu sao lưu</string>
+    <string name="restore_success">Đã tải tệp sao lưu</string>
     <string name="restore_failed_format" formatted="true">Không thể khôi phục dữ liệu từ %s</string>
-    <string name="backup_success">Sao lưu dữ liệu thành công</string>
-    <string name="backup_failed">Thiếu quyền truy cập bộ nhớ, hãy thử lại.</string>
+    <string name="backup_success">Dữ liệu đã lưu</string>
+    <string name="backup_failed">Thiếu quyền truy cập bộ nhớ. Vui lòng thử lại.</string>
     <string name="backup_failed_error_format">Lỗi khi sao lưu %s</string>
     <string name="search">Tìm kiếm</string>
     <string name="category_account">Tài khoản và Bảo mật</string>
     <string name="category_updates">Cập nhật và Sao lưu</string>
     <string name="settings_info">Thông tin</string>
     <string name="advanced_search">Tìm kiếm nâng cao</string>
-    <string name="advanced_search_des">Cho phép tìm kiếm theo bộ lọc từng nhà cung cấp</string>
-    <string name="bug_report_settings_off">Chỉ gửi dữ liệu khi xảy ra lỗi đến nhà phát triển</string>
-    <string name="bug_report_settings_on">Không gửi dữ liệu</string>
+    <string name="advanced_search_des">Cung cấp cho bạn kết quả tìm kiếm được phân loại theo từng nguồn phim</string>
     <string name="show_fillers_settings">Hiển thị tập phụ cho anime</string>
     <string name="show_trailers_settings">Hiển thị trailer</string>
     <string name="kitsu_settings">Hiển thị poster từ Kitsu</string>
-    <string name="pref_filter_search_quality">Ẩn chất lượng video khi tìm kiếm</string>
-    <string name="automatic_plugin_updates">Tự động cập nhật plugin</string>
-    <string name="updates_settings">Hiển thị thông báo cập nhật App</string>
-    <string name="updates_settings_des">Tự động tìm kiếm bản cập nhật mới sau khi khởi động app.</string>
-    <string name="uprereleases_settings">Cập nhật phiên bản Beta</string>
-    <string name="uprereleases_settings_des">Tìm kiếm các phiên bản Beta thay vì đợi bản cập nhật chính thức</string>
+    <string name="pref_filter_search_quality">Ẩn chất lượng video trong kết quả tìm kiếm</string>
+    <string name="automatic_plugin_updates">Tự động cập nhật tiện ích mở rộng</string>
+    <string name="updates_settings">Hiển thị thông báo cập nhật ứng dụng</string>
+    <string name="updates_settings_des">Tự động tìm kiếm bản cập nhật mới sau khi khởi động ứng dụng.</string>
     <string name="github">Github</string>
     <string name="lightnovel">Ứng dụng đọc tiểu thuyết của cùng nhà phát triển</string>
     <string name="anim">Ứng dụng xem Anime của cùng nhà phát triển</string>
     <string name="discord">Tham gia cộng đồng trên Discord</string>
-    <string name="benene">Gửi lời cảm ơn tới nhà phát triển</string>
-    <string name="benene_des">Gửi lời cảm ơn</string>
+    <string name="benene">Gửi ủng hộ tới nhà phát triển</string>
+    <string name="benene_des">Gửi ủng hộ</string>
     <string name="app_language">Ngôn ngữ ứng dụng</string>
     <string name="no_chromecast_support_toast">Nguồn phim này chưa hỗ trợ Chromecast</string>
-    <string name="no_links_found_toast">Không tìm thấy link</string>
-    <string name="copy_link_toast">Đã copy link vào bộ nhớ đệm</string>
-    <string name="play_episode_toast">Xem Phim</string>
-    <string name="subs_default_reset_toast">Làm mới toàn bộ cài đặt</string>
-    <string name="acra_report_toast">Rất tiếc! Ứng dụng đã xảy ra lỗi. Chúng tôi đang tìm hiểu nguyên nhân và khắc phục nó</string>
+    <string name="no_links_found_toast">Không tìm thấy liên kết</string>
+    <string name="copy_link_toast">Đã sao chép liên kết vào bộ nhớ tạm</string>
+    <string name="play_episode_toast">Phát Tập phim</string>
+    <string name="subs_default_reset_toast">Đặt lại giá trị mặc định</string>
     <string name="season">Mùa</string>
     <string name="no_season">Không có mùa nào</string>
     <string name="episode">Tập</string>
     <string name="episodes">Tập</string>
     <string name="episodes_range">%1$d-%2$d</string>
     <string name="episode_format" formatted="true">%1$d %2$s</string>
-    <string name="season_short">M</string>
-    <string name="episode_short">T</string>
+    <string name="season_short">Mùa</string>
+    <string name="episode_short">Tập</string>
     <string name="no_episodes_found">Không có tập nào</string>
     <string name="delete_file">Xóa Tệp</string>
     <string name="delete">Xóa</string>
     <string name="cancel">Hủy bỏ</string>
-    <string name="pause">Tạm Dừng</string>
-    <string name="resume">Tiếp Tục</string>
+    <string name="pause">Tạm dừng</string>
+    <string name="resume">Tiếp tục</string>
     <string name="go_back_30">-30</string>
     <string name="go_forward_30">+30</string>
-    <string name="delete_message">%s sẽ bị xoá vĩnh viễn
-\nBạn có chắc chắn muốn xóa?</string>
-    <string name="resume_time_left" formatted="true">%dm
-\ncòn lại</string>
+    <string name="delete_message">%s sẽ bị xoá vĩnh viễn \nBạn có chắc chắn không?</string>
+    <string name="resume_time_left" formatted="true">%d phút\ncòn lại</string>
     <string name="status_ongoing">Đang chiếu</string>
-    <string name="status_completed">Hoàn Thành</string>
+    <string name="status_completed">Hoàn thành</string>
     <string name="status">Trạng Thái</string>
     <string name="year">Năm</string>
-    <string name="rating">Đánh Giá</string>
-    <string name="duration">Thời Lượng</string>
+    <string name="rating">Đánh giá</string>
+    <string name="duration">Thời lượng</string>
     <string name="site">Nguồn</string>
-    <string name="synopsis">Thông tin</string>
+    <string name="synopsis">Tóm tắt phim</string>
     <string name="queued">Hàng chờ</string>
     <string name="no_subtitles">Không có phụ đề</string>
-    <string name="action_default">Mặc Định</string>
+    <string name="action_default">Mặc định</string>
     <string name="free_storage">Còn trống</string>
     <string name="used_storage">Đã sử dụng</string>
-    <string name="app_storage">App</string>
+    <string name="app_storage">Ứng dụng</string>
     <!--plural-->
     <string name="movies">Phim Lẻ</string>
     <string name="tv_series">Phim Bộ</string>
@@ -235,60 +226,60 @@
     <string name="nsfw_singular">NSFW</string>
     <string name="other_singular">Video</string>
     <string name="source_error">Lỗi nguồn phim</string>
-    <string name="remote_error">Lỗi kết nối tới máy chủ</string>
-    <string name="render_error">Không thể render</string>
-    <string name="unexpected_error">Đã có lỗi xảy ra. Vui lòng thử lại sau</string>
-    <string name="storage_error">Lỗi tải xuống. Hãy kiểm tra quyền truy cập bộ nhớ của ứng dụng</string>
-    <string name="episode_action_chromecast_episode">Tập Chromecast</string>
-    <string name="episode_action_chromecast_mirror">Chiếu Chromecast</string>
-    <string name="episode_action_play_in_app">Xem với trình phát mặc định</string>
-    <string name="episode_action_play_in_format">Xem với trình phát %s</string>
+    <string name="remote_error">Lỗi nguồn từ xa</string>
+    <string name="render_error">Lỗi kết xuất</string>
+    <string name="unexpected_error">Lỗi trình phát bất ngờ</string>
+    <string name="storage_error">Lỗi tải xuống. Hãy kiểm tra quyền truy cập bộ nhớ</string>
+    <string name="episode_action_chromecast_episode">Truyền tập phim</string>
+    <string name="episode_action_chromecast_mirror">Truyền nguồn thay thế</string>
+    <string name="episode_action_play_in_app">Phát bằng ứng dụng</string>
+    <string name="episode_action_play_in_format">Phát bằng %s</string>
     <string name="episode_action_auto_download">Tự động tải xuống</string>
-    <string name="episode_action_download_mirror">Nguồn tải xuống</string>
-    <string name="episode_action_reload_links">Lấy link mới nhất</string>
-    <string name="episode_action_download_subtitle">Tải phụ đề</string>
+    <string name="episode_action_download_mirror">Tải xuống nguồn thay thế</string>
+    <string name="episode_action_reload_links">Tải lại các liên kết</string>
+    <string name="episode_action_download_subtitle">Tải xuống phụ đề</string>
     <string name="show_hd">Nhãn chất lượng phim</string>
     <string name="show_dub">Nhãn lồng tiếng</string>
     <string name="show_sub">Nhãn phụ đề</string>
-    <string name="show_title">Tiêu đề</string>
-    <string name="poster_ui_settings">Thay đổi giao diện trên poster</string>
+    <string name="show_title">Tên phim</string>
+    <string name="poster_ui_settings">Hiển thị các thông tin trên poster</string>
     <string name="no_update_found">Bạn đang dùng phiên bản mới nhất</string>
     <string name="check_for_update">Kiểm tra cập nhật</string>
     <string name="video_lock">Khóa</string>
-    <string name="video_aspect_ratio_resize">Thu Phóng</string>
-    <string name="video_source">Nguồn &amp; Phụ đề</string>
-    <string name="video_skip_op">Bỏ qua OP</string>
+    <string name="video_aspect_ratio_resize">Thu phóng</string>
+    <string name="video_source">Nguồn</string>
+    <string name="video_skip_op">Bỏ qua Giới thiệu</string>
     <string name="dont_show_again">Không hiện lại</string>
     <string name="skip_update">Bỏ qua bản cập nhật này</string>
     <string name="update">Cập nhật</string>
     <string name="watch_quality_pref">Chất lượng xem ưu tiên (WiFi)</string>
-    <string name="limit_title">Kí tự tối đa trên tiêu đề</string>
-    <string name="limit_title_rez">Nội dung trình phát video</string>
+    <string name="limit_title">Số ký tự tối đa tiêu đề trình phát</string>
+    <string name="limit_title_rez">Hiện thông tin trình phát</string>
     <string name="video_buffer_size_settings">Kích thước bộ nhớ đệm video</string>
     <string name="video_buffer_length_settings">Thời lượng bộ nhớ đệm</string>
-    <string name="video_buffer_disk_settings">Lưu bộ nhớ đệm video trên ổ cứng</string>
+    <string name="video_buffer_disk_settings">Bộ nhớ đệm video trên thiết bị</string>
     <string name="video_buffer_clear_settings">Xoá bộ nhớ đệm hình ảnh và video</string>
-    <string name="video_ram_description">Sẽ gây lỗi nếu đặt quá cao trên máy có dung lượng ram thấp như Android TV.</string>
+    <string name="video_ram_description">Sẽ gây lỗi nếu đặt quá cao trên thiết bị có bộ nhớ thấp như Android TV.</string>
     <string name="video_disk_description">Sẽ gây lỗi nếu đặt quá cao trên máy có dung lượng lưu trữ thấp như Android TV.</string>
     <string name="dns_pref">DNS over HTTPS</string>
     <string name="dns_pref_summary">Rất hữu ích để bỏ chặn ISP</string>
-    <string name="add_site_pref">Sao chép trang web</string>
+    <string name="add_site_pref">Bản sao trang web</string>
     <string name="remove_site_pref">Xoá trang web</string>
-    <string name="add_site_summary">Thêm bản sao của một trang web, với một địa chỉ khác</string>
+    <string name="add_site_summary">Thêm bản sao của trang hiện có bằng một URL khác</string>
     <string name="download_path_pref">Đường dẫn tải xuống</string>
     <string name="nginx_url_pref">Địa chỉ máy chủ Nginx</string>
-    <string name="display_subbed_dubbed_settings">Hiển thị nhãn Phụ đề hoặc Thuyết minh</string>
+    <string name="display_subbed_dubbed_settings">Hiển thị Anime Lồng tiếng/Phụ đề</string>
     <string name="resize_fit">Vừa màn hình</string>
     <string name="resize_fill">Kéo dãn</string>
     <string name="resize_zoom">Phóng to</string>
-    <string name="legal_notice">Disclaimer</string>
+    <string name="legal_notice">Tuyên bố miễn trừ trách nhiệm</string>
     <string name="category_general">Tổng quan</string>
     <string name="random_button_settings">Nút ngẫu nhiên</string>
     <string name="random_button_settings_desc">Hiện nút ngẫu nhiên trên Trang chủ và Thư viện</string>
     <string name="provider_lang_settings">Ngôn ngữ mở rộng</string>
-    <string name="app_layout">Giao diện App</string>
+    <string name="app_layout">Bố cục ứng dụng</string>
     <string name="preferred_media_settings">Thể loại ưu tiên</string>
-    <string name="enable_nsfw_on_providers">Kích hoạt NSFW trên các tiện ích mở rộng được hỗ trợ</string>
+    <string name="enable_nsfw_on_providers">Kích hoạt NSFW trên các Tiện ích mở rộng được hỗ trợ</string>
     <string name="subtitles_encoding">Mã hoá phụ đề</string>
     <string name="category_providers">Nguồn phim</string>
     <string name="category_ui">Giao diện</string>
@@ -297,15 +288,15 @@
     <string name="phone_layout">Giao diện điện thoại</string>
     <string name="emulator_layout">Giao diện giả lập</string>
     <string name="primary_color_settings">Màu chính</string>
-    <string name="app_theme_settings">Chủ đề App</string>
-    <string name="bottom_title_settings">Vị trí tiêu đề</string>
-    <string name="bottom_title_settings_des">Đặt tiêu đề dưới poster</string>
+    <string name="app_theme_settings">Chủ đề ứng dụng</string>
+    <string name="bottom_title_settings">Vị trí tên phim</string>
+    <string name="bottom_title_settings_des">Đặt tên phim dưới poster</string>
     <!-- account stuff -->
     <string name="example_password">Mật khẩu</string>
-    <string name="example_username">Tài khoản</string>
+    <string name="example_username">Tên người dùng</string>
     <string name="example_email">Email</string>
     <string name="example_ip">127.0.0.1</string>
-    <string name="example_site_name">Tên mới</string>
+    <string name="example_site_name">Tên trang mới</string>
     <string name="example_site_url">https://example.com</string>
     <string name="example_lang_name">Mã ngôn ngữ (vi)</string>
     <string name="login_format" formatted="true">%1$s %2$s</string>
@@ -322,10 +313,10 @@
     <string name="sync_score_format" formatted="true">%d / 10</string>
     <string name="sync_total_episodes_none">/??</string>
     <string name="sync_total_episodes_some" formatted="true">/%d</string>
-    <string name="authenticated_user" formatted="true">Đã xác thực %s</string>
-    <string name="authenticated_user_fail" formatted="true">Không thể xác thực %s</string>
+    <string name="authenticated_user" formatted="true">%s đã xác thực</string>
+    <string name="authenticated_user_fail" formatted="true">Không thể đăng nhập tại %s</string>
     <!-- ============ -->
-    <string name="none">Mặc định</string>
+    <string name="none">Không có</string>
     <string name="normal">Bình thường</string>
     <string name="all">Tất cả</string>
     <string name="max">Tối đa</string>
@@ -335,26 +326,26 @@
     <string name="subtitles_shadow">Đổ bóng</string>
     <string name="subtitles_raised">Nâng</string>
     <string name="subtitle_offset">Chỉnh phụ đề</string>
-    <string name="subtitle_offset_hint">1000ms</string>
+    <string name="subtitle_offset_hint">1000 ms</string>
     <string name="subtitle_offset_title">Độ trễ phụ đề</string>
-    <string name="subtitle_offset_extra_hint_later_format">Dùng nếu phụ đề bị nhanh %dms</string>
-    <string name="subtitle_offset_extra_hint_before_format">Dùng nếu phụ đề bị trễ %dms</string>
-    <string name="subtitle_offset_extra_hint_none_format">Không chỉnh</string>
+    <string name="subtitle_offset_extra_hint_later_format">Dùng nếu phụ đề bị nhanh %d ms</string>
+    <string name="subtitle_offset_extra_hint_before_format">Dùng nếu phụ đề bị trễ %d ms</string>
+    <string name="subtitle_offset_extra_hint_none_format">Không điều chỉnh</string>
     <!--
     Example text (pangram) can optionally be translated; if you do, include all the letters in the alphabet,
     see: 
 	https://en.wikipedia.org/w/index.php?title=Pangram&oldid=225849300
 	https://en.wikipedia.org/wiki/The_quick_brown_fox_jumps_over_the_lazy_dog
     -->
-    <string name="subtitles_example_text">Xem trước mẫu phụ đề</string>
+    <string name="subtitles_example_text">Phụ đề của bạn sẽ trông tương tự như thế này</string>
     <string name="recommended">Được đề xuất</string>
     <string name="player_loaded_subtitles" formatted="true">Đã tải %s</string>
-    <string name="player_load_subtitles">Chọn từ máy</string>
+    <string name="player_load_subtitles">Chọn từ tệp</string>
     <string name="player_load_subtitles_online">Chọn từ Internet</string>
-    <string name="downloaded_file">Tệp đã tải</string>
+    <string name="downloaded_file">Tệp đã tải xuống</string>
     <string name="actor_main">Vai chính</string>
     <string name="actor_supporting">Vai phụ</string>
-    <string name="actor_background">Lý lịch</string>
+    <string name="actor_background">Diễn viên quần chúng</string>
     <string name="home_source">Nguồn</string>
     <string name="home_random">Ngẫu nhiên</string>
     <string name="coming_soon">Sắp có…</string>
@@ -374,18 +365,18 @@
     <string name="quality_hdr">HDR</string>
     <string name="quality_sdr">SDR</string>
     <string name="quality_webrip">Web</string>
-    <string name="poster_image">Ảnh áp phích</string>
+    <string name="poster_image">Ảnh Poster</string>
     <string name="category_player">Trình phát</string>
-    <string name="resolution_and_title">Độ phân giải và Tên nguồn</string>
-    <string name="title">Tên nguồn</string>
+    <string name="resolution_and_title">Độ phân giải và Tên</string>
+    <string name="title">Tên</string>
     <string name="resolution">Độ phân giải</string>
     <string name="error_invalid_id">Id không hợp lệ</string>
     <string name="error_invalid_data">Lỗi dữ liệu</string>
     <string name="error_invalid_url">Lỗi đường dẫn</string>
     <string name="error">Lỗi</string>
-    <string name="subtitles_remove_captions">Xoá phụ đề đã dùng</string>
-    <string name="subtitles_remove_bloat">Loại bỏ mã hoá phụ đề</string>
-    <string name="subtitles_filter_lang">Lọc theo ngôn ngữ media được chuộng hơn</string>
+    <string name="subtitles_remove_captions">Xóa bỏ chú thích chi tiết trong phụ đề</string>
+    <string name="subtitles_remove_bloat">Xóa bỏ nội dung thừa trong phụ đề</string>
+    <string name="subtitles_filter_lang">Lọc theo ngôn ngữ ưu tiên</string>
     <string name="extras">Thêm</string>
     <string name="trailer">Trailer</string>
     <string name="network_adress_example">https://example.com/example.mp4</string>
@@ -393,69 +384,66 @@
     <string name="next">Tiếp theo</string>
     <string name="provider_languages_tip">Xem video bằng các ngôn ngữ này</string>
     <string name="previous">Trước đó</string>
-    <string name="skip_setup">Bỏ qua cài đặt setup</string>
-    <string name="app_layout_subtext">Chọn giao diện phù hợp với thiết bị của bạn</string>
-    <string name="crash_reporting_title">Báo cáo sự cố</string>
+    <string name="skip_setup">Bỏ qua thiết lập lần đầu</string>
+    <string name="app_layout_subtext">Thay đổi giao diện phù hợp với thiết bị của bạn</string>
     <string name="preferred_media_subtext">Bạn muốn xem gì</string>
     <string name="setup_done">Hoàn tất</string>
     <string name="extensions">Tiện ích mở rộng</string>
-    <string name="add_repository">Thêm kho lưu trữ</string>
-    <string name="repository_name_hint">Tên kho lưu trữ (Tùy chọn)</string>
-    <string name="repository_url_hint">Đường dẫn kho lưu trữ hoặc Mã ngắn</string>
-    <string name="plugin_loaded">Đã tải plugin</string>
-    <string name="plugin_deleted">Plugin đã xoá</string>
+    <string name="add_repository">Thêm kho nguồn phim</string>
+    <string name="repository_name_hint">Tên kho nguồn phim (Tùy chọn)</string>
+    <string name="repository_url_hint">URL kho nguồn phim hoặc Mã ngắn</string>
+    <string name="plugin_loaded">Tiện ích mở rộng đã tải</string>
+    <string name="plugin_deleted">Tiện ích mở rộng đã xoá</string>
     <string name="plugin_load_fail" formatted="true">Không tải được %s</string>
     <string name="is_adult">18+</string>
     <string name="batch_download_start_format" formatted="true">Đã bắt đầu tải xuống %1$d %2$s…</string>
     <string name="batch_download_finish_format" formatted="true">Đã tải xuống %1$d %2$s</string>
     <string name="batch_download_nothing_to_download_format" formatted="true">Toàn bộ %s đã được tải xuống</string>
-    <string name="batch_download">Tải hàng loạt</string>
-    <string name="plugin_singular">plugin</string>
-    <string name="plugin">plugin</string>
-    <string name="delete_repository_plugins">Tất cả plugin của kho lưu trữ sẽ bị xoá</string>
-    <string name="delete_repository">Xoá kho lưu trữ</string>
-    <string name="setup_extensions_subtext">Tải nguồn phim bạn muốn dùng</string>
-    <string name="plugins_downloaded" formatted="true">Đã tải: %d</string>
+    <string name="batch_download">Tải xuống hàng loạt</string>
+    <string name="plugin_singular">tiện ích mở rộng</string>
+    <string name="plugin">tiện ích mở rộng</string>
+    <string name="delete_repository_plugins">Việc này sẽ xóa tất cả tiện ích mở rộng trong kho nguồn phim</string>
+    <string name="delete_repository">Xoá kho nguồn phim</string>
+    <string name="setup_extensions_subtext">Tải xuống danh sách các trang web bạn muốn sử dụng</string>
+    <string name="plugins_downloaded" formatted="true">Đã tải xuống: %d</string>
     <string name="plugins_disabled" formatted="true">Đã vô hiệu: %d</string>
-    <string name="plugins_not_downloaded" formatted="true">Không tải: %d</string>
-    <string name="blank_repo_message">CloudStream không có sẵn trang web nào. Bạn cần cài đặt các trang web từ kho lưu trữ.
-\n
-\nHãy tham gia Discord của chúng tôi hoặc tìm kiếm trực tuyến.</string>
-    <string name="view_public_repositories_button">Xem kho lưu trữ của cộng đồng</string>
+    <string name="plugins_not_downloaded" formatted="true">Chưa tải xuống: %d</string>
+    <string name="blank_repo_message">CloudStream không có sẵn trang web nào. Bạn cần cài đặt các trang web từ kho lưu trữ. \n \nHãy tham gia Discord của chúng tôi hoặc tìm kiếm trực tuyến.</string>
+    <string name="view_public_repositories_button">Xem các kho nguồn phim của cộng đồng</string>
     <string name="view_public_repositories_button_short">Danh sách công khai</string>
     <string name="uppercase_all_subtitles">In hoa toàn bộ phụ đề</string>
-    <string name="download_all_plugins_from_repo">Cảnh báo: CloudStream 3 không chịu trách nhiệm về các tiện ích bên thứ ba và không cung cấp bất kỳ sự hỗ trợ nào!</string>
-    <string name="single_plugin_disabled" formatted="true">%s (Đã vô hiệu hoá)</string>
-    <string name="tracks">Âm thanh &amp; Chất lượng</string>
+    <string name="download_all_plugins_from_repo">Cảnh báo: CloudStream không chịu trách nhiệm về các tiện ích mở rộng bên thứ ba và không cung cấp bất kỳ sự hỗ trợ nào!</string>
+    <string name="single_plugin_disabled" formatted="true">%s (Đã vô hiệu)</string>
+    <string name="tracks">Âm thanh &amp; video</string>
     <string name="audio_tracks">Âm thanh</string>
-    <string name="video_tracks">Chất lượng Video</string>
-    <string name="apply_on_restart">Áp dụng khi khởi động lại ứng dụng.</string>
+    <string name="video_tracks">Video</string>
+    <string name="apply_on_restart">Khởi động lại ứng dụng để thấy câc thay đổi.</string>
     <string name="safe_mode_title">Chế độ an toàn được bật</string>
-    <string name="safe_mode_description">Đã xảy ra sự cố và chúng tôi đã tự động tắt tất cả các tiện ích mở rộng, hãy tìm và xóa tiện ích mở rộng đang gây ra sự cố.</string>
+    <string name="safe_mode_description">Tất cả tiện ích mở rộng đã được tắt do ứng dụng bị ngừng bất thường để giúp bạn tìm ra vấn đề gây lỗi.</string>
     <string name="safe_mode_crash_info">Xem thông tin sự cố</string>
     <string name="history">Lịch sử</string>
     <string name="action_mark_as_watched">Đánh dấu là đã xem</string>
-    <string name="automatic_plugin_download">Tự động tải xuống plugin</string>
-    <string name="redo_setup_process">Thiết lập lại</string>
-    <string name="apk_installer_settings">Bộ cài APK</string>
-    <string name="apk_installer_settings_des">Một số máy không hỗ trợ trình cài đặt gói mới. Hãy thử tùy chọn cũ nếu các bản cập nhật không cài đặt.</string>
+    <string name="automatic_plugin_download">Tự động tải xuống tiện ích mở rộng</string>
+    <string name="redo_setup_process">Làm lại tiến trình thiết lập</string>
+    <string name="apk_installer_settings">Trình cài đặt APK</string>
+    <string name="apk_installer_settings_des">Một số thiết bị không hỗ trợ trình cài đặt gói mới. Hãy thử chọn chế độ tương thích cũ nếu các bản cập nhật không thể cài đặt.</string>
     <string name="season_format">%1$s %2$d%3$s</string>
-    <string name="play_trailer_button">Xem Trailer</string>
-    <string name="automatic_plugin_download_summary">Tự động tải plugin còn thiếu.</string>
-    <string name="update_started">Bắt đầu cập nhật</string>
+    <string name="play_trailer_button">Phát Trailer</string>
+    <string name="automatic_plugin_download_summary">Tự động cài đặt tất cả tiện ích mở rộng chưa được cài đặt từ những kho nguồn phim đã thêm.</string>
+    <string name="update_started">Cập nhật đã bắt đầu</string>
     <string name="pref_category_links">Liên kết</string>
     <string name="hls_playlist">Danh sách HLS</string>
     <string name="player_pref">Trình phát ưu tiên</string>
-    <string name="player_settings_play_in_app">Trình phát mặc định</string>
+    <string name="player_settings_play_in_app">Trình phát tích hợp</string>
     <string name="extension_rating" formatted="true">Đánh giá: %s</string>
     <string name="no">Không</string>
     <string name="extension_version">Phiên bản</string>
     <string name="extension_authors">Tác giả</string>
     <string name="pref_category_app_updates">Cập nhật ứng dụng</string>
     <string name="pref_category_backup">Sao lưu</string>
-    <string name="pref_category_extensions">Tiện ích</string>
+    <string name="pref_category_extensions">Tiện ích mở rộng</string>
     <string name="pref_category_actions">Hành động</string>
-    <string name="pref_category_cache">Cache</string>
+    <string name="pref_category_cache">Bộ nhớ đệm</string>
     <string name="pref_category_gestures">Cử chỉ</string>
     <string name="pref_category_player_features">Tính năng trình phát</string>
     <string name="pref_category_subtitles">Phụ đề</string>
@@ -469,44 +457,43 @@
     <string name="extension_size">Kích thước</string>
     <string name="extension_types">Hỗ trợ</string>
     <string name="extension_language">Ngôn ngữ</string>
-    <string name="extension_install_first">Cài đặt tiện ích trước</string>
+    <string name="extension_install_first">Cài đặt tiện ích mở rộng trước</string>
     <string name="app_not_found_error">Không thấy ứng dụng</string>
     <string name="all_languages_preference">Tất cả ngôn ngữ</string>
-    <string name="skip_type_format" formatted="true">Tua %s</string>
+    <string name="skip_type_format" formatted="true">Bỏ qua %s</string>
     <string name="skip_type_op">Mở đầu</string>
     <string name="skip_type_ed">Kết thúc</string>
-    <string name="skip_type_recap">Tóm tắt</string>
-    <string name="skip_type_mixed_ed">Các kết thúc hỗn hợp</string>
-    <string name="skip_type_mixed_op">Các mở đầu hỗn hợp</string>
-    <string name="skip_type_creddits">Danh đề</string>
+    <string name="skip_type_recap">Điểm lại nội dung</string>
+    <string name="skip_type_mixed_ed">Kết thúc hỗn hợp</string>
+    <string name="skip_type_mixed_op">Mở đầu hỗn hợp</string>
+    <string name="skip_type_credits">Danh đề</string>
     <string name="skip_type_intro">Giới thiệu</string>
     <string name="clear_history">Xoá lịch sử</string>
-    <string name="enable_skip_op_from_database_des">Hiển thị nút tua nhanh cho mở đầu/kết thúc</string>
-    <string name="clipboard_too_large">Văn bản quá dài. Không thể lưu vào khay nhớ tạm.</string>
+    <string name="enable_skip_op_from_database_des">Hiện các popup bỏ qua cho mở đầu/kết thúc</string>
+    <string name="clipboard_too_large">Văn bản quá dài. Không thể lưu vào bộ nhớ tạm.</string>
     <string name="action_remove_from_watched">Xoá khỏi đã xem</string>
     <string name="confirm_exit_dialog">Bạn có chắc muốn thoát?</string>
     <string name="yes">Có</string>
-    <string name="update_notification_downloading">Đang tải bản cập nhật…</string>
+    <string name="update_notification_downloading">Đang tải xuống bản cập nhật…</string>
     <string name="update_notification_installing">Đang cài bản cập nhật…</string>
     <string name="update_notification_failed">Không thể cài đặt phiên bản mới</string>
-    <string name="delayed_update_notice">Ứng dụng sẽ được cập nhật khi thoát</string>
+    <string name="delayed_update_notice">Ứng dụng sẽ được cập nhật sau khi thoát</string>
     <string name="library">Thư viện</string>
     <string name="browser">Trình duyệt</string>
-    <string name="plugin_downloaded">Plugin đã tải</string>
-    <string name="apk_installer_legacy">Legacy</string>
+    <string name="plugin_downloaded">Tiện ích mở rộng đã tải xuống</string>
+    <string name="apk_installer_legacy">Chế độ tương thích cũ</string>
     <string name="sort_updated_new">Đã cập nhật (Mới đến Cũ)</string>
     <string name="sort_updated_old">Đã cập nhật (Cũ đến Mới)</string>
-    <string name="empty_library_no_accounts_message">Thư viện của bạn đang trống :(
-\nĐăng nhập vào tài khoản thư viện hoặc thêm phim vào thư viện cục bộ.</string>
-    <string name="open_with">Mở với</string>
-    <string name="provider_info_meta">Thông tin dữ liệu không được cung cấp bởi trang web, video sẽ không tìm thấy link nếu nó không tồn tại trên trang web.</string>
-    <string name="apk_installer_package_installer">PackageInstaller</string>
+    <string name="empty_library_no_accounts_message">Thư viện của bạn đang trống :( \nĐăng nhập vào tài khoản thư viện hoặc thêm phim vào thư viện cục bộ.</string>
+    <string name="open_with">Mở bằng</string>
+    <string name="provider_info_meta">Siêu dữ liệu không được cung cấp bởi trang web, video sẽ không tải được nếu nó không tồn tại trên trang web.</string>
+    <string name="apk_installer_package_installer">Trình cài đặt gói</string>
     <string name="sort">Sắp xếp</string>
     <string name="sort_rating_desc">Xếp hạng (Cao đến Thấp)</string>
     <string name="sort_rating_asc">Xếp hạng (Thấp đến Cao)</string>
     <string name="sort_alphabetical_z">Chữ cái (Z đến A)</string>
     <string name="sort_by">Sắp xếp theo</string>
-    <string name="empty_library_logged_in_message">Danh sách này trống, hãy thử chuyển sang danh sách khác.</string>
+    <string name="empty_library_logged_in_message">Danh sách này trống. Vui lòng thử chuyển sang danh sách khác.</string>
     <string name="sort_alphabetical_a">Chữ cái (A đến Z)</string>
     <string name="select_library">Chọn Thư viện</string>
     <string name="test_log">Nhật ký</string>
@@ -518,22 +505,21 @@
     <string name="jsdelivr_proxy">GitHub Proxy</string>
     <string name="jsdelivr_enabled">Không thể kết nối được tới GitHub. Đang bật jsDelivr proxy…</string>
     <string name="pref_category_android_tv">Android TV</string>
-    <string name="restart">Khởi động lại</string>
+    <string name="restart">Phát từ đầu</string>
     <string name="subscription_new">Đã đăng kí %s</string>
     <string name="subscription_episode_released">Tập %d đã ra mắt!</string>
     <string name="subscription_list_name">Đã đăng kí</string>
-    <string name="stop">Dừng lại</string>
-    <string name="pref_category_bypass">Bỏ qua ISP</string>
+    <string name="stop">Dừng</string>
+    <string name="pref_category_bypass">Bỏ chặn nhà mạng</string>
     <string name="subscription_deleted">Đã bỏ đăng ký %s</string>
-    <string name="safe_mode_file">Tìm thấy tệp Safe mode!
-\nKhông tải bất cứ tiện ích mở rộng nào khi khởi động cho đến khi loại bỏ tệp.</string>
-    <string name="revert">Đảo ngược lại</string>
+    <string name="safe_mode_file">Tìm thấy tệp Safe mode! \nKhông tải bất cứ tiện ích mở rộng nào khi khởi động cho đến khi loại bỏ tệp.</string>
+    <string name="revert">Hoàn tác</string>
     <string name="subscription_in_progress_notification">Đang cập nhật các phim đã đăng kí</string>
-    <string name="jsdelivr_proxy_summary">Bỏ qua chặn đường link GitHub bằng cách dùng jsDelivr. Có thể gây ra việc cập nhật bị chậm vài ngày.</string>
-    <string name="android_tv_interface_off_seek_settings_summary">Lượng tua thêm được sử dụng khi trình phát ẩn</string>
-    <string name="android_tv_interface_off_seek_settings">Lượng tua thêm</string>
-    <string name="android_tv_interface_on_seek_settings_summary">Lượng tua thêm được sử dụng khi trình phát hiện lên</string>
-    <string name="android_tv_interface_on_seek_settings">Lượng tua thêm</string>
+    <string name="jsdelivr_proxy_summary">Bỏ chặn các URL gốc của GitHub bằng jsDelivr. Có thể làm cập nhật bị trễ vài ngày.</string>
+    <string name="android_tv_interface_off_seek_settings_summary">Lượng thời gian tua được dùng khi trình phát đang bị ẩn</string>
+    <string name="android_tv_interface_off_seek_settings">Thời lượng tua khi trình phát đang ẩn</string>
+    <string name="android_tv_interface_on_seek_settings_summary">Lượng thời gian tua được dùng khi trình phát đang hiển thị</string>
+    <string name="android_tv_interface_on_seek_settings">Thời lượng tua khi trình phát đang hiện</string>
     <string name="profile_number">Hồ sơ %d</string>
     <string name="mobile_data">Dữ liệu di động</string>
     <string name="set_default">Đặt mặc định</string>
@@ -543,106 +529,92 @@
     <string name="profiles">Hồ sơ</string>
     <string name="help">Trợ giúp</string>
     <string name="profile_background_des">Nền hồ sơ</string>
-    <string name="quality_profile_help">Tại đây bạn có thể thay đổi cách sắp xếp các nguồn. Nếu video có mức độ ưu tiên cao hơn thì video đó sẽ xuất hiện cao hơn trong lựa chọn nguồn. Tổng ưu tiên nguồn và ưu tiên chất lượng là ưu tiên video.
-\n
-\nNguồn A: 3
-\nChất lượng B: 7
-\nSẽ có mức độ ưu tiên video kết hợp là 10.
-\n
-\nLƯU Ý: Nếu tổng là 10 hoặc nhiều hơn, trình phát sẽ tự động bỏ tải khi liên kết đó được tải!</string>
-    <string name="qualities">Các phẩm chất</string>
+    <string name="quality_profile_help">Tại đây bạn có thể thay đổi cách sắp xếp các nguồn. Nếu video có mức độ ưu tiên cao hơn thì video đó sẽ xuất hiện cao hơn trong lựa chọn nguồn. Tổng ưu tiên nguồn và ưu tiên chất lượng là ưu tiên video. \n \nNguồn A: 3 \nChất lượng B: 7 \nSẽ có mức độ ưu tiên video kết hợp là 10. \n \nLƯU Ý: Nếu tổng là 10 hoặc nhiều hơn, trình phát sẽ tự động bỏ tải khi liên kết đó được tải!</string>
+    <string name="qualities">Chất lượng</string>
     <string name="already_voted">Bạn đã bình chọn</string>
-    <string name="disable">Vô hiệu hoá</string>
-    <string name="no_repository_found_error">Không tìm thấy tiện ích, hãy kiểm tra URL và thử lại với VPN</string>
-    <string name="no_plugins_found_error">Không tìm thấy plugin</string>
+    <string name="disable">Tắt</string>
+    <string name="no_repository_found_error">Không tìm thấy kho nguồn phim, hãy kiểm tra URL và thử lại với VPN</string>
+    <string name="no_plugins_found_error">Không tìm thấy tiện ích mở rộng</string>
     <string name="unable_to_inflate">Không thể khởi tạo UI, đây là một LỖI LỚN và cần được báo cáo ngay lập tức tới %s</string>
-    <string name="automatic_plugin_download_mode_title">Chọn chế độ để lọc plugin tải xuống</string>
-    <string name="favorite_removed">%s đã loại bỏ khỏi mục yêu thích</string>
+    <string name="automatic_plugin_download_mode_title">Chọn chế độ lọc tiện ích mở rộng tải xuống</string>
+    <string name="favorite_removed">%s đã xóa khỏi mục yêu thích</string>
     <string name="favorites_list_name">Yêu thích</string>
     <string name="favorite_added">%s đã thêm vào mục yêu thích</string>
-    <string name="duplicate_message_multiple" formatted="true">Các mục có thể trùng lặp đã được tìm thấy trong thư viện của bạn:
-\n
-\n%s
-\n
-\nBạn vẫn muốn thêm mục này, thay thế những mục hiện có hay hủy hành động?</string>
+    <string name="duplicate_message_multiple" formatted="true">Các mục có thể trùng lặp đã được tìm thấy trong thư viện của bạn: \n \n%s \n \nBạn vẫn muốn thêm mục này, thay thế những mục hiện có hay hủy hành động?</string>
     <string name="backup_frequency">Tần suất sao lưu</string>
     <string name="duplicate_title">Đã tìm thấy bản sao tiềm năng</string>
     <string name="lock_profile">Khóa hồ sơ</string>
     <string name="action_add_to_favorites">Thêm vào mục yêu thích</string>
     <string name="duplicate_replace_all">Thay thế tất cả</string>
-    <string name="pin_error_incorrect">Mã PIN không chính xác. Vui lòng thử lại.</string>
+    <string name="pin_error_incorrect">Mã PIN không đúng. Vui lòng thử lại.</string>
     <string name="action_unsubscribe">Hủy đăng ký</string>
     <string name="pin_error_length">Mã PIN phải có 4 ký tự</string>
     <string name="duplicate_replace">Thay thế</string>
     <string name="duplicate_add">Thêm vào</string>
     <string name="action_subscribe">Đăng ký</string>
-    <string name="action_remove_from_favorites">Loại bỏ khỏi mục yêu thích</string>
-    <string name="select_an_account">Chọn một tài khoản</string>
-    <string name="duplicate_message_single">Có vẻ như một mục có khả năng trùng lặp đã tồn tại trong thư viện của bạn: \'%s.\'
-\n
-\nBạn vẫn muốn thêm mục này, thay thế mục hiện có hay hủy hành động?</string>
-    <string name="enter_pin">Nhập PIN</string>
+    <string name="action_remove_from_favorites">Xóa khỏi mục yêu thích</string>
+    <string name="select_an_account">Chọn một Hồ sơ</string>
+    <string name="duplicate_message_single">Có vẻ như một mục có khả năng trùng lặp đã tồn tại trong thư viện của bạn: \'%s.\' \n \nBạn vẫn muốn thêm mục này, thay thế mục hiện có hay hủy hành động?</string>
+    <string name="enter_pin">Nhập mã PIN</string>
     <string name="pin">PIN</string>
     <string name="enter_current_pin">Nhập mã PIN hiện tại</string>
     <string name="logged_account" formatted="true">Đã đăng nhập với tư cách %s</string>
     <string name="enter_pin_with_name" formatted="true">Nhập mã PIN cho %s</string>
-    <string name="use_default_account">Sử dụng tài khoản mặc định</string>
-    <string name="skip_startup_account_select_pref">Bỏ qua lựa chọn tài khoản khi khởi động</string>
-    <string name="manage_accounts">Quản lý tài khoản</string>
-    <string name="edit_account">Chỉnh sửa tài khoản</string>
-    <string name="links_reloaded_toast">Tải lại link</string>
-    <string name="result_search_tooltip">Tìm kiếm tiện ích khác</string>
+    <string name="use_default_account">Sử dụng Hồ sơ mặc định</string>
+    <string name="skip_startup_account_select_pref">Bỏ qua lựa chọn hồ sơ lúc khởi động</string>
+    <string name="manage_accounts">Quản lý hồ sơ</string>
+    <string name="edit_account">Chỉnh sửa hồ sơ</string>
+    <string name="links_reloaded_toast">Tải lại liên kết</string>
+    <string name="result_search_tooltip">Tìm kiếm trong tiện ích mở rộng khác</string>
     <string name="recommendations_tooltip">Hiển thị đề xuất</string>
-    <string name="test_extensions">Kiểm tra nguồn phim</string>
+    <string name="test_extensions">Kiểm tra tất cả Tiện ích mở rộng</string>
     <string name="rotate_video">Xoay</string>
     <string name="subscribe_tooltip">Thông báo tập mới</string>
-    <string name="speed_setting_summary">Chỉnh tốc độ trong trình phát</string>
+    <string name="speed_setting_summary">Thêm tùy chọn tốc độ phát trong trình phát</string>
     <string name="rotate_video_desc">Hiển thị nút xoay màn hình</string>
-    <string name="auto_rotate_video_desc">Kích hoạt chế độ xoay màn hình tự động</string>
+    <string name="auto_rotate_video_desc">Bật tự động xoay màn hình theo hướng của video</string>
     <string name="auto_rotate_video">Tự động xoay</string>
     <string name="toast_copied">đã sao chép!</string>
-    <string name="clipboard_permission_error">Vấn đề truy cập Bảng ghi tạm, Hãy thử lại.</string>
-    <string name="clipboard_unknown_error">Lỗi sao chép, Hãy sao chép logcat và liên hệ hỗ trợ ứng dụng.</string>
+    <string name="clipboard_permission_error">Lỗi truy cập Bộ nhớ tạm, Vui lòng thử lại.</string>
+    <string name="clipboard_unknown_error">Lỗi sao chép, Vui lòng sao chép logcat và liên hệ hỗ trợ ứng dụng.</string>
     <string name="favorite">Yêu thích</string>
     <string name="ok">OK</string>
-    <string name="battery_dialog_title">Vô hiệu Tối ưu pin</string>
-    <string name="app_info_intent_error">Không thể mở thông tin ứng dụng của CloudStream.</string>
-    <string name="unfavorite">Không thích</string>
+    <string name="battery_dialog_title">Tắt tối ưu hóa pin</string>
+    <string name="app_info_intent_error">Không thể mở thông tin ứng dụng CloudStream.</string>
+    <string name="unfavorite">Bỏ yêu thích</string>
     <string name="biometric_authentication_title">Mở khóa Cloudstream</string>
-    <string name="music_singlar">Nhạc</string>
+    <string name="music_singular">Nhạc</string>
     <string name="audio_book_singular">Sách nói</string>
-    <string name="biometric_setting">Khóa với sinh trắc học</string>
-    <string name="resume_remaining" formatted="true">%s
-\ncòn lại</string>
+    <string name="biometric_setting">Khóa bằng sinh trắc học</string>
+    <string name="resume_remaining" formatted="true">%s\ncòn lại</string>
     <string name="biometric_unsupported">Xác thực bằng sinh trắc học không được hỗ trợ trên thiết bị này</string>
-    <string name="password_pin_authentication_title">Mật khẩu/PIN Xác thực</string>
+    <string name="password_pin_authentication_title">Xác thực bằng Mật khẩu/PIN</string>
     <string name="biometric_warning">Dữ liệu CloudStream của bạn hiện đã được sao lưu. Mặc dù khả năng xảy ra điều này là rất thấp nhưng tất cả các thiết bị đều có thể hoạt động khác nhau. Trong trường hợp hiếm gặp là bạn bị khóa truy cập ứng dụng, hãy xóa hoàn toàn dữ liệu ứng dụng và khôi phục từ bản sao lưu. Chúng tôi rất xin lỗi vì bất kỳ sự bất tiện nào phát sinh từ việc này.</string>
     <string name="biometric_setting_summary">Mở khóa ứng dụng bằng Vân tay, Khuôn mặt, PIN, Hình vẽ và Mật khẩu.</string>
-    <string name="biometric_prompt_description">Màn hình bị đóng sau nhiều lần thử thất bại. Hãy khởi động lại ứng dụng.</string>
-    <string name="test_extensions_summary">Bài kiểm tra này chỉ dành cho các nhà phát triển và không xác nhận hay phủ nhận việc hoạt động của bất kỳ nguồn phim nào.</string>
+    <string name="biometric_prompt_description">Sau vài lần thử thất bại, hộp thoại sẽ tự đóng. Chỉ cần khởi động lại ứng dụng để thử lại.</string>
+    <string name="test_extensions_summary">Bài kiểm tra này chỉ dành cho các nhà phát triển và không xác nhận hay phủ nhận việc hoạt động của bất kỳ tiện ích mở rộng nào.</string>
     <string name="app_unrestricted_toast">Chế độ tiêu thụ pin của ứng dụng đã được đặt ở mức không giới hạn</string>
-    <string name="custom_media_singluar">Phương tiện</string>
-    <string name="repo_copy_label">Tên và URL kho lưu trữ</string>
+    <string name="custom_media_singular">Phương tiện</string>
+    <string name="repo_copy_label">Tên và URL kho nguồn phim</string>
     <string name="reset_btn">Đặt lại</string>
-    <string name="battery_dialog_message">Để đảm bảo quá trình tải xuống và thông báo cho các chương trình truyền hình đã đăng ký không bị gián đoạn, CloudStream cần có quyền chạy ở chế độ nền. Bằng cách nhấn OK, một hộp thoại yêu cầu sẽ hiển thị. Hãy nhấn \"Cho phép\".\n\nXin lưu ý, quyền này không có nghĩa là CS3 sẽ làm hao pin của bạn. Nó sẽ chỉ hoạt động ở chế độ nền khi cần thiết, chẳng hạn như khi nhận được thông báo hoặc tải xuống video từ các tiện ích mở rộng chính thức.</string>
+    <string name="battery_dialog_message">Để đảm bảo quá trình tải xuống và thông báo cho các chương trình truyền hình đã đăng ký không bị gián đoạn, CloudStream cần có quyền chạy ở chế độ nền. Bằng cách nhấn OK, một hộp thoại yêu cầu sẽ hiển thị. Vui lòng nhấn \"Cho phép\".\n\nXin lưu ý, quyền này không có nghĩa là CS3 sẽ làm hao pin của bạn. Nó sẽ chỉ hoạt động ở chế độ nền khi cần thiết, chẳng hạn như khi nhận được thông báo hoặc tải xuống video từ các tiện ích mở rộng chính thức.</string>
     <string name="next_season_episode_format" formatted="true">Mùa %1$d Tập %2$d sẽ được phát hành vào</string>
-    <string name="episode_upcoming_format" formatted="true">Sắp tới sau %s</string>
+    <string name="episode_upcoming_format" formatted="true">Sắp ra mắt sau %s</string>
     <string name="player_settings_select_cast_device">Chọn thiết bị truyền</string>
     <string name="pref_category_security">Bảo mật</string>
     <string name="pref_category_accounts">Tài khoản</string>
     <string name="qr_image">Mã QR</string>
     <string name="dismiss">Bỏ qua</string>
-    <string name="open_downloaded_repo">Mở tiện ích mở rộng</string>
+    <string name="open_downloaded_repo">Mở kho nguồn phim</string>
     <string name="cs3wiki">CloudStream Wiki</string>
     <string name="device_pin_url_message">Truy cập <b>%s</b> trên điện thoại hoặc máy tính và nhập mã bên trên</string>
     <string name="device_pin_expired_message">Mã PIN đã hết hạn!</string>
-    <string name="device_pin_counter_text">Mã sẽ hết hạn trong %1$dm %2$ds</string>
-    <string name="hide_player_control_names_key" translatable="false">hide_player_control_names_key</string>
-    <string name="device_pin_error_message">Không lấy được mã PIN, hãy thử xác thực cục bộ</string>
-    <string name="downloads_empty">Hiện không có bản tải xuống nào.</string>
+    <string name="device_pin_counter_text">Mã sẽ hết hạn trong %1$d phút %2$d giây</string>
+    <string name="device_pin_error_message">Không lấy được mã PIN, vui lòng thử xác thực cục bộ</string>
+    <string name="downloads_empty">Không có tải xuống nào.</string>
     <string name="auth_locally">Xác thực cục bộ</string>
-    <string name="episode_action_cast_mirror">Cast mirror</string>
-    <string name="play_from_beginning_img_des">Xem từ đầu</string>
+    <string name="episode_action_cast_mirror">Truyền nguồn thay thế</string>
+    <string name="play_from_beginning_img_des">Phát từ đầu</string>
     <string name="open_local_video">Mở video có sẵn</string>
     <string name="test_warning">Cảnh báo</string>
     <string name="sort_release_date_new">Ngày phát hành (Mới đến Cũ)</string>
@@ -650,28 +622,20 @@
     <string name="offline_file">Có thể xem ngoại tuyến</string>
     <string name="select_all">Chọn tất cả</string>
     <string name="deselect_all">Bỏ chọn tất cả</string>
-    <string name="delete_files">Xoá tập tin</string>
+    <string name="delete_files">Xoá các tệp</string>
     <string name="delete_format" formatted="true">Xoá (%1$d | %2$s)</string>
-    <string name="delete_message_multiple" formatted="true">Bạn có chắc chắn muốn xóa vĩnh viễn các mục sau không?
-\n
-\n%s</string>
-    <string name="delete_message_series_episodes" formatted="true">Bạn có chắc chắn muốn xóa vĩnh viễn các tập trong %1$s?
-\n
-\n%2$s</string>
-    <string name="delete_message_series_section" formatted="true">Bạn cũng sẽ xóa vĩnh viễn tất cả các tập trong loạt phim sau:
-\n
-\n%s</string>
-    <string name="delete_message_series_only" formatted="true">Bạn có chắc chắn muốn xóa vĩnh viễn tất cả các tập trong loạt phim này không?
-\n
-\n%s</string>
-    <string name="delete_plugin">Xóa plugin</string>
+    <string name="delete_message_multiple" formatted="true">Bạn có chắc chắn muốn xóa vĩnh viễn các mục sau không? \n \n%s</string>
+    <string name="delete_message_series_episodes" formatted="true">Bạn có chắc chắn muốn xóa vĩnh viễn các tập trong %1$s? \n \n%2$s</string>
+    <string name="delete_message_series_section" formatted="true">Bạn cũng sẽ xóa vĩnh viễn tất cả các tập trong loạt phim: \n \n%s</string>
+    <string name="delete_message_series_only" formatted="true">Bạn có chắc chắn muốn xóa vĩnh viễn tất cả các tập trong loạt phim này không? \n \n%s</string>
+    <string name="delete_plugin">Xóa tiện ích mở rộng</string>
     <string name="sort_release_date_old">Ngày phát hành (Cũ đến mới)</string>
-    <string name="hide_player_control_names">Ẩn tên các nút điều khiển</string>
-    <string name="preview_seekbar_desc">Bật chế độ xem trước hình thu nhỏ trên seekbar</string>
-    <string name="preview_seekbar">Xem trước Seekbar</string>
-    <string name="no_subtitles_loaded">Chưa tải phụ đề</string>
+    <string name="hide_player_control_names">Ẩn tên các nút điều khiển trình phát</string>
+    <string name="preview_seekbar_desc">Bật xem trước hình thu nhỏ trên thanh tua</string>
+    <string name="preview_seekbar">Xem trước trên thanh tua</string>
+    <string name="no_subtitles_loaded">Chưa tải phụ đề nào</string>
     <string name="confirm_before_exiting_title">Xác nhận trước khi thoát</string>
-    <string name="confirm_before_exiting_desc">Hiện hộp thoại xác nhận thoát ứng dụng</string>
+    <string name="confirm_before_exiting_desc">Hiện hộp thoại xác nhận trước khi thoát ứng dụng</string>
     <string name="dont_show">Không hiển thị</string>
     <string name="show">Hiển thị</string>
     <string name="backup_path_title">Vị trí thư mục sao lưu</string>
@@ -679,13 +643,13 @@
     <string name="subs_edge_size">Kích thước cạnh</string>
     <string name="torrent_info">Video này là Torrent, điều này có nghĩa là hoạt động video của bạn có thể được theo dõi.\nHãy đảm bảo rằng bạn hiểu về Torrent trước khi tiếp tục.</string>
     <string name="encoding_error">Lỗi mã hóa</string>
-    <string name="software_decoding_desc">Cho phép trình phát các tệp video không được điện thoại của bạn hỗ trợ, nhưng có thể bị lag ở độ phân giải cao</string>
+    <string name="software_decoding_desc">Giải mã phần mềm cho phép phát các tệp video không được thiết bị của bạn hỗ trợ, nhưng có thể gây ra phản hồi chậm hoặc phát lại không ổn định ở độ phân giải cao.</string>
     <string name="software_decoding">Bộ giải mã ứng dụng</string>
-    <string name="torrent_not_accepted">Khởi động lại ứng dụng và chấp nhận cửa sổ bật lên của Stream Torrent để tiếp tục</string>
+    <string name="torrent_not_accepted">Khởi động lại ứng dụng và chấp nhận cửa sổ bật lên của Stream Torrent để tiếp tục.</string>
     <string name="torrent_preferred_media">Kích hoạt torrent trong Cài đặt/Nguồn phim/Thể loại ưu tiên</string>
     <string name="player_load_one_subtitle_online">Tải phụ đề đầu tiên có sẵn</string>
-    <string name="audio_singluar">Âm thanh</string>
-    <string name="podcast_singluar">Podcast</string>
+    <string name="audio_singular">Âm thanh</string>
+    <string name="podcast_singular">Podcast</string>
     <string name="unsupported_error">Lỗi không được hỗ trợ</string>
     <string name="sort_episodes_rating_low_high">Xếp hạng (Thấp nhất)</string>
     <string name="sort_episodes_number_asc">Tập (Tăng dần)</string>
@@ -693,16 +657,16 @@
     <string name="sort_button_rating">Xếp hạng %s</string>
     <string name="sort_button_date">Ngày %s</string>
     <string name="sort_button_episode">Tập %s</string>
-    <string name="update_plugins">Cập nhật plugin</string>
-    <string name="no_plugins_updated_manually">Không có plugin nào được cập nhật.</string>
-    <string name="sort_episodes_date_oldest">Ngày phát hành (Cũ nhất)</string>
-    <string name="plugins_updated_manually">Đã cập nhật thành công %d plugin!</string>
+    <string name="update_plugins">Cập nhật tiện ích mở rộng</string>
+    <string name="no_plugins_updated_manually">Không có tiện ích mở rộng nào được cập nhật.</string>
+    <string name="sort_episodes_date_oldest">Ngày phát sóng (Cũ nhất)</string>
+    <string name="plugins_updated_manually">Đã cập nhật thành công %d tiện ích mở rộng!</string>
     <string name="sort_episodes_rating_high_low">Xếp hạng (Cao nhất)</string>
-    <string name="update_plugins_manually">Cập nhật plugin thủ công</string>
+    <string name="update_plugins_manually">Cập nhật tiện ích mở rộng thủ công</string>
     <string name="sort_episodes_number_desc">Tập (Giảm dần)</string>
-    <string name="starting_plugin_update_manually">Bắt đầu quá trình cập nhật plugin!</string>
+    <string name="starting_plugin_update_manually">Bắt đầu quá trình cập nhật tiện ích mở rộng!</string>
     <string name="player_notification_channel_name">Thông báo trình phát</string>
-    <string name="player_notification_channel_description">Thông báo trình phát để điều khiển phát lại từ nền</string>
+    <string name="player_notification_channel_description">Điều khiển phát lại trong nền bằng thông báo của trình phát</string>
     <string name="begin_speaking">Bắt đầu nói…</string>
     <string name="speech_recognition_unavailable">Tìm kiếm giọng nói không khả dụng</string>
     <string name="subtitles_from_online">Trực tuyến</string>
@@ -712,4 +676,76 @@
     <string name="subtitles_from_embedded">Được nhúng</string>
     <string name="all_subtitles_bold">Làm tất cả phụ đề in đậm</string>
     <string name="all_subtitles_italic">Làm tất cả phụ đề in nghiêng</string>
-</resources>
\ No newline at end of file
+    <string name="player_settings_always_ask">Luôn hỏi</string>
+    <string name="show_rating">Nhãn đánh giá</string>
+    <string name="download_parallel_settings_des">Số lượng mục khác nhau có thể tải xuống cùng lúc</string>
+    <string name="parallel_downloads">Tải xuống đồng thời</string>
+    <string name="concurrent_connections">Kết nối đồng thời</string>
+    <string name="concurrent_connections_settings_des">Số lượng kết nối đồng thời mà mỗi lần tải xuống có thể sử dụng</string>
+    <string name="go_to_downloads">Đến mục Tải xuống</string>
+    <string name="no_internet_connection">Không có kết nối Internet. \n\nVui lòng kết nối Internet rồi thử lại, hoặc xem các nội dung đã tải xuống khi đang ngoại tuyến.</string>
+    <string name="overscan_settings_des">Thay đổi khung hiển thị màn hình</string>
+    <string name="overscan_settings">Quét chồng lấn</string>
+    <string name="poster_size_settings_des">Thay đổi kích thước poster</string>
+    <string name="poster_size_settings">Kích thước poster</string>
+    <string name="speedup_title">Tăng tốc độ phát khi nhấn giữ</string>
+    <string name="speedup_summary">Nhấn giữ để tăng tốc độ phát 2x</string>
+    <string name="download_time_left_hour_min_sec_format" formatted="true">%1$d giờ %2$d phút %3$d giây</string>
+    <string name="download_time_left_min_sec_format" formatted="true">%1$d phút %2$d giây</string>
+    <string name="download_time_left_sec_format" formatted="true">%1$d giây</string>
+    <string name="no_account">Không có tài khoản</string>
+    <string name="edit_profile_image_title">Chỉnh sửa ảnh Hồ sơ</string>
+    <string name="edit_profile_image_hint">Nhập URL ảnh Hồ sơ</string>
+    <string name="edit_profile_image_error_empty">Không tìm thấy URL</string>
+    <string name="edit_profile_image_error_invalid">URL hoặc ảnh không hợp lệ</string>
+    <string name="edit_profile_image_success">Đã cập nhật ảnh thành công</string>
+    <string name="action_mark_watched_up_to_this_episode">Đánh dấu là đã xem đến tập này</string>
+    <string name="action_remove_mark_watched_up_to_this_episode">Xóa đã xem đến tập này</string>
+    <string name="action_reload">Đã tải lại</string>
+    <string name="reload_provider">Tải lại nguồn phim</string>
+    <string name="name">Tên</string>
+    <string name="resolution_and_name">Độ phân giải và tên</string>
+    <string name="episode_action_play_mirror">Phát nguồn thay thế</string>"
+    <string name="subs_subtitle_alignment">Căn chỉnh phụ đề</string>
+    <string name="bottom_left">Dưới trái</string>
+    <string name="bottom_center">Dưới giữa</string>
+    <string name="bottom_right">Dưới phải</string>
+    <string name="top_left">Trên trái</string>
+    <string name="top_right">Trên phải</string>
+    <string name="top_center">Trên giữa</string>
+    <string name="middle_center">Trung tâm</string>
+    <string name="middle_left">Giữa trái</string>
+    <string name="middle_right">Giữa phải</string>
+    <string name="play_full_series_button">Phát trọn bộ loạt phim</string>
+    <string name="search_suggestions">Gợi ý tìm kiếm</string>
+    <string name="search_suggestions_des">Hiển thị gợi ý tìm kiếm khi đang nhập</string>
+    <string name="clear_suggestions">Xóa gợi ý</string>
+    <string name="install_prerelease">Cài đặt phiên bản phát hành trước</string>
+    <string name="prerelease_already_installed">Bản phát hành trước đã được cài đặt.</string>
+    <string name="prerelease_install_failed">Cài đặt bản phát hành trước thất bại.</string>
+    <string name="show_episode_text">Tập</string>
+    <string name="extra_brightness_settings_des">Bật bộ lọc độ sáng khi độ sáng màn hình vượt quá 100%</string>
+    <string name="show_cast_in_details">Hiển thị bảng dàn diễn viên</string>
+    <string name="video_info">Thông tin video</string>
+    <string name="extra_brightness_settings">Độ sáng bổ sung</string>
+    <string name="source_name">Tên nguồn</string>
+    <string name="download_queue">Hàng đợi tải xuống</string>
+    <string name="queue_empty_message">Không có tải xuống đang chờ nào.</string>
+    <string name="source_priority_help">Quyết định cách sắp xếp các nguồn video trong trình phát.</string>
+    <string name="source_priority">Ưu tiên nguồn</string>
+    <string name="download_all">Tải xuống tất cả</string>
+    <string name="cancel_all">Hủy tất cả</string>
+    <string name="download_episode_range">Bạn có muốn tải xuống tập %s không?</string>
+    <string name="cancel_queue_message">Bạn có muốn hủy tất cả tải xuống đang chờ không?</string>
+    <plurals name="downloads_active">
+        <item quantity="other">%d đang tải xuống</item>
+    </plurals>
+    <plurals name="downloads_queued">
+        <item quantity="other">%d tải xuống đang chờ</item>
+    </plurals>
+    <string name="extra_brightness_key">Đã bật độ sáng bổ sung</string>
+    <string name="show_player_metadata_overlay">Hiển thị lớp phủ siêu dữ liệu trình phát</string>
+    <string name="player_is_live">Trực tiếp</string>
+    <string name="video_singular">Video</string>
+    <string name="skip_type_preview">Xem trước</string>
+</resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-b+zh+TW/strings.xml
similarity index 80%
rename from app/src/main/res/values-zh-rTW/strings.xml
rename to app/src/main/res/values-b+zh+TW/strings.xml
index 6b191d33fb7..cfd8adf05ca 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-b+zh+TW/strings.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- FORMAT MIGHT TRANSLATE, WILL CAUSE CRASH IF APPLIED WRONG -->
-    <string name="extra_info_format" formatted="true" translatable="false">%d %s | %s</string>
-    <string name="storage_size_format" formatted="true" translatable="false">%s • %s</string>
-    <string name="download_size_format" formatted="true" translatable="false">%s / %s</string>
-    <string name="episode_name_format" formatted="true" translatable="false">%s %s</string>
-    <string name="ffw_text_format" formatted="true" translatable="false">+%d</string>
-    <string name="rew_text_format" formatted="true" translatable="false">-%d</string>
-    <string name="ffw_text_regular_format" formatted="true" translatable="false">%d</string>
-    <string name="rew_text_regular_format" formatted="true" translatable="false">%d</string>
-    <string name="rating_format" formatted="true" translatable="false">%.1f/10.0</string>
-    <string name="year_format" formatted="true" translatable="false">%d</string>
     <string name="app_dub_sub_episode_text_format" formatted="true">%1$s 共 %2$d 集</string>
     <string name="cast_format" formatted="true">演員：%s</string>
     <string name="next_episode_format" formatted="true">第 %d 集即將發佈於</string>
@@ -23,16 +13,13 @@
     <string name="episode_poster_img_des">劇集封面</string>
     <string name="home_main_poster_img_des">主封面</string>
     <string name="home_next_random_img_des">隨機下一個</string>
-    <string name="episode_play_img_des" translatable="false">@string/play_episode</string>
     <string name="go_back_img_des">返回</string>
-    <string name="change_providers_img_des" translatable="false">@string/home_change_provider_img_des</string>
     <string name="home_change_provider_img_des">更改片源</string>
     <string name="preview_background_img_des">預覽背景</string>
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">速度（%.2fx）</string>
     <string name="rated_format" formatted="true">評分：%.1f</string>
-    <string name="new_update_format" formatted="true">發現新版本！
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">發現新版本！ \n%1$s -&gt; %2$s</string>
     <string name="filler" formatted="true">填充</string>
     <string name="duration_format" formatted="true">%d 分鐘</string>
     <string name="app_name">CloudStream</string>
@@ -46,7 +33,6 @@
     <string name="no_data">無資料</string>
     <string name="episode_more_options_des">更多選項</string>
     <string name="next_episode">下一集</string>
-    <string name="result_plot" translatable="false">@string/synopsis</string>
     <string name="result_tags">類型</string>
     <string name="result_share">分享</string>
     <string name="result_open_in_browser">在瀏覽器中打開</string>
@@ -75,7 +61,6 @@
     <string name="download_failed">下載失敗</string>
     <string name="download_canceled">下載取消</string>
     <string name="download_done">下載完畢</string>
-    <string name="download_format" translatable="false">%s - %s</string>
     <string name="stream">網路串流</string>
     <string name="error_loading_links_toast">載入連結錯誤</string>
     <string name="download_storage_text">內部儲存空間</string>
@@ -85,7 +70,6 @@
     <string name="popup_play_file">播放檔案</string>
     <string name="popup_resume_download">繼續下載</string>
     <string name="popup_pause_download">暫停下載</string>
-    <string name="pref_disable_acra">停用自動錯誤報告</string>
     <string name="home_more_info">更多資訊</string>
     <string name="home_expanded_hide">隱藏</string>
     <string name="home_play">播放</string>
@@ -166,17 +150,13 @@
     <string name="settings_info">資訊</string>
     <string name="advanced_search">進階搜尋</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>
     <string name="show_trailers_settings">顯示預告片</string>
     <string name="kitsu_settings">顯示來自 Kitsu 的封面</string>
     <string name="pref_filter_search_quality">在搜尋結果中隱藏所選的影片畫質</string>
-    <string name="automatic_plugin_updates">自動更新外掛程式</string>
+    <string name="automatic_plugin_updates">自動更新外掛</string>
     <string name="updates_settings">顯示應用程式更新</string>
     <string name="updates_settings_des">啟動應用程式後自動搜尋更新。</string>
-    <string name="uprereleases_settings">更新至預覽版</string>
-    <string name="uprereleases_settings_des">搜尋預覽版更新而不是僅搜尋正式版</string>
     <string name="github">Github</string>
     <string name="lightnovel">由相同開發者開發的輕小說應用程式</string>
     <string name="anim">由相同開發者開發的動漫應用程式</string>
@@ -189,7 +169,6 @@
     <string name="copy_link_toast">連結已複製到剪貼簿</string>
     <string name="play_episode_toast">播放劇集</string>
     <string name="subs_default_reset_toast">重設為預設值</string>
-    <string name="acra_report_toast">很抱歉，應用程式崩潰了，將傳送一份匿名錯誤報告給開發者</string>
     <string name="season">季</string>
     <string name="season_format">%1$s %2$d%3$s</string>
     <string name="no_season">無季</string>
@@ -207,10 +186,8 @@
     <string name="resume">繼續</string>
     <string name="go_back_30">-30</string>
     <string name="go_forward_30">+30</string>
-    <string name="delete_message" formatted="true">這將永遠刪除 %s
-\n你確定嗎?</string>
-    <string name="resume_time_left" formatted="true">剩下
-\n%d 分鐘</string>
+    <string name="delete_message" formatted="true">這將永遠刪除 %s \n你確定嗎?</string>
+    <string name="resume_time_left" formatted="true">剩下 \n%d 分鐘</string>
     <string name="status_ongoing">連載中</string>
     <string name="status_completed">已完結</string>
     <string name="status">狀態</string>
@@ -266,10 +243,6 @@
     <string name="show_dub">配音標籤</string>
     <string name="show_sub">字幕標籤</string>
     <string name="show_title">標題</string>
-    <string name="show_hd_key" translatable="false">show_hd_key</string>
-    <string name="show_dub_key" translatable="false">show_dub_key</string>
-    <string name="show_sub_key" translatable="false">show_sub_key</string>
-    <string name="show_title_key" translatable="false">show_title_key</string>
     <string name="poster_ui_settings">封面內容</string>
     <string name="no_update_found">未找到更新</string>
     <string name="check_for_update">檢查更新</string>
@@ -282,7 +255,7 @@
     <string name="update">更新</string>
     <string name="watch_quality_pref">偏好播放畫質 (WiFi)</string>
     <string name="limit_title">影片播放器標題最大字數</string>
-    <string name="limit_title_rez">影片播放器標題</string>
+    <string name="limit_title_rez">顯示播放器資訊</string>
     <string name="video_buffer_size_settings">影片緩衝大小</string>
     <string name="video_buffer_length_settings">影片緩衝長度</string>
     <string name="video_buffer_disk_settings">磁碟上的影片快取</string>
@@ -301,8 +274,6 @@
     <string name="resize_fill">拉伸</string>
     <string name="resize_zoom">縮放</string>
     <string name="legal_notice">免責聲明</string>
-    <string name="legal_notice_key" translatable="false">legal_notice_key</string>
-    <string name="legal_notice_text" translatable="false">Any legal issues regarding the content on this application should be taken up with the actual file hosts and providers themselves as we are not affiliated with them. In case of copyright infringement, please directly contact the responsible parties or the streaming websites. The app is purely for educational and personal use. CloudStream 3 does not host any content on the app, and has no control over what media is put up or taken down. CloudStream 3 functions like any other search engine, such as Google. CloudStream 3 does not host, upload or manage any videos, films or content. It simply crawls, aggregates and displayes links in a convenient, user-friendly interface. It merely scrapes 3rd-party websites that are publicly accessable via any regular web browser. It is the responsibility of user to avoid any actions that might violate the laws governing his/her locality. Use CloudStream 3 at your own risk.</string>
     <string name="category_general">通用</string>
     <string name="random_button_settings">隨機按鈕</string>
     <string name="random_button_settings_desc">在主畫面與媒體庫中顯示隨機按鈕</string>
@@ -322,10 +293,6 @@
     <string name="bottom_title_settings">封面標題位置</string>
     <string name="bottom_title_settings_des">將標題移到封面下方</string>
     <!-- account stuff -->
-    <string name="anilist_key" translatable="false">anilist_key</string>
-    <string name="mal_key" translatable="false">mal_key</string>
-    <string name="opensubtitles_key" translatable="false">opensubtitles_key</string>
-    <string name="nginx_key" translatable="false">nginx_key</string>
     <string name="example_password">密碼</string>
     <string name="example_username">使用者名稱</string>
     <string name="example_email">電子郵件</string>
@@ -333,14 +300,6 @@
     <string name="example_site_name">新網站名稱</string>
     <string name="example_site_url">https://example.com</string>
     <string name="example_lang_name">語言代號 (zh_TW)</string>
-    <!--
-    <string name="mal_account_settings" translatable="false">MAL</string>
-    <string name="anilist_account_settings" translatable="false">AniList</string>
-    <string name="tmdb_account_settings" translatable="false">TMDB</string>
-    <string name="imdb_account_settings" translatable="false">IMDB</string>
-    <string name="kitsu_account_settings" translatable="false">Kitsu</string>
-    <string name="trakt_account_settings" translatable="false">Trakt</string>
-    -->
     <string name="login_format" formatted="true">%1$s %2$s</string>
     <string name="account">帳號</string>
     <string name="logout">登出</string>
@@ -363,7 +322,6 @@
     <string name="all">全部</string>
     <string name="max">最大</string>
     <string name="min">最小</string>
-    <string name="subtitles_none" translatable="false">@string/none</string>
     <string name="subtitles_outline">輪廓</string>
     <string name="subtitles_depressed">凹陷</string>
     <string name="subtitles_shadow">陰影</string>
@@ -429,7 +387,6 @@
     <string name="previous">上一個</string>
     <string name="skip_setup">跳過設定</string>
     <string name="app_layout_subtext">更改應用程式的外觀以適應你的設備</string>
-    <string name="crash_reporting_title">程式崩潰報告</string>
     <string name="preferred_media_subtext">你想要看什麼</string>
     <string name="setup_done">完成</string>
     <string name="extensions">擴充功能</string>
@@ -437,36 +394,34 @@
     <string name="repository_name_hint">資源庫名稱（選填）</string>
     <string name="repository_url_hint">資源庫 URL 或簡碼</string>
     <string name="plugin_loaded">外掛程式已載入</string>
-    <string name="plugin_deleted">外掛程式已刪除</string>
+    <string name="plugin_deleted">外掛已刪除</string>
     <string name="plugin_load_fail" formatted="true">無法載入 %s</string>
     <string name="is_adult">18+</string>
     <string name="batch_download_start_format" formatted="true">開始下載 %1$d %2$s …</string>
     <string name="batch_download_finish_format" formatted="true">已下載 %1$d %2$s</string>
     <string name="batch_download_nothing_to_download_format" formatted="true">全部 %s 已經下載</string>
     <string name="batch_download">批次下載</string>
-    <string name="plugin_singular">外掛程式</string>
-    <string name="plugin">外掛程式</string>
-    <string name="delete_repository_plugins">這也將刪除所有在資源庫中的外掛程式</string>
+    <string name="plugin_singular">外掛</string>
+    <string name="plugin">外掛</string>
+    <string name="delete_repository_plugins">這也將刪除所有在資源庫中的外掛</string>
     <string name="delete_repository">刪除資源庫</string>
     <string name="setup_extensions_subtext">下載你所需的片源</string>
     <string name="plugins_downloaded" formatted="true">已下載：%d</string>
     <string name="plugins_disabled" formatted="true">已停用：%d</string>
     <string name="plugins_not_downloaded" formatted="true">未下載：%d</string>
     <string name="plugins_updated" formatted="true">已更新 %d 外掛程式</string>
-    <string name="blank_repo_message">CloudStream 預設沒有安裝網站。你需要從儲存庫安裝網站。
-\n
-\n加入我們的 Discord 或在網路上搜尋。</string>
+    <string name="blank_repo_message">CloudStream 預設沒有安裝網站。你需要從儲存庫安裝網站。 \n \n加入我們的 Discord 或在網路上搜尋。</string>
     <string name="view_public_repositories_button">查看</string>
     <string name="view_public_repositories_button_short">公開清單</string>
     <string name="uppercase_all_subtitles">字幕全大寫</string>
-    <string name="download_all_plugins_from_repo">警告：CloudStream 3 不對使用第三方擴充功能承擔任何責任，也不提供任何支援！</string>
+    <string name="download_all_plugins_from_repo">警告：CloudStream 不對使用第三方擴充功能承擔任何責任，也不提供任何支援！</string>
     <string name="single_plugin_disabled" formatted="true">%s （停用）</string>
     <string name="tracks">軌道</string>
     <string name="audio_tracks">音頻軌道</string>
     <string name="video_tracks">影片軌道</string>
     <string name="apply_on_restart">重新啟動應用程式以查看變更。</string>
     <string name="safe_mode_title">安全模式已啟用</string>
-    <string name="safe_mode_description">由於程式崩潰，所有外掛程式皆已關閉，以協助您找到導致問題的程式。</string>
+    <string name="safe_mode_description">由於程式當掉，為了協助您找到導致問題的程式，所有外掛皆已關閉。</string>
     <string name="safe_mode_crash_info">查看程式崩潰資訊</string>
     <string name="extension_rating" formatted="true">評分：%s</string>
     <string name="extension_description">簡介</string>
@@ -476,7 +431,7 @@
     <string name="extension_authors">作者</string>
     <string name="extension_types">類型</string>
     <string name="extension_language">語言</string>
-    <string name="extension_install_first">請先安裝外掛程式</string>
+    <string name="extension_install_first">請先安裝外掛</string>
     <string name="hls_playlist">HLS 播放清單</string>
     <string name="player_pref">偏好影片播放器</string>
     <string name="player_settings_play_in_app">內部播放器</string>
@@ -488,17 +443,17 @@
     <string name="skip_type_recap">前情回顧</string>
     <string name="skip_type_mixed_ed">混合片尾</string>
     <string name="skip_type_mixed_op">混合片頭</string>
-    <string name="skip_type_creddits">致謝名單</string>
+    <string name="skip_type_credits">致謝名單</string>
     <string name="skip_type_intro">介紹</string>
     <string name="clear_history">清除歷史紀錄</string>
     <string name="history">歷史紀錄</string>
-    <string name="automatic_plugin_download">自動下載外掛程式</string>
+    <string name="automatic_plugin_download">自動下載外掛</string>
     <string name="confirm_exit_dialog">你確定要離開？</string>
     <string name="automatic_plugin_download_summary">從新增的資源庫自動安裝所有尚未安裝的外掛程式。</string>
     <string name="enable_skip_op_from_database_des">在開始/結束顯示跳過彈出視窗</string>
     <string name="update_notification_failed">無法安裝新版本的應用程式</string>
     <string name="apk_installer_settings">APK 安裝器</string>
-    <string name="apk_installer_settings_des">有些手機不支援新的軟體包安裝程式。 如果未安裝更新，請嘗試使用舊版選項。</string>
+    <string name="apk_installer_settings_des">部分裝置不支援新的軟體安裝程式。 如果未安裝更新，請嘗試使用舊版選項。</string>
     <string name="clipboard_too_large">文字太多。 無法儲存到剪貼簿。</string>
     <string name="yes">是</string>
     <string name="update_notification_downloading">正在下載應用程式更新…</string>
@@ -543,8 +498,7 @@
     <string name="sort_alphabetical_a">按字母順序（A 到 Z）</string>
     <string name="sort_alphabetical_z">按字母順序（Z 到 A）</string>
     <string name="select_library">選擇媒體庫</string>
-    <string name="safe_mode_file">找到安全模式檔案！
-\n在刪除此檔案之前，將不會在啟動時載入任何擴充功能。</string>
+    <string name="safe_mode_file">找到安全模式檔案！ \n在刪除此檔案之前，將不會在啟動時載入任何擴充功能。</string>
     <string name="test_log">日誌</string>
     <string name="test_failed">失敗</string>
     <string name="test_passed">通過</string>
@@ -562,8 +516,7 @@
     <string name="revert">還原</string>
     <string name="jsdelivr_enabled">無法存取 GitHub。 正在開啟 jsDelivr proxy…</string>
     <string name="jsdelivr_proxy_summary">使用 jsDelivr 繞過直接使用 GitHub 網址時的存取封鎖。 可能導致更新延遲數天。</string>
-    <string name="empty_library_no_accounts_message">您的媒體庫是空的 :(
-\n登入媒體庫帳號或將節目新增到您本機的媒體庫。</string>
+    <string name="empty_library_no_accounts_message">您的媒體庫是空的 :( \n登入媒體庫帳號或將節目新增到您本機的媒體庫。</string>
     <string name="empty_library_logged_in_message">您的媒體庫是空的。可嘗試以不同的帳號登入。</string>
     <string name="subscription_in_progress_notification">正在更新訂閱節目</string>
     <string name="backup_frequency">備份頻率</string>
@@ -571,11 +524,7 @@
     <string name="favorites_list_name">我的最愛</string>
     <string name="favorite_added">%s 已加入我的最愛</string>
     <string name="logged_account" formatted="true">以 %s 的身分登入</string>
-    <string name="duplicate_message_multiple" formatted="true">您的媒體庫中似乎有多個重覆的項目：
-\n
-\n%s
-\n
-\n您要強制加入、取代已有項目、還是取消操作？</string>
+    <string name="duplicate_message_multiple" formatted="true">您的媒體庫中似乎有多個重覆的項目： \n \n%s \n \n您要強制加入、取代已有項目、還是取消操作？</string>
     <string name="enter_pin_with_name" formatted="true">輸入 %s 的 PIN 碼</string>
     <string name="mobile_data">行動數據</string>
     <string name="duplicate_title">找到可能重覆的項目</string>
@@ -607,24 +556,14 @@
     <string name="no_repository_found_error">找不到資源庫，請檢查網址與 VPN 設定</string>
     <string name="already_voted">您已完成投票</string>
     <string name="no_plugins_found_error">在資源庫中找不到外掛程式</string>
-    <string name="duplicate_message_single" formatted="true">您的媒體庫中似乎有重覆的項目：「%s」。
-\n
-\n您要強制加入、取代已有項目、還是取消操作？</string>
+    <string name="duplicate_message_single" formatted="true">您的媒體庫中似乎有重覆的項目：「%s」。 \n \n您要強制加入、取代已有項目、還是取消操作？</string>
     <string name="set_default">設回預設</string>
     <string name="enter_pin">輸入 PIN 碼</string>
     <string name="pin">PIN 碼</string>
-    <string name="quality_profile_help">您可在此調整來源的排序方式。具有愈小的優先值的影片，在來源選擇中顯示得愈前面。來源優先值與品質優先值的加總就是影片優先值。
-\n例如：
-\n來源 A：3
-\n品質 B： 7
-\n則該來源的影片優先值為 10。
-\n
-\n注意：如果加總達到 10 或更高，則載入該連結時播放器將自動跳過載入！</string>
+    <string name="quality_profile_help">您可在此調整來源的排序方式。具有愈小的優先值的影片，在來源選擇中顯示得愈前面。來源優先值與品質優先值的加總就是影片優先值。 \n例如： \n來源 A：3 \n品質 B： 7 \n則該來源的影片優先值為 10。 \n \n注意：如果加總達到 10 或更高，則載入該連結時播放器將自動跳過載入！</string>
     <string name="enter_current_pin">輸入目前的 PIN 碼</string>
     <string name="rotate_video_desc">顯示切換畫面方向的按鈕</string>
-    <string name="rotate_video_key">rotate_video_key</string>
     <string name="automatic_plugin_download_mode_title">選擇篩選外掛程式下載的模式</string>
-    <string name="auto_rotate_video_key">auto_rotate_video_key</string>
     <string name="auto_rotate_video">自動旋轉</string>
     <string name="rotate_video">旋轉</string>
     <string name="auto_rotate_video_desc">根據影片方向自動切換畫面方向</string>
@@ -636,17 +575,16 @@
     <string name="biometric_setting">使用生物辨識技術鎖定</string>
     <string name="app_unrestricted_toast">應用程式電池使用已設定為無限制</string>
     <string name="biometric_authentication_title">解除鎖定 CloudStream</string>
-    <string name="custom_media_singluar">媒體</string>
+    <string name="custom_media_singular">媒體</string>
     <string name="reset_btn">重置</string>
     <string name="recommendations_tooltip">顯示推薦</string>
     <string name="speed_setting_summary">在播放器中新增速度選項</string>
     <string name="episode_upcoming_format" formatted="true">即將在 %s 推出</string>
-    <string name="resume_remaining" formatted="true">%s
-\n剩餘</string>
+    <string name="resume_remaining" formatted="true">%s \n剩餘</string>
     <string name="test_extensions">測試所有擴充功能</string>
     <string name="battery_dialog_title">停用電池優化</string>
     <string name="audio_book_singular">有聲書</string>
-    <string name="music_singlar">音樂</string>
+    <string name="music_singular">音樂</string>
     <string name="next_season_episode_format" formatted="true">第 %1$d 季第 %2$d 集即將發佈於</string>
     <string name="result_search_tooltip">在其他擴充功能中搜尋</string>
     <string name="subscribe_tooltip">新集數通知</string>
@@ -661,10 +599,9 @@
     <string name="app_info_intent_error">無法開啟 CloudStream 的應用程式資訊頁面。</string>
     <string name="biometric_warning">您的 CloudStream 資料已完成備份。儘管可能性非常低，但因不同裝置的行為都有所不同，在極少數情況下，您可能會無法存取本應用程式。此時請完全清除本應用程式的資料，再使用已有的備份進行還原。若因此造成任何不便，我們深感抱歉。</string>
     <string name="test_extensions_summary">此測試是供開發人員參考，而不是用以驗證任何擴充功能的正常運作與否。</string>
-    <string name="battery_dialog_message">為了確保下載與通知已訂閱的電視節目的不間斷，CloudStream 需要取得在背景執行的權限。若點選「確定」，將移至「應用程式資訊」，請找到「應用程式電池使用」並將電池用量設置為「無限制」。請注意，取得此權限並不表示 CS3 會明顯增加電池用量，而是只在必要時在背景執行，例如取得通知或使用官方擴充功能下載影片時。若選擇「取消」，您可以稍後在「一般設定」中調整此設定。</string>
+    <string name="battery_dialog_message">為了確保已訂閱的電視節目的不間斷下載與通知，CloudStream 需要取得在背景執行的權限。若點選「確定」，將顯示「請求權限」，請選擇「允許」。\n\n請注意，取得此權限並不表示本程式會明顯增加電池用量，而是只在必要時在背景執行，例如取得通知或使用擴充功能下載影片。</string>
     <string name="cs3wiki">CloudStream Wiki</string>
     <string name="biometric_unsupported">此裝置不支援生物特徵認證</string>
-    <string name="hide_player_control_names_key" translatable="false">hide_player_control_names_key</string>
     <string name="device_pin_error_message">無法取得裝置 PIN 碼，請嘗試本機驗證</string>
     <string name="delete_plugin">刪除外掛程式</string>
     <string name="open_downloaded_repo">開啟資源庫</string>
@@ -704,11 +641,110 @@
     <string name="no_subtitles_loaded">尚未載入字幕</string>
     <string name="torrent_info">此影片是 Torrent，這意味著你的影片活動可以被追蹤。\n在繼續之前，請確保你瞭解 Torrenting。</string>
     <string name="subs_edge_size">subs_edge_size</string>
-    <string name="audio_singluar">音樂</string>
+    <string name="audio_singular">音樂</string>
     <string name="encoding_error">編碼錯誤</string>
-    <string name="unsupported_error">因為不支持造成的錯誤</string>
-    <string name="podcast_singluar">播客</string>
+    <string name="unsupported_error">因為不支援造成錯誤</string>
+    <string name="podcast_singular">播客</string>
     <string name="software_decoding">軟體解碼</string>
-    <string name="torrent_not_accepted">不接受的種子</string>
+    <string name="torrent_not_accepted">重開程式並「同意」線上播放 Torrent 視窗。</string>
     <string name="player_load_one_subtitle_online">載入第一個可用的</string>
-</resources>
\ No newline at end of file
+    <string name="download_time_left_hour_min_sec_format" formatted="true">%1$d小時 %2$d分鐘 %3$d秒</string>
+    <string name="download_time_left_min_sec_format" formatted="true">%1$d分鐘 %2$d秒</string>
+    <string name="download_time_left_sec_format" formatted="true">%1$d秒</string>
+    <string name="download_queue">下載佇列</string>
+    <string name="speech_recognition_unavailable">不支援語音辨識</string>
+    <string name="begin_speaking">開始說話……</string>
+    <string name="play_full_series_button">播放全劇</string>
+    <string name="queue_empty_message">目前佇列中無下載影片。</string>
+    <string name="extra_brightness_settings">額外亮度</string>
+    <string name="extra_brightness_settings_des">超過100%亮度時開啟亮度調整</string>
+    <string name="extra_brightness_key">已開啟額外亮度</string>
+    <string name="search_suggestions">搜尋建議</string>
+    <string name="search_suggestions_des">輸入時顯示搜尋建議</string>
+    <string name="clear_suggestions">清除建議</string>
+    <string name="show_cast_in_details">顯示投影控制板</string>
+    <string name="install_prerelease">安裝提前發行版</string>
+    <string name="prerelease_already_installed">已安裝提前發行版。</string>
+    <string name="prerelease_install_failed">提前發行版安裝失敗。</string>
+    <string name="episode_action_play_mirror">鏡像播放</string>"
+    <string name="show_rating">評分標籤</string>
+    <string name="show_episode_text">影劇文本</string>
+    <string name="video_info">媒體資訊</string>
+    <string name="player_settings_always_ask">總是詢問</string>
+    <string name="plugins_updated_manually">成功更新了 %d 外掛！</string>
+    <string name="no_plugins_updated_manually">沒有需要更新的外掛。</string>
+    <string name="player_notification_channel_name">播放器通知</string>
+    <string name="player_notification_channel_description">控制背景播放的通知</string>
+    <string name="subtitles_from_embedded">內嵌</string>
+    <string name="subtitles_from_online">線上</string>
+    <string name="all_subtitles_bold">所有字幕變為粗體</string>
+    <string name="all_subtitles_italic">所有字幕變為斜體</string>
+    <string name="background_radius">背景寬度</string>
+    <string name="download_parallel_settings_des">允許同時下載幾個項目</string>
+    <string name="parallel_downloads">同時下載</string>
+    <string name="concurrent_connections">同時連接量</string>
+    <string name="concurrent_connections_settings_des">下載時，每個下載可同時使用的連接量</string>
+    <string name="go_to_downloads">前往下載</string>
+    <string name="no_internet_connection">無網際網路。\n\n請連接網路後重試，或者以離線模式觀看已下載項目。</string>
+    <string name="overscan_settings_des">更改螢幕邊界</string>
+    <string name="overscan_settings">放大符合螢幕</string>
+    <string name="poster_size_settings_des">更改圖片尺寸</string>
+    <string name="poster_size_settings">圖片尺寸</string>
+    <string name="speedup_title">長按以切換速度</string>
+    <string name="speedup_summary">2 倍速（按住）</string>
+    <string name="edit_profile_image_title">編輯帳戶圖片</string>
+    <string name="edit_profile_image_hint">輸入需使用的網址 URL 以更改帳戶圖片</string>
+    <string name="edit_profile_image_error_empty">未找到該網址</string>
+    <string name="edit_profile_image_error_invalid">無效網址或圖片</string>
+    <string name="edit_profile_image_success">已成功更新圖片</string>
+    <string name="action_mark_watched_up_to_this_episode">將這集及之前集數標示為「已觀看」</string>
+    <string name="action_remove_mark_watched_up_to_this_episode">移除至此前所有集數「已觀看」狀態</string>
+    <string name="action_reload">已重新載入</string>
+    <string name="reload_provider">重新載入來源</string>
+    <string name="name">名稱</string>
+    <string name="source_name">來源名</string>
+    <string name="resolution_and_name">解析度與名稱</string>
+    <string name="download_all">全部下載</string>
+    <string name="cancel_all">全部取消</string>
+    <string name="download_episode_range">需要下載第 %s 集嗎？</string>
+    <string name="cancel_queue_message">需取消佇列中的所有下載嗎？</string>
+    <string name="subs_subtitle_alignment">字幕對齊</string>
+    <string name="bottom_left">左下</string>
+    <string name="bottom_center">底部置中</string>
+    <string name="bottom_right">右下</string>
+    <string name="middle_left">左中</string>
+    <string name="middle_center">正中</string>
+    <string name="middle_right">右中</string>
+    <string name="top_left">左上</string>
+    <string name="top_center">頂部置中</string>
+    <string name="top_right">右上</string>
+    <plurals name="downloads_active">
+        <item quantity="other">%d 個正在下載</item>
+    </plurals>
+    <plurals name="downloads_queued">
+        <item quantity="other">佇列中有 %d 個下載</item>
+    </plurals>
+    <string name="sort_episodes_number_asc">集數（由舊至新）</string>
+    <string name="sort_episodes_number_desc">集數（由新至舊）</string>
+    <string name="sort_episodes_rating_high_low">評分（最高）</string>
+    <string name="sort_episodes_rating_low_high">評分（最低）</string>
+    <string name="sort_episodes_date_newest">播放日期（最新）</string>
+    <string name="sort_episodes_date_oldest">播放日期（最舊）</string>
+    <string name="sort_button_episode">第 %s 集</string>
+    <string name="sort_button_rating">評分 %s</string>
+    <string name="sort_button_date">日期 %s</string>
+    <string name="slide_up_again_to_exceed_100">讓音量超過 100%（再次上滑）</string>
+    <string name="update_plugins">更新外掛</string>
+    <string name="update_plugins_manually">手動更新外掛</string>
+    <string name="starting_plugin_update_manually">正在更新外掛！</string>
+    <string name="source_priority">來源優先順序</string>
+    <string name="source_priority_help">決定影片來源的排列順序</string>
+    <string name="no_account">帳戶不存在</string>
+    <string name="torrent_preferred_media">在「設定/影片來源/首選媒體」中啟用 Torrent下載</string>
+    <string name="software_decoding_desc">軟體解碼使程式可以播放裝置不支援的影片，但可能導致播放高解析的影片時的延遲或不穩定。</string>
+    <string name="volume_exceeded_100">音量已超過 100%</string>
+    <string name="show_player_metadata_overlay">顯示播放器元資料遮罩層</string>
+    <string name="video_singular">影片</string>
+    <string name="skip_type_preview">預覽</string>
+    <string name="player_is_live">播放中</string>
+</resources>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-b+zh/strings.xml
similarity index 86%
rename from app/src/main/res/values-zh/strings.xml
rename to app/src/main/res/values-b+zh/strings.xml
index da1d7d29014..56ec8f43eb8 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-b+zh/strings.xml
@@ -1,17 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- FORMAT MIGHT TRANSLATE, WILL CAUSE CRASH IF APPLIED WRONG -->
-    <string name="extra_info_format" formatted="true" translatable="false">%d %s | %s</string>
-    <string name="storage_size_format" formatted="true" translatable="false">%s • %s</string>
-    <string name="download_size_format" formatted="true" translatable="false">%s / %s</string>
-    <string name="episode_name_format" formatted="true" translatable="false">%s %s</string>
-    <string name="ffw_text_format" formatted="true" translatable="false">+%d</string>
-    <string name="rew_text_format" formatted="true" translatable="false">-%d</string>
-    <string name="ffw_text_regular_format" formatted="true" translatable="false">%d</string>
-    <string name="rew_text_regular_format" formatted="true" translatable="false">%d</string>
-    <string name="rating_format" formatted="true" translatable="false">%.1f/10.0</string>
-    <string name="year_format" formatted="true" translatable="false">%d</string>
-    <string name="app_dub_sub_episode_text_format" formatted="true">%1$s 共 %2$d 集</string>
+    <string name="app_dub_sub_episode_text_format" formatted="true">%1$s Ep %2$d</string>
     <string name="cast_format" formatted="true">演员：%s</string>
     <string name="next_episode_format" formatted="true">第 %d 集将发布于</string>
     <string name="next_episode_time_day_format" formatted="true">%1$dd %2$dh %3$dm</string>
@@ -23,16 +13,13 @@
     <string name="episode_poster_img_des">剧集封面</string>
     <string name="home_main_poster_img_des">主封面</string>
     <string name="home_next_random_img_des">随机下一个</string>
-    <string name="episode_play_img_des" translatable="false">@string/play_episode</string>
     <string name="go_back_img_des">返回</string>
-    <string name="change_providers_img_des" translatable="false">@string/home_change_provider_img_des</string>
     <string name="home_change_provider_img_des">更改片源</string>
     <string name="preview_background_img_des">预览背景</string>
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">速度（%.2fx）</string>
     <string name="rated_format" formatted="true">评分：%.1f</string>
-    <string name="new_update_format" formatted="true">发现新版本！
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">发现新版本！ \n%1$s -&gt; %2$s</string>
     <string name="filler" formatted="true">填充</string>
     <string name="duration_format" formatted="true">%d 分钟</string>
     <string name="app_name">CloudStream</string>
@@ -46,7 +33,6 @@
     <string name="no_data">无数据</string>
     <string name="episode_more_options_des">更多选项</string>
     <string name="next_episode">下一集</string>
-    <string name="result_plot" translatable="false">@string/synopsis</string>
     <string name="result_tags">类型</string>
     <string name="result_share">分享</string>
     <string name="result_open_in_browser">在浏览器中打开</string>
@@ -75,7 +61,6 @@
     <string name="download_failed">下载失败</string>
     <string name="download_canceled">下载取消</string>
     <string name="download_done">下载完毕</string>
-    <string name="download_format" translatable="false">%s - %s</string>
     <string name="stream">播放</string>
     <string name="error_loading_links_toast">加载链接错误</string>
     <string name="download_storage_text">内部存储</string>
@@ -85,7 +70,6 @@
     <string name="popup_play_file">播放文件</string>
     <string name="popup_resume_download">继续下载</string>
     <string name="popup_pause_download">暂停下载</string>
-    <string name="pref_disable_acra">禁用自动错误报告</string>
     <string name="home_more_info">更多信息</string>
     <string name="home_expanded_hide">隐藏</string>
     <string name="home_play">播放</string>
@@ -166,8 +150,6 @@
     <string name="settings_info">信息</string>
     <string name="advanced_search">高级搜索</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>
     <string name="show_trailers_settings">显示预告片</string>
     <string name="kitsu_settings">显示来自 Kitsu 的封面</string>
@@ -176,8 +158,6 @@
     <string name="automatic_plugin_download">自动下载插件</string>
     <string name="updates_settings">显示应用更新</string>
     <string name="updates_settings_des">启动应用后自动搜索更新。</string>
-    <string name="uprereleases_settings">更新至预览版</string>
-    <string name="uprereleases_settings_des">搜索预览版更新替代仅搜索完整版本</string>
     <string name="github">Github</string>
     <string name="lightnovel">由相同开发者开发的轻小说应用</string>
     <string name="anim">由相同开发者开发的动漫应用</string>
@@ -190,7 +170,6 @@
     <string name="copy_link_toast">链接已复制到剪贴板</string>
     <string name="play_episode_toast">播放剧集</string>
     <string name="subs_default_reset_toast">重置为默认值</string>
-    <string name="acra_report_toast">抱歉，应用崩溃了，将发送一份匿名错误报告给开发者</string>
     <string name="season">季</string>
     <string name="season_format">%1$s %2$d%3$s</string>
     <string name="no_season">无季</string>
@@ -208,10 +187,8 @@
     <string name="resume">继续</string>
     <string name="go_back_30">-30</string>
     <string name="go_forward_30">+30</string>
-    <string name="delete_message" formatted="true">这将永久删除 %s
-\n您确定吗?</string>
-    <string name="resume_time_left" formatted="true">%d 分钟
-\n剩余</string>
+    <string name="delete_message" formatted="true">这将永久删除 %s \n您确定吗?</string>
+    <string name="resume_time_left" formatted="true">%d 分钟 \n剩余</string>
     <string name="status_ongoing">连载中</string>
     <string name="status_completed">已完结</string>
     <string name="status">状态</string>
@@ -267,10 +244,6 @@
     <string name="show_dub">配音标签</string>
     <string name="show_sub">字幕标签</string>
     <string name="show_title">标题</string>
-    <string name="show_hd_key" translatable="false">show_hd_key</string>
-    <string name="show_dub_key" translatable="false">show_dub_key</string>
-    <string name="show_sub_key" translatable="false">show_sub_key</string>
-    <string name="show_title_key" translatable="false">show_title_key</string>
     <string name="poster_ui_settings">封面内容</string>
     <string name="no_update_found">未找到更新</string>
     <string name="check_for_update">检查更新</string>
@@ -283,7 +256,7 @@
     <string name="update">更新</string>
     <string name="watch_quality_pref">首选播放画质（WiFi）</string>
     <string name="limit_title">视频播放器标题最多字符</string>
-    <string name="limit_title_rez">视频播放器标题</string>
+    <string name="limit_title_rez">显示播放器信息</string>
     <string name="video_buffer_size_settings">视频缓冲大小</string>
     <string name="video_buffer_length_settings">视频缓冲长度</string>
     <string name="video_buffer_disk_settings">视频缓存存储</string>
@@ -302,8 +275,6 @@
     <string name="resize_fill">拉伸</string>
     <string name="resize_zoom">缩放</string>
     <string name="legal_notice">免责声明</string>
-    <string name="legal_notice_key" translatable="false">legal_notice_key</string>
-    <string name="legal_notice_text" translatable="false">Any legal issues regarding the content on this application should be taken up with the actual file hosts and providers themselves as we are not affiliated with them. In case of copyright infringement, please directly contact the responsible parties or the streaming websites. The app is purely for educational and personal use. CloudStream 3 does not host any content on the app, and has no control over what media is put up or taken down. CloudStream 3 functions like any other search engine, such as Google. CloudStream 3 does not host, upload or manage any videos, films or content. It simply crawls, aggregates and displayes links in a convenient, user-friendly interface. It merely scrapes 3rd-party websites that are publicly accessable via any regular web browser. It is the responsibility of user to avoid any actions that might violate the laws governing his/her locality. Use CloudStream 3 at your own risk.</string>
     <string name="category_general">通用</string>
     <string name="random_button_settings">随机按钮</string>
     <string name="random_button_settings_desc">在主页和库中显示随机按钮</string>
@@ -323,10 +294,6 @@
     <string name="bottom_title_settings">封面标题位置</string>
     <string name="bottom_title_settings_des">将标题移至封面下方</string>
     <!-- account stuff -->
-    <string name="anilist_key" translatable="false">anilist_key</string>
-    <string name="mal_key" translatable="false">mal_key</string>
-    <string name="opensubtitles_key" translatable="false">opensubtitles_key</string>
-    <string name="nginx_key" translatable="false">nginx_key</string>
     <string name="example_password">密码</string>
     <string name="example_username">用户名</string>
     <string name="example_email">邮箱</string>
@@ -334,14 +301,6 @@
     <string name="example_site_name">网站名称</string>
     <string name="example_site_url">网站链接</string>
     <string name="example_lang_name">语言代码 (zh)</string>
-    <!--
-    <string name="mal_account_settings" translatable="false">MAL</string>
-    <string name="anilist_account_settings" translatable="false">AniList</string>
-    <string name="tmdb_account_settings" translatable="false">TMDB</string>
-    <string name="imdb_account_settings" translatable="false">IMDB</string>
-    <string name="kitsu_account_settings" translatable="false">Kitsu</string>
-    <string name="trakt_account_settings" translatable="false">Trakt</string>
-    -->
     <string name="login_format" formatted="true">%1$s %2$s</string>
     <string name="account">账户</string>
     <string name="logout">注销</string>
@@ -364,7 +323,6 @@
     <string name="all">全部</string>
     <string name="max">最大</string>
     <string name="min">最小</string>
-    <string name="subtitles_none" translatable="false">@string/none</string>
     <string name="subtitles_outline">轮廓</string>
     <string name="subtitles_depressed">凹陷</string>
     <string name="subtitles_shadow">阴影</string>
@@ -430,7 +388,6 @@
     <string name="previous">上一个</string>
     <string name="skip_setup">跳过设置向导</string>
     <string name="app_layout_subtext">更改为适应您的设备的应用布局</string>
-    <string name="crash_reporting_title">崩溃报告</string>
     <string name="preferred_media_subtext">您想要看什么</string>
     <string name="setup_done">完成</string>
     <string name="extensions">扩展</string>
@@ -454,13 +411,11 @@
     <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 默认不安装片源。您需要从仓库中安装片源。
-\n
-\n加入我们的 Discord 或在网上搜索。</string>
+    <string name="blank_repo_message">CloudStream 默认不安装片源。您需要从仓库中安装片源。 \n \n加入我们的 Discord 或在网上搜索。</string>
     <string name="view_public_repositories_button">查看社区仓库</string>
     <string name="view_public_repositories_button_short">公开列表</string>
     <string name="uppercase_all_subtitles">字幕全大写</string>
-    <string name="download_all_plugins_from_repo">警告： CloudStream 3 对使用第三方插件不承担任何责任和提供任何支持！</string>
+    <string name="download_all_plugins_from_repo">警告： CloudStream 对使用第三方插件不承担任何责任，不提供任何支持！</string>
     <string name="single_plugin_disabled" formatted="true">%s（禁用）</string>
     <string name="tracks">轨道</string>
     <string name="audio_tracks">音频轨道</string>
@@ -489,7 +444,7 @@
     <string name="skip_type_recap">前情回顾</string>
     <string name="skip_type_mixed_ed">混合片尾</string>
     <string name="skip_type_mixed_op">混合片头</string>
-    <string name="skip_type_creddits">致谢名单</string>
+    <string name="skip_type_credits">致谢名单</string>
     <string name="skip_type_intro">介绍</string>
     <string name="clear_history">清除历史记录</string>
     <string name="history">历史记录</string>
@@ -504,7 +459,7 @@
     <string name="update_notification_failed">无法安装新版的应用</string>
     <string name="automatic_plugin_download_summary">自动安装已添加的仓库内所有未安装的插件。</string>
     <string name="apk_installer_settings">APK 安装器</string>
-    <string name="apk_installer_settings_des">部分手机不支持新的软件包安装程序。如果未安装更新，请尝试使用传统选项。</string>
+    <string name="apk_installer_settings_des">部分设备不支持新的软件包安装程序。如果未安装更新，请尝试使用传统选项。</string>
     <string name="apk_installer_legacy">传统</string>
     <string name="apk_installer_package_installer">软件包安装程序</string>
     <string name="play_trailer_button">播放预告片</string>
@@ -526,8 +481,7 @@
     <string name="delayed_update_notice">应用退出后将会更新</string>
     <string name="plugin_downloaded">插件已下载</string>
     <string name="action_remove_from_watched">从已观看中移除</string>
-    <string name="safe_mode_file">发现安全模式文件！
-\n启动时不加载任何扩展，直到文件被删除。</string>
+    <string name="safe_mode_file">发现安全模式文件！ \n启动时不加载任何扩展，直到文件被删除。</string>
     <string name="browser">浏览器</string>
     <string name="library">库</string>
     <string name="sort_by">排序方式</string>
@@ -540,8 +494,7 @@
     <string name="sort_alphabetical_z">字母排序（从 Z 到 A）</string>
     <string name="select_library">选择库</string>
     <string name="open_with">打开方式</string>
-    <string name="empty_library_no_accounts_message">您的库是空的 :(
-\n登录库账户或添加节目到您的本地库。</string>
+    <string name="empty_library_no_accounts_message">您的库是空的 :( \n登录库账户或添加节目到您的本地库。</string>
     <string name="empty_library_logged_in_message">此列表是空的，请尝试切换到另一个。</string>
     <string name="android_tv_interface_on_seek_settings">播放器显示 - 快进快退秒数</string>
     <string name="android_tv_interface_on_seek_settings_summary">播放器可见时使用的快进快退秒数</string>
@@ -574,13 +527,7 @@
     <string name="profiles">配置文件</string>
     <string name="help">帮助</string>
     <string name="mobile_data">移动流量</string>
-    <string name="quality_profile_help">在这里，您可以更改源的排序方式。如果视频具有更高的优先级，它将在源选择中显示得更高。源优先级和质量优先级的总和就是视频优先级。
-\n
-\n来源 A：3
-\n质量 B： 7
-\n组合视频优先级为 10。
-\n
-\n注意：如果总和为 10 或更多，则加载该链接时播放器将自动跳过加载！</string>
+    <string name="quality_profile_help">在这里，您可以更改源的排序方式。如果视频具有更高的优先级，它将在源选择中显示得更高。源优先级和质量优先级的总和就是视频优先级。 \n \n来源 A：3 \n质量 B： 7 \n组合视频优先级为 10。 \n \n注意：如果总和为 10 或更多，则加载该链接时播放器将自动跳过加载！</string>
     <string name="qualities">质量</string>
     <string name="profile_background_des">个人资料背景</string>
     <string name="pin">PIN</string>
@@ -610,14 +557,8 @@
     <string name="already_voted">您已投票</string>
     <string name="favorite_added">%s已添加到收藏夹</string>
     <string name="favorite_removed">%s已从收藏夹中删除</string>
-    <string name="duplicate_message_single" formatted="true">您的资料库中似乎已经存在一个可能相同的项目：\'%s.\'
-\n
-\n您想添加该项目、替换现有项目还是取消操作？</string>
-    <string name="duplicate_message_multiple" formatted="true">在您的资料库中发现了潜在的重复项目：
-\n
-\n%s
-\n
-\n您想添加此项目、替换现有项目还是取消操作？</string>
+    <string name="duplicate_message_single" formatted="true">您的资料库中似乎已经存在一个可能相同的项目：\'%s.\' \n \n您想添加该项目、替换现有项目还是取消操作？</string>
+    <string name="duplicate_message_multiple" formatted="true">在您的资料库中发现了潜在的重复项目： \n \n%s \n \n您想添加此项目、替换现有项目还是取消操作？</string>
     <string name="enter_pin">确认PIN</string>
     <string name="enter_pin_with_name" formatted="true">输入来自 %s 的 PIN 码</string>
     <string name="lock_profile">锁定个人资料</string>
@@ -637,16 +578,15 @@
     <string name="biometric_authentication_title">解锁 CloudStream</string>
     <string name="biometric_setting">使用生物识别技术锁定</string>
     <string name="password_pin_authentication_title">密码或 PIN 验证</string>
-    <string name="resume_remaining" formatted="true">%s
-\n剩余</string>
+    <string name="resume_remaining" formatted="true">%s \n剩余</string>
     <string name="test_extensions">测试所有扩展</string>
     <string name="toast_copied">已复制！</string>
     <string name="clipboard_permission_error">访问剪贴板出错，请重试。</string>
     <string name="app_unrestricted_toast">应用程序电池使用量已设置为不受限制</string>
     <string name="audio_book_singular">有声书</string>
-    <string name="custom_media_singluar">媒体</string>
+    <string name="custom_media_singular">媒体</string>
     <string name="battery_dialog_title">禁用电池最佳化</string>
-    <string name="music_singlar">音乐</string>
+    <string name="music_singular">音乐</string>
     <string name="app_info_intent_error">无法打开 CloudStream 的应用程序信息。</string>
     <string name="biometric_setting_summary">使用指纹、面部 ID、PIN 码、图案和密码解锁应用程序。</string>
     <string name="test_extensions_summary">此测试仅适用于开发人员，不会验证或否认任何扩展的工作。</string>
@@ -662,7 +602,6 @@
     <string name="player_settings_select_cast_device">选择投射设备</string>
     <string name="next_season_episode_format" formatted="true">%1$d季%2$d集将在</string>
     <string name="episode_action_cast_mirror">投射镜像</string>
-    <string name="hide_player_control_names_key" translatable="false">hide_player_control_names_key</string>
     <string name="downloads_empty">目前尚无下载。</string>
     <string name="open_local_video">打开本地视频</string>
     <string name="pref_category_security">安全</string>
@@ -685,18 +624,10 @@
     <string name="deselect_all">全不选</string>
     <string name="delete_files">删除文件</string>
     <string name="delete_format" formatted="true">删除 (%1$d | %2$s)</string>
-    <string name="delete_message_multiple" formatted="true">您确定要永久删除以下项目吗？
-\n
-\n%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="delete_message_series_only" formatted="true">您确定要永久删除下述系列的所有剧集吗？
-\n
-\n%s</string>
+    <string name="delete_message_multiple" formatted="true">您确定要永久删除以下项目吗？ \n \n%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="delete_message_series_only" formatted="true">您确定要永久删除下述系列的所有剧集吗？ \n \n%s</string>
     <string name="sort_release_date_new">发布日期（从新至旧）</string>
     <string name="device_pin_error_message">无法获取设备 PIN 码，尝试本地身份验证</string>
     <string name="device_pin_expired_message">PIN 码现已过期！</string>
@@ -710,15 +641,15 @@
     <string name="torrent_info">这是个 Torrent 的视频，这意味着您的视频活动可以被追踪。\n请确认您了解 Torrenting 后，再继续。</string>
     <string name="backup_path_title">备份文件夹位置</string>
     <string name="subs_edge_size">边缘大小</string>
-    <string name="audio_singluar">音频</string>
-    <string name="podcast_singluar">播客</string>
+    <string name="audio_singular">音频</string>
+    <string name="podcast_singular">播客</string>
     <string name="encoding_error">编码错误</string>
     <string name="unsupported_error">不受支持的错误</string>
     <string name="player_load_one_subtitle_online">加载第一个可用的字幕</string>
     <string name="torrent_preferred_media">在设置/提供者/首选媒体处开启 torrent</string>
     <string name="torrent_not_accepted">重启应用并接受在线播放 Torrent 弹窗以继续。</string>
     <string name="software_decoding">软件解码</string>
-    <string name="software_decoding_desc">软件解码让播放器能够播放你的手机所不支持的视频文件，但可能导致播放高分辨率视频时的延迟或不稳定</string>
+    <string name="software_decoding_desc">软件解码让播放器能够播放你的设备所不支持的视频文件，但可能导致播放高分辨率视频时的延迟或不稳定。</string>
     <string name="sort_episodes_number_desc">集数（降序）</string>
     <string name="sort_episodes_date_oldest">播放日期（最旧）</string>
     <string name="sort_button_rating">得分 %s</string>
@@ -744,4 +675,76 @@
     <string name="all_subtitles_bold">加粗所有字幕</string>
     <string name="volume_exceeded_100">音量已经超过 100%</string>
     <string name="slide_up_again_to_exceed_100">再次上滑让音量超过 100%</string>
-</resources>
\ No newline at end of file
+    <string name="parallel_downloads">并行下载</string>
+    <string name="concurrent_connections">并发连接</string>
+    <string name="overscan_settings_des">更改屏幕边界</string>
+    <string name="overscan_settings">过扫描</string>
+    <string name="go_to_downloads">转到下载</string>
+    <string name="download_parallel_settings_des">可同时下载多少项目</string>
+    <string name="concurrent_connections_settings_des">每个下载项目下载期间可同时使用多少个连接</string>
+    <string name="no_internet_connection">无互联网连接。\n\n请连接到互联网并重试，或者在离线时观看已下载项目。</string>
+    <string name="poster_size_settings_des">更改海报尺寸</string>
+    <string name="poster_size_settings">海报尺寸</string>
+    <string name="player_settings_always_ask">始终询问</string>
+    <string name="speedup_title">长按速度开关</string>
+    <string name="speedup_summary">按住获得 2 倍速</string>
+    <string name="download_time_left_hour_min_sec_format" formatted="true">%1$d小时 %2$d分钟 %3$d秒</string>
+    <string name="download_time_left_min_sec_format" formatted="true">%1$d分钟 %2$d秒</string>
+    <string name="download_time_left_sec_format" formatted="true">%1$d秒</string>
+    <string name="show_rating">评分标签</string>
+    <string name="no_account">无账户</string>
+    <string name="edit_profile_image_title">编辑个人资料图片</string>
+    <string name="edit_profile_image_hint">输入个人资料图片 URL</string>
+    <string name="edit_profile_image_error_empty">未找到 URL</string>
+    <string name="edit_profile_image_error_invalid">无效 URL 或图片</string>
+    <string name="edit_profile_image_success">成功更新了图片</string>
+    <string name="action_mark_watched_up_to_this_episode">将这一集和之前的标为已观看</string>
+    <string name="action_remove_mark_watched_up_to_this_episode">去除这一集和之前集数的已观看状态</string>
+    <string name="action_reload">已重新加载</string>
+    <string name="reload_provider">重新加载视频源</string>
+    <string name="episode_action_play_mirror">播放镜像</string>"
+    <string name="name">名称</string>
+    <string name="resolution_and_name">分辨率和名称</string>
+    <string name="subs_subtitle_alignment">字幕对齐</string>
+    <string name="bottom_left">左下</string>
+    <string name="bottom_center">底部居中</string>
+    <string name="bottom_right">右下</string>
+    <string name="middle_left">中左</string>
+    <string name="middle_center">正中</string>
+    <string name="middle_right">中右</string>
+    <string name="top_left">左上</string>
+    <string name="top_center">顶部居中</string>
+    <string name="top_right">右上</string>
+    <string name="play_full_series_button">播放全剧</string>
+    <string name="install_prerelease">安装预发行版</string>
+    <string name="prerelease_already_installed">已安装预发行版。</string>
+    <string name="prerelease_install_failed">安装预发行版失败。</string>
+    <string name="show_episode_text">剧集文本</string>
+    <string name="search_suggestions">搜索建议</string>
+    <string name="search_suggestions_des">输入时显示搜索建议</string>
+    <string name="clear_suggestions">清除建议</string>
+    <string name="show_cast_in_details">显示投屏面板</string>
+    <string name="video_info">媒体信息</string>
+    <string name="source_name">源名称</string>
+    <string name="extra_brightness_settings">额外亮度</string>
+    <string name="extra_brightness_settings_des">超过 100% 亮度时启用亮度过滤器</string>
+    <string name="download_queue">下载队列</string>
+    <string name="queue_empty_message">队列中当前无下载。</string>
+    <string name="download_all">全部下载</string>
+    <string name="cancel_all">全部取消</string>
+    <string name="download_episode_range">要下载第 %s 集吗？</string>
+    <string name="cancel_queue_message">要取消队列中的所有下载吗？</string>
+    <plurals name="downloads_active">
+        <item quantity="other">%d 个活跃下载</item>
+    </plurals>
+    <plurals name="downloads_queued">
+        <item quantity="other">队列中有 %d 个下载</item>
+    </plurals>
+    <string name="source_priority">源优先级</string>
+    <string name="source_priority_help">确定在播放器中如何排列视频源的顺序</string>
+    <string name="extra_brightness_key">已启用额外亮度</string>
+    <string name="show_player_metadata_overlay">显示播放器元数据遮罩层</string>
+    <string name="video_singular">视频</string>
+    <string name="skip_type_preview">预览</string>
+    <string name="player_is_live">播放中</string>
+</resources>
diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml
new file mode 100644
index 00000000000..3d9200faf8c
--- /dev/null
+++ b/app/src/main/res/values-be/strings.xml
@@ -0,0 +1,742 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_dub_sub_episode_text_format" formatted="true">%1$s серыя %2$d</string>
+    <string name="cast_format" formatted="true">Склад: %s</string>
+    <string name="next_episode_format" formatted="true">Серыя %d будзе выпушчана праз</string>
+    <string name="next_season_episode_format" formatted="true">Серыя %2$d сезона %1$d будзе выпушчана праз</string>
+    <string name="next_episode_time_day_format" formatted="true">%1$d д %2$d гадз %3$d хв</string>
+    <string name="next_episode_time_hour_format" formatted="true">%1$d гадз %2$d хв</string>
+    <string name="next_episode_time_min_format" formatted="true">%d м</string>
+    <string name="download_time_left_hour_min_sec_format" formatted="true">%1$d гадз %2$d хв %3$d с</string>
+    <string name="download_time_left_min_sec_format" formatted="true">%1$d хв %2$d с</string>
+    <string name="download_time_left_sec_format" formatted="true">%1$d с</string>
+    <string name="result_poster_img_des">Плакат</string>
+    <string name="search_poster_img_des">Плакат</string>
+    <string name="episode_poster_img_des">Плакат серыі</string>
+    <string name="home_main_poster_img_des">Асноўны плакат</string>
+    <string name="home_next_random_img_des">Наступны выпадковы</string>
+    <string name="go_back_img_des">Назад</string>
+    <string name="play_from_beginning_img_des">Прайграць з пачатку</string>
+    <string name="home_change_provider_img_des">Змяніць пастаўшчыка</string>
+    <string name="preview_background_img_des">Перадпрагляд фону</string>
+    <string name="player_speed_text_format" formatted="true">Хуткасць (%.2fx)</string>
+    <string name="rated_format" formatted="true">Ацэнка: %.1f</string>
+    <string name="new_update_format" formatted="true">Знойдзена новае абнаўленне!\n%1$s -&gt; %2$s</string>
+    <string name="filler" formatted="true">Запаўняльнік</string>
+    <string name="duration_format" formatted="true">%d хвіл</string>
+    <string name="app_name">CloudStream</string>
+    <string name="play_with_app_name">Прайграць праз CloudStream</string>
+    <string name="title_home">Дамашняя</string>
+    <string name="title_search">Пошук</string>
+    <string name="title_downloads">Спампоўкі</string>
+    <string name="title_settings">Налады</string>
+    <string name="search_hint">Шукаць…</string>
+    <string name="search_hint_site" formatted="true">Шукаць па %s…</string>
+    <string name="speech_recognition_unavailable">Распазнаванне маўлення недаступна</string>
+    <string name="begin_speaking">Пачніце размаўляць…</string>
+    <string name="no_data">Няма дадзеных</string>
+    <string name="episode_more_options_des">Больш параметраў</string>
+    <string name="next_episode">Наступная серыя</string>
+    <string name="result_tags">Жанры</string>
+    <string name="result_share">Абагуліць</string>
+    <string name="result_open_in_browser">Адкрыць у браўзеры</string>
+    <string name="browser">Браўзер</string>
+    <string name="skip_loading">Прапусціць загрузку</string>
+    <string name="loading">Загрузка…</string>
+    <string name="type_watching">Гляджу</string>
+    <string name="type_on_hold">На ўтрыманні</string>
+    <string name="type_completed">Завершана</string>
+    <string name="type_dropped">Пакінута</string>
+    <string name="type_plan_to_watch">Планірую глядзець</string>
+    <string name="type_re_watching">Пераглядваю</string>
+    <string name="play_movie_button">Прайграць фільм</string>
+    <string name="play_trailer_button">Прайграць трэйлер</string>
+    <string name="play_livestream_button">Прайграць трансляцыю</string>
+    <string name="play_torrent_button">Трансліраваць Torrent</string>
+    <string name="play_full_series_button">Прайграць серыял поўнасцю</string>
+    <string name="torrent_info">Гэта відэа — Torrent, гэта значыць, што ваша актыўнасць можа быць адсочана.\nУпэўніцеся, што вы ведаеце, як працуюць Torrent-файлы, перад працягам.</string>
+    <string name="pick_source">Крыніцы</string>
+    <string name="pick_subtitle">Субцітры</string>
+    <string name="reload_error">Паспрабаваць перападлучыцца…</string>
+    <string name="go_back">Назад</string>
+    <string name="play_episode">Прайграць серыю</string>
+    <string name="download">Спампаваць</string>
+    <string name="downloaded">Спампавана</string>
+    <string name="downloading">Ідзе спампоўванне</string>
+    <string name="download_paused">Спампоўванне прыпынена</string>
+    <string name="download_started">Спампоўванне пачалося</string>
+    <string name="download_failed">Не ўдалося спампаваць</string>
+    <string name="download_canceled">Спампоўванне скасавана</string>
+    <string name="download_done">Спампоўванне завершана</string>
+    <string name="downloads_delete_select">Выберыце элементы для выдалення</string>
+    <string name="downloads_empty">Спамповак пакуль што няма.</string>
+    <string name="offline_file">Даступна для прагляду па-за сеткай</string>
+    <string name="select_all">Выбраць ўсё</string>
+    <string name="deselect_all">Зняць выбар</string>
+    <string name="update_started">Пачалося абнаўленне</string>
+    <string name="stream">Сеткавая трансляцыя</string>
+    <string name="open_local_video">Адкрыць лакальнае відэа</string>
+    <string name="error_loading_links_toast">Памылка пры загрузцы спасылак</string>
+    <string name="links_reloaded_toast">Спасылкі перазагружаны</string>
+    <string name="download_storage_text">Унутранае сховішча</string>
+    <string name="app_dubbed_text">Дуб</string>
+    <string name="app_subbed_text">Суб</string>
+    <string name="popup_delete_file">Выдаліць файл</string>
+    <string name="popup_play_file">Прайграць файл</string>
+    <string name="popup_resume_download">Узнавіць спампоўванне</string>
+    <string name="popup_pause_download">Прыпыніць спампоўванне</string>
+    <string name="home_more_info">Дадатковыя звесткі</string>
+    <string name="home_expanded_hide">Схаваць</string>
+    <string name="home_play">Прайграць</string>
+    <string name="home_info">Звесткі</string>
+    <string name="filter_bookmarks">Фільтр закладак</string>
+    <string name="error_bookmarks_text">Закладкі</string>
+    <string name="action_remove_from_bookmarks">Выдаліць</string>
+    <string name="action_add_to_bookmarks">Задаць статус прагляду</string>
+    <string name="sort_apply">Прымяніць</string>
+    <string name="sort_copy">Скапіраваць</string>
+    <string name="sort_close">Закрыць</string>
+    <string name="sort_clear">Ачысціць</string>
+    <string name="sort_save">Захаваць</string>
+    <string name="repo_copy_label">Назва рэпазіторыя і спасылка</string>
+    <string name="toast_copied">скапіравана!</string>
+    <string name="subscribe_tooltip">Паведамленне аб новай серыі</string>
+    <string name="result_search_tooltip">Пошук у іншых пашырэннях</string>
+    <string name="recommendations_tooltip">Паказваць рэкамендацыі</string>
+    <string name="player_speed">Хуткасць прайгравальніка</string>
+    <string name="subtitles_settings">Налады субцітраў</string>
+    <string name="subs_text_color">Колер тэксту</string>
+    <string name="subs_outline_color">Колер контуру</string>
+    <string name="subs_background_color">Колер фону</string>
+    <string name="subs_window_color">Колер акна</string>
+    <string name="subs_edge_type">Тып контуру</string>
+    <string name="subs_subtitle_elevation">Уздым субцітраў</string>
+    <string name="subs_font">Шрыфт</string>
+    <string name="subs_font_size">Памер шрыфту</string>
+    <string name="search_provider_text_providers">Пошук праз пастаўшчыкоў</string>
+    <string name="search_provider_text_types">Пошук праз тыпы</string>
+    <string name="benene_count_text">%d бенена(ў) дадзена распрацоўшчыкам</string>
+    <string name="benene_count_text_none">Бененаў не дадзена</string>
+    <string name="subs_auto_select_language">Выбраць мову аўтаматычна</string>
+    <string name="subs_download_languages">Спампаваць мовы</string>
+    <string name="subs_subtitle_languages">Мова субцітраў</string>
+    <string name="subs_hold_to_reset_to_default">Утрымайце, каб скінуць</string>
+    <string name="subs_import_text" formatted="true">Усталёўвайце шрыфты, перацягваючы іх да %s</string>
+    <string name="continue_watching">Працягнуць прагляд</string>
+    <string name="action_remove_watching">Выдаліць</string>
+    <string name="action_open_watching">Больш інфармацыі</string>
+    <string name="action_open_play">\@string/home_play</string>
+    <string name="vpn_might_be_needed">Для карэктнай працы гэтага пастаўшчыка можа спатрэбіцца VPN</string>
+    <string name="vpn_torrent">Гэты пастаўшчык — Torrent, рэкамендуецца VPN</string>
+    <string name="provider_info_meta">Вэб-сайт не пастаўляе метададзеных, загрузіць відэа не ўдасца, калі на сайце яго няма.</string>
+    <string name="torrent_plot">Апісанне</string>
+    <string name="normal_no_plot">Сюжэту не знойдзена</string>
+    <string name="torrent_no_plot">Апісання не знойдзена</string>
+    <string name="show_log_cat">Паказаць Logcat 🐈</string>
+    <string name="test_log">Журнал</string>
+    <string name="picture_in_picture">Відарыс у відарысе</string>
+    <string name="picture_in_picture_des">Працягвае прайграванне ў мініяцюры зверху іншых праграм</string>
+    <string name="player_size_settings">Кнопка змены памеру прайгравальніка</string>
+    <string name="player_size_settings_des">Прыбраць чорныя межы</string>
+    <string name="player_subtitles_settings">Субцітры</string>
+    <string name="player_subtitles_settings_des">Налады субцітраў прайгравальніка</string>
+    <string name="chromecast_subtitles_settings">Субцітры Chromecast</string>
+    <string name="chromecast_subtitles_settings_des">Налады субцітраў Chromecast</string>
+    <string name="eigengraumode_settings">Хуткасць прайгравання</string>
+    <string name="speed_setting_summary">Дадаць параметр хуткасці да прайгравальніка</string>
+    <string name="swipe_to_seek_settings">Чырканне для перамоткі</string>
+    <string name="swipe_to_seek_settings_des">Правядзіце пальцам з боку ў бок, каб кіраваць пазіцыяй у відэа</string>
+    <string name="swipe_to_change_settings">Чырканне для змены налад</string>
+    <string name="swipe_to_change_settings_des">Правядзіце пальцам уверх або ўніз злева ці справа, каб змяніць яркасць або гучнасць</string>
+    <string name="autoplay_next_settings">Аўтаматычнае прайграванне наступнай серыі</string>
+    <string name="autoplay_next_settings_des">Прайграць наступную серыю пасля сканчэння бягучай</string>
+    <string name="double_tap_to_seek_settings">Падвойнае націсканне для перамоткі</string>
+    <string name="double_tap_to_pause_settings">Падвойнае націсканне для прыпынення</string>
+    <string name="double_tap_to_seek_amount_settings">Крок перамоткі (у секундах)</string>
+    <string name="double_tap_to_seek_settings_des">Двойчы націсніце справа ці злева, каб перайсці наперад ці назад</string>
+    <string name="double_tap_to_pause_settings_des">Двойчы націсніце пасярэдзіне, каб прыпыніць прайграванне</string>
+    <string name="use_system_brightness_settings">Выкарыстоўваць сістэмную яркасць</string>
+    <string name="use_system_brightness_settings_des">Выкарыстоўваць сістэмную яркасць у прайгравальніку замест цёмнага накладання</string>
+    <string name="episode_sync_settings">Абнаўляць працэс прагляду</string>
+    <string name="episode_sync_settings_des">Аўтаматычна сінхранізаваць прагрэс бягучай серыі</string>
+    <string name="restore_settings">Аднавіць дадзеныя з рэзервовай копіі</string>
+    <string name="backup_settings">Рэзервовае капіраванне дадзеных</string>
+    <string name="backup_frequency">Частата рэзервовага капіравання</string>
+    <string name="restore_success">Загружаны файл рэзервовай копіі</string>
+    <string name="restore_failed_format" formatted="true">Не ўдалося аднавіць дадзеныя з файла %s</string>
+    <string name="backup_success">Дадзеныя захаваны</string>
+    <string name="backup_failed">Няма дазволу да сховішча. Паспрабуйце ізноў.</string>
+    <string name="backup_failed_error_format">Памылка пры рэзервовым капіраванні %s</string>
+    <string name="search">Пошук</string>
+    <string name="library">Бібліятэка</string>
+    <string name="category_account">Уліковыя запісы і бяспека</string>
+    <string name="category_updates">Абнаўленні і рэзервовае капіраванне</string>
+    <string name="settings_info">Звесткі</string>
+    <string name="advanced_search">Пашыраны пошук</string>
+    <string name="advanced_search_des">Паказвае пошукавыя вынікі, падзеленыя па пастаўшчыкам</string>
+    <string name="show_fillers_settings">Паказваць серыі-запаўняльнікі для анімэ</string>
+    <string name="show_trailers_settings">Паказваць трэйлеры</string>
+    <string name="kitsu_settings">Паказваць плакаты з Kitsu</string>
+    <string name="pref_filter_search_quality">Схаваць выбраную якасць відэа з вынікаў пошуку</string>
+    <string name="automatic_plugin_updates">Аўтаматычнае абнаўленне ўбудоў</string>
+    <string name="automatic_plugin_download">Аўтаматычная спампоўка ўбудоў</string>
+    <string name="apk_installer_settings_des">Некаторыя прылады не падтрымліваюць новы ўсталёўшчык пакетаў. Калі абнаўленні не ўсталёўваюцца, паспрабуйце ранейшую версію.</string>
+    <string name="github">Github</string>
+    <string name="automatic_plugin_download_mode_title">Выберыце рэжым фільтравання спампоўвання убудоў</string>
+    <string name="search_suggestions">Прапановы пошуку</string>
+    <string name="search_suggestions_des">Паказваць прапановы пошуку падчас уводу тэксту</string>
+    <string name="clear_suggestions">Ачысціць прапановы</string>
+    <string name="show_cast_in_details">Паказваць склад акцёраў</string>
+    <string name="automatic_plugin_download_summary">Аўтаматычна ўсталёўваць усе яшчэ не ўсталяваныя ўбудовы з даданых рэпазіторыяў.</string>
+    <string name="updates_settings">Паказваць абнаўленні праграмы</string>
+    <string name="updates_settings_des">Аўтаматычна правяраць на новыя абнаўленні пасля адкрыцця праграмы.</string>
+    <string name="redo_setup_process">Паўтарыць наладжванне</string>
+    <string name="install_prerelease">Усталяваць перадфінальную версію</string>
+    <string name="prerelease_already_installed">Перадфінальная версія ўжо ўсталявана.</string>
+    <string name="prerelease_install_failed">Не ўдалося ўсталяваць перадфінальную версію.</string>
+    <string name="apk_installer_settings">Усталёўшчык APK</string>
+    <string name="lightnovel">Лёгкая праграма для раманаў ад тых жа распрацоўшчыкаў</string>
+    <string name="anim">Праграма для анімэ ад тых жа распрацоўшчыкаў</string>
+    <string name="discord">Далучайцеся да Discord</string>
+    <string name="benene">Даць распрацоўшчыкам бенен</string>
+    <string name="benene_des">Дадзена бененаў</string>
+    <string name="app_language">Мова праграмы</string>
+    <string name="no_chromecast_support_toast">У гэтага пастаўшчыка няма падтрымкі Chromecast</string>
+    <string name="no_links_found_toast">Спасылак не знойдзена</string>
+    <string name="copy_link_toast">Спасылка скапіравана да буфера абмену</string>
+    <string name="play_episode_toast">Прайграць серыю</string>
+    <string name="subs_default_reset_toast">Скінуць да пачатковага значэння</string>
+    <string name="season">Сезон</string>
+    <string name="season_format">%1$s %2$d%3$s</string>
+    <string name="no_season">Сезона няма</string>
+    <string name="episode">Серыя</string>
+    <string name="episodes">Серый</string>
+    <string name="episodes_range">%1$d-%2$d</string>
+    <string name="episode_format" formatted="true">%1$d %2$s</string>
+    <string name="episode_upcoming_format" formatted="true">Наступны праз %s</string>
+    <string name="season_short">Сез</string>
+    <string name="episode_short">Сер</string>
+    <string name="no_episodes_found">Серый не знойдзена</string>
+    <string name="delete">Выдаліць</string>
+    <string name="delete_file">Выдаліць файл</string>
+    <string name="delete_files">Выдаліць файлы</string>
+    <string name="delete_format" formatted="true">Выдаліць (%1$d | %2$s)</string>
+    <string name="cancel">Скасаваць</string>
+    <string name="pause">Прыпыніць</string>
+    <string name="start">Пачаць</string>
+    <string name="test_failed">Няўдала</string>
+    <string name="test_passed">Пройдзена</string>
+    <string name="test_warning">Увага</string>
+    <string name="resume">Узнавіць</string>
+    <string name="go_back_30">-30</string>
+    <string name="go_forward_30">+30</string>
+    <string name="delete_message" formatted="true">Гэта выдаліць %s назаўсёды\nВы ўпэўнены?</string>
+    <string name="delete_message_multiple" formatted="true">Вы ўпэўнены, што хочаце назаўсёды выдаліць наступныя элементы?\n\n%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="delete_message_series_only" formatted="true">Вы ўпэўнены, што хочаце назаўсёды выдаліце ўсе серыі гэтага серыяла:\n\n%s</string>
+    <string name="resume_time_left" formatted="true">%dхв\nзасталося</string>
+    <string name="resume_remaining" formatted="true">%s\nзасталося</string>
+    <string name="status_ongoing">Бягучы</string>
+    <string name="status_completed">Завершана</string>
+    <string name="status">Стан</string>
+    <string name="year">Год</string>
+    <string name="rating">Рэйтынг</string>
+    <string name="duration">Працягласць</string>
+    <string name="site">Вэб-сайт</string>
+    <string name="synopsis">Сціслы агляд</string>
+    <string name="queued">у чарзе</string>
+    <string name="no_subtitles">Субцітраў няма</string>
+    <string name="action_default">Прадвызначаны</string>
+    <string name="free_storage">Свабодна</string>
+    <string name="used_storage">Ужыта</string>
+    <string name="app_storage">Праграма</string>
+    <string name="movies">Фільмы</string>
+    <string name="tv_series">Тэлесерыялы</string>
+    <string name="cartoons">Мультфільмы</string>
+    <string name="anime">Анімэ</string>
+    <string name="torrent">Torrents</string>
+    <string name="documentaries">Дакументальныя фільмы</string>
+    <string name="ova">OVA</string>
+    <string name="asian_drama">Азіяцкія драмы</string>
+    <string name="livestreams">Прамыя трансляцыі</string>
+    <string name="nsfw">NSFW</string>
+    <string name="others">Іншыя</string>
+    <string name="movies_singular">Фільм</string>
+    <string name="tv_series_singular">Серыял</string>
+    <string name="cartoons_singular">Мультфільм</string>
+    <string name="anime_singular">Анімэ</string>
+    <string name="ova_singular">OVA</string>
+    <string name="torrent_singular">Torrent</string>
+    <string name="documentaries_singular">Дакументальны фільм</string>
+    <string name="asian_drama_singular">Азіяцкая драма</string>
+    <string name="live_singular">Прамая трансляцыя</string>
+    <string name="nsfw_singular">NSFW</string>
+    <string name="other_singular">Відэа</string>
+    <string name="music_singular">Музыка</string>
+    <string name="audio_book_singular">Аўдыякніга</string>
+    <string name="custom_media_singular">Медыя</string>
+    <string name="audio_singular">Аўдыя</string>
+    <string name="podcast_singular">Падкаст</string>
+    <string name="source_error">Памылка крыніцы</string>
+    <string name="remote_error">Памылка аддаленага элемента</string>
+    <string name="render_error">Памылка паказу</string>
+    <string name="encoding_error">Памылка кадзіравання</string>
+    <string name="unsupported_error">Непадтрыманая памылка</string>
+    <string name="unexpected_error">Нечаканая памылка прайгравальніка</string>
+    <string name="storage_error">Памылка спампоўвання, праверце дазвол на сховішча</string>
+    <string name="episode_action_chromecast_episode">Глядзець праз Chromecast</string>
+    <string name="episode_action_chromecast_mirror">Люстэрка Chromecast</string>
+    <string name="extra_brightness_settings">Дадатковая яркасць</string>
+    <string name="extra_brightness_settings_des">Уключыць фільтр яркасці калі яркасць дысплэя больш за 100%</string>
+    <string name="extra_brightness_key">extra_brightness_enabled</string>
+    <string name="episode_action_cast_mirror">Трансляцыя праз люстэрку</string>
+    <string name="episode_action_play_in_app">Глядзець у праграме</string>
+    <string name="episode_action_play_mirror">Глядзець праз люстэрку</string>"
+    <string name="episode_action_play_in_format">Глядзець у %s</string>
+    <string name="episode_action_auto_download">Аўтаспампоўка</string>
+    <string name="episode_action_download_mirror">Спампаваць люстэрку</string>
+    <string name="episode_action_reload_links">Абнавіць спасылкі</string>
+    <string name="episode_action_download_subtitle">Спампаваць субцітры</string>
+    <string name="show_hd">Метка якасці</string>
+    <string name="show_dub">Метка дубляжу</string>
+    <string name="show_sub">Метка субцітраў</string>
+    <string name="show_rating">Метка рэйтынгу</string>
+    <string name="show_title">Загаловак</string>
+    <string name="show_episode_text">Тэкст серыі</string>
+    <string name="poster_ui_settings">Пераключэнне элементаў інтэрфейсу на плакаце</string>
+    <string name="no_update_found">Абнаўленняў не знойдзена</string>
+    <string name="check_for_update">Праверыць на абнаўленні</string>
+    <string name="video_lock">Блакіроўка</string>
+    <string name="video_aspect_ratio_resize">Змена памеру</string>
+    <string name="video_source">Крыніца</string>
+    <string name="video_skip_op">Прапусціць ОП</string>
+    <string name="dont_show_again">Не паказваць зноў</string>
+    <string name="skip_update">Прапусціць гэта абнаўленне</string>
+    <string name="update">Абнавіць</string>
+    <string name="watch_quality_pref">Прыярытэтная якасць прагляду (WiFi)</string>
+    <string name="watch_quality_pref_data">Прыярытэтная якасць прагляду (Мабільная перадача дадзеных)</string>
+    <string name="limit_title">Максімальная колькасць сімвалаў у загалоўку праглядальніка</string>
+    <string name="limit_title_rez">Паказваць інфармацыю ў прайгравальніку</string>
+    <string name="video_buffer_size_settings">Памер буфера відэа</string>
+    <string name="video_buffer_length_settings">Даўжыня буфера відэа</string>
+    <string name="video_buffer_disk_settings">Кэш відэа на дыску</string>
+    <string name="video_buffer_clear_settings">Ачысціць кэш відэа і відарысаў</string>
+    <string name="android_tv_interface_on_seek_settings">Прайгравальнік паказаны — крок перамоткі</string>
+    <string name="android_tv_interface_on_seek_settings_summary">Крок перамоткі калі прайгравальнік бачны</string>
+    <string name="android_tv_interface_off_seek_settings">Прайгравальнік схаваны — крок перамоткі</string>
+    <string name="android_tv_interface_off_seek_settings_summary">Крок перамоткі калі прайгравальнік схаваны</string>
+    <string name="video_ram_description">Выклікае збоі пры высокіх значэннях на прыладах з маленькім аб\'ёмам памяці, такіх як Android TV.</string>
+    <string name="video_disk_description">Выклікае праблемы пры высокіх значэннях на прыладах з маленькім аб\'ёмам сховішча, такіх як Android TV.</string>
+    <string name="dns_pref">DNS праз HTTPS</string>
+    <string name="dns_pref_summary">Карысна для абходу блакіровак</string>
+    <string name="jsdelivr_proxy">Проксі GitHub</string>
+    <string name="jsdelivr_enabled">Не ўдалося дасягнуць GitHub. Уключэнне проксі jsDelivr…</string>
+    <string name="jsdelivr_proxy_summary">Абыходзьце блакіроўкі спасылак GitHub з дапамогай jsDelivr. Можа затрымаць абнаўленні на некалькі дзён.</string>
+    <string name="add_site_pref">Кланіраваць вэб-сайт</string>
+    <string name="remove_site_pref">Выдаліць вэб-сайт</string>
+    <string name="add_site_summary">Дадайце копію існуючага вэб-сайта з іншым URL-адрасам</string>
+    <string name="download_path_pref">Шлях спампоўкі</string>
+    <string name="nginx_url_pref">URL-адрас сервера NGINX</string>
+    <string name="display_subbed_dubbed_settings">Паказваць метку «Дубляж»/«Субцітры» для анімэ</string>
+    <string name="resize_fit">Умясціць у экран</string>
+    <string name="resize_fill">Запоўніць</string>
+    <string name="resize_zoom">Маштабаваць</string>
+    <string name="legal_notice">Адмова ад адказнасці</string>
+    <string name="pref_category_bypass">Абходы ISP</string>
+    <string name="pref_category_links">Спасылкі</string>
+    <string name="pref_category_app_updates">Абнаўленні праграмы</string>
+    <string name="pref_category_backup">Рэзервовае капіраванне</string>
+    <string name="pref_category_extensions">Пашырэнні</string>
+    <string name="pref_category_actions">Дзеянні</string>
+    <string name="pref_category_cache">Кэш</string>
+    <string name="pref_category_android_tv">Android TV</string>
+    <string name="pref_category_gestures">Жэсты</string>
+    <string name="pref_category_security">Бяспека</string>
+    <string name="pref_category_accounts">Уліковыя запісы</string>
+    <string name="pref_category_player_features">Функцыі прайгравальніка</string>
+    <string name="pref_category_subtitles">Субцітры</string>
+    <string name="pref_category_player_layout">Макет</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>
+    <string name="random_button_settings">Кнопка «Выпадковае»</string>
+    <string name="random_button_settings_desc">Паказваць кнопку «Выпадковае» на дамашняй старонцы і ў бібліятэцы</string>
+    <string name="provider_lang_settings">Мовы пашырэнняў</string>
+    <string name="app_layout">Макет праграмы</string>
+    <string name="preferred_media_settings">Прыярытэтнае медыя</string>
+    <string name="enable_nsfw_on_providers">Уключыць NSFW на пашырэннях, дзе гэта падтрымліваецца</string>
+    <string name="subtitles_encoding">Кадзіраванне субцітраў</string>
+    <string name="category_providers">Пастаўшчыкі</string>
+    <string name="category_provider_test">Праверка пастаўшчыкоў</string>
+    <string name="test_extensions">Праверыць усе пашырэнні</string>
+    <string name="test_extensions_summary">Гэта праверка прызначана толькі для распрацоўшчыкаў і не вызначае работу абы-якога пашырэння.</string>
+    <string name="category_ui">Макет</string>
+    <string name="automatic">Аўтаматычны</string>
+    <string name="tv_layout">Макет тэлевізара</string>
+    <string name="phone_layout">Макет тэлефона</string>
+    <string name="emulator_layout">Макет эмулятара</string>
+    <string name="primary_color_settings">Асноўны колер</string>
+    <string name="app_theme_settings">Тэма праграмы</string>
+    <string name="bottom_title_settings">Размяшчэнне загалоўка плаката</string>
+    <string name="bottom_title_settings_des">Размяшчаць назву пад плакатам</string>
+    <string name="example_password">parol123</string>
+    <string name="example_username">Імя карыстальніка</string>
+    <string name="example_email">vitaju@sviet.com</string>
+    <string name="example_ip">127.0.0.1</string>
+    <string name="example_site_name">НоваяНазваСайта</string>
+    <string name="example_site_url">https://pryklad.by</string>
+    <string name="example_lang_name">Код мовы (be)</string>
+    <string name="login_format" formatted="true">%2$s%1$s</string>
+    <string name="account">уліковы запіс</string>
+    <string name="logout">Выйсці</string>
+    <string name="login">Увайсці</string>
+    <string name="auth_locally">Лакальная праверка сапраўднасці</string>
+    <string name="switch_account">Змяніць ўліковы запіс</string>
+    <string name="add_account">Дадаць уліковы запіс</string>
+    <string name="create_account">Стварыць уліковы запіс</string>
+    <string name="add_sync">Дадаць адсочванне</string>
+    <string name="added_sync_format" formatted="true">Дададзена %s</string>
+    <string name="upload_sync">Сінхранізаваць</string>
+    <string name="sync_score">Ацэнка</string>
+    <string name="sync_score_format" formatted="true">%d / 10</string>
+    <string name="sync_total_episodes_none">/??</string>
+    <string name="sync_total_episodes_some" formatted="true">/%d</string>
+    <string name="authenticated_user" formatted="true">%s праверана на сапраўднасць</string>
+    <string name="authenticated_user_fail" formatted="true">Не ўдалося ўвайсці ў %s</string>
+    <string name="disable">Выключыць</string>
+    <string name="none">Нічога</string>
+    <string name="normal">Звычайны</string>
+    <string name="all">Усё</string>
+    <string name="max">Макс.</string>
+    <string name="min">Мін.</string>
+    <string name="subtitles_outline">Контур</string>
+    <string name="subtitles_depressed">Заніжаныя</string>
+    <string name="subtitles_shadow">Цень</string>
+    <string name="subtitles_raised">Паднятыя</string>
+    <string name="subtitle_offset">Сінхранізаваць субцітры</string>
+    <string name="subtitle_offset_hint">1000 мс</string>
+    <string name="subtitle_offset_title">Затрымка субцітраў</string>
+    <string name="subtitle_offset_extra_hint_later_format">Выкарыстоўвайце, калі субцітры паяўляюцца на %d мс раней</string>
+    <string name="subtitle_offset_extra_hint_before_format">Выкарыстоўвайце, калі субцітры паяўляюцца на %d мс пазней</string>
+    <string name="subtitle_offset_extra_hint_none_format">Без затрымкі субцітраў</string>
+    <string name="subtitles_example_text">У цэху з’яўляецца чорт, кроўю і пугай фарбуе свежы шампіньён</string>
+    <string name="recommended">Рэкамендавана</string>
+    <string name="player_loaded_subtitles" formatted="true">Загружана %s</string>
+    <string name="player_load_subtitles">Загрузіць з файла</string>
+    <string name="player_load_subtitles_online">Спампаваць з інтэрнэту</string>
+    <string name="player_load_one_subtitle_online">Спампаваць першыя даступныя</string>
+    <string name="downloaded_file">Спампаваны файл</string>
+    <string name="actor_main">Галоўны</string>
+    <string name="actor_supporting">Другасны</string>
+    <string name="actor_background">Фонавы</string>
+    <string name="home_source">Крыніца</string>
+    <string name="home_random">Выпадковае</string>
+    <string name="coming_soon">Скора…</string>
+    <string name="quality_cam">Cam</string>
+    <string name="quality_cam_rip">Cam</string>
+    <string name="quality_cam_hd">Cam</string>
+    <string name="quality_hq">HQ</string>
+    <string name="quality_hd">HD</string>
+    <string name="quality_ts">TS</string>
+    <string name="quality_tc">TC</string>
+    <string name="quality_blueray">Blu-ray</string>
+    <string name="quality_workprint">WP</string>
+    <string name="quality_dvd">DVD</string>
+    <string name="quality_4k">4K</string>
+    <string name="quality_sd">SD</string>
+    <string name="quality_uhd">UHD</string>
+    <string name="quality_hdr">HDR</string>
+    <string name="quality_sdr">SDR</string>
+    <string name="quality_webrip">Web</string>
+    <string name="poster_image">Відарыс плаката</string>
+    <string name="qr_image">Відарыс QR-кода</string>
+    <string name="category_player">Прайгравальнік</string>
+    <string name="resolution_and_title">Раздзяляльнасць і загаловак</string>
+    <string name="title">Загаловак</string>
+    <string name="resolution">Раздзяляльнасць</string>
+    <string name="video_info">Звесткі пра медыя</string>
+    <string name="error_invalid_id">Памылковы ID</string>
+    <string name="error_invalid_data">Памылковыя дадзеныя</string>
+    <string name="error_invalid_url">Памылковы URL-адрэс</string>
+    <string name="error">Памылка</string>
+    <string name="subtitles_remove_captions">Прыбраць схаваныя цітры з субцітраў</string>
+    <string name="subtitles_remove_bloat">Прыбраць раздуванне з субцітраў</string>
+    <string name="subtitles_filter_lang">Фільтраваць па прыярытэтнай мове медыя</string>
+    <string name="extras">Дадатковае</string>
+    <string name="trailer">Трэйлер</string>
+    <string name="network_adress_example">https://pryklad.by/pryklad.mp4</string>
+    <string name="referer">Referer (неабавязкова)</string>
+    <string name="next">Далей</string>
+    <string name="provider_languages_tip">Праглядвайце відэа на гэтых мовах</string>
+    <string name="previous">Назад</string>
+    <string name="skip_setup">Прапусціць наладжванне</string>
+    <string name="app_layout_subtext">Змяніце выгляд праграмы пад вашу прыладу</string>
+    <string name="preferred_media_subtext">Што хочаце ўбачыць</string>
+    <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="plugin_loaded">Убудова загружана</string>
+    <string name="plugin_downloaded">Убудова спампавана</string>
+    <string name="plugin_deleted">Убудова выдалена</string>
+    <string name="plugin_load_fail" formatted="true">Не ўдалося загрузіць %s</string>
+    <string name="is_adult">18+</string>
+    <string name="batch_download_start_format" formatted="true">Пачатак спампоўвання %1$d%2$s…</string>
+    <string name="batch_download_finish_format" formatted="true">%1$d%2$s спампавана</string>
+    <string name="batch_download_nothing_to_download_format" formatted="true">Усе %s ужо спампаваныя</string>
+    <string name="no_plugins_found_error">У рэпазіторыі не знойдзена ўбудоў</string>
+    <string name="no_repository_found_error">Рэпазіторый не знойдзены, праверце URL-адрас і паспрабуйце VPN</string>
+    <string name="batch_download">Пакетная спампоўка</string>
+    <string name="plugin_singular">убудова</string>
+    <string name="plugin">убудовы</string>
+    <string name="delete_repository_plugins">Гэта таксама прывядзе да выдалення ўсіх убудоў рэпазіторыя</string>
+    <string name="delete_repository">Выдаліць рэпазіторый</string>
+    <string name="delete_plugin">Выдаліць убудову</string>
+    <string name="setup_extensions_subtext">Спампуйце спіс вэб-сайтаў, якімі вы хочаце карыстацца</string>
+    <string name="plugins_downloaded" formatted="true">Спампавана: %d</string>
+    <string name="plugins_disabled" formatted="true">Выключана: %d</string>
+    <string name="plugins_not_downloaded" formatted="true">Не спампавана: %d</string>
+    <string name="plugins_updated" formatted="true">Абноўлена %d убудоў</string>
+    <string name="blank_repo_message">Прадвызначана на CloudStream няма ўсталяваных вэб-сайтаў. Вам трэба ўсталяваць вэб-сайты з рэпазіторыяў. \n \nДалучыцеся да нашага сервера Discord або пашукайце ў сетцы.</string>
+    <string name="view_public_repositories_button">Праглядзець рэпазіторыі ад супольнасці</string>
+    <string name="view_public_repositories_button_short">Публічны спіс</string>
+    <string name="uppercase_all_subtitles">Усе субцітры верхнім рэгістрам</string>
+    <string name="download_all_plugins_from_repo">Увага: CloudStream не нясе адказнасці за выкарыстанне старонніх пашырэнняў і не пастаўляе для іх ніякай падтрымцы!</string>
+    <string name="single_plugin_disabled" formatted="true">%s (выключана)</string>
+    <string name="tracks">Трэкі</string>
+    <string name="audio_tracks">Аўдыятрэкі</string>
+    <string name="video_tracks">Відэатрэкі</string>
+    <string name="apply_on_restart">Перазапусціце праграму, каб убачыць змены.</string>
+    <string name="restart">Перазапусціць</string>
+    <string name="stop">Спыніць</string>
+    <string name="safe_mode_title">Бяспечны рэжым уключаны</string>
+    <string name="safe_mode_description">Усе пашырэнні былі выключаны праз збой, каб вы змаглі знайсці, якое з іх выклікае праблемы.</string>
+    <string name="safe_mode_crash_info">Праглядзець звесткі пра збой</string>
+    <string name="extension_rating" formatted="true">Рэйтынг: %s</string>
+    <string name="extension_description">Апісанне</string>
+    <string name="extension_version">Версія</string>
+    <string name="extension_status">Стан</string>
+    <string name="extension_size">Памер</string>
+    <string name="extension_authors">Аўтары</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_pref">Прыярытэтны прайгравальнік</string>
+    <string name="player_settings_play_in_app">Убудаваны прайгравальнік</string>
+    <string name="player_settings_always_ask">Заўсёды пытацца</string>
+    <string name="player_settings_select_cast_device">Выбраць прыладу для трансляцыі</string>
+    <string name="app_not_found_error">Праграмы не знойдзена</string>
+    <string name="all_languages_preference">Усе мовы</string>
+    <string name="skip_type_format" formatted="true">Прапусціць %s</string>
+    <string name="skip_type_op">Опенінг</string>
+    <string name="skip_type_ed">Заканчэнне</string>
+    <string name="skip_type_recap">Зводка</string>
+    <string name="skip_type_mixed_ed">Змешанае заканчэнне</string>
+    <string name="skip_type_mixed_op">Змешаны опенінг</string>
+    <string name="skip_type_credits">Удзельнікі</string>
+    <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="clipboard_too_large">Надта шмат тэксту. Не ўдалося захаваць да буфера абмену.</string>
+    <string name="clipboard_permission_error">Памылка доступу да буфера абмену, паспрабуйце яшчэ раз.</string>
+    <string name="clipboard_unknown_error">Памылка пры капіраванні, скапіруйце logcat і звярніцеся ў падтрымку.</string>
+    <string name="action_mark_as_watched">Пазначыць як прагледжанае</string>
+    <string name="action_remove_from_watched">Прыбраць з прагледжанага</string>
+    <string name="confirm_exit_dialog">Вы ўпэўнены, што хочаце выйсці?</string>
+    <string name="yes">Так</string>
+    <string name="no">Не</string>
+    <string name="ok">ОК</string>
+    <string name="dismiss">Адхіліць</string>
+    <string name="open_downloaded_repo">Адкрыць рэпазіторый</string>
+    <string name="battery_dialog_title">Выключыць аптымізацыю батарэі</string>
+    <string name="battery_dialog_message">Каб забяспечыць бесперапынныя спампоўкі і апавяшчэнні аб тэлеперадачах, на якія вы падпісаны, CloudStream патрэбны дазвол на выкананне ў фонавым рэжыме. Па націсканні «ОК», вам пакажацца дыялогавае акно. Націсніце «Дазволіць».\n\nЗвярніце ўвагу — гэта не значыць, што CS3 будзе садзіць вашу батарэю. Праграма будзе працаваць у фоне толькі калі патрэбна, напрыклад пры атрыманні апавяшчэнняў або спампоўванні відэа з афіцыйных пашырэнняў.</string>
+    <string name="app_unrestricted_toast">Выкарыстанне батарэі ўжо выстаўлена як неабмежаванае</string>
+    <string name="app_info_intent_error">Не ўдалося адкрыць звесткі пра праграму CloudStream.</string>
+    <string name="update_notification_downloading">Спампоўванне абнаўлення праграмы…</string>
+    <string name="update_notification_installing">Усталяванне абнаўлення праграмы…</string>
+    <string name="update_notification_failed">Не ўдалося ўсталяваць новую версію праграмы</string>
+    <string name="apk_installer_legacy">Састарэлая версія</string>
+    <string name="apk_installer_package_installer">Усталёўшчык пакетаў</string>
+    <string name="delayed_update_notice">Праграма будзе абноўлена пасля выхаду</string>
+    <string name="sort_by">Сартаваць па</string>
+    <string name="sort">Сартаваць</string>
+    <string name="sort_rating_desc">Рэйтынгу (ад высокага да нізкага)</string>
+    <string name="sort_rating_asc">Рэйтынгу (ад нізкага да высокага)</string>
+    <string name="sort_updated_new">Абнаўленню (ад новага да старога)</string>
+    <string name="sort_updated_old">Абнаўленню (ад старога да новага)</string>
+    <string name="sort_alphabetical_a">Алфавіту (ад А да Я)</string>
+    <string name="sort_alphabetical_z">Алфавіту (ад Я да А)</string>
+    <string name="sort_episodes_number_asc">Серыі (па ўзрастанні)</string>
+    <string name="sort_episodes_number_desc">Серыі (па ўбыванні)</string>
+    <string name="sort_episodes_rating_high_low">Рэйтынгу (найвышэйшы)</string>
+    <string name="sort_episodes_rating_low_high">Рэйтынгу (найніжэйшы)</string>
+    <string name="sort_episodes_date_newest">Даце паказу (найноўшыя)</string>
+    <string name="sort_episodes_date_oldest">Даце паказу (найстарэйшыя)</string>
+    <string name="sort_button_episode">Сер. %s</string>
+    <string name="sort_button_rating">Рэйтынг %s</string>
+    <string name="sort_button_date">Дата %s</string>
+    <string name="select_library">Выбраць бібліятэку</string>
+    <string name="open_with">Адкрыць праз</string>
+    <string name="empty_library_no_accounts_message">Ваша бібліятэка пустая :( \nУвайдзіце ва ўліковы запіс з бібліятэкай або дадайце праграмы да вашай лакальнай бібліятэкі.</string>
+    <string name="empty_library_logged_in_message">Гэты спіс пусты. Паспрабуйце пераключыцца на іншы.</string>
+    <string name="safe_mode_file">Знойдзены файл бяспечнага рэжыму! \nПашырэнні не будуць загружацца на запуску, пакуль файл не будзе выдалены.</string>
+    <string name="revert">Вярнуць</string>
+    <string name="subscription_in_progress_notification">Ідзе абнаўленне падпісак</string>
+    <string name="subscription_list_name">Вы падпісаны</string>
+    <string name="subscription_new">Вы падпісаліся на %s</string>
+    <string name="subscription_deleted">Вы адпісаліся ад %s</string>
+    <string name="subscription_episode_released">Выпушчана серыя %d!</string>
+    <string name="action_subscribe">Падпісацца</string>
+    <string name="action_unsubscribe">Адпісацца</string>
+    <string name="profile_number">Профіль %d</string>
+    <string name="wifi">Wi-Fi</string>
+    <string name="mobile_data">Мабільная перадача дадзеных</string>
+    <string name="set_default">Выбраць як прадвызначаны</string>
+    <string name="use">Выкарыстоўваць</string>
+    <string name="edit">Рэдагаваць</string>
+    <string name="profiles">Профілі</string>
+    <string name="help">Даведка</string>
+    <string name="quality_profile_help">Тут можна змяніць парадак крыніц. Калі ў відэа большы прыярытэт, яно будзе паказвацца вышэй пры выбары крыніцы. Прыярытэтам відэа з\'яўляецца сума прыярытэту крыніцы і прыярытэту якасці.\n\nКрыніца А: 3\nЯкасць Б: 7\nПрыярытэт відэа будзе 10.\n\nЗАЎВАГА: Калі сума раўняецца 10 ці болей прайгравальнік аўтаматычна прапусціць загрузку для гэтай спасылцы!</string>
+    <string name="qualities">Якасці</string>
+    <string name="profile_background_des">Фон профілю</string>
+    <string name="unable_to_inflate">Не ўдалося карэктна стварыць інтэрфейс, гэта СУР\'ЁЗНАЯ ХІБА, пра якую варта неадкладна паведаміць %s</string>
+    <string name="already_voted">Вы ўжо прагаласавалі</string>
+    <string name="favorites_list_name">Абраныя</string>
+    <string name="favorite_added">%s дададзена ў абранае</string>
+    <string name="favorite_removed">%s прыбрана з абранага</string>
+    <string name="action_add_to_favorites">Дадаць у абранае</string>
+    <string name="action_remove_from_favorites">Прыбраць з абранага</string>
+    <string name="duplicate_title">Знойдзены магчымы дублікат</string>
+    <string name="duplicate_add">Дадаць</string>
+    <string name="duplicate_replace">Замяніць</string>
+    <string name="duplicate_replace_all">Замяніць усё</string>
+    <string name="duplicate_message_single" formatted="true">Падобна на тое, што ў вашай бібліятэцы ёсць дублікат гэтага элемента: ‹%s.›\n\nЦі хочаце вы ўсё роўна яго дадаць, замяніць ужо існуючы, або скасаваць дзеянне?</string>
+    <string name="duplicate_message_multiple" formatted="true">У вашай бібліятэцы знойдзены магчымыя дублікаты: \n\n%s \n\nЦі хочаце вы ўсё роўна яго дадаць, замяніць ужо існуючыя, або скасаваць дзеянне?</string>
+    <string name="enter_pin">Увядзіце PIN-код</string>
+    <string name="enter_pin_with_name" formatted="true">Увядзіце PIN-код для %s</string>
+    <string name="enter_current_pin">Увядзіце бягучы PIN-код</string>
+    <string name="lock_profile">Заблакіраваць профіль</string>
+    <string name="pin">PIN-код</string>
+    <string name="pin_error_incorrect">Няправільны PIN-код. Паспрабуйце яшчэ раз.</string>
+    <string name="pin_error_length">PIN-код павінны быць з 4 сімвалаў</string>
+    <string name="select_an_account">Выберыце ўліковы запіс</string>
+    <string name="no_account">Без ўліковага запісу</string>
+    <string name="manage_accounts">Кіраванне ўліковымі запісамі</string>
+    <string name="edit_account">Рэдагаваць уліковы запіс</string>
+    <string name="logged_account" formatted="true">Вы ўвайшлі як %s</string>
+    <string name="skip_startup_account_select_pref">Прапускаць выбар уліковага запісу пры запуске</string>
+    <string name="use_default_account">Выкарыстоўваць прадвызначаны ўліковы запіс</string>
+    <string name="rotate_video">Павярнуць</string>
+    <string name="rotate_video_desc">Паказваць кнопку пераключэння арыентацыі экрана</string>
+    <string name="auto_rotate_video_desc">Уключыць аўтаматычнае пераключэнне арыентацыі экрана ў залежнасці ад арыентацыі відэа</string>
+    <string name="auto_rotate_video">Аўтапаварот</string>
+    <string name="favorite">Дадаць у абраныя</string>
+    <string name="unfavorite">Выдаліць з абранага</string>
+    <string name="biometric_authentication_title">Разблакіруйце CloudStream</string>
+    <string name="biometric_setting">Блакіроўка біяметрыяй</string>
+    <string name="password_pin_authentication_title">Праверка сапраўднасці паролем/PIN-кодам</string>
+    <string name="biometric_unsupported">Праверка сапраўднасці біяметрыяй не падтрымліваецца на гэтай прыладзе</string>
+    <string name="biometric_setting_summary">Разблакіруйце праграму адбіткам пальца, Face ID, PIN-кодам, узорам разблакіроўкі або паролем.</string>
+    <string name="biometric_prompt_description">Праз некалькі няўдалых спроб акно з запытам закрыецца. Проста перазапусціце праграму, каб паўтарыць спробу.</string>
+    <string name="biometric_warning">Вашы дадзеныя CloudStream былібылі толькі што зарэзерваваныя. Нягледзячы на тое, што магчымасць вельмі маленькая, усе прылады могуць паводзіць сябе па-рознаму. У рэдкасным выпадку, калі вы страціце доступ да праграмы, поўнасцю ачысціце даныя і аднавіце іх праз рэзервовую копію. Выбачайце за любую нязручнасць, якая можа з гэтага атрымацца.</string>
+    <string name="reset_btn">Скінуць</string>
+    <string name="cs3wiki">CloudStream-Вікі</string>
+    <string name="device_pin_url_message">Наведайце <b>%s</b> на вашым смартфоне або камп\'ютары і ўвядзіце код вышэй</string>
+    <string name="device_pin_error_message">Не ўдалося атрымаць PIN-код прылады, паспрабуйце лакальную праверку сапраўднасці</string>
+    <string name="device_pin_expired_message">PIN-код састарэў!</string>
+    <string name="device_pin_counter_text">Код мінуе праз %1$dхв %2$dс</string>
+    <string name="sort_release_date_new">Даце выпуску (ад новага да старога)</string>
+    <string name="sort_release_date_old">Даце выпуску (ад старога да новага)</string>
+    <string name="hide_player_control_names">Схаваць назвы элементаў кіравання прайгравальніка</string>
+    <string name="preview_seekbar">Перадпрагляд на шкале часу</string>
+    <string name="preview_seekbar_desc">Уключыць мініяцюру папярэдняга прагляду на шкале часу</string>
+    <string name="no_subtitles_loaded">Субцітраў яшчэ не загружана</string>
+    <string name="backup_path_title">Размяшчэнне папкі з рэзервовымі копіямі</string>
+    <string name="custom">Уласнае</string>
+    <string name="confirm_before_exiting_title">Пацвярджэнне перад выхадам</string>
+    <string name="confirm_before_exiting_desc">Паказваць дыялог перад выхадам з праграмы</string>
+    <string name="show">Паказваць</string>
+    <string name="dont_show">Не паказваць</string>
+    <string name="subs_edge_size">Памер краёў</string>
+    <string name="torrent_preferred_media">Уключыце Torrent у Наладах/Пастаўшчыкі/Прыярытэтнае медыя</string>
+    <string name="torrent_not_accepted">Перазапусціце праграму і прыміце ўсплывальнае акно «Трансліраваць Torrent», каб працягнуць.</string>
+    <string name="software_decoding">Праграмная дэкадзіроўка</string>
+    <string name="software_decoding_desc">Праграмная дэкадзіроўка дазваляе прайгравальніку паказваць відэафайлы, якія не падтрымліваюцца на вашай прыладзе, але можа выклікаць затрымкі або рабіць прайграванне нестабільным на высокіх раздзяляльнасцях.</string>
+    <string name="volume_exceeded_100">Гучнасць перавысіла 100%</string>
+    <string name="slide_up_again_to_exceed_100">Правядзіце пальцам уверх яшчэ раз, каб зрабіць гучнасць больш за 100%</string>
+    <string name="update_plugins">Абнавіць убудовы</string>
+    <string name="update_plugins_manually">Абнавіць убудовы ўручную</string>
+    <string name="starting_plugin_update_manually">Пачынаецца абнаўленне ўбудоў!</string>
+    <string name="plugins_updated_manually">Абноўлена %d убудова(ы/ў)!</string>
+    <string name="no_plugins_updated_manually">Ніводнай убудовы не было абноўлена.</string>
+    <string name="player_notification_channel_name">Апавяшчэнні прайгравальніка</string>
+    <string name="player_notification_channel_description">Апавяшчэнне прайгравальніка для кіравання прайграваннем у фонавым рэжыме</string>
+    <string name="subtitles_from_embedded">Убудаваны</string>
+    <string name="subtitles_from_online">Сеткавы</string>
+    <string name="all_subtitles_bold">Зрабіць усе субцітры тоўстымі</string>
+    <string name="all_subtitles_italic">Зрабіць усе субцітры курсіўнымі</string>
+    <string name="background_radius">Радыус фону</string>
+    <string name="download_parallel_settings_des">Колькі разных элементаў можна спампоўваць паралельна</string>
+    <string name="parallel_downloads">Паралельныя спампоўкі</string>
+    <string name="concurrent_connections">Адначасовыя злучэнні</string>
+    <string name="concurrent_connections_settings_des">Колькі адначасовых злучэнняў можа выкарыстоўваць кожнае спампоўванне</string>
+    <string name="go_to_downloads">Перайсці ў спампоўкі</string>
+    <string name="no_internet_connection">Інтэрнет-злучэнне адсутнічае.\n\nЗлучыцеся з інтэрнэтам і паспрабуйце яшчэ раз, або паглядзіце свае спампоўкі, пакуль вы па-за сеткай.</string>
+    <string name="overscan_settings_des">Змяняе краі экрана</string>
+    <string name="overscan_settings">Абрэзка відарыса</string>
+    <string name="poster_size_settings_des">Змяняе памер плакатаў</string>
+    <string name="poster_size_settings">Памер плаката</string>
+    <string name="speedup_title">Пераключэнне хуткасці пры доўгім націсканні</string>
+    <string name="speedup_summary">Утрымлівайце, каб пераключыцца на 2-кратную хуткасць</string>
+    <string name="edit_profile_image_title">Рэдагаваць відарыс профілю</string>
+    <string name="edit_profile_image_hint">Увядзіце URL-адрас відарыса профілю</string>
+    <string name="edit_profile_image_error_empty">URL-адрас не знойдзены</string>
+    <string name="edit_profile_image_error_invalid">Памылковы URL-адрас або відарыс</string>
+    <string name="edit_profile_image_success">Відарыс абноўлены</string>
+    <string name="action_mark_watched_up_to_this_episode">Пазначыць прагледжаным усё да гэтай серыі</string>
+    <string name="action_remove_mark_watched_up_to_this_episode">Прыбраць пазнаку «Прагледжана» з усіх серый да гэтай</string>
+    <string name="action_reload">Перазагружана</string>
+    <string name="reload_provider">Перазагрузіць пастаўшчыка</string>
+    <string name="name">Назва</string>
+    <string name="source_name">Назва крыніцы</string>
+    <string name="resolution_and_name">Раздзяляльнасць і назва</string>
+    <string name="subs_subtitle_alignment">Выраўноўванне</string>
+    <string name="bottom_left">Знізу злева</string>
+    <string name="bottom_center">Знізу па цэнтру</string>
+    <string name="bottom_right">Знізу справа</string>
+    <string name="middle_left">У сярэдзіне злева</string>
+    <string name="middle_center">У сярэдзіне па цэнтру</string>
+    <string name="middle_right">У сярэдзіне справа</string>
+    <string name="top_left">Зверху злева</string>
+    <string name="top_center">Зверху па цэнтру</string>
+    <string name="top_right">Зверху справа</string>
+    <string name="download_queue">Чагра спампоўванняў</string>
+    <string name="queue_empty_message">У чарзе пакуль што няма спампоўванняў.</string>
+    <string name="source_priority">Прыярытэт крыніц</string>
+    <string name="source_priority_help">Выберыце, як сартаваць крыніцы відэа ў прайгравальніку</string>
+    <string name="download_all">Спампаваць усё</string>
+    <string name="cancel_all">Скасаваць усё</string>
+    <string name="download_episode_range">Спампаваць %s серыю?</string>
+    <string name="cancel_queue_message">Скасаваць усе спампоўванні ў чарзе?</string>
+    <plurals name="downloads_active">
+        <item quantity="one">%d актыўнае спампоўванне</item>
+        <item quantity="few">%d актыўных спампоўвання</item>
+        <item quantity="many">%d актыўных спампоўванняў</item>
+        <item quantity="other">%d актыўных спампоўванняў</item>
+    </plurals>
+    <plurals name="downloads_queued">
+        <item quantity="one">%d спампоўванне ў чарзе</item>
+        <item quantity="few">%d спампоўвання ў чарзе</item>
+        <item quantity="many">%d спампоўванняў у чарзе</item>
+        <item quantity="other">%d спампоўванняў у чарзе</item>
+    </plurals>
+    <string name="show_player_metadata_overlay">Паказваць накладанне з метададзенымі ў прайгравальніку</string>
+    <string name="video_singular">Відэа</string>
+    <string name="skip_type_preview">Перадпрагляд</string>
+    <string name="player_is_live">Ужывую</string>
+</resources>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
new file mode 100644
index 00000000000..495eb5e3c0b
--- /dev/null
+++ b/app/src/main/res/values-ca/strings.xml
@@ -0,0 +1,331 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_dub_sub_episode_text_format" formatted="true">%1$sEp.%2$d</string>
+    <string name="cast_format" formatted="true">Repartiment:%s</string>
+    <string name="next_episode_format" formatted="true">L\'episodi %d s\'estrenarà en</string>
+    <string name="next_season_episode_format" formatted="true">La temporada %1$d, Episodi %2$d s\'estrenarà en</string>
+    <string name="next_episode_time_day_format" formatted="true">%1$dd%2$dh%3$dm</string>
+    <string name="next_episode_time_hour_format" formatted="true">%1$dh%2$dm</string>
+    <string name="next_episode_time_min_format" formatted="true">%dm</string>
+    <string name="download_time_left_hour_min_sec_format" formatted="true">%1$dh%2$dm%3$ds</string>
+    <string name="download_time_left_min_sec_format" formatted="true">%1$dm%2$ds</string>
+    <string name="download_time_left_sec_format" formatted="true">%1$ds</string>
+    <string name="result_poster_img_des">Cartell</string>
+    <string name="search_poster_img_des">Cartell</string>
+    <string name="episode_poster_img_des">Cartell de l\'episodi</string>
+    <string name="home_main_poster_img_des">Cartell principal</string>
+    <string name="home_next_random_img_des">Proper aleatori</string>
+    <string name="go_back_img_des">Tornar</string>
+    <string name="play_from_beginning_img_des">Reproduïr des del començament</string>
+    <string name="home_change_provider_img_des">Canvia el proveïdor</string>
+    <string name="preview_background_img_des">Fons de la previsualització</string>
+    <string name="player_speed_text_format" formatted="true">Velocitat (%.2fx)</string>
+    <string name="rated_format" formatted="true">Valoració: %.1f</string>
+    <string name="new_update_format" formatted="true">S\'ha trobat una nova actualització!\n%1$s-&gt;%2$s</string>
+    <string name="filler" formatted="true">Episodi especial</string>
+    <string name="duration_format" formatted="true">%d min</string>
+    <string name="app_name">CloudStream</string>
+    <string name="play_with_app_name">Reprodueix amb CloudStream</string>
+    <string name="title_home">Inici</string>
+    <string name="title_search">Cercar</string>
+    <string name="title_downloads">Descàrregues</string>
+    <string name="title_settings">Configuració</string>
+    <string name="search_hint">Cercar…</string>
+    <string name="search_hint_site" formatted="true">Cercar a %s…</string>
+    <string name="speech_recognition_unavailable">Reconeixement de veu no disponible</string>
+    <string name="begin_speaking">Comenci a parlar…</string>
+    <string name="no_data">Sense dades</string>
+    <string name="episode_more_options_des">Més opcions</string>
+    <string name="next_episode">Proper episodi</string>
+    <string name="result_tags">Gèneres</string>
+    <string name="result_share">Comparteix</string>
+    <string name="result_open_in_browser">Obre al navegador</string>
+    <string name="browser">Navegador</string>
+    <string name="skip_loading">Omet la càrrega</string>
+    <string name="loading">Carregant…</string>
+    <string name="type_watching">Mirant</string>
+    <string name="type_on_hold">En espera</string>
+    <string name="type_completed">Completat</string>
+    <string name="type_dropped">Descartat</string>
+    <string name="type_plan_to_watch">Planeja mirar</string>
+    <string name="type_re_watching">Tornant a mirar</string>
+    <string name="play_movie_button">Reprodueix pel·licula</string>
+    <string name="play_trailer_button">Reprodueix tràiler</string>
+    <string name="play_livestream_button">Reprodueix Livestream</string>
+    <string name="play_torrent_button">Transmet Torrent</string>
+    <string name="torrent_info">Aquest vídeo és un Torrent, i implica que la vostra activitat pot ésser rastrejada\nAssegureu-vos d\'entendre com funcionen els Torrents abans de continuar.</string>
+    <string name="pick_source">Fonts</string>
+    <string name="pick_subtitle">Subtítols</string>
+    <string name="reload_error">Torna a intentar la connexió…</string>
+    <string name="go_back">Torna</string>
+    <string name="play_episode">Reprodueix l\'episodi</string>
+    <string name="download">Descarregar</string>
+    <string name="downloading">Descarregant</string>
+    <string name="download_paused">Descàrrega en espera</string>
+    <string name="download_started">S\'ha iniciat la descàrrega</string>
+    <string name="download_failed">Descarrega fallida</string>
+    <string name="download_canceled">Descàrrega cancel·lada</string>
+    <string name="download_done">Descàrrega completada</string>
+    <string name="downloads_delete_select">Selecciona els elements a eliminar</string>
+    <string name="downloads_empty">No hi ha descàrregues en curs.</string>
+    <string name="offline_file">Disponible fora de línia</string>
+    <string name="select_all">Seleccionar tot</string>
+    <string name="deselect_all">Deseleccionar tot</string>
+    <string name="update_started">Actualització iniciada</string>
+    <string name="stream">Transmissió</string>
+    <string name="open_local_video">Obre vídeo local</string>
+    <string name="error_loading_links_toast">Error carregant els enllaços</string>
+    <string name="links_reloaded_toast">S\'han tornat a carregar els enllaços</string>
+    <string name="download_storage_text">emmagatzematge intern</string>
+    <string name="app_dubbed_text">Doblat</string>
+    <string name="app_subbed_text">Sub.</string>
+    <string name="popup_delete_file">Esborra el fitxer</string>
+    <string name="popup_play_file">Reprodueix el fitxer</string>
+    <string name="popup_resume_download">Continua la descàrrega</string>
+    <string name="popup_pause_download">Posa la descàrrega en espera</string>
+    <string name="home_more_info">Més informació</string>
+    <string name="home_expanded_hide">Amaga</string>
+    <string name="home_play">Reprodueix</string>
+    <string name="home_info">Informació</string>
+    <string name="filter_bookmarks">Filtra els favorits</string>
+    <string name="error_bookmarks_text">Favorits</string>
+    <string name="action_remove_from_bookmarks">Elimina</string>
+    <string name="action_add_to_bookmarks">Defineix l\'estat de visualització</string>
+    <string name="sort_apply">Aplica</string>
+    <string name="sort_copy">Copia</string>
+    <string name="sort_close">Tanca</string>
+    <string name="sort_clear">Buida</string>
+    <string name="sort_save">Desa</string>
+    <string name="repo_copy_label">Nom i URL del repositori</string>
+    <string name="toast_copied">Copiat!</string>
+    <string name="subscribe_tooltip">Notificació d\'episodi nou</string>
+    <string name="result_search_tooltip">Cerca en altres extensions</string>
+    <string name="recommendations_tooltip">Mostra les recomanacions</string>
+    <string name="player_speed">Velocitat de reproducció</string>
+    <string name="subtitles_settings">Configuració dels subtítols</string>
+    <string name="subs_text_color">Color del text</string>
+    <string name="subs_outline_color">Color de la vora</string>
+    <string name="subs_background_color">Color del fons</string>
+    <string name="subs_window_color">Color de la finestra</string>
+    <string name="subs_edge_type">Tipus de vora</string>
+    <string name="subs_subtitle_elevation">alçada del subtítol</string>
+    <string name="subs_font">Lletra</string>
+    <string name="subs_font_size">Tamany de la lletra</string>
+    <string name="search_provider_text_providers">Cerca amb proveïdors</string>
+    <string name="search_provider_text_types">Cerca per tipus</string>
+    <string name="benene_count_text">%d bananes donades als desenvolupadors</string>
+    <string name="benene_count_text_none">No s\'han donat bananes</string>
+    <string name="subs_auto_select_language">Selecciona l\'idioma automàticament</string>
+    <string name="subs_download_languages">Descarrega els idiomes</string>
+    <string name="subs_subtitle_languages">Idioma dels subtítols</string>
+    <string name="subs_hold_to_reset_to_default">Manteniu premut per restablir els valors per defecte</string>
+    <string name="subs_import_text" formatted="true">Importeu tipus de lletra desant-les a %s</string>
+    <string name="continue_watching">Continua mirant</string>
+    <string name="action_remove_watching">Eliminar</string>
+    <string name="action_open_watching">Més info</string>
+    <string name="action_open_play">\@string/home_play</string>
+    <string name="vpn_might_be_needed">Potser necessiteu una VPN per que aquest proveïdor funcioni correctament</string>
+    <string name="vpn_torrent">Aquest proveïdor és un Torrent, es recomana fer servir una VPN</string>
+    <string name="provider_info_meta">El lloc no proveeix metadades, la càrrega del video fallarà si no existeix al lloc.</string>
+    <string name="torrent_plot">Descripció</string>
+    <string name="normal_no_plot">No hi ha descripció de la trama</string>
+    <string name="torrent_no_plot">No hi ha descripció</string>
+    <string name="show_log_cat">Mostra el registre logcat 🐈</string>
+    <string name="test_log">Registre</string>
+    <string name="picture_in_picture">PIP (Imatge dins d\'imatge)</string>
+    <string name="picture_in_picture_des">Continua la reproducció en una finestra en miniatura per sobre de altres aplicacions</string>
+    <string name="player_size_settings">Botó de canvi de mida del reproductor</string>
+    <string name="audio_book_singular">Audiollibre</string>
+    <string name="custom_media_singular">Mitjà</string>
+    <string name="audio_singular">Àudio</string>
+    <string name="podcast_singular">Pòdcast</string>
+    <string name="source_error">Error a l\'origen</string>
+    <string name="remote_error">Error remot</string>
+    <string name="render_error">Error de renderitzat</string>
+    <string name="encoding_error">Error de codificació</string>
+    <string name="unsupported_error">Error no suportat</string>
+    <string name="unexpected_error">Error inesperat del reproductor</string>
+    <string name="storage_error">Error de descàrrega, verifiqueu els permisos de emmagatzematge</string>
+    <string name="episode_action_chromecast_episode">Envia l\'episodi al Chromecast</string>
+    <string name="episode_action_chromecast_mirror">Duplica al Chromecast</string>
+    <string name="episode_action_cast_mirror">Transmet la duplicació del vídeo</string>
+    <string name="episode_action_play_in_app">Reprodueix a l\'aplicació</string>
+    <string name="episode_action_play_mirror">Reprodueix en duplicat</string>"
+    <string name="episode_action_play_in_format">Reprodueix en %s</string>
+    <string name="episode_action_auto_download">Descàrrega automàtica</string>
+    <string name="episode_action_download_mirror">Descarrega el duplicat</string>
+    <string name="episode_action_reload_links">Torna a carregar els enllaços</string>
+    <string name="episode_action_download_subtitle">Descarrega els subtítols</string>
+    <string name="show_hd">Etiqueta de qualitat</string>
+    <string name="show_dub">Etiqueta de doblatge</string>
+    <string name="show_sub">Etiqueta de subtítol</string>
+    <string name="show_rating">Etiqueta de valoració</string>
+    <string name="show_title">Títol</string>
+    <string name="poster_ui_settings">Activa o desactiva elements al cartell</string>
+    <string name="no_update_found">No s\'ha trobat cap actualització</string>
+    <string name="check_for_update">Comprova si hi ha actualitzacions</string>
+    <string name="video_lock">Bloqueja</string>
+    <string name="video_aspect_ratio_resize">Canvia la mida</string>
+    <string name="video_source">Font</string>
+    <string name="video_skip_op">Omet la obertura</string>
+    <string name="dont_show_again">No el tornis a mostrar</string>
+    <string name="skip_update">Omet aquesta actualització</string>
+    <string name="update">Actualitza</string>
+    <string name="watch_quality_pref">Qualitat de vídeo preferida (WiFi)</string>
+    <string name="watch_quality_pref_data">Qualitat de vídeo preferida (dades mòbils)</string>
+    <string name="limit_title">Caràcters màxims al títol del reproductor</string>
+    <string name="limit_title_rez">Resolució del reproductor de vídeo</string>
+    <string name="pref_category_defaults">Valors per defecte</string>
+    <string name="pref_category_looks">Aspecte</string>
+    <string name="pref_category_ui_features">Funcions</string>
+    <string name="category_general">General</string>
+    <string name="random_button_settings">Botó aleatori</string>
+    <string name="random_button_settings_desc">Mostra el botó \'aleatori\' a l\'inici i a la llibreria</string>
+    <string name="provider_lang_settings">Idiomes de la extensió</string>
+    <string name="app_layout">Disseny de l\'aplicació</string>
+    <string name="preferred_media_settings">Mitjà preferit</string>
+    <string name="enable_nsfw_on_providers">Permet contingut per adults (NSFW) a les extensions compatibles</string>
+    <string name="subtitles_encoding">Codificació dels subtítols</string>
+    <string name="category_providers">Proveïdors</string>
+    <string name="category_provider_test">Comprova els proveïdors</string>
+    <string name="test_extensions">Comprova totes les extensions</string>
+    <string name="test_extensions_summary">Aquesta prova està destinada als desenvolupadors, i no valida el funcionament de cap extensió.</string>
+    <string name="category_ui">Disseny</string>
+    <string name="automatic">Automàtic</string>
+    <string name="tv_layout">Disseny a la TV</string>
+    <string name="phone_layout">Disseny al telèfon</string>
+    <string name="emulator_layout">Disseny a l\'emulador</string>
+    <string name="primary_color_settings">Color principal</string>
+    <string name="app_theme_settings">aspecte de l\'aplicació</string>
+    <string name="bottom_title_settings">Ubicació del títol al cartell</string>
+    <string name="bottom_title_settings_des">Mostra el títol sota el cartell</string>
+    <string name="example_password">contrassenya123</string>
+    <string name="example_username">Nom d\'usuari</string>
+    <string name="example_email">hola@mon.cat</string>
+    <string name="example_ip">127.0.0.1</string>
+    <string name="example_site_name">NomDelLloc</string>
+    <string name="example_site_url">https://exemple.cat</string>
+    <string name="example_lang_name">Codi d\'idioma (ca_ES)</string>
+    <string name="login_format" formatted="true">%1$s%2$s</string>
+    <string name="account">compte</string>
+    <string name="logout">Tanca la sessió</string>
+    <string name="login">Inicia la sessió</string>
+    <string name="auth_locally">Autenticació local</string>
+    <string name="switch_account">Canvia el compte</string>
+    <string name="add_account">Afegeix un compte</string>
+    <string name="create_account">Crea un compte</string>
+    <string name="add_sync">Afegeix seguiment</string>
+    <string name="added_sync_format" formatted="true">Afegit %s</string>
+    <string name="upload_sync">Sincronitza</string>
+    <string name="sync_score">Valorat</string>
+    <string name="sync_score_format" formatted="true">%d / 10</string>
+    <string name="sync_total_episodes_none">/ ??</string>
+    <string name="sync_total_episodes_some" formatted="true">/ %d</string>
+    <string name="authenticated_user" formatted="true">%s autenticat</string>
+    <string name="authenticated_user_fail" formatted="true">No s\'ha pogut iniciar sessió a %s</string>
+    <string name="disable">Deshabilita</string>
+    <string name="none">Cap</string>
+    <string name="normal">Normal</string>
+    <string name="all">Tot</string>
+    <string name="max">Màx</string>
+    <string name="min">Mín</string>
+    <string name="subtitles_outline">Vora</string>
+    <string name="subtitles_depressed">Enfonsat</string>
+    <string name="subtitles_shadow">Ombra</string>
+    <string name="subtitles_raised">Elevat</string>
+    <string name="subtitle_offset">Sincronitza els subtítols</string>
+    <string name="subtitle_offset_hint">1000 mil·lisegons</string>
+    <string name="subtitle_offset_title">Retard dels subtítols</string>
+    <string name="subtitle_offset_extra_hint_later_format">Fes servir això si els subtítols es mostren %d mil·lisegons massa aviat</string>
+    <string name="subtitle_offset_extra_hint_before_format">Fes servir això si els subtítols es mostren %d mil·lisegons massa tard</string>
+    <string name="subtitles_example_text">Jove xef, porti whisky amb quinze glaçons d\'hidrogen, coi</string>
+    <string name="recommended">Recomanat</string>
+    <string name="player_loaded_subtitles" formatted="true">%s carregat</string>
+    <string name="player_load_subtitles">Carrega des del fitxer</string>
+    <string name="player_load_subtitles_online">Carrega des d\'internet</string>
+    <string name="player_load_one_subtitle_online">Carrega el primer disponible</string>
+    <string name="downloaded_file">Fitxer descarregat</string>
+    <string name="actor_main">Principal</string>
+    <string name="actor_supporting">actor secundari</string>
+    <string name="actor_background">antecendents de l\'actor</string>
+    <string name="home_source">Font</string>
+    <string name="home_random">Aleatori</string>
+    <string name="coming_soon">Aviat…</string>
+    <string name="quality_cam">Càmera</string>
+    <string name="quality_cam_rip">Extret de càmera</string>
+    <string name="quality_cam_hd">Càmera HD</string>
+    <string name="quality_hq">Alta Qualitat (HQ)</string>
+    <string name="quality_hd">Alta Definició (HD)</string>
+    <string name="quality_ts">Telesync (TS)</string>
+    <string name="quality_tc">Telecine (TC)</string>
+    <string name="quality_blueray">Blu-ray</string>
+    <string name="quality_workprint">Còpia de treball (WP)</string>
+    <string name="quality_dvd">DVD</string>
+    <string name="quality_4k">4K</string>
+    <string name="quality_sd">Definició simple (SD)</string>
+    <string name="quality_uhd">Definició ultra alta (UHD)</string>
+    <string name="quality_hdr">Alt rang dinàmic (HDR)</string>
+    <string name="quality_sdr">Rang dinamic simple (SDR)</string>
+    <string name="quality_webrip">Web (webrip)</string>
+    <string name="poster_image">Imatge del cartell</string>
+    <string name="qr_image">imatge del codi QR</string>
+    <string name="category_player">Reproductor</string>
+    <string name="resolution_and_title">Resolució i títol</string>
+    <string name="title">Títol</string>
+    <string name="resolution">Resolució</string>
+    <string name="error_invalid_id">Identificador no vàlid</string>
+    <string name="error_invalid_data">Dades no vàlides</string>
+    <string name="error_invalid_url">URL no vàlida</string>
+    <string name="error">Error</string>
+    <string name="subtitles_remove_captions">Elimina la transcripció de l\'àudio (CC) dels subtítols</string>
+    <string name="subtitles_remove_bloat">Eliminar contingut irrellevant dels subtítols</string>
+    <string name="subtitles_filter_lang">Filtra per l\'idioma preferit</string>
+    <string name="extras">Extres</string>
+    <string name="trailer">Tràiler</string>
+    <string name="network_adress_example">https://exemple.cat/exemple.mp4</string>
+    <string name="referer">Referit (opcional)</string>
+    <string name="next">Següent</string>
+    <string name="provider_languages_tip">Veure vídeos en aquests idiomes</string>
+    <string name="previous">Anterior</string>
+    <string name="skip_setup">Omet la configuració</string>
+    <string name="app_layout_subtext">Canvia l\'aspecte de la aplicació perquè s\'adapti al vostre dispositiu</string>
+    <string name="preferred_media_subtext">Què vols veure</string>
+    <string name="setup_done">Fet</string>
+    <string name="extensions">Extensions</string>
+    <string name="add_repository">Afegir repositori</string>
+    <string name="set_default">Estableix opció per defecte</string>
+    <string name="use">Utilitza</string>
+    <string name="edit">Edita</string>
+    <string name="profiles">Perfils</string>
+    <string name="help">Ajuda</string>
+    <string name="quality_profile_help">Aqui pots modificar l\'ordre de les fonts. Si un vídeo té una prioritat superior, apareixerà abans a la selecció de fonts. La suma de la prioritat de font i la prioritat de qualitat és la prioritat de vídeo.\n\nFont: 3\nQualitat: 7\nTindría una prioritat de vídeo total de 10.\n\nNOTA: Si la suma és 10 o més, el reproductor ometrà autimàticament la càrrega quan es carregui l\'enllaç!</string>
+    <string name="qualities">Qualitats</string>
+    <string name="profile_background_des">Fons del perfil</string>
+    <string name="unable_to_inflate">La interfície d\'usuari no s\'ha pogut crear correctament, es tracta d\'un ERROR MAJOR que s\'ha de reportar immediatament %s</string>
+    <string name="already_voted">Ja heu votat</string>
+    <string name="favorites_list_name">Preferits</string>
+    <string name="favorite_added">%s afegit als favorits</string>
+    <string name="favorite_removed">%s eliminat dels favorits</string>
+    <string name="action_add_to_favorites">Afegir als favorits</string>
+    <string name="action_remove_from_favorites">Eliminar dels favorits</string>
+    <string name="duplicate_title">S\'ha trobat un possible duplicat</string>
+    <string name="duplicate_add">Afegir</string>
+    <string name="duplicate_replace">Reemplaça</string>
+    <string name="duplicate_replace_all">Reemplaça-ho tot</string>
+    <string name="duplicate_message_single" formatted="true">Un possible duplicat ja existeix a la vostra bibliotèca: \'%s\'.\n\nVol afegir aquest element de totes maneres, reemplaçar l\'existent o cancel·lar aquesta acció?</string>
+    <string name="duplicate_message_multiple" formatted="true">Diversos possibles duplicats ja existeixen a la vostra bibliotèca:\n\n%s\n\nVol afegir aquest element de totes maneres, reemplaçar els existents o cancel·lar aquesta acció?</string>
+    <string name="enter_pin">Introduïu el PIN</string>
+    <string name="enter_pin_with_name" formatted="true">Introduïu el PIN per %s</string>
+    <string name="enter_current_pin">Introduïu el PIN actual</string>
+    <string name="lock_profile">Bloqueja el perfil</string>
+    <string name="pin">PIN</string>
+    <string name="pin_error_incorrect">PIN incorrecte. Si us plau, torneu a intentar-ho.</string>
+    <string name="pin_error_length">El PIN ha de tenir 4 caràcters</string>
+    <string name="select_an_account">Seleccioneu un compte</string>
+    <string name="no_account">Sense compte</string>
+    <string name="manage_accounts">Gestiona els comptes</string>
+    <string name="edit_account">Edita el compte</string>
+    <string name="logged_account" formatted="true">Connectat com %s</string>
+    <string name="skip_startup_account_select_pref">Omet la selecció de comtpe a l\'inici</string>
+    <string name="use_default_account">Utilitza el compte per defecte</string>
+</resources>
diff --git a/app/src/main/res/values-fil/strings.xml b/app/src/main/res/values-fil/strings.xml
deleted file mode 100644
index 1ad7cbc8a52..00000000000
--- a/app/src/main/res/values-fil/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="hide_player_control_names_key" translatable="false">hide_player_control_names_key</string>
-    <string name="pin_error_incorrect">Maling PIN. Pakisubukang muli.</string>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
new file mode 100644
index 00000000000..a13f87bfab3
--- /dev/null
+++ b/app/src/main/res/values-sq/strings.xml
@@ -0,0 +1,738 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_dub_sub_episode_text_format" formatted="true">%1$s Ep %2$d</string>
+    <string name="cast_format" formatted="true">Kasti: %s</string>
+    <string name="next_episode_format" formatted="true">Episodi %d do të publikohet në</string>
+    <string name="next_season_episode_format" formatted="true">Sezoni %1$d Episodi %2$d do të publikohet në</string>
+    <string name="next_episode_time_day_format" formatted="true">%1$dd %2$do %3$dm</string>
+    <string name="next_episode_time_hour_format" formatted="true">%1$do %2$dm</string>
+    <string name="next_episode_time_min_format" formatted="true">%dm</string>
+    <string name="download_time_left_hour_min_sec_format" formatted="true">%1$do %2$dm %3$ds</string>
+    <string name="download_time_left_min_sec_format" formatted="true">%1$dm %2$ds</string>
+    <string name="download_time_left_sec_format" formatted="true">%1$ds</string>
+    <string name="result_poster_img_des">Posteri</string>
+    <string name="search_poster_img_des">Posteri</string>
+    <string name="episode_poster_img_des">Posteri i episodit</string>
+    <string name="home_main_poster_img_des">Posteri kryesor</string>
+    <string name="home_next_random_img_des">Tjetër rastësore</string>
+    <string name="go_back_img_des">Kthehu prapa</string>
+    <string name="play_from_beginning_img_des">Luaj nga fillimi</string>
+    <string name="home_change_provider_img_des">Ndrysho ofruesin</string>
+    <string name="preview_background_img_des">Parashikim sfondi</string>
+    <string name="player_speed_text_format" formatted="true">Shpejtësia (%.2fx)</string>
+    <string name="rated_format" formatted="true">Vlerësuar: %.1f</string>
+    <string name="new_update_format" formatted="true">U gjet update i ri!\n%1$s -&gt; %2$s</string>
+    <string name="filler" formatted="true">Filler</string>
+    <string name="duration_format" formatted="true">%d min</string>
+    <string name="app_name">CloudStream</string>
+    <string name="play_with_app_name">Luaj me CloudStream</string>
+    <string name="title_home">Kryefaqja</string>
+    <string name="title_search">Kërko</string>
+    <string name="title_downloads">Shkarkimet</string>
+    <string name="download_queue">Radhë shkarkimesh</string>
+    <string name="title_settings">Cilësimet</string>
+    <string name="search_hint">Kërko…</string>
+    <string name="search_hint_site" formatted="true">Kërko %s…</string>
+    <string name="speech_recognition_unavailable">Njohja e të folurit nuk është e disponueshme</string>
+    <string name="begin_speaking">Fillo të flasësh…</string>
+    <string name="no_data">Nuk ka të dhëna</string>
+    <string name="episode_more_options_des">Më shumë opsione</string>
+    <string name="next_episode">Episodi i radhës</string>
+    <string name="result_tags">Zhanri</string>
+    <string name="result_share">Shpërndaje</string>
+    <string name="result_open_in_browser">Hap në Browser</string>
+    <string name="browser">Browser</string>
+    <string name="skip_loading">Anashkalo ngarkimin</string>
+    <string name="loading">Duke u ngarkuar…</string>
+    <string name="type_watching">Duke parë</string>
+    <string name="type_on_hold">Në pritje</string>
+    <string name="type_completed">Përfunduar</string>
+    <string name="type_dropped">Braktisur</string>
+    <string name="type_plan_to_watch">Planifikoni të shikoni</string>
+    <string name="type_re_watching">Duke rishikuar</string>
+    <string name="play_movie_button">Luaj Filmin</string>
+    <string name="play_trailer_button">Luaj Trailerin</string>
+    <string name="play_livestream_button">Luaj Transmetimin Live</string>
+    <string name="play_torrent_button">Transmeto Torrent</string>
+    <string name="play_full_series_button">Luaj serinë e plotë</string>
+    <string name="torrent_info">Kjo video është një Torrent, kjo do të thotë që aktiviteti juaj i videos mund të gjurmohet.\nSigurohuni që kuptoni Torrent-in para se të vazhdoni.</string>
+    <string name="pick_source">Burime</string>
+    <string name="pick_subtitle">Titrat</string>
+    <string name="reload_error">Ripovo lidhjen…</string>
+    <string name="go_back">Kthehu mbrapa</string>
+    <string name="play_episode">Luaj Episodin</string>
+    <string name="download">Shkarko</string>
+    <string name="downloaded">U shkarkua</string>
+    <string name="downloading">Duke u shkarkuar</string>
+    <string name="download_paused">Shkarkimi u ndërpre</string>
+    <string name="download_started">Shkarkimi filloi</string>
+    <string name="download_failed">Shkarkimi dështoi</string>
+    <string name="download_canceled">Shkarkimi u anulua</string>
+    <string name="download_done">Shkarkimi u krye</string>
+    <string name="downloads_delete_select">Zgjidhni artikuj për të fshirë</string>
+    <string name="downloads_empty">Momentalisht nuk ka shkarkime.</string>
+    <string name="queue_empty_message">Momentalisht nuk ka shkarkime në radhë.</string>
+    <string name="offline_file">E disponueshme për shikim offline</string>
+    <string name="select_all">Zgjidh të gjitha</string>
+    <string name="deselect_all">Çzgjidh të gjitha</string>
+    <string name="update_started">Përditësimi filloi</string>
+    <string name="stream">Transmetim në rrjet</string>
+    <string name="open_local_video">Hap video lokale</string>
+    <string name="error_loading_links_toast">Gabim gjatë ngarkimit të lidhjeve</string>
+    <string name="links_reloaded_toast">Lidhjet u ringarkuan</string>
+    <string name="download_storage_text">Memorie e brendshme</string>
+    <string name="app_dubbed_text">Dublim</string>
+    <string name="app_subbed_text">Titra</string>
+    <string name="popup_delete_file">Fshi skedarin</string>
+    <string name="popup_play_file">Luaj skedarin</string>
+    <string name="popup_resume_download">Rifillo shkarkimin</string>
+    <string name="popup_pause_download">Ndalo shkarkimin</string>
+    <string name="home_more_info">Më shumë info</string>
+    <string name="home_expanded_hide">Fsheh</string>
+    <string name="home_play">Luaj</string>
+    <string name="home_info">Informacion</string>
+    <string name="filter_bookmarks">Filtro të ruajturat</string>
+    <string name="error_bookmarks_text">Të ruajturat</string>
+    <string name="action_remove_from_bookmarks">Hiq</string>
+    <string name="action_add_to_bookmarks">Vendos statusin e shikueshmërisë</string>
+    <string name="sort_apply">Apliko</string>
+    <string name="sort_copy">Kopjo</string>
+    <string name="sort_close">Mbyll</string>
+    <string name="sort_clear">Fshi</string>
+    <string name="sort_save">Ruaj</string>
+    <string name="repo_copy_label">Emri i repository-t dhe URL</string>
+    <string name="toast_copied">U kopjua!</string>
+    <string name="subscribe_tooltip">Njoftimi i episodeve të reja</string>
+    <string name="result_search_tooltip">Kërko në shtesat e tjera</string>
+    <string name="recommendations_tooltip">Shfaq rekomandime</string>
+    <string name="player_speed">Shpejtësia e luajtësit</string>
+    <string name="subtitles_settings">Cilësimet e titrave</string>
+    <string name="subs_text_color">Ngjyra e tekstit</string>
+    <string name="subs_outline_color">Ngjyra e konturit</string>
+    <string name="subs_background_color">Ngjyra e sfondit</string>
+    <string name="subs_window_color">Ngjyra e faqes</string>
+    <string name="subs_edge_type">Lloji i konturit</string>
+    <string name="subs_subtitle_elevation">Lartësia e titrave</string>
+    <string name="subs_font">Stili i shkrimit</string>
+    <string name="subs_font_size">Madhësia e shkrimit</string>
+    <string name="search_provider_text_providers">Kërko duke përdorur ofruesit</string>
+    <string name="search_provider_text_types">Kërko duke përdorur tipet</string>
+    <string name="benene_count_text">%d Banane të dhëna per developer-at</string>
+    <string name="benene_count_text_none">Asnjë Banane e dhënë</string>
+    <string name="subs_auto_select_language">Zgjedhje automatike e gjuhës</string>
+    <string name="subs_download_languages">Shkarko gjuhët</string>
+    <string name="subs_subtitle_languages">Gjuha e titrave</string>
+    <string name="subs_hold_to_reset_to_default">Mbaje shtupur për ti rikthyer në gjendjen fillestare</string>
+    <string name="subs_import_text" formatted="true">Importo stilin e shkrimit duke i vendosur në %s</string>
+    <string name="continue_watching">Vazhdo shikimin</string>
+    <string name="action_remove_watching">Hiq</string>
+    <string name="action_open_watching">Më shumë informacion</string>
+    <string name="action_open_play">\@string/home_play</string>
+    <string name="vpn_might_be_needed">Një VPN mund të nevojitet që ky ofrues të funksionojë në rregull</string>
+    <string name="vpn_torrent">Ky ofrues është Torrent, rekomandohet një VPN</string>
+    <string name="provider_info_meta">Metadata nuk ofrohet nga kjo faqe, ngarkimi i videos do të dështojë nëse nuk ekziston në këtë faqe.</string>
+    <string name="torrent_plot">Përshkrimi</string>
+    <string name="normal_no_plot">Skenari nuk u gjet</string>
+    <string name="torrent_no_plot">Përshkrimi nuk u gjet</string>
+    <string name="show_log_cat">Shfaq regjistrin Logcat 🐈</string>
+    <string name="test_log">Rregjistër</string>
+    <string name="picture_in_picture">Imazh-brenda-imazhit</string>
+    <string name="picture_in_picture_des">Vazhdo shikimin në një luajtës të vogël mbi aplikacionet e tjera</string>
+    <string name="player_size_settings">Butoni për ndryshimin e madhësisë së luajtësit</string>
+    <string name="player_size_settings_des">Hiq kufijtë e errët</string>
+    <string name="player_subtitles_settings">Titrat</string>
+    <string name="player_subtitles_settings_des">Cilësimet e titrave të luajtësit</string>
+    <string name="chromecast_subtitles_settings">Titrat e Chromecast</string>
+    <string name="chromecast_subtitles_settings_des">Cilësimet e titrave të Chromecast</string>
+    <string name="eigengraumode_settings">Shpejtësia e rikthimit</string>
+    <string name="speed_setting_summary">Shto një opsion shpejtësie në luajtës</string>
+    <string name="swipe_to_seek_settings">Rrëshqit për të kaluar</string>
+    <string name="swipe_to_seek_settings_des">Rrëshqit nga njëra anë në tjetrën për të lëvizur pozicionin e shikimit në video</string>
+    <string name="swipe_to_change_settings">Rrëshqit per te ndryshuar cilësimet</string>
+    <string name="swipe_to_change_settings_des">Rrëshqit lart ose poshtë në të djathtë ose të majtë për të ndryshuar nivelin e ndriçimit dhe volumin</string>
+    <string name="autoplay_next_settings">Luaj episodin tjetër automatikisht</string>
+    <string name="autoplay_next_settings_des">Luaj episodin tjetër kur episodi aktual mbaron</string>
+    <string name="double_tap_to_seek_settings">Shtyp dy herë për të kaluar</string>
+    <string name="double_tap_to_pause_settings">Shtyp dy herë për të ndaluar</string>
+    <string name="double_tap_to_seek_amount_settings">Sasia e kalimit të luajtësit (sekonda)</string>
+    <string name="double_tap_to_seek_settings_des">Shtyp dy herë në të djathtë ose të majtë për ta kaluar para ose mbrapa</string>
+    <string name="double_tap_to_pause_settings_des">Shtyp dy herë në mes për të ndaluar</string>
+    <string name="use_system_brightness_settings">Përdor nivelin e ndriçimit të sitemit</string>
+    <string name="use_system_brightness_settings_des">Përdor ndriçimin e sistemit në luajtësin e aplikacionit në vend të një mbivendosjeje të errët</string>
+    <string name="extra_brightness_settings">Ndriçim ekstra</string>
+    <string name="extra_brightness_settings_des">Aktivizo filtrin e ndriçimit kur ndriçimi i ekranit kalon 100%</string>
+    <string name="extra_brightness_key">extra_brightness_enabled</string>
+    <string name="episode_sync_settings">Përditëso progresin e shikimit</string>
+    <string name="episode_sync_settings_des">Sinkronizo automatikisht progresin e episodit aktual</string>
+    <string name="restore_settings">Rikthe të dhënat nga kopja rezervë</string>
+    <string name="backup_settings">Të dhënat e kopjes rezervë</string>
+    <string name="backup_frequency">Shpeshtësia e kopjimit rezervë</string>
+    <string name="restore_success">Kopja rezervë u ngarkua</string>
+    <string name="restore_failed_format" formatted="true">Dështoi rikthimi i të dhënave nga skedari %s</string>
+    <string name="backup_success">Të dhënat u ruajtën</string>
+    <string name="backup_failed">Lejet për ruajtje mungojnë. Ju lutem provoni përsëri.</string>
+    <string name="backup_failed_error_format">Gabim gjatë kopjimit rezervë të %s</string>
+    <string name="search">Kërko</string>
+    <string name="library">Bilblioteka</string>
+    <string name="category_account">Llogaritë dhe Siguria</string>
+    <string name="category_updates">Përditësime dhe Kopje Rezervë</string>
+    <string name="settings_info">Informacion</string>
+    <string name="advanced_search">Kërkim i avancuar</string>
+    <string name="advanced_search_des">Tregon rezultatet e kërkimit të ndara sipas ofruesit</string>
+    <string name="search_suggestions">Kërkime të sugjeruara</string>
+    <string name="search_suggestions_des">Trego sugjerimet ndërkohë që shkruani</string>
+    <string name="clear_suggestions">Pastro sugjerimet</string>
+    <string name="show_fillers_settings">Trego episodin Filler për anime</string>
+    <string name="show_player_metadata_overlay">Shfaq informacionin e Metadata-s mbi video</string>
+    <string name="show_trailers_settings">Shfaq trailerat</string>
+    <string name="kitsu_settings">Shfaq posterat nga Kitsu</string>
+    <string name="show_cast_in_details">Shfaq panelin e aktorëve</string>
+    <string name="pref_filter_search_quality">Mos shfaq cilësinë e videos së përzgjedhur në rezultatet e kërkimit</string>
+    <string name="automatic_plugin_updates">Përditësim automatik i shtesave</string>
+    <string name="automatic_plugin_download">Shkarkim automatik i shtesave</string>
+    <string name="automatic_plugin_download_mode_title">Zgjidh modalitetin për të filtruar shtesat që shkarkohen</string>
+    <string name="automatic_plugin_download_summary">Instalo automatikisht të gjitha shtesat që janë shtuar dhe ende nuk janë instaluar nga repository-t.</string>
+    <string name="updates_settings">Shfaq përditësimet e aplikacionit</string>
+    <string name="updates_settings_des">Kërko automatikisht për përditësime të reja kur hapet aplikacioni.</string>
+    <string name="redo_setup_process">Ribëj procesin e konfigurimit</string>
+    <string name="install_prerelease">Instalo versione beta</string>
+    <string name="prerelease_already_installed">Versioni beta është i instaluar.</string>
+    <string name="prerelease_install_failed">Dështoi instalimi i versionit beta.</string>
+    <string name="apk_installer_settings">Instaluesi i APK-ve</string>
+    <string name="apk_installer_settings_des">Disa pajisje nuk mbështesin instaluesin e ri të paketës. Provoni opsionin e vjetër nëse përditësimet nuk instalohen.</string>
+    <string name="github">Github</string>
+    <string name="lightnovel">Aplikacioni Light Novel nga të njëjtit developer-a</string>
+    <string name="anim">Aplikacioni i Anime-ve nga të njëjtit developer-a</string>
+    <string name="discord">Na u bashko në Discord</string>
+    <string name="benene">Jep një banane për developer-at</string>
+    <string name="benene_des">Banane të dhëna</string>
+    <string name="app_language">Gjuha e aplikacionit</string>
+    <string name="no_chromecast_support_toast">Ky ofrues nuk suporton Chromecast</string>
+    <string name="no_links_found_toast">Nuk u gjetën lidhje</string>
+    <string name="copy_link_toast">Lidhja u kopjua në kujtesën e përkohshme</string>
+    <string name="play_episode_toast">Luaj Episodin</string>
+    <string name="subs_default_reset_toast">Rikthe në vlerën fillestare</string>
+    <string name="season">Sezoni</string>
+    <string name="season_format">%1$s %2$d%3$s</string>
+    <string name="no_season">Asnje sezon</string>
+    <string name="episode">Episodi</string>
+    <string name="episodes">Episodet</string>
+    <string name="episodes_range">%1$d-%2$d</string>
+    <string name="episode_format" formatted="true">%1$d %2$s</string>
+    <string name="episode_upcoming_format" formatted="true">Vazhdon në %s</string>
+    <string name="season_short">S</string>
+    <string name="episode_short">E</string>
+    <string name="no_episodes_found">Nuk u gjet asnjë episod</string>
+    <string name="delete">Fshij</string>
+    <string name="delete_file">Fshi skedarin</string>
+    <string name="delete_files">Fshi skedarët</string>
+    <string name="delete_format" formatted="true">Fshij (%1$d | %2$s)</string>
+    <string name="cancel">Anulo</string>
+    <string name="pause">Ndalo</string>
+    <string name="start">Fillo</string>
+    <string name="test_failed">Dështoi</string>
+    <string name="test_passed">Kaloi</string>
+    <string name="test_warning">Paralajmërim</string>
+    <string name="resume">Vazhdo</string>
+    <string name="go_back_30">-30</string>
+    <string name="go_forward_30">+30</string>
+    <string name="delete_message" formatted="true">Kjo do të fshijë përgjithmonë %s\nJeni të sigurt?</string>
+    <string name="delete_message_multiple" formatted="true">Jeni të sigurt që dëshironi të fshini përgjithmonë artikujt e mëposhtëm?\n\n%s</string>
+    <string name="delete_message_series_episodes" formatted="true">Jeni të sigurt që dëshironi të fshini përgjithmonë episodet e mëposhtme në %1$s?\n\n%2$s</string>
+    <string name="delete_message_series_section" formatted="true">Do të fshini gjithashtu përgjithmonë të gjitha episodet në seritë e mëposhtme:\n\n%s</string>
+    <string name="delete_message_series_only" formatted="true">Jeni të sigurt që dëshironi të fshini përfundimisht të gjitha episodet në serinë e mëposhtme?\n\n%s</string>
+    <string name="resume_time_left" formatted="true">%dm\ntë mbetura</string>
+    <string name="resume_remaining" formatted="true">%s\ntë mbetura</string>
+    <string name="status_ongoing">Në vazhdim</string>
+    <string name="status_completed">Përfunduar</string>
+    <string name="status">Statusi</string>
+    <string name="year">Viti</string>
+    <string name="rating">Vlerësimi</string>
+    <string name="duration">Kohëzgjatja</string>
+    <string name="site">Faqja</string>
+    <string name="synopsis">Sinopsisi</string>
+    <string name="queued">në rradhë</string>
+    <string name="no_subtitles">Pa titra</string>
+    <string name="action_default">Parazgjedhur</string>
+    <string name="free_storage">Falas</string>
+    <string name="used_storage">Përdorur</string>
+    <string name="app_storage">Aplikacion</string>
+    <string name="movies">Filmat</string>
+    <string name="tv_series">Seriale televizive</string>
+    <string name="cartoons">Vizatimore</string>
+    <string name="anime">Anime</string>
+    <string name="torrent">Torrents</string>
+    <string name="documentaries">Dokumentarë</string>
+    <string name="ova">OVA</string>
+    <string name="asian_drama">Drama aziatike</string>
+    <string name="livestreams">Transmetime live</string>
+    <string name="nsfw">NSFW</string>
+    <string name="others">Tjera</string>
+    <string name="movies_singular">Film</string>
+    <string name="tv_series_singular">Seri</string>
+    <string name="cartoons_singular">Vizatimorë</string>
+    <string name="anime_singular">Anime</string>
+    <string name="ova_singular">OVA</string>
+    <string name="torrent_singular">Torrent</string>
+    <string name="documentaries_singular">Dokumentar</string>
+    <string name="asian_drama_singular">Dramë aziatike</string>
+    <string name="live_singular">Transmetim live</string>
+    <string name="nsfw_singular">NSFW</string>
+    <string name="other_singular">Video</string>
+    <string name="music_singular">Muzikë</string>
+    <string name="audio_book_singular">Libër audio</string>
+    <string name="custom_media_singular">Media</string>
+    <string name="audio_singular">Audio</string>
+    <string name="podcast_singular">Podkast</string>
+    <string name="source_error">Gabim në burim</string>
+    <string name="remote_error">Gabim në distancë</string>
+    <string name="render_error">Gabim në renderer</string>
+    <string name="encoding_error">Gabim në enkodim</string>
+    <string name="unsupported_error">Gabim i pasuportueshëm</string>
+    <string name="unexpected_error">Gabim i papritur i luajtësit</string>
+    <string name="storage_error">Gabim në shkarkim, kontrolloni lejet e memories</string>
+    <string name="episode_action_chromecast_episode">Episod Chromecast-i</string>
+    <string name="episode_action_chromecast_mirror">Pasqyrim Chromecast</string>
+    <string name="episode_action_cast_mirror">Pasqyrim Cast</string>
+    <string name="episode_action_play_in_app">Luaj në aplikacion</string>
+    <string name="episode_action_play_mirror">Luaj pasqyrimin</string>"
+    <string name="episode_action_play_in_format">Luaj në %s</string>
+    <string name="episode_action_auto_download">Shkarko automatikisht</string>
+    <string name="episode_action_download_mirror">Pasqyrim shkarkimi</string>
+    <string name="episode_action_reload_links">Ringarko lidhjet</string>
+    <string name="episode_action_download_subtitle">Shkarko titrat</string>
+    <string name="show_hd">Etiketa e cilësisë</string>
+    <string name="show_dub">Etiketa e dublimit</string>
+    <string name="show_sub">Etiketa e titrave</string>
+    <string name="show_rating">Etiketa e vlerësimit</string>
+    <string name="show_title">Titulli</string>
+    <string name="show_episode_text">Teksti i episodit</string>
+    <string name="poster_ui_settings">Zgjidh elementët e ndërfaqes mbi poster</string>
+    <string name="no_update_found">Nuk u gjet asnjë përditësim</string>
+    <string name="check_for_update">Kontrollo për përditësime</string>
+    <string name="video_lock">Çelës</string>
+    <string name="video_aspect_ratio_resize">Ndrysho madhësinë</string>
+    <string name="video_source">Burimi</string>
+    <string name="video_skip_op">Kalo Intron</string>
+    <string name="dont_show_again">Mos e shfaq përsëri</string>
+    <string name="skip_update">Anashkalo këtë përditësim</string>
+    <string name="update">Përditëso</string>
+    <string name="watch_quality_pref">Cilësia e preferuar e shikimit (WiFi)</string>
+    <string name="watch_quality_pref_data">Cilësia e preferuar e shikimit (Mobile Data)</string>
+    <string name="limit_title">Numri maksimal i karaktereve të titullit</string>
+    <string name="limit_title_rez">Shfaq informacionin e luajtësit</string>
+    <string name="video_buffer_size_settings">Madhësia e bufferit të videos</string>
+    <string name="video_buffer_length_settings">Gjatësia e bufferit të videos</string>
+    <string name="video_buffer_disk_settings">Video cache në disk</string>
+    <string name="video_buffer_clear_settings">Pastro cache-në e videove dhe imazheve</string>
+    <string name="android_tv_interface_on_seek_settings">Sasia e kalimit - Luajtësi i dukshëm</string>
+    <string name="android_tv_interface_on_seek_settings_summary">Sasia e kalimit kur luajtësi është i dukshëm</string>
+    <string name="android_tv_interface_off_seek_settings">Sasia e kalimit - Luajtësi i fshehur</string>
+    <string name="android_tv_interface_off_seek_settings_summary">Sasia e kalimit kur luajtësi është i fshehur</string>
+    <string name="video_ram_description">Shkakton keqfunksionim nëse vendoset shumë lartë në pajisje me memorie të ulët, si Android TV.</string>
+    <string name="video_disk_description">Shkakton probleme nëse vendoset shumë lartë në pajisje me memorie të ulët, si Android TV.</string>
+    <string name="dns_pref">DNS në vend të HTTPS</string>
+    <string name="dns_pref_summary">E dobishme për të anashkaluar bllokimet e ISP-së</string>
+    <string name="jsdelivr_proxy">GitHub Proxy</string>
+    <string name="jsdelivr_enabled">Nuk mund të arrihej GitHub. Po aktivizohet proxy jsDelivr…</string>
+    <string name="jsdelivr_proxy_summary">Anashkalon bllokimin e URL-ve të GitHub duke përdorur jsDelivr. Mund të shkaktojë vonesa të disa ditëve në përditësime.</string>
+    <string name="add_site_pref">Klono faqen</string>
+    <string name="remove_site_pref">Fshi faqen</string>
+    <string name="add_site_summary">Shto një klonim të një faqeje ekzistuese, me një URL tjetër</string>
+    <string name="download_path_pref">Destinacioni i shkarkimit</string>
+    <string name="nginx_url_pref">URL e serverit NGINX</string>
+    <string name="display_subbed_dubbed_settings">Shfaq Anime të Dubluar/me Titra</string>
+    <string name="resize_fit">Përshtat me ekranin</string>
+    <string name="resize_fill">Shtrij</string>
+    <string name="resize_zoom">Zmadho</string>
+    <string name="legal_notice">Mohim përgjegjësie</string>
+    <string name="pref_category_bypass">Tejkalues ISP-je</string>
+    <string name="pref_category_links">Lidhjet</string>
+    <string name="pref_category_app_updates">Përditësimet e aplikacionit</string>
+    <string name="pref_category_backup">Kopja rezervë</string>
+    <string name="pref_category_extensions">Shtesat</string>
+    <string name="pref_category_actions">Veprimet</string>
+    <string name="pref_category_cache">Cache</string>
+    <string name="pref_category_android_tv">Android TV</string>
+    <string name="pref_category_gestures">Gjeste</string>
+    <string name="pref_category_security">Siguria</string>
+    <string name="pref_category_accounts">Llogaritë</string>
+    <string name="pref_category_player_features">Veçoritë e luajtësit</string>
+    <string name="pref_category_subtitles">Titrat</string>
+    <string name="pref_category_player_layout">Paraqitja</string>
+    <string name="pref_category_defaults">Parazgjedhjet</string>
+    <string name="pref_category_looks">Pamja</string>
+    <string name="pref_category_ui_features">Veçoritë</string>
+    <string name="category_general">Të përgjithshme</string>
+    <string name="random_button_settings">Buton i rastësishëm</string>
+    <string name="random_button_settings_desc">Shfaq butonin e rastësishëm në Faqen kryesore dhe Bibliotekë</string>
+    <string name="select_library">Zgjidh Bibliotekën</string>
+    <string name="empty_library_no_accounts_message">Biblioteka juaj është bosh :(\nHyni në një llogari biblioteke ose shtoni shfaqje në bibliotekën tuaj lokale.</string>
+    <string name="provider_lang_settings">Gjuha e shtesave</string>
+    <string name="app_layout">Paraqitja e aplikacionit</string>
+    <string name="preferred_media_settings">Media e preferuar</string>
+    <string name="enable_nsfw_on_providers">Aktivizo NSFW për shtesat që e suportojnë</string>
+    <string name="subtitles_encoding">Enkodimi i titrave</string>
+    <string name="category_providers">Ofruesit</string>
+    <string name="category_provider_test">Testim i ofruesve</string>
+    <string name="test_extensions">Testo të gjitha shtesat</string>
+    <string name="test_extensions_summary">Ky test është vetëm për developer-a dhe nuk verifikon apo mohon funksionimin e asnjë shtese.</string>
+    <string name="category_ui">Paraqitja</string>
+    <string name="automatic">Automatikisht</string>
+    <string name="tv_layout">Paraqitja për TV</string>
+    <string name="phone_layout">Paraqitja për Celular</string>
+    <string name="emulator_layout">Paraqitja për emulator</string>
+    <string name="primary_color_settings">Ngjyra kryesore</string>
+    <string name="app_theme_settings">Pamja e aplikacionit</string>
+    <string name="bottom_title_settings">Vendodhja e titullit te posterit</string>
+    <string name="bottom_title_settings_des">Vendos titullin poshte posterit</string>
+    <string name="example_password">Fjalëkalimi123</string>
+    <string name="example_username">Emri i përdoruesit</string>
+    <string name="example_email">përshëndetje@shqipëri.com</string>
+    <string name="example_ip">127.0.0.1</string>
+    <string name="example_site_name">EmriRiFaqes</string>
+    <string name="example_site_url">https://shembull.com</string>
+    <string name="example_lang_name">Kodi i gjuhës (al)</string>
+    <string name="login_format" formatted="true">%1$s %2$s</string>
+    <string name="account">llogaria</string>
+    <string name="logout">Çkycu</string>
+    <string name="login">Hyr</string>
+    <string name="auth_locally">Autentifikohu lokalisht</string>
+    <string name="switch_account">Ndrysho llogari</string>
+    <string name="add_account">Shto llogari</string>
+    <string name="create_account">Krijo një llogari</string>
+    <string name="add_sync">Shto gjurmim</string>
+    <string name="added_sync_format" formatted="true">U shtua %s</string>
+    <string name="upload_sync">Rifresko</string>
+    <string name="sync_score">Vlerësuar</string>
+    <string name="sync_score_format" formatted="true">%d / 10</string>
+    <string name="sync_total_episodes_none">/??</string>
+    <string name="sync_total_episodes_some" formatted="true">/%d</string>
+    <string name="authenticated_user" formatted="true">%s u autentifikua</string>
+    <string name="authenticated_user_fail" formatted="true">Nuk mund të hysh në %s</string>
+    <string name="disable">Çaktivizuar</string>
+    <string name="none">Asnjë</string>
+    <string name="normal">Normal</string>
+    <string name="all">Të gjitha</string>
+    <string name="max">Maksimumi</string>
+    <string name="min">Minimumi</string>
+    <string name="subtitles_outline">Kontur</string>
+    <string name="subtitles_depressed">Të zhytura</string>
+    <string name="subtitles_shadow">Hije</string>
+    <string name="subtitles_raised">Të ngritura</string>
+    <string name="subtitle_offset">Sinkronizo titrat</string>
+    <string name="subtitle_offset_hint">1000 ms</string>
+    <string name="subtitle_offset_title">Vonesa e titrave</string>
+    <string name="subtitle_offset_extra_hint_later_format">Përdore nëse titrat shfaqen %d ms më herët</string>
+    <string name="subtitle_offset_extra_hint_before_format">Përdore nëse titrat shfaqen %d ms më vonë</string>
+    <string name="subtitle_offset_extra_hint_none_format">Pa vonesë titrash</string>
+    <string name="subtitles_example_text">Dhelpra e shpejtë ngjyra kafe kërcen mbi qenin dembel</string>
+    <string name="recommended">E rekomanduar</string>
+    <string name="player_loaded_subtitles" formatted="true">U ngarkua %s</string>
+    <string name="player_load_subtitles">Ngarko nga skedari</string>
+    <string name="player_load_subtitles_online">Ngarko nga interneti</string>
+    <string name="player_load_one_subtitle_online">Ngarko të parën e disponueshme</string>
+    <string name="downloaded_file">Skedar i shkarkuar</string>
+    <string name="actor_main">Kryesor</string>
+    <string name="actor_supporting">Mbështetës</string>
+    <string name="actor_background">Figurant</string>
+    <string name="home_source">Burimi</string>
+    <string name="home_random">Rastësor</string>
+    <string name="coming_soon">Së shpejti…</string>
+    <string name="quality_cam">Kamera</string>
+    <string name="quality_cam_rip">Kamera</string>
+    <string name="quality_cam_hd">Kamera</string>
+    <string name="quality_hq">HQ</string>
+    <string name="quality_hd">HD</string>
+    <string name="quality_ts">TS</string>
+    <string name="quality_tc">TC</string>
+    <string name="quality_blueray">Blu-ray</string>
+    <string name="quality_workprint">WP</string>
+    <string name="quality_dvd">DVD</string>
+    <string name="quality_4k">4K</string>
+    <string name="quality_sd">SD</string>
+    <string name="quality_uhd">UHD</string>
+    <string name="quality_hdr">HDR</string>
+    <string name="quality_sdr">SDR</string>
+    <string name="quality_webrip">Web</string>
+    <string name="poster_image">Imazhi i posterit</string>
+    <string name="qr_image">Imazhi i kodit QR</string>
+    <string name="category_player">Luajtësi</string>
+    <string name="resolution_and_title">Rezolucioni dhe titulli</string>
+    <string name="title">Titulli</string>
+    <string name="resolution">Rezolucioni</string>
+    <string name="video_info">Informacion i medias</string>
+    <string name="error_invalid_id">ID e pavlefshme</string>
+    <string name="error_invalid_data">Të dhëna të pavlefshme</string>
+    <string name="error_invalid_url">URL e pavlefshme</string>
+    <string name="error">Gabim</string>
+    <string name="subtitles_remove_captions">Hiq titrat e mbyllura</string>
+    <string name="subtitles_remove_bloat">Hiq të tepërtat nga titrat</string>
+    <string name="subtitles_filter_lang">Filtro sipas gjuhës së preferuar të medias</string>
+    <string name="extras">Ekstra</string>
+    <string name="trailer">Traileri</string>
+    <string name="network_adress_example">https://shembull.com/shembull.mp4</string>
+    <string name="referer">Referues (opsional)</string>
+    <string name="next">Tjetër</string>
+    <string name="provider_languages_tip">Shiko videot në këto gjuhë</string>
+    <string name="previous">E mëparshme</string>
+    <string name="skip_setup">Kalo konfigurimin</string>
+    <string name="app_layout_subtext">Ndrysho pamjen e aplikacionit për tu përshtatur me pajisjen tuaj</string>
+    <string name="preferred_media_subtext">Çfarë dëshironi të shihni</string>
+    <string name="setup_done">U krye</string>
+    <string name="extensions">Shtesat</string>
+    <string name="add_repository">Shto repository</string>
+    <string name="repository_name_hint">Emri i repository-t (Opsional)</string>
+    <string name="repository_url_hint">URL-ja ose kodi i shkurtër i repository-t</string>
+    <string name="plugin_loaded">Shtesa u ngarkua</string>
+    <string name="plugin_downloaded">Shtesa u shkarkua</string>
+    <string name="plugin_deleted">Shtesa u fshi</string>
+    <string name="plugin_load_fail" formatted="true">Nuk mund të ngarkohej %s</string>
+    <string name="is_adult">18+</string>
+    <string name="batch_download_start_format" formatted="true">Filloi shkarkimi i %1$d %2$s…</string>
+    <string name="batch_download_finish_format" formatted="true">U shkarkuan %1$d %2$s</string>
+    <string name="batch_download_nothing_to_download_format" formatted="true">Të gjitha %s janë shkarkuar tashmë</string>
+    <string name="no_plugins_found_error">Asnjë shtesë nuk u gjet në repository</string>
+    <string name="no_repository_found_error">Repository nuk u gjet, verifiko URL-në ose provoje me VPN</string>
+    <string name="safe_mode_description">Të gjitha shtesat u ndaluan për shkak të një gabimi për të ndihmuar në gjetjen e shkaktarit.</string>
+    <string name="view_public_repositories_button_short">Lista publike</string>
+    <string name="blank_repo_message">CloudStream nuk vjen me faqe të instaluara. Duhet ti shtosh faqet nga repository-t.\n\nNa u bashko në Discord ose kërko në internet.</string>
+    <string name="extension_authors">Autorët</string>
+    <string name="plugin_singular">shtesë</string>
+    <string name="uppercase_all_subtitles">Titrat vetëm me shkronja të mëdha</string>
+    <string name="player_pref">Luajtësi i preferuar i videove</string>
+    <string name="extension_description">Përshkrimi</string>
+    <string name="view_public_repositories_button">Shiko repository-t e komunitetit</string>
+    <string name="safe_mode_title">Modaliteti i sigurt është aktive</string>
+    <string name="plugins_not_downloaded" formatted="true">Të pa shkarkuara: %d</string>
+    <string name="extension_install_first">Instalo shtesën para</string>
+    <string name="apply_on_restart">Rifillo aplikacionin për të parë ndryshimet.</string>
+    <string name="plugins_disabled" formatted="true">Çaktivizuar: %d</string>
+    <string name="stop">Pauzë</string>
+    <string name="tracks">Gjurmë</string>
+    <string name="batch_download">Shkarkimi në grup përfundoi</string>
+    <string name="delete_repository_plugins">Kjo do të heqë të gjitha shtesat</string>
+    <string name="extension_language">Gjuha</string>
+    <string name="restart">Rifillo</string>
+    <string name="delete_plugin">Fshi shtesën</string>
+    <string name="extension_size">Madhësia</string>
+    <string name="safe_mode_crash_info">Shiko të dhënat e gabimit</string>
+    <string name="extension_types">Të suportuara</string>
+    <string name="plugins_downloaded" formatted="true">Shkarkuar: %d</string>
+    <string name="video_tracks">Gjurmë video-je</string>
+    <string name="plugins_updated" formatted="true">U përditësuan %d shtesa</string>
+    <string name="hls_playlist">Lista e HLS</string>
+    <string name="plugin">shtesa</string>
+    <string name="extension_rating" formatted="true">Vlerësimi: %s</string>
+    <string name="download_all_plugins_from_repo">Paralajmërim: CloudStream nuk mban asnjë përgjegjësi për përdorimin e shtesave të palëve të treta dhe nuk ofron asnjë mbështetje për to!</string>
+    <string name="extension_status">Statusi</string>
+    <string name="delete_repository">Fshi repository-n</string>
+    <string name="extension_version">Versioni</string>
+    <string name="single_plugin_disabled" formatted="true">%s (Çaktivizuar)</string>
+    <string name="setup_extensions_subtext">Shkarko listën e faqeve që dëshiron të përdorësh</string>
+    <string name="audio_tracks">Gjurmë audio-je</string>
+    <string name="video_singular">Video</string>
+    <string name="player_settings_play_in_app">Luajtësi i integruar</string>
+    <string name="player_settings_always_ask">Pyet gjithmonë</string>
+    <string name="player_settings_select_cast_device">Zgjidh pajisjen për transmetim</string>
+    <string name="app_not_found_error">Aplikacioni nuk u gjet</string>
+    <string name="all_languages_preference">Të gjitha gjuhët</string>
+    <string name="skip_type_format" formatted="true">Kalo %s</string>
+    <string name="skip_type_op">Hapjen</string>
+    <string name="skip_type_ed">Mbylljen</string>
+    <string name="skip_type_recap">Përmbledhjen</string>
+    <string name="skip_type_mixed_ed">Mbylljen e përzier</string>
+    <string name="skip_type_mixed_op">Hapjen e përzier</string>
+    <string name="skip_type_credits">Kreditet</string>
+    <string name="skip_type_preview">Parashikimin</string>
+    <string name="skip_type_intro">Intron</string>
+    <string name="clear_history">Pastro historikun</string>
+    <string name="history">Historia</string>
+    <string name="enable_skip_op_from_database_des">Shfaq butonat për kapërcimin e hyrjes/mbylljes</string>
+    <string name="clipboard_too_large">Teksti është shumë i gjatë. Nuk mund të ruhet në Clipboard.</string>
+    <string name="clipboard_permission_error">Gabim gjatë aksesimit të Clipboard-it. Ju lutem provoni përsëri.</string>
+    <string name="clipboard_unknown_error">Kopjimi dështoi. Kopjo logcat-in dhe kontakto support-in e aplikacionit.</string>
+    <string name="action_mark_as_watched">Shënoje si e përfunduar</string>
+    <string name="action_remove_from_watched">Hiqe nga të shikuarat</string>
+    <string name="confirm_exit_dialog">Jeni i sigurt që dëshironi të dilni?</string>
+    <string name="yes">Po</string>
+    <string name="no">Jo</string>
+    <string name="ok">Në rregull</string>
+    <string name="dismiss">Largo</string>
+    <string name="open_downloaded_repo">Hap repository-n</string>
+    <string name="battery_dialog_title">Çaktivizo kursimin e baterisë</string>
+    <string name="battery_dialog_message">Për të siguruar shkarkime të pandërprera dhe njoftime për serialet e abonuar, CloudStream ka nevojë për leje për të funksionuar në sfond. Duke shtypur OK, do t’ju shfaqet një dialog kërkese. Ju lutem shtypni “Lejo”.\n\nJu lutemi vini re: kjo leje nuk do të thotë që CS3 do të harxhojë baterinë tuaj. Do të funksionojë në sfond vetëm kur është e nevojshme, si p.sh. kur merr njoftime ose shkarkon video nga shtesat zyrtare.</string>
+    <string name="app_unrestricted_toast">Përdorimi i baterisë është i vendosur si i pakufizuar</string>
+    <string name="app_info_intent_error">Informacioni i aplikacionit CloudStream nuk mund të hapet.</string>
+    <string name="update_notification_downloading">Po shkarkohet përditësimi i aplikacionit…</string>
+    <string name="update_notification_installing">Po instalohet përditësimi i aplikacionit…</string>
+    <string name="update_notification_failed">Instalimi i versionit të ri dështoi</string>
+    <string name="apk_installer_legacy">Version i vjetër</string>
+    <string name="apk_installer_package_installer">Instaluesi i paketës</string>
+    <string name="delayed_update_notice">Aplikacioni do të përditësohet sapo të mbyllet</string>
+    <string name="sort_by">Rendit nga</string>
+    <string name="sort">Rendit</string>
+    <string name="sort_rating_desc">Vlerësimi (nga më i larti te më i ulëti)</string>
+    <string name="sort_rating_asc">Vlerësimi (nga më i ulëti te më i larti)</string>
+    <string name="sort_updated_new">Përditësuar (nga më i riu te më i vjetri)</string>
+    <string name="sort_updated_old">Përditësuar (nga më i vjetri te më i riu)</string>
+    <string name="sort_alphabetical_a">Alfabetike (A–Z)</string>
+    <string name="sort_alphabetical_z">Alfabetike (Z–A)</string>
+    <string name="sort_episodes_number_asc">Episodet (rritëse)</string>
+    <string name="sort_episodes_number_desc">Episodet (zbritëse)</string>
+    <string name="sort_episodes_rating_high_low">Vlerësimi (më i larti)</string>
+    <string name="sort_episodes_rating_low_high">Vlerësimi (më i ulëti)</string>
+    <string name="sort_episodes_date_newest">Data e publikimit (më e fundit)</string>
+    <string name="sort_episodes_date_oldest">Data e publikimit (më e hershmja)</string>
+    <string name="sort_button_episode">Ep %s</string>
+    <string name="sort_button_rating">Vlerësimi %s</string>
+    <string name="sort_button_date">Data %s</string>
+    <string name="open_with">Hape me</string>
+    <string name="empty_library_logged_in_message">Kjo listë është bosh. Provo një tjetër.</string>
+    <string name="safe_mode_file">U gjet skedari i modalitetit të sigurt!\nNuk do të ngarkohen asnjë shtesë gjatë nisjes derisa skedari të hiqet.</string>
+    <string name="revert">Riktheje në gjendjen e mëparshme</string>
+    <string name="subscription_in_progress_notification">Duke përditësuar serialet që ndiqni</string>
+    <string name="subscription_list_name">I abonuar</string>
+    <string name="subscription_new">I abonuar në %s</string>
+    <string name="subscription_deleted">U çabonove nga %s</string>
+    <string name="subscription_episode_released">Episodi %d u publikua!</string>
+    <string name="action_subscribe">Abonohu</string>
+    <string name="action_unsubscribe">Çabonohu</string>
+    <string name="profile_number">Profili %d</string>
+    <string name="wifi">Wi-Fi</string>
+    <string name="mobile_data">Mobile data</string>
+    <string name="set_default">Vendose si parazgjedhje</string>
+    <string name="use">Përdor</string>
+    <string name="edit">Ndrysho</string>
+    <string name="source_priority">Prioriteti i burimit</string>
+    <string name="source_priority_help">Vendos si duhet të renditen burimet e videos në luajtës</string>
+    <string name="profiles">Profilet</string>
+    <string name="help">Ndihmë</string>
+    <string name="quality_profile_help">Këtu mund të ndryshoni si renditen burimet. Nëse një video ka prioritet më të lartë, do të shfaqet më lart në përzgjedhjen e burimeve. Shuma e prioritetit të burimit dhe prioritetit të cilësisë është prioriteti i videos.\n\nBurimi A: 3\nCilësia B: 7\nDo të ketë një prioritet të kombinuar video-je prej 10.\n\nSHËNIM: Nëse shuma është 10 ose më shumë, luajtësi do të kapërcejë automatikisht ngarkimin kur të hapet ai link!</string>
+    <string name="qualities">Cilësitë</string>
+    <string name="profile_background_des">Sfondi i profilit</string>
+    <string name="unable_to_inflate">UI nuk mundi të krijohej siç duhet, ky është një PROBLEM SERIOZ dhe duhet raportuar menjëherë %s</string>
+    <string name="already_voted">Ju keni votuar</string>
+    <string name="favorites_list_name">Të preferuarat</string>
+    <string name="favorite_added">%s u shtua te të preferuarat</string>
+    <string name="favorite_removed">%s u hoq nga të preferuarat</string>
+    <string name="action_add_to_favorites">Shto te të preferuarat</string>
+    <string name="action_remove_from_favorites">Hiqe nga të preferuarat</string>
+    <string name="duplicate_title">U gjet dublikatë e mundshme</string>
+    <string name="duplicate_add">Shto</string>
+    <string name="duplicate_replace">Zëvendëso</string>
+    <string name="duplicate_replace_all">Zëvendëso të gjitha</string>
+    <string name="duplicate_message_single" formatted="true">Duket se një artikull i mundshëm i dyfishuar tashmë ekziston në bibliotekën tuaj: ‘%s’.\n\nDëshironi ta shtoni gjithsesi, ta zëvendësoni atë ekzistuesin, apo ta anuloni veprimin?</string>
+    <string name="duplicate_message_multiple" formatted="true">Janë gjetur artikuj të mundshëm të dyfishtë në bibliotekën tuaj:\n\n%s\n\nDëshironi ta shtoni gjithsesi, të zëvendësoni ato ekzistuesit, apo të anuloni veprimin?</string>
+    <string name="enter_pin">Fut PIN-in</string>
+    <string name="enter_pin_with_name" formatted="true">Fut PIN-in për %s</string>
+    <string name="enter_current_pin">Fut PIN-in aktual</string>
+    <string name="lock_profile">Kyç profilin</string>
+    <string name="pin">PIN</string>
+    <string name="pin_error_incorrect">PIN-i i gabuar. Ju lutem provoni përsëri.</string>
+    <string name="pin_error_length">PIN-i duhet të ketë 4 karaktere</string>
+    <string name="select_an_account">Zgjidh një Llogari</string>
+    <string name="no_account">Asnjë llogari</string>
+    <string name="manage_accounts">Menaxho Llogaritë</string>
+    <string name="edit_account">Ndrysho llogarinë</string>
+    <string name="logged_account" formatted="true">I identifikuar si %s</string>
+    <string name="skip_startup_account_select_pref">Kapërce përzgjedhjen e llogarisë gjatë nisjes</string>
+    <string name="use_default_account">Përdor llogarinë e paracaktuar</string>
+    <string name="rotate_video">Rrotullo</string>
+    <string name="rotate_video_desc">Shfaq një buton për ndryshimin e orientimit të ekranit</string>
+    <string name="auto_rotate_video_desc">Aktivizo rrotullimin automatik të ekranit sipas orientimit të videos</string>
+    <string name="auto_rotate_video">Rrotullim automatik</string>
+    <string name="favorite">I preferuar</string>
+    <string name="unfavorite">Hiq nga të preferuarat</string>
+    <string name="biometric_authentication_title">Hap CloudStream-in</string>
+    <string name="biometric_setting">Kyç me biometrikë</string>
+    <string name="password_pin_authentication_title">Verifikim me fjalëkalim/PIN</string>
+    <string name="biometric_unsupported">Biometrikat nuk janë të disponueshme në këtë pajisje</string>
+    <string name="biometric_setting_summary">Hap aplikacionin me gjurmë gishti, Face ID, PIN, Pattern ose fjalëkalim.</string>
+    <string name="biometric_prompt_description">Pas disa përpjekjesh të dështuara, rifillo aplikacionin për ta provuar përsëri.</string>
+    <string name="biometric_warning">Të dhënat tuaja të CloudStream janë kopjuar tani. Edhe pse mundësia është shumë e ulët, disa pajisje mund të sillen ndryshe. Në raste të rralla, nëse bllokoheni nga hyrja në aplikacion, fshini plotësisht të dhënat e aplikacionit dhe rikthejini ato nga kopja rezervë. Na vjen shumë keq për çdo shqetësim që mund të shkaktohet nga kjo.</string>
+    <string name="reset_btn">Rivendos</string>
+    <string name="cs3wiki">CloudStream Wiki</string>
+    <string name="device_pin_url_message">Vizitoni <b>%s</b> në telefonin ose kompjuterin tuaj dhe futni kodin e mësipërm</string>
+    <string name="device_pin_error_message">Nuk u mor kodi PIN i pajisjes, provo verifikim lokal</string>
+    <string name="device_pin_expired_message">PIN-i ka skaduar!</string>
+    <string name="device_pin_counter_text">Kodi skadon pas %1$dm %2$ds</string>
+    <string name="sort_release_date_new">Data e publikimit (nga më e reja te më e vjetra)</string>
+    <string name="sort_release_date_old">Data e publikimit (nga më e vjetra te më e reja)</string>
+    <string name="hide_player_control_names">Fshih emrat e kontrolleve të luajtësit</string>
+    <string name="preview_seekbar">Shiriti i kërkimit</string>
+    <string name="preview_seekbar_desc">Aktivizo miniaturën e pamjes paraprake në shiritin kërkues</string>
+    <string name="no_subtitles_loaded">Nuk ka titra të ngarkuara ende</string>
+    <string name="backup_path_title">Vendndodhja e dosjes së kopjes rezervë</string>
+    <string name="custom">I personalizuar</string>
+    <string name="confirm_before_exiting_title">Konfirmo para daljes</string>
+    <string name="confirm_before_exiting_desc">Shfaq dialogun para daljes nga aplikacioni</string>
+    <string name="show">Shfaqe</string>
+    <string name="dont_show">Mos e shfaq</string>
+    <string name="subs_edge_size">Madhësia e konturit</string>
+    <string name="torrent_preferred_media">Aktivizo torrent-in në Cilësimet/Ofruesit/Media e preferuar</string>
+    <string name="torrent_not_accepted">Rifillo aplikacionin dhe prano dritaren “Stream Torrent” për të vazhduar.</string>
+    <string name="software_decoding">Dekodim me softuer</string>
+    <string name="software_decoding_desc">Dekodimi me softuer i lejon player-it të luajë video që nuk mbështeten nga pajisja juaj, por mund të shkaktojë vonesa ose paqëndrueshmëri në rezolucione të larta.</string>
+    <string name="volume_exceeded_100">Volumi është mbi 100%</string>
+    <string name="slide_up_again_to_exceed_100">Rrëshqit lart përsëri për të kaluar mbi 100%</string>
+    <string name="update_plugins">Përditëso shtesat</string>
+    <string name="update_plugins_manually">Përditëso shtesat manualisht</string>
+    <string name="starting_plugin_update_manually">Filloi procesi i përditësimit të shtesave!</string>
+    <string name="plugins_updated_manually">%d Shtes(at) u përditësuan me sukses!</string>
+    <string name="no_plugins_updated_manually">Nuk u përditësua asnjë shtesë.</string>
+    <string name="player_notification_channel_name">Njoftimet e luajtësit</string>
+    <string name="player_notification_channel_description">Njoftimi për kontrollin e luajtjes nga sfondi</string>
+    <string name="subtitles_from_embedded">I integruar</string>
+    <string name="subtitles_from_online">Online</string>
+    <string name="all_subtitles_bold">Bëji të gjitha titrat me shkronja të trasha</string>
+    <string name="all_subtitles_italic">Bëji të gjitha titrat me shkronja të pjerrëta</string>
+    <string name="background_radius">Rrezja e sfondit</string>
+    <string name="download_parallel_settings_des">Sa elementë të ndryshëm mund të shkarkohen njëkohësisht</string>
+    <string name="parallel_downloads">Shkarkimet paralele</string>
+    <string name="concurrent_connections">Lidhje paralele</string>
+    <string name="concurrent_connections_settings_des">Numri i lidhjeve paralele për çdo shkarkim</string>
+    <string name="go_to_downloads">Shko tek Shkarkimet</string>
+    <string name="no_internet_connection">Nuk ka lidhje interneti.\n\nJu lutemi lidhuni me internetin dhe provojeni përsëri, ose shikoni shkarkimet tuaja offline.</string>
+    <string name="overscan_settings_des">Ndryshon kufijtë e ekranit</string>
+    <string name="overscan_settings">Tejskenim</string>
+    <string name="poster_size_settings_des">Ndryshon madhësinë e posterave</string>
+    <string name="poster_size_settings">Madhësia e posterit</string>
+    <string name="speedup_title">Ndërrimi i shpejtësisë me shtypje të gjatë</string>
+    <string name="speedup_summary">Mbaj shtypur për shpejtësi 2x</string>
+    <string name="edit_profile_image_title">Ndrysho foton e profilit</string>
+    <string name="edit_profile_image_hint">Fut URL-n e fotos së profilit</string>
+    <string name="edit_profile_image_error_empty">Nuk u gjet asnjë URL</string>
+    <string name="edit_profile_image_error_invalid">URL ose imazh i pavlefshëm</string>
+    <string name="edit_profile_image_success">Imazhi u përditësua me sukses</string>
+    <string name="action_mark_watched_up_to_this_episode">Shëno si të parë deri në këtë episod</string>
+    <string name="action_remove_mark_watched_up_to_this_episode">Hiq të parët deri në këtë episod</string>
+    <string name="action_reload">U ringarkuan</string>
+    <string name="reload_provider">Ringarko ofruesin</string>
+    <string name="name">Emri</string>
+    <string name="source_name">Emri i burimit</string>
+    <string name="resolution_and_name">Rezolucioni dhe emri</string>
+    <string name="download_all">Shkarko të gjitha</string>
+    <string name="cancel_all">Anulo të gjitha</string>
+    <string name="download_episode_range">Dëshiron të shkarkosh episodin %s?</string>
+    <string name="cancel_queue_message">Dëshiron të anulosh të gjitha shkarkimet në radhë?</string>
+    <string name="subs_subtitle_alignment">Pozicionimi i titrave</string>
+    <string name="bottom_left">Poshtë majtas</string>
+    <string name="bottom_center">Poshtë në mes</string>
+    <string name="bottom_right">Poshtë djathtas</string>
+    <string name="middle_left">Në mes majtas</string>
+    <string name="middle_center">Në mes në qendër</string>
+    <string name="middle_right">Në mes djathtas</string>
+    <string name="top_left">Lart majtas</string>
+    <string name="top_center">Lart në mes</string>
+    <string name="top_right">Lart djathtas</string>
+    <plurals name="downloads_active">
+        <item quantity="one">%d shkarkim aktiv</item>
+        <item quantity="other">%d shkarkime aktive</item>
+    </plurals>
+    <plurals name="downloads_queued">
+        <item quantity="one">%d shkarkim në radhë</item>
+        <item quantity="other">%d shkarkime në radhë</item>
+    </plurals>
+    <string name="player_is_live">Live</string>
+</resources>
diff --git a/app/src/main/res/values/array.xml b/app/src/main/res/values/array.xml
index f59e7f27e36..d14dca768c5 100644
--- a/app/src/main/res/values/array.xml
+++ b/app/src/main/res/values/array.xml
@@ -54,20 +54,19 @@
         <item>@string/nsfw</item>
     </array>
 
-    <array name="limit_title_rez_pref_names">
-        <item>@string/resolution_and_title</item>
-        <item>@string/title</item>
+    <array name="title_info_pref_names">
+        <item>@string/source_name</item>
         <item>@string/resolution</item>
-        <item>@string/none</item>
+        <item>@string/video_info</item>
     </array>
 
-    <array name="limit_title_rez_pref_values">
-        <item>3</item>
-        <item>2</item>
-        <item>1</item>
-        <item>0</item>
+    <array name="title_info_pref_values">
+        <item>@string/show_name_key</item>
+        <item>@string/show_resolution_key</item>
+        <item>@string/show_media_info_key</item>
     </array>
 
+
     <array name="limit_title_pref_names">
         <item>@string/none</item>
         <item>16 characters</item>
@@ -202,14 +201,18 @@
         <item>@string/show_hd</item>
         <item>@string/show_dub</item>
         <item>@string/show_sub</item>
+        <item>@string/show_rating</item>
         <item>@string/show_title</item>
+        <item>@string/show_episode_text</item>
     </array>
 
     <array name="poster_ui_options_values">
         <item>@string/show_hd_key</item>
         <item>@string/show_dub_key</item>
         <item>@string/show_sub_key</item>
+        <item>@string/show_rating_key</item>
         <item>@string/show_title_key</item>
+        <item>@string/show_episode_text_key</item>
     </array>
 
     <array name="app_layout">
@@ -228,14 +231,16 @@
 
     <array name="software_decoding_switch">
         <item>@string/automatic</item>
-        <item>@string/yes</item>
-        <item>@string/no</item>
+        <item>HW+SW</item>
+        <item>SW+HW</item>
+        <item>HW</item>
     </array>
 
     <array name="software_decoding_switch_values">
-        <item>-1</item>
-        <item>0</item>
-        <item>1</item>
+        <item>-1</item> <!-- Auto-->
+        <item>0</item>  <!-- HW+SW, aka on but prefer hw -->
+        <item>2</item>  <!-- SW+HW, aka on but prefer sw -->
+        <item>1</item>  <!-- HW, aka off -->
     </array>
 
     <array name="confirm_exit">
@@ -305,6 +310,9 @@
         <item>Flashbang</item>
         <item>System</item>
         <item>Material You</item>
+        <item>Dracula</item>
+        <item>Lavender Dreams</item>
+        <item>Silent Blue</item>
     </string-array>
     <string-array name="themes_names_values">
         <item>AmoledLight</item>
@@ -313,6 +321,9 @@
         <item>Light</item>
         <item>System</item>
         <item>Monet</item>
+        <item>Dracula</item>
+        <item>Lavender</item>
+        <item>SilentBlue</item>
     </string-array>
 
     <string-array name="extension_statuses">
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index c7af48e08ec..7c71b557193 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -71,4 +71,9 @@
         <attr name="white" format="color" />
         <attr name="black" format="color" />
     </declare-styleable>
+
+    <declare-styleable name="PercentageCropImageView">
+        <attr name="cropYCenterOffsetPct" format="float" />
+        <attr name="cropXCenterOffsetPct" format="float" />
+    </declare-styleable>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 885250ec0f9..48b69232abe 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -21,6 +21,8 @@
 
     <color name="white">#FFF</color>
     <color name="black">#000</color>
+    <color name="gray_200">#EEEEEE</color>
+    <color name="gray_400">#BDBDBD</color>
 
     <color name="whiteText">#FFF</color>
     <color name="blackText">#000</color>
@@ -35,6 +37,7 @@
     <color name="subColorBg">#F53B66</color>
     <color name="typeColorText">#BEC8FF</color>
     <color name="typeColorBg">#3700B3</color>
+
     <!--
     <color name="ratingColor">#4C3115</color>
     <color name="ratingColorBg">#FFA662</color>
@@ -66,6 +69,33 @@
     <color name="lightGrayTextColor">#5f6267</color>
     <color name="lightIconColor">#5f6267</color>
 
+    <!--Dracula Theme-->
+    <color name="DraculaPrimaryGrayBackground">#414450</color>
+    <color name="DraculaBitDarkerGrayBackground">#282a36</color>
+    <color name="DraculaGrayBackground">#44475A</color>
+    <color name="DraculaItemBackground">#373844</color>
+    <color name="DraculaTextColor">#F8F8F2</color>
+    <color name="DraculaGrayTextColor">#6272A4</color>
+    <color name="DraculaIconColor">#6272A4</color>
+
+    <!-- Lavender Dreams Theme -->
+    <color name="LavenderPrimaryGrayBackground">#f7eefc</color>
+    <color name="LavenderBitDarkerGrayBackground">#fdf0fb</color>
+    <color name="LavenderGrayBackground">#b794f6</color>
+    <color name="LavenderItemBackground">#f8f5ff</color>
+    <color name="LavenderTextColor">#2d1b47</color>
+    <color name="LavenderGrayTextColor">#9ab3ff</color>
+    <color name="LavenderIconColor">#7c3aed</color>
+
+    <!--Silent Blue Theme-->
+    <color name="SilentBluePrimaryGrayBackground">#282f49</color>
+    <color name="SilentBlueBitDarkerGrayBackground">#151a30</color>
+    <color name="SilentBlueGrayBackground">#3A446A</color>
+    <color name="SilentBlueItemBackground">#3A446A</color>
+    <color name="SilentBlueTextColor">#E0E1F3</color>
+    <color name="SilentBlueGrayTextColor">#7B83B0</color>
+    <color name="SilentBlueIconColor">#7B83B0</color>
+
     <!--Other Colors -->
     <color name="colorPrimaryBlue">#5664B7</color>
     <color name="colorPrimaryRed">#D50000</color>
@@ -91,4 +121,5 @@
     <color name="colorTestPass">#48E484</color>
     <color name="colorTestFail">#ea596e</color>
     <color name="colorTestWarning">#FF9800</color>
+    <color name="playIconBackground">#B3000000</color>
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 631201b13f8..b0c150000b5 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -16,10 +16,20 @@
     <integer name="loading_time">2000</integer>
 
     <dimen name="storage_radius">3dp</dimen>
-    <dimen name="navbar_width">62dp</dimen>
+    <dimen name="navbar_width">0dp</dimen>
+
+    <dimen name="nav_view_height">70dp</dimen>
+    <dimen name="nav_rail_view_width">62dp</dimen>
 
     <dimen name="download_size">50dp</dimen>
     <dimen name="video_frame_width">1dp</dimen>
 
     <dimen name="account_select_linear_item_size">100dp</dimen>
+    <dimen name="dialog_buttons_inset">5dp</dimen>
+
+    <dimen name="home_poster_progress_size">50dp</dimen>
+    <dimen name="episode_progress_size">40dp</dimen>
+    <dimen name="continue_watching_progress_size">25dp</dimen>
+    <dimen name="circular_progress_thickness">2dp</dimen>
+    <dimen name="download_header_progress_size">35dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/donottranslate-strings.xml b/app/src/main/res/values/donottranslate-strings.xml
new file mode 100644
index 00000000000..6a4c8271341
--- /dev/null
+++ b/app/src/main/res/values/donottranslate-strings.xml
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- KEYS -->
+    <string name="search_providers_list_key">search_providers_list</string>
+    <string name="locale_key">app_locale</string>
+    <string name="search_types_list_key">search_type_list</string>
+    <string name="auto_update_key">auto_update</string>
+    <string name="auto_update_plugins_key">auto_update_plugins</string>
+    <string name="auto_download_plugins_key">auto_download_plugins_key2</string>
+    <string name="skip_update_key">skip_update_key</string>
+    <string name="install_prerelease_key">install_prerelease_key</string>
+    <string name="manual_check_update_key">manual_check_update</string>
+    <string name="fast_forward_button_time_key">fast_forward_button_time</string>
+    <string name="benene_count">benene_count</string>
+    <string name="subtitle_settings_key">subtitle_settings_key</string>
+    <string name="test_providers_key">test_providers_key</string>
+    <string name="subtitle_settings_chromecast_key">subtitle_settings_chromecast_key</string>
+    <string name="quality_pref_key">quality_pref_key</string>
+    <string name="quality_pref_mobile_data_key">quality_pref_mobile_data_key</string>
+    <string name="player_default_key">player_default_key</string>
+    <string name="prefer_limit_title_key">prefer_limit_title_key</string>
+    <string name="prefer_limit_show_player_info">prefer_limit_show_player_info</string>
+    <string name="apk_installer_key">apk_installer_key</string>
+    <string name="video_buffer_size_key">video_buffer_size_key</string>
+    <string name="video_buffer_length_key">video_buffer_length_key</string>
+    <string name="video_buffer_clear_key">video_buffer_clear_key</string>
+    <string name="video_buffer_disk_key">video_buffer_disk_key</string>
+    <string name="use_system_brightness_key">use_system_brightness_key</string>
+    <string name="swipe_enabled_key">swipe_enabled_key</string>
+    <string name="playback_speed_enabled_key">playback_speed_enabled_key</string>
+    <string name="player_resize_enabled_key">player_resize_enabled_key</string>
+    <string name="player_source_priority_key">player_source_priority_key</string>
+    <string name="pip_enabled_key">pip_enabled_key</string>
+    <string name="double_tap_enabled_key">double_tap_enabled_key</string>
+    <string name="double_tap_pause_enabled_key">double_tap_pause_enabled_key</string>
+    <string name="double_tap_seek_time_key">double_tap_seek_time_key2</string>
+    <string name="android_tv_interface_off_seek_key">android_tv_interface_off_seek_key</string>
+    <string name="android_tv_interface_on_seek_key">android_tv_interface_on_seek_key</string>
+    <string name="swipe_vertical_enabled_key">swipe_vertical_enabled_key</string>
+    <string name="autoplay_next_key">autoplay_next_key</string>
+    <string name="display_sub_key">display_sub_key</string>
+    <string name="show_fillers_key">show_fillers_key</string>
+    <string name="show_player_metadata_key">show_player_metadata_key</string>
+    <string name="show_trailers_key">show_trailers_key</string>
+    <string name="show_kitsu_posters_key">show_kitsu_posters_key</string>
+    <string name="show_cast_in_details_key">show_cast_in_details_key</string>
+    <string name="random_button_key">random_button_key</string>
+    <string name="provider_lang_key">provider_lang_key</string>
+    <string name="dns_key">dns_key</string>
+    <string name="jsdelivr_proxy_key">jsdelivr_proxy_key</string>
+    <string name="download_path_key">download_path_key</string>
+    <string name="download_parallel_key">download_parallel_key</string>
+    <string name="download_concurrent_key">download_concurrent_key</string>
+    <string name="download_path_key_visual">download_path_key_visual</string>
+    <string name="app_name_download_path">Cloudstream</string>
+    <string name="app_layout_key">app_layout_key</string>
+    <string name="primary_color_key">primary_color_key</string>
+    <string name="restore_key">restore_key</string>
+    <string name="backup_key">backup_key</string>
+    <string name="automatic_backup_key">automatic_backup_key</string>
+    <string name="prefer_media_type_key">prefer_media_type_key_2</string>
+    <string name="app_theme_key">app_theme_key</string>
+    <string name="episode_sync_enabled_key">episode_sync_enabled_key</string>
+    <string name="log_enabled_key">log_enabled_key</string>
+    <string name="show_logcat_key">show_logcat_key</string>
+    <string name="bottom_title_key">bottom_title_key</string>
+    <string name="poster_ui_key">poster_ui_key</string>
+    <string name="overscan_key">overscan_key</string>
+    <string name="poster_size_key">poster_size_key</string>
+    <string name="subtitles_encoding_key">subtitles_encoding_key</string>
+    <string name="override_site_key">override_site_key</string>
+    <string name="redo_setup_key">redo_setup_key</string>
+    <string name="filter_sub_lang_key">filter_sub_lang_key</string>
+    <string name="pref_filter_search_quality_key">pref_filter_search_quality_key</string>
+    <string name="enable_nsfw_on_providers_key">enable_nsfw_on_providers_key</string>
+    <string name="skip_startup_account_select_key">skip_startup_account_select_key</string>
+    <string name="enable_skip_op_from_database">enable_skip_op_from_database</string>
+    <string name="rotate_video_key">rotate_video_key</string>
+    <string name="auto_rotate_video_key">auto_rotate_video_key</string>
+    <string name="biometric_key">biometric_key</string>
+    <string name="battery_optimisation_key">battery_optimisation</string>
+    <string name="show_hd_key">show_hd_key</string>
+    <string name="show_dub_key">show_dub_key</string>
+    <string name="show_sub_key">show_sub_key</string>
+    <string name="show_rating_key">show_rating_key</string>
+    <string name="show_title_key">show_title_key</string>
+    <string name="show_episode_text_key">show_episode_text_key</string>
+    <string name="hide_player_control_names_key">hide_player_control_names_key</string>
+    <string name="preview_seekbar_key">preview_seekbar_key</string>
+    <string name="backup_path_key">backup_path_key</string>
+    <string name="backup_dir_key">backup_dir_key</string>
+    <string name="confirm_exit_key">confirm_exit_key</string>
+    <string name="software_decoding_key">software_decoding_key2</string>
+    <string name="manual_update_plugins_key">manual_update_plugins</string>
+    <string name="legal_notice_key">legal_notice_key</string>
+    <string name="speedup_key">speedup_key</string>
+    <string name="anilist_key">anilist_key</string>
+    <string name="simkl_key">simkl_key</string>
+    <string name="mal_key">mal_key</string>
+    <string name="kitsu_key">kitsu_key</string>
+    <string name="opensubtitles_key">opensubtitles_key</string>
+    <string name="subdl_key">subdl_key</string>
+    <string name="animeskip_key">animeskip_key</string>
+
+    <string name="pref_category_security_key">pref_category_security_key</string>
+    <string name="pref_category_gestures_key">pref_category_gestures_key</string>
+    <string name="pref_category_android_tv_key">pref_category_android_tv_key</string>
+
+    <string name="tv_no_focus_tag">tv_no_focus_tag</string>
+
+    <!-- FORMAT WILL CAUSE CRASH IF APPLIED WRONG -->
+    <string name="extra_info_format" formatted="true">%1$d %2$s | %3$s</string>
+    <string name="storage_size_format" formatted="true">%1$s • %2$s</string>
+    <string name="download_format" formatted="true">%1$s - %2$s</string>
+    <string name="download_size_format" formatted="true">%1$s / %2$s</string>
+    <string name="episode_name_format" formatted="true">%1$s %2$s</string>
+    <string name="episode_text">S1E1</string>
+    <string name="ffw_text_format" formatted="true">+%d</string>
+    <string name="rew_text_format" formatted="true">-%d</string>
+    <string name="ffw_text_regular_format" formatted="true">%d</string>
+    <string name="rew_text_regular_format" formatted="true">%d</string>
+    <string name="rating_format" formatted="true">%s/10.0</string>
+    <string name="year_format" formatted="true">%d</string>
+
+    <string name="episode_play_img_des">@string/play_episode</string>
+    <string name="change_providers_img_des">@string/home_change_provider_img_des</string>
+    <string name="result_plot">@string/synopsis</string>
+
+    <string name="subtitles_none">@string/none</string>
+    <string name="type_none">@string/none</string>
+    <string name="duplicate_cancel">@string/cancel</string>
+    <string name="sort_cancel">@string/cancel</string>
+    <string name="default_subtitles">@string/action_default</string>
+    <string name="default_account">@string/action_default</string>
+
+    <string name="show_name_key">show_name</string>
+    <string name="show_resolution_key">show_resolution</string>
+    <string name="show_media_info_key">show_media_info</string>
+    <string name="prefer_title_limit_key">prefer_title_limit</string>
+
+    <string name="legal_notice_text">Any legal issues regarding the content on this application
+        should be taken up with the actual file hosts and providers themselves as we are not affiliated with them.
+
+        In case of copyright infringement, please directly contact the responsible parties or the streaming websites.
+
+        The app is purely for educational and personal use.
+
+        CloudStream does not host any content on the app, and has no control over what media is put up or taken down.
+        CloudStream functions like any other search engine, such as Google. CloudStream does not host, upload or
+        manage any videos, films or content. It simply crawls, aggregates and displayes links in a convenient,
+        user-friendly interface.
+
+        It merely scrapes 3rd-party websites that are publicly accessible via any regular web browser. It is the
+        responsibility of user to avoid any actions that might violate the laws governing his/her locality. Use
+        CloudStream at your own risk.
+    </string>
+
+    <plurals name="episodes">
+        <item quantity="one">@string/episode</item>
+        <item quantity="other">@string/episodes</item>
+    </plurals>
+</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a973dcc2105..31cf951cf5f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,91 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--https://newbedev.com/concatenate-multiple-strings-in-xml--><resources>
-    <!-- KEYS DON'T TRANSLATE -->
-    <string name="search_providers_list_key" translatable="false">search_providers_list</string>
-    <string name="locale_key" translatable="false">app_locale</string>
-    <string name="search_types_list_key" translatable="false">search_type_list</string>
-    <string name="auto_update_key" translatable="false">auto_update</string>
-    <string name="auto_update_plugins_key" translatable="false">auto_update_plugins</string>
-    <string name="auto_download_plugins_key" translatable="false">auto_download_plugins_key2</string>
-    <string name="skip_update_key" translatable="false">skip_update_key</string>
-    <string name="prerelease_update_key" translatable="false">prerelease_update</string>
-    <string name="manual_check_update_key" translatable="false">manual_check_update</string>
-    <string name="fast_forward_button_time_key" translatable="false">fast_forward_button_time</string>
-    <string name="benene_count" translatable="false">benene_count</string>
-    <string name="subtitle_settings_key" translatable="false">subtitle_settings_key</string>
-    <string name="test_providers_key" translatable="false">test_providers_key</string>
-    <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_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>
-    <string name="video_buffer_size_key" translatable="false">video_buffer_size_key</string>
-    <string name="video_buffer_length_key" translatable="false">video_buffer_length_key</string>
-    <string name="video_buffer_clear_key" translatable="false">video_buffer_clear_key</string>
-    <string name="video_buffer_disk_key" translatable="false">video_buffer_disk_key</string>
-    <string name="use_system_brightness_key" translatable="false">use_system_brightness_key</string>
-    <string name="swipe_enabled_key" translatable="false">swipe_enabled_key</string>
-    <string name="playback_speed_enabled_key" translatable="false">playback_speed_enabled_key</string>
-    <string name="player_resize_enabled_key" translatable="false">player_resize_enabled_key</string>
-    <string name="pip_enabled_key" translatable="false">pip_enabled_key</string>
-    <string name="double_tap_enabled_key" translatable="false">double_tap_enabled_key</string>
-    <string name="double_tap_pause_enabled_key" translatable="false">double_tap_pause_enabled_key</string>
-    <string name="double_tap_seek_time_key" translatable="false">double_tap_seek_time_key2</string>
-    <string name="android_tv_interface_off_seek_key" translatable="false">android_tv_interface_off_seek_key</string>
-    <string name="android_tv_interface_on_seek_key" translatable="false">android_tv_interface_on_seek_key</string>
-    <string name="swipe_vertical_enabled_key" translatable="false">swipe_vertical_enabled_key</string>
-    <string name="autoplay_next_key" translatable="false">autoplay_next_key</string>
-    <string name="display_sub_key" translatable="false">display_sub_key</string>
-    <string name="show_fillers_key" translatable="false">show_fillers_key</string>
-    <string name="show_trailers_key" translatable="false">show_trailers_key</string>
-    <string name="show_kitsu_posters_key" translatable="false">show_kitsu_posters_key</string>
-    <string name="random_button_key" translatable="false">random_button_key</string>
-    <string name="provider_lang_key" translatable="false">provider_lang_key</string>
-    <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_parallel_key" translatable="false">download_parallel_key</string>
-    <string name="download_concurrent_key" translatable="false">download_concurrent_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>
-    <string name="restore_key" translatable="false">restore_key</string>
-    <string name="backup_key" translatable="false">backup_key</string>
-    <string name="automatic_backup_key" translatable="false">automatic_backup_key</string>
-    <string name="prefer_media_type_key" translatable="false">prefer_media_type_key_2</string>
-    <string name="app_theme_key" translatable="false">app_theme_key</string>
-    <string name="episode_sync_enabled_key" translatable="false">episode_sync_enabled_key</string>
-    <string name="log_enabled_key" translatable="false">log_enabled_key</string>
-    <string name="show_logcat_key" translatable="false">show_logcat_key</string>
-    <string name="bottom_title_key" translatable="false">bottom_title_key</string>
-    <string name="poster_ui_key" translatable="false">poster_ui_key</string>
-    <string name="overscan_key" translatable="false">overscan_key</string>
-    <string name="poster_size_key" translatable="false">poster_size_key</string>
-    <string name="subtitles_encoding_key" translatable="false">subtitles_encoding_key</string>
-    <string name="override_site_key" translatable="false">override_site_key</string>
-    <string name="redo_setup_key" translatable="false">redo_setup_key</string>
-    <string name="filter_sub_lang_key" translatable="false">filter_sub_lang_key</string>
-    <string name="pref_filter_search_quality_key" translatable="false">pref_filter_search_quality_key</string>
-    <string name="enable_nsfw_on_providers_key" translatable="false">enable_nsfw_on_providers_key</string>
-    <string name="skip_startup_account_select_key" translatable="false">skip_startup_account_select_key</string>
-    <string name="enable_skip_op_from_database" translatable="false">enable_skip_op_from_database</string>
-    <string name="rotate_video_key" translatable="false">rotate_video_key</string>
-    <string name="auto_rotate_video_key" translatable="false">auto_rotate_video_key</string>
-    <string name="biometric_key" translatable="false">biometric_key</string>
     <!-- FORMAT MIGHT TRANSLATE, WILL CAUSE CRASH IF APPLIED WRONG -->
-    <string name="extra_info_format" formatted="true" translatable="false">%d %s | %s</string>
-    <string name="storage_size_format" formatted="true" translatable="false">%s • %s</string>
-    <string name="download_size_format" formatted="true" translatable="false">%s / %s</string>
-    <string name="episode_name_format" formatted="true" translatable="false">%s %s</string>
-    <string name="ffw_text_format" formatted="true" translatable="false">+%d</string>
-    <string name="rew_text_format" formatted="true" translatable="false">-%d</string>
-    <string name="ffw_text_regular_format" formatted="true" translatable="false">%d</string>
-    <string name="rew_text_regular_format" formatted="true" translatable="false">%d</string>
-    <string name="rating_format" formatted="true" translatable="false">%.1f/10.0</string>
-    <string name="year_format" formatted="true" translatable="false">%d</string>
     <string name="app_dub_sub_episode_text_format" formatted="true">%1$s Ep %2$d</string>
     <string name="cast_format" formatted="true">Cast: %s</string>
     <string name="next_episode_format" formatted="true">Episode %d will be released in</string>
@@ -93,16 +8,17 @@
     <string name="next_episode_time_day_format" formatted="true">%1$dd %2$dh %3$dm</string>
     <string name="next_episode_time_hour_format" formatted="true">%1$dh %2$dm</string>
     <string name="next_episode_time_min_format" formatted="true">%dm</string>
+    <string name="download_time_left_hour_min_sec_format" formatted="true">%1$dh %2$dm %3$ds</string>
+    <string name="download_time_left_min_sec_format" formatted="true">%1$dm %2$ds</string>
+    <string name="download_time_left_sec_format" formatted="true">%1$ds</string>
     <!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
     <string name="result_poster_img_des">Poster</string>
     <string name="search_poster_img_des">Poster</string>
     <string name="episode_poster_img_des">Episode Poster</string>
     <string name="home_main_poster_img_des">Main Poster</string>
     <string name="home_next_random_img_des">Next Random</string>
-    <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>
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
@@ -116,6 +32,7 @@
     <string name="title_home">Home</string>
     <string name="title_search">Search</string>
     <string name="title_downloads">Downloads</string>
+    <string name="download_queue">Download queue</string>
     <string name="title_settings">Settings</string>
     <string name="search_hint">Search…</string>
     <string name="search_hint_site" formatted="true">Search %s…</string>
@@ -124,7 +41,6 @@
     <string name="no_data">No Data</string>
     <string name="episode_more_options_des">More Options</string>
     <string name="next_episode">Next episode</string>
-    <string name="result_plot" translatable="false">@string/synopsis</string>
     <string name="result_tags">Genres</string>
     <string name="result_share">Share</string>
     <string name="result_open_in_browser">Open In Browser</string>
@@ -136,12 +52,12 @@
     <string name="type_completed">Completed</string>
     <string name="type_dropped">Dropped</string>
     <string name="type_plan_to_watch">Plan to Watch</string>
-    <string name="type_none" translatable="false">@string/none</string>
     <string name="type_re_watching">Rewatching</string>
     <string name="play_movie_button">Play Movie</string>
     <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="play_full_series_button">Play Full Series</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>
@@ -157,9 +73,9 @@
     <string name="download_failed">Download Failed</string>
     <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="queue_empty_message">There are currently no queued 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>
@@ -175,7 +91,6 @@
     <string name="popup_play_file">Play File</string>
     <string name="popup_resume_download">Resume Download</string>
     <string name="popup_pause_download">Pause Download</string>
-    <string name="pref_disable_acra">Disable automatic bug reporting</string>
     <string name="home_more_info">More info</string>
     <string name="home_expanded_hide">Hide</string>
     <string name="home_play">Play</string>
@@ -185,7 +100,6 @@
     <string name="action_remove_from_bookmarks">Remove</string>
     <string name="action_add_to_bookmarks">Set watch status</string>
     <string name="sort_apply">Apply</string>
-    <string name="sort_cancel" translatable="false">@string/cancel</string>
     <string name="sort_copy">Copy</string>
     <string name="sort_close">Close</string>
     <string name="sort_clear">Clear</string>
@@ -252,6 +166,9 @@
     <string name="use_system_brightness_settings_des">Use system brightness in the app player instead of a dark
         overlay
     </string>
+    <string name="extra_brightness_settings">Extra brightness</string>
+    <string name="extra_brightness_settings_des">Enable brightness filter when 100% display brightness is exceeded</string>
+    <string name="extra_brightness_key">extra_brightness_enabled</string>
     <string name="episode_sync_settings">Update watch progress</string>
     <string name="episode_sync_settings_des">Automatically sync your current episode progress</string>
     <string name="restore_settings">Restore data from backup</string>
@@ -269,11 +186,14 @@
     <string name="settings_info">Info</string>
     <string name="advanced_search">Advanced Search</string>
     <string name="advanced_search_des">Gives you the search results separated by provider</string>
-    <string name="bug_report_settings_off">Only sends data on crashes</string>
-    <string name="bug_report_settings_on">Sends no data</string>
+    <string name="search_suggestions">Search Suggestions</string>
+    <string name="search_suggestions_des">Show search suggestions while typing</string>
+    <string name="clear_suggestions">Clear Suggestions</string>
     <string name="show_fillers_settings">Show filler episode for anime</string>
+    <string name="show_player_metadata_overlay">Show Player Metadata Overlay</string>
     <string name="show_trailers_settings">Show trailers</string>
     <string name="kitsu_settings">Show posters from Kitsu</string>
+    <string name="show_cast_in_details">Show cast panel</string>
     <string name="pref_filter_search_quality">Hide selected video quality in search results</string>
     <string name="automatic_plugin_updates">Automatic plugin updates</string>
     <string name="automatic_plugin_download">Automatically download plugins</string>
@@ -282,10 +202,11 @@
     <string name="updates_settings">Show app updates</string>
     <string name="updates_settings_des">Automatically search for new updates after starting the app.</string>
     <string name="redo_setup_process">Redo setup process</string>
-    <string name="uprereleases_settings">Update to prereleases</string>
-    <string name="uprereleases_settings_des">Search for prerelease updates instead of full releases only</string>
+    <string name="install_prerelease">Install pre-release version</string>
+    <string name="prerelease_already_installed">Pre-release is already installed.</string>
+    <string name="prerelease_install_failed">Failed to install pre-release.</string>
     <string name="apk_installer_settings">APK Installer</string>
-    <string name="apk_installer_settings_des">Some phones do not support the new package installer. Try the legacy option if updates do not install. </string>
+    <string name="apk_installer_settings_des">Some devices do not support the new package installer. Try the legacy option if updates do not install.</string>
     <string name="github">Github</string>
     <string name="lightnovel">Light novel app by the same devs</string>
     <string name="anim">Anime app by the same devs</string>
@@ -298,9 +219,6 @@
     <string name="copy_link_toast">Link copied to clipboard</string>
     <string name="play_episode_toast">Play Episode</string>
     <string name="subs_default_reset_toast">Reset to default value</string>
-    <string name="acra_report_toast">Sorry, the application crashed. An anonymous bug report will be sent to the
-        developers
-    </string>
     <string name="season">Season</string>
     <string name="season_format">%1$s %2$d%3$s</string>
     <string name="no_season">No Season</string>
@@ -343,8 +261,6 @@
     <string name="queued">queued</string>
     <string name="no_subtitles">No Subtitles</string>
     <string name="action_default">Default</string>
-    <string name="default_subtitles" translatable="false">@string/action_default</string>
-    <string name="default_account" translatable="false">@string/action_default</string>
     <string name="free_storage">Free</string>
     <string name="used_storage">Used</string>
     <string name="app_storage">App</string>
@@ -360,10 +276,6 @@
     <string name="livestreams">Livestreams</string>
     <string name="nsfw">NSFW</string>
     <string name="others">Others</string>
-    <plurals name="episodes" translatable="false">
-        <item quantity="one">@string/episode</item>
-        <item quantity="other">@string/episodes</item>
-    </plurals>
     <!--singular-->
     <string name="movies_singular">Movie</string>
     <string name="tv_series_singular">Series</string>
@@ -376,11 +288,12 @@
     <string name="live_singular">Livestream</string>
     <string name="nsfw_singular">NSFW</string>
     <string name="other_singular">Video</string>
-    <string name="music_singlar">Music</string>
+    <string name="music_singular">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="custom_media_singular">Media</string>
+    <string name="audio_singular">Audio</string>
+    <string name="podcast_singular">Podcast</string>
+    <string name="video_singular">Video</string>
     <string name="source_error">Source error</string>
     <string name="remote_error">Remote error</string>
     <string name="render_error">Renderer error</string>
@@ -392,6 +305,7 @@
     <string name="episode_action_chromecast_mirror">Chromecast mirror</string>
     <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_mirror">Play mirror</string>"
     <string name="episode_action_play_in_format">Play in %s</string>
     <string name="episode_action_auto_download">Auto download</string>
     <string name="episode_action_download_mirror">Download mirror</string>
@@ -400,11 +314,9 @@
     <string name="show_hd">Quality label</string>
     <string name="show_dub">Dub label</string>
     <string name="show_sub">Sub label</string>
+    <string name="show_rating">Rating Label</string>
     <string name="show_title">Title</string>
-    <string name="show_hd_key" translatable="false">show_hd_key</string>
-    <string name="show_dub_key" translatable="false">show_dub_key</string>
-    <string name="show_sub_key" translatable="false">show_sub_key</string>
-    <string name="show_title_key" translatable="false">show_title_key</string>
+    <string name="show_episode_text">Episode Text</string>
     <string name="poster_ui_settings">Toggle UI elements on poster</string>
     <string name="no_update_found">No Update Found</string>
     <string name="check_for_update">Check for Update</string>
@@ -418,7 +330,7 @@
     <string name="watch_quality_pref">Preferred watch quality (WiFi)</string>
     <string name="watch_quality_pref_data">Preferred watch quality (Mobile Data)</string>
     <string name="limit_title">Video player title max chars</string>
-    <string name="limit_title_rez">Video player resolution</string>
+    <string name="limit_title_rez">Show player information</string>
     <string name="video_buffer_size_settings">Video buffer size</string>
     <string name="video_buffer_length_settings">Video buffer length</string>
     <string name="video_buffer_disk_settings">Video cache on disk</string>
@@ -444,23 +356,6 @@
     <string name="resize_fill">Stretch</string>
     <string name="resize_zoom">Zoom</string>
     <string name="legal_notice">Disclaimer</string>
-    <string name="legal_notice_key" translatable="false">legal_notice_key</string>
-    <string name="legal_notice_text" translatable="false">Any legal issues regarding the content on this application
-        should be taken up with the actual file hosts and providers themselves as we are not affiliated with them.
-
-        In case of copyright infringement, please directly contact the responsible parties or the streaming websites.
-
-        The app is purely for educational and personal use.
-
-        CloudStream 3 does not host any content on the app, and has no control over what media is put up or taken down.
-        CloudStream 3 functions like any other search engine, such as Google. CloudStream 3 does not host, upload or
-        manage any videos, films or content. It simply crawls, aggregates and displayes links in a convenient,
-        user-friendly interface.
-
-        It merely scrapes 3rd-party websites that are publicly accessable via any regular web browser. It is the
-        responsibility of user to avoid any actions that might violate the laws governing his/her locality. Use
-        CloudStream 3 at your own risk.
-    </string>
     <string name="pref_category_bypass">ISP Bypasses</string>
     <string name="pref_category_links">Links</string>
     <string name="pref_category_app_updates">App updates</string>
@@ -469,11 +364,8 @@
     <string name="pref_category_actions">Actions</string>
     <string name="pref_category_cache">Cache</string>
     <string name="pref_category_android_tv">Android TV</string>
-    <string name="pref_category_android_tv_key" translatable="false">pref_category_android_tv_key</string>
     <string name="pref_category_gestures">Gestures</string>
-    <string name="pref_category_gestures_key" translatable="false">pref_category_gestures_key</string>
     <string name="pref_category_security">Security</string>
-    <string name="pref_category_security_key" translatable="false">pref_category_security_key</string>
     <string name="pref_category_accounts">Accounts</string>
     <string name="pref_category_player_features">Player features</string>
     <string name="pref_category_subtitles">Subtitles</string>
@@ -503,12 +395,6 @@
     <string name="bottom_title_settings">Poster title location</string>
     <string name="bottom_title_settings_des">Put the title under the poster</string>
     <!-- account stuff -->
-    <string name="anilist_key" translatable="false">anilist_key</string>
-    <string name="simkl_key" translatable="false">simkl_key</string>
-    <string name="mal_key" translatable="false">mal_key</string>
-    <string name="opensubtitles_key" translatable="false">opensubtitles_key</string>
-    <string name="subdl_key" translatable="false">subdl_key</string>
-    <string name="nginx_key" translatable="false">nginx_key</string>
     <string name="example_password">password123</string>
     <string name="example_username">Username</string>
     <string name="example_email">hello@world.com</string>
@@ -516,14 +402,6 @@
     <string name="example_site_name">NewSiteName</string>
     <string name="example_site_url">https://example.com</string>
     <string name="example_lang_name">Language code (en)</string>
-    <!--
-    <string name="mal_account_settings" translatable="false">MAL</string>
-    <string name="anilist_account_settings" translatable="false">AniList</string>
-    <string name="tmdb_account_settings" translatable="false">TMDB</string>
-    <string name="imdb_account_settings" translatable="false">IMDB</string>
-    <string name="kitsu_account_settings" translatable="false">Kitsu</string>
-    <string name="trakt_account_settings" translatable="false">Trakt</string>
-    -->
     <string name="login_format" formatted="true">%1$s %2$s</string>
     <string name="account">account</string>
     <string name="logout">Log out</string>
@@ -548,7 +426,6 @@
     <string name="all">All</string>
     <string name="max">Max</string>
     <string name="min">Min</string>
-    <string name="subtitles_none" translatable="false">@string/none</string>
     <string name="subtitles_outline">Outline</string>
     <string name="subtitles_depressed">Depressed</string>
     <string name="subtitles_shadow">Shadow</string>
@@ -600,6 +477,7 @@
     <string name="resolution_and_title">Resolution and title</string>
     <string name="title">Title</string>
     <string name="resolution">Resolution</string>
+    <string name="video_info">Media Info</string>
     <string name="error_invalid_id">Invalid ID</string>
     <string name="error_invalid_data">Invalid data</string>
     <string name="error_invalid_url">Invalid URL</string>
@@ -616,7 +494,6 @@
     <string name="previous">Previous</string>
     <string name="skip_setup">Skip setup</string>
     <string name="app_layout_subtext">Change the look of the app to suit your device</string>
-    <string name="crash_reporting_title">Crash reporting</string>
     <string name="preferred_media_subtext">What do you want to see</string>
     <string name="setup_done">Done</string>
     <string name="extensions">Extensions</string>
@@ -650,7 +527,7 @@
     <string name="view_public_repositories_button">View community repositories</string>
     <string name="view_public_repositories_button_short">Public list</string>
     <string name="uppercase_all_subtitles">Uppercase all subtitles</string>
-    <string name="download_all_plugins_from_repo">Warning: CloudStream 3 does not take any responsibility for using third-party extensions and does not provide any support for them!</string>
+    <string name="download_all_plugins_from_repo">Warning: CloudStream does not take any responsibility for using third-party extensions and does not provide any support for them!</string>
     <string name="single_plugin_disabled" formatted="true">%s (Disabled)</string>
     <string name="tracks">Tracks</string>
     <string name="audio_tracks">Audio tracks</string>
@@ -683,7 +560,8 @@
     <string name="skip_type_recap">Recap</string>
     <string name="skip_type_mixed_ed">Mixed ending</string>
     <string name="skip_type_mixed_op">Mixed opening</string>
-    <string name="skip_type_creddits">Credits</string>
+    <string name="skip_type_credits">Credits</string>
+    <string name="skip_type_preview">Preview</string>
     <string name="skip_type_intro">Intro</string>
     <string name="clear_history">Clear history</string>
     <string name="history">History</string>
@@ -704,7 +582,6 @@
         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>
     <string name="update_notification_downloading">Downloading app update…</string>
@@ -750,6 +627,8 @@
     <string name="set_default">Set default</string>
     <string name="use">Use</string>
     <string name="edit">Edit</string>
+    <string name="source_priority">Source priority</string>
+    <string name="source_priority_help">Decide how video sources should be sorted in the player</string>
     <string name="profiles">Profiles</string>
     <string name="help">Help</string>
     <string name="quality_profile_help">
@@ -774,7 +653,6 @@
     <string name="duplicate_add">Add</string>
     <string name="duplicate_replace">Replace</string>
     <string name="duplicate_replace_all">Replace All</string>
-    <string name="duplicate_cancel" translatable="false">@string/cancel</string>
     <string name="duplicate_message_single" formatted="true">
         It appears that a potentially duplicate item already exists in your library: \'%s.\'
 
@@ -787,7 +665,6 @@
 
         \n\nWould you like to add this item anyway, replace the existing ones, or cancel the action?
     </string>
-    <string name="tv_no_focus_tag" translatable="false">tv_no_focus_tag</string>
     <string name="enter_pin">Enter PIN</string>
     <string name="enter_pin_with_name" formatted="true">Enter PIN for %s</string>
     <string name="enter_current_pin">Enter Current PIN</string>
@@ -796,6 +673,7 @@
     <string name="pin_error_incorrect">Incorrect PIN. Please try again.</string>
     <string name="pin_error_length">PIN must be 4 characters</string>
     <string name="select_an_account">Select an Account</string>
+    <string name="no_account">No account</string>
     <string name="manage_accounts">Manage Accounts</string>
     <string name="edit_account">Edit account</string>
     <string name="logged_account" formatted="true">Logged in as %s</string>
@@ -823,35 +701,28 @@
     <string name="device_pin_counter_text">Code expires in %1$dm %2$ds</string>
     <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">Restart app and accept Stream Torrent pop-up to proceed.</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="software_decoding_desc">Software decoding enables the player to play video files not supported by your device, but may cause laggy or unstable playback on high resolution.</string>
     <string name="volume_exceeded_100">Volume has exceeded 100%</string>
     <string name="slide_up_again_to_exceed_100">Slide up again to go beyond 100%</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>
@@ -875,7 +746,42 @@
     <string name="overscan_settings">Overscan</string>
     <string name="poster_size_settings_des">Changes size of posters</string>
     <string name="poster_size_settings">Poster size</string>
-    <string name="speedup_key" translatable="false">speedup_key</string>
-    <string name="speedup_title" >LongPress Speed Toggle</string>
-    <string name="speedup_summary" >Hold to get 2x speed</string>
+    <string name="speedup_title">LongPress Speed Toggle</string>
+    <string name="speedup_summary">Hold to get 2x speed</string>
+    <string name="edit_profile_image_title">Edit Profile Image</string>
+    <string name="edit_profile_image_hint">Enter Profile Image URL</string>
+    <string name="edit_profile_image_error_empty">No URL Found</string>
+    <string name="edit_profile_image_error_invalid">Invalid URL or Image</string>
+    <string name="edit_profile_image_success">Successfully Image Updated</string>
+    <string name="action_mark_watched_up_to_this_episode">Mark as watched up to this episode</string>
+    <string name="action_remove_mark_watched_up_to_this_episode">Remove watched up to this episode</string>
+    <string name="action_reload">Reloaded</string>
+    <string name="reload_provider">Reload Provider</string>
+    <string name="name">Name</string>
+    <string name="source_name">Source Name</string>
+    <string name="resolution_and_name">Resolution and name</string>
+    <string name="download_all">Download all</string>
+    <string name="cancel_all">Cancel all</string>
+    <string name="download_episode_range">Do you want to download episode %s?</string>
+    <string name="cancel_queue_message">Do you want to cancel all queued downloads?</string>
+    <string name="subs_subtitle_alignment">Subtitle Alignment</string>
+    <string name="bottom_left">Bottom left</string>
+    <string name="bottom_center">Bottom center</string>
+    <string name="bottom_right">Bottom right</string>
+    <string name="middle_left">Middle left</string>
+    <string name="middle_center">Middle center</string>
+    <string name="middle_right">Middle right</string>
+    <string name="top_left">Top left</string>
+    <string name="top_center">Top center</string>
+    <string name="top_right">Top right</string>
+    <plurals name="downloads_active">
+        <item quantity="one">%d active download</item>
+        <item quantity="other">%d active downloads</item>
+    </plurals>
+    <plurals name="downloads_queued">
+        <item quantity="one">%d download queued</item>
+        <item quantity="other">%d downloads queued</item>
+    </plurals>
+    <string name="player_is_live">Live</string>
+
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 6a849238316..f386bb62eff 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -2,25 +2,21 @@
     <!-- 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:navigationBarColor">?attr/primaryBlackBackground</item>
         <item name="android:statusBarColor">?attr/iconGrayBackground</item>
 
+        <item name="android:windowTranslucentStatus">true</item>
+        <item name="android:windowTranslucentNavigation">false</item>
+
         <item name="android:scrollbarThumbVertical">@null</item>
         <item name="android:scrollbarThumbHorizontal">@null</item>
 
-        <item name="android:windowTranslucentStatus">true</item> <!--true-->
-        <item name="android:windowTranslucentNavigation">false</item>
-        <item name="alertDialogTheme">@style/Theme.AlertDialog</item>
-
         <item name="android:textViewStyle">@style/AppTextViewStyle</item>
         <item name="android:buttonStyle">@style/AppButtonStyle</item>
         <item name="android:editTextStyle">@style/AppEditStyle</item>
+        <item name="alertDialogTheme">@style/Theme.AlertDialog</item>
         <item name="materialButtonStyle">@style/AppMaterialButtonStyle</item>
         <item name="preferenceFragmentCompatStyle">@style/PreferenceTheme</item>
         <item name="bottomSheetDialogTheme">@style/AppBottomSheetDialogTheme</item>
@@ -90,6 +86,7 @@
 
     <style name="AmoledModeLight" parent="AmoledMode">
         <item name="primaryGrayBackground">@color/amoledModeLight</item>
+        <item name="boxItemBackground">@color/amoledModeLight</item>
     </style>
 
     <style name="ChipFilled" parent="@style/Widget.Material3.Chip.Filter">
@@ -105,6 +102,7 @@
         <item name="android:fontFamily">@font/google_sans</item>
         <item name="android:tag">@string/tv_no_focus_tag</item>
         <item name="chipMinTouchTargetSize">0dp</item>
+        <item name="checkedIconVisible">false</item>
     </style>
 
     <style name="RoundProgressbar">
@@ -115,8 +113,10 @@
 
     <style name="ChipFilledSemiTransparent" parent="@style/ChipFilled">
         <item name="chipBackgroundColor">@color/transparent</item>
-        <item name="chipSurfaceColor">@color/white_attr_20</item>
+        <item name="chipSurfaceColor">#33FFFFFF</item>
         <item name="backgroundColor">@color/transparent</item>
+        <item name="android:textColor">@color/textColor</item>
+        <item name="textColor">@color/textColor</item>
     </style>
 
     <style name="ChipParent">
@@ -138,15 +138,17 @@
     </style>
 
     <style name="DubButton" parent="@style/SearchBox">
-        <item name="android:background">@drawable/dub_bg_color</item>
         <item name="android:text">@string/app_dubbed_text</item>
-        <item name="android:textColor">@color/dubColorText</item>
+        <!-- Background is set programmatically -->
+        <item name="textColor">?attr/primaryGrayBackground</item>
+        <item name="android:textColor">?attr/primaryGrayBackground</item>
     </style>
 
     <style name="SubButton" parent="@style/SearchBox">
-        <item name="android:background">@drawable/sub_bg_color</item>
         <item name="android:text">@string/app_subbed_text</item>
-        <item name="android:textColor">@color/subColorText</item>
+    </style>
+    <style name="EpisodeTextButton" parent="@style/SearchBox">
+        <item name="android:text">@string/episode_text</item>
     </style>
 
     <!--<style name="RatingButton" parent="@style/SearchBox">
@@ -156,16 +158,15 @@
 
     <style name="RatingButton" parent="@style/SearchBox">
         <item name="android:minWidth">40dp</item>
-        <item name="android:background">@drawable/rating_bg_color</item>
-        <item name="drawableTint">?attr/colorOnPrimary</item>
-        <item name="android:textColor">?attr/colorOnPrimary</item>
-        <item name="drawableStartCompat">@drawable/ic_baseline_star_24</item>
+        <item name="drawableTint">?attr/textColor</item>
+        <item name="drawableSize">10sp</item>
+
+        <item name="drawableEndCompat">@drawable/kid_star_24px</item>
     </style>
 
     <style name="TypeButton" parent="@style/SearchBox">
-        <item name="android:background">@drawable/type_bg_color</item>
+        <item name="android:layout_width">wrap_content</item>
         <item name="android:text">@string/quality_hd</item>
-        <item name="android:textColor">@color/typeColorText</item>
     </style>
 
     <style name="LightMode">
@@ -177,8 +178,48 @@
         <item name="grayTextColor">@color/lightGrayTextColor</item>
         <item name="white">@color/black</item>
         <item name="black">@color/white</item>
-
         <item name="colorOnPrimary">@color/blackText</item>
+        <item name="isLightTheme">true</item>
+        <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">true</item>
+    </style>
+
+    <style name="DraculaMode">
+        <item name="primaryGrayBackground">@color/DraculaPrimaryGrayBackground</item>
+        <item name="primaryBlackBackground">@color/DraculaBitDarkerGrayBackground</item>
+        <item name="iconGrayBackground">@color/DraculaGrayBackground</item>
+        <item name="boxItemBackground">@color/DraculaItemBackground</item>
+        <item name="textColor">@color/DraculaTextColor</item>
+        <item name="iconColor">@color/DraculaIconColor</item>
+        <item name="white">@color/DraculaTextColor</item>
+        <item name="black">@color/DraculaPrimaryGrayBackground</item>
+        <item name="colorOnPrimary">@color/DraculaTextColor</item>
+    </style>
+
+
+    <style name="SilentBlueMode">
+        <item name="primaryGrayBackground">@color/SilentBluePrimaryGrayBackground</item>
+        <item name="primaryBlackBackground">@color/SilentBlueBitDarkerGrayBackground</item>
+        <item name="iconGrayBackground">@color/SilentBlueGrayBackground</item>
+        <item name="boxItemBackground">@color/SilentBlueItemBackground</item>
+        <item name="textColor">@color/SilentBlueTextColor</item>
+        <item name="iconColor">@color/SilentBlueIconColor</item>
+        <item name="white">@color/SilentBlueTextColor</item>
+        <item name="black">@color/SilentBluePrimaryGrayBackground</item>
+        <item name="colorOnPrimary">@color/SilentBlueTextColor</item>
+    </style>
+
+    <style name="LavenderMode">
+        <item name="primaryGrayBackground">@color/LavenderPrimaryGrayBackground</item>
+        <item name="primaryBlackBackground">@color/LavenderBitDarkerGrayBackground</item>
+        <item name="iconGrayBackground">@color/LavenderGrayBackground</item>
+        <item name="boxItemBackground">@color/LavenderItemBackground</item>
+        <item name="textColor">@color/LavenderTextColor</item>
+        <item name="iconColor">@color/LavenderIconColor</item>
+        <item name="white">@color/LavenderTextColor</item>
+        <item name="black">@color/LavenderPrimaryGrayBackground</item>
+        <item name="colorOnPrimary">@color/LavenderTextColor</item>
+        <item name="isLightTheme">true</item>
+        <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">true</item>
     </style>
 
     <style name="MonetMode">
@@ -427,6 +468,7 @@
         <item name="android:queryHint">@string/search_hint</item>
         <item name="android:background">@color/transparent</item>
         <item name="android:fontFamily">@font/google_sans</item>
+        <item name="closeIcon">@drawable/ic_baseline_close_24</item>
     </style>
 
     <style name="AppBottomSheetDialogTheme">
@@ -455,6 +497,11 @@
         <item name="android:windowMinWidthMinor">@dimen/abc_dialog_min_width_minor</item>
         <item name="android:windowBackground">@drawable/dialog__window_background</item>
         <item name="textAllCaps">false</item>
+        <item name="android:textColorPrimary">?attr/grayTextColor</item>
+
+        <item name="buttonBarPositiveButtonStyle">@style/WhiteButton.Dialog</item>
+        <item name="buttonBarNegativeButtonStyle">@style/BlackButton.Dialog</item>
+        <item name="buttonBarNeutralButtonStyle">@style/BlackButton.Dialog</item>
     </style>
 
     <style name="TabNoCaps" parent="TextAppearance.Design.Tab">
@@ -508,7 +555,7 @@
         <item name="android:navigationBarColor">?attr/colorPrimary</item>
     </style>
 
-    <style name="AlertDialogCustom" parent="Theme.AppCompat.Dialog.Alert">
+    <style name="AlertDialogCustom" parent="Theme.AlertDialog">
         <item name="android:windowFullscreen">true</item>
         <item name="android:textColor">?attr/textColor</item>
         <item name="android:textColorPrimary">?attr/textColor</item>
@@ -538,6 +585,17 @@
         <item name="android:windowNoTitle">true</item>
     </style>
 
+    <style name="DialogFullscreenPlayer" parent="DialogFullscreen">
+        <item name="android:windowBackground">?attr/primaryBlackBackground</item>
+        <item name="android:windowTranslucentNavigation">false</item>
+        <item name="android:windowTranslucentStatus">false</item>
+
+        <item name="android:windowIsFloating">false</item>
+        <item name="android:navigationBarColor">?attr/primaryBlackBackground</item>
+        <item name="android:statusBarColor">?attr/primaryBlackBackground</item>
+        <item name="android:windowLightStatusBar" tools:targetApi="m">?attr/isLightTheme</item>
+    </style>
+
     <style name="DialogHalfFullscreen" parent="AlertDialogCustom">
         <item name="android:windowEnterAnimation">@anim/enter_anim</item>
         <item name="android:windowExitAnimation">@anim/exit_anim</item>
@@ -587,7 +645,7 @@
 
     <style name="SettingsItem">
         <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">50sp</item>
+        <item name="android:layout_height">50dp</item>
         <item name="android:gravity">center_vertical</item>
         <item name="android:paddingStart">20dp</item>
         <item name="android:paddingEnd">20dp</item>
@@ -609,20 +667,22 @@
     </style>
 
     <style name="SearchBox">
+        <item name="android:background">@drawable/bg_color_both</item>
+        <item name="android:minWidth">40dp</item>
         <item name="android:textStyle">bold</item>
-        <item name="android:minWidth">50dp</item>
         <item name="android:gravity">center</item>
-        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_marginBottom">5dp</item>
         <item name="android:paddingLeft">7dp</item>
         <item name="android:paddingRight">7dp</item>
         <item name="android:paddingTop">3dp</item>
         <item name="android:paddingBottom">3dp</item>
-        <item name="android:textSize">12sp</item>
-        <item name="textColor">@color/textColor</item>
-        <item name="android:textColor">@color/textColor</item>
-        <item name="android:layout_margin">2dp</item>
+        <item name="android:textSize">10sp</item>
+        <item name="textColor">?attr/textColor</item>
+        <item name="android:textColor">?attr/textColor</item>
+        <item name="android:layout_marginLeft">1dp</item>
+        <item name="android:layout_marginRight">1dp</item>
+        <item name="android:layout_marginTop">1dp</item>
     </style>
 
     <style name="NiceButton">
@@ -653,6 +713,21 @@
         <item name="android:textColor">?attr/iconGrayBackground</item>
         <item name="rippleColor">?attr/primaryBlackBackground</item>
     </style>
+    <!-- This is so shit, because android has no native way to either changing the layout (android:layout) or changing the layout_height for no reason.
+    So the only way to shrink the buttons is by using insetTop+insetBottom along with the drawable.
+    https://android.googlesource.com/platform/frameworks/base/+/master/core/res/res/layout/alert_dialog.xml <- old xml for reference, but new use m3_alert_dialog
+    -->
+    <style name="BlackButton.Dialog" parent="BlackButton">
+        <item name="android:foreground">@drawable/outline_drawable_less_inset</item>
+        <item name="android:insetTop">@dimen/dialog_buttons_inset</item>
+        <item name="android:insetBottom">@dimen/dialog_buttons_inset</item>
+    </style>
+
+    <style name="WhiteButton.Dialog" parent="WhiteButton">
+        <item name="android:foreground">@drawable/outline_drawable_less_inset</item>
+        <item name="android:insetTop">@dimen/dialog_buttons_inset</item>
+        <item name="android:insetBottom">@dimen/dialog_buttons_inset</item>
+    </style>
 
     <style name="BlackLabel" parent="@style/Widget.MaterialComponents.Tooltip">
         <item name="backgroundTint">?attr/iconGrayBackground</item>
@@ -683,13 +758,24 @@
         <item name="android:drawablePadding">20dp</item>
     </style>
 
+    <!-- https://github.com/material-components/material-components-android/blob/4e4e8f3388beb7e82a87cb67142aa34444a79740/lib/java/com/google/android/material/navigation/res/values/attrs.xml#L129 -->
+    <!-- https://developer.android.com/design/ui/tv/guides/components/navigation-drawer -->
+    <style name="CustomIndicator" parent="Widget.Material3Expressive.NavigationRailView.ActiveIndicator">
+        <item name="expandedHeight">48dp</item>
+        <item name="expandedWidth">180dp</item>
+        <item name="android:height">48dp</item>
+        <item name="android:width">48dp</item>
+
+        <item name="expandedActiveIndicatorPaddingTop">0dp</item>
+        <item name="expandedActiveIndicatorPaddingBottom">0dp</item>
+    </style>
 
     <style name="BlackButton" parent="NiceButton">
         <item name="strokeColor">?attr/textColor</item>
         <item name="backgroundTint">?attr/iconGrayBackground</item>
         <item name="iconTint">?attr/textColor</item>
         <item name="android:textColor">?attr/textColor</item>
-        <item name="rippleColor">?attr/textColor</item>
+        <item name="rippleColor">@color/black_button_ripple</item>
     </style>
 
     <style name="SmallBlackButton" parent="BlackButton">
@@ -968,4 +1054,75 @@
             @drawable/cast_ic_mini_controller_closed_caption
         </item>
     </style>
+
+    <style name="RoundedImageView">
+        <item name="cornerFamily">rounded</item>
+        <item name="cornerSize">50%</item>
+    </style>
+
+    <style name="PlayUnderlayProgress">
+        <item name="shapeAppearanceOverlay">@style/RoundedImageView</item>
+        <item name="android:scaleType">center</item>
+        <item name="android:src">@drawable/netflix_play</item>
+        <item name="android:layout_gravity">center</item>
+    </style>
+
+    <style name="CircularProgress">
+        <item name="trackThickness">@dimen/circular_progress_thickness</item>
+        <item name="android:layout_gravity">center</item>
+        <item name="indicatorColor">@color/white</item>
+        <item name="indicatorTrackGapSize">0dp</item>
+        <item name="trackColor">@color/white_attr_20</item>
+    </style>
+
+    <style name="HomePlayUnderlayProgress" parent="PlayUnderlayProgress">
+        <item name="tint">@color/white</item>
+        <item name="android:layout_width">@dimen/home_poster_progress_size</item>
+        <item name="android:layout_height">@dimen/home_poster_progress_size</item>
+        <item name="android:background">@color/playIconBackground</item>
+    </style>
+
+    <style name="HomeCircularProgress" parent="CircularProgress">
+        <item name="android:layout_width">@dimen/home_poster_progress_size</item>
+        <item name="android:layout_height">@dimen/home_poster_progress_size</item>
+        <item name="indicatorSize">@dimen/home_poster_progress_size</item>
+    </style>
+
+    <style name="EpisodePlayUnderlayProgress" parent="PlayUnderlayProgress">
+        <item name="tint">@color/white</item>
+        <item name="android:layout_width">40dp</item>
+        <item name="android:layout_height">40dp</item>
+        <item name="android:background">@color/playIconBackground</item>
+    </style>
+
+    <style name="EpisodeCircularProgress" parent="CircularProgress">
+        <item name="android:layout_width">@dimen/episode_progress_size</item>
+        <item name="android:layout_height">@dimen/episode_progress_size</item>
+        <item name="indicatorSize">@dimen/episode_progress_size</item>
+    </style>
+
+    <style name="ContinueWatchingPlayUnderlayProgress">
+        <item name="android:layout_width">@dimen/continue_watching_progress_size</item>
+        <item name="android:layout_height">@dimen/continue_watching_progress_size</item>
+        <item name="android:src">@drawable/play_button_transparent</item>
+        <item name="android:layout_gravity">center</item>
+    </style>
+
+    <style name="ContinueWatchingCircularProgress" parent="CircularProgress">
+        <item name="android:layout_width">@dimen/continue_watching_progress_size</item>
+        <item name="android:layout_height">@dimen/continue_watching_progress_size</item>
+        <item name="indicatorSize">@dimen/continue_watching_progress_size</item>
+    </style>
+
+    <style name="DownloadHeaderCircularProgress" parent="CircularProgress">
+        <item name="android:layout_width">@dimen/download_header_progress_size</item>
+        <item name="android:layout_height">@dimen/download_header_progress_size</item>
+        <item name="indicatorSize">@dimen/download_header_progress_size</item>
+    </style>
+    <style name="DownloadHeaderPlayUnderlayProgress" parent="PlayUnderlayProgress">
+        <item name="tint">@color/white</item>
+        <item name="android:layout_width">@dimen/download_header_progress_size</item>
+        <item name="android:layout_height">@dimen/download_header_progress_size</item>
+        <item name="android:background">@color/playIconBackground</item>
+    </style>
 </resources>
diff --git a/app/src/main/res/xml/settings_account.xml b/app/src/main/res/xml/settings_account.xml
index bbef5f05bb9..58009031846 100644
--- a/app/src/main/res/xml/settings_account.xml
+++ b/app/src/main/res/xml/settings_account.xml
@@ -9,6 +9,10 @@
             android:icon="@drawable/mal_logo"
             android:key="@string/mal_key" />
 
+        <Preference
+            android:icon="@drawable/kitsu_icon"
+            android:key="@string/kitsu_key" />
+
         <Preference
             android:icon="@drawable/ic_anilist_icon"
             android:key="@string/anilist_key" />
@@ -24,6 +28,9 @@
         <Preference
             android:icon="@drawable/subdl_logo_big"
             android:key="@string/subdl_key" />
+        <Preference
+            android:icon="@drawable/animeskip"
+            android:key="@string/animeskip_key" />
 
         <SwitchPreference
             android:defaultValue="false"
diff --git a/app/src/main/res/xml/settings_player.xml b/app/src/main/res/xml/settings_player.xml
index c953d6d3b3d..6e136747448 100644
--- a/app/src/main/res/xml/settings_player.xml
+++ b/app/src/main/res/xml/settings_player.xml
@@ -33,7 +33,7 @@
 
         <Preference
             android:icon="@drawable/ic_baseline_text_format_24"
-            android:key="@string/prefer_limit_title_rez_key"
+            android:key="@string/prefer_limit_show_player_info"
             android:title="@string/limit_title_rez" />
         <SwitchPreference
             android:defaultValue="false"
@@ -57,6 +57,11 @@
 
 
     <PreferenceCategory android:title="@string/pref_category_player_features">
+        <Preference
+            android:icon="@drawable/ic_baseline_people_24"
+            android:summary="@string/source_priority_help"
+            android:title="@string/source_priority"
+            app:key="@string/player_source_priority_key"/>
         <SwitchPreference
             android:icon="@drawable/ic_baseline_picture_in_picture_alt_24"
             android:summary="@string/picture_in_picture_des"
@@ -103,7 +108,7 @@
             android:icon="@drawable/screen_rotation"
             android:summary="@string/auto_rotate_video_desc"
             android:title="@string/auto_rotate_video"
-            app:defaultValue="false"
+            app:defaultValue="true"
             app:key="@string/auto_rotate_video_key" />
         <SwitchPreference
             android:icon="@drawable/preview_seekbar_24"
@@ -117,6 +122,12 @@
             android:title="@string/software_decoding"
             app:defaultValue="true"
             app:key="@string/software_decoding_key" />
+        <SwitchPreference
+            android:icon="@drawable/sun_7_24"
+            android:summary="@string/extra_brightness_settings_des"
+            android:title="@string/extra_brightness_settings"
+            app:defaultValue="false"
+            app:key="@string/extra_brightness_key" />
     </PreferenceCategory>
     <PreferenceCategory
         android:title="@string/pref_category_gestures"
diff --git a/app/src/main/res/xml/settings_ui.xml b/app/src/main/res/xml/settings_ui.xml
index 08c0fba7296..1b516ffa304 100644
--- a/app/src/main/res/xml/settings_ui.xml
+++ b/app/src/main/res/xml/settings_ui.xml
@@ -58,6 +58,12 @@
             android:title="@string/advanced_search"
             app:defaultValue="true"
             app:key="advanced_search" />
+        <SwitchPreference
+            android:icon="@drawable/search_icon"
+            android:summary="@string/search_suggestions_des"
+            android:title="@string/search_suggestions"
+            app:defaultValue="true"
+            app:key="search_suggestions_enabled" />
         <SwitchPreference
             android:defaultValue="true"
             android:icon="@drawable/baseline_theaters_24"
@@ -68,11 +74,21 @@
             android:icon="@drawable/kitsu_icon"
             android:key="@string/show_kitsu_posters_key"
             android:title="@string/kitsu_settings" />
+        <SwitchPreference
+            android:defaultValue="true"
+            android:icon="@drawable/ic_baseline_people_24"
+            android:key="@string/show_cast_in_details_key"
+            android:title="@string/show_cast_in_details" />    
         <SwitchPreference
             android:defaultValue="false"
             android:icon="@drawable/ic_baseline_skip_next_24"
             android:key="@string/show_fillers_key"
             android:title="@string/show_fillers_settings" />
+        <SwitchPreference
+            android:defaultValue="true"
+            android:icon="@drawable/metadata_overlay_icon"
+            android:key="@string/show_player_metadata_key"
+            android:title="@string/show_player_metadata_overlay" />
         <SwitchPreference
             android:icon="@drawable/ic_baseline_play_arrow_24"
             android:summary="@string/random_button_settings_desc"
diff --git a/app/src/main/res/xml/settings_updates.xml b/app/src/main/res/xml/settings_updates.xml
index 2c2de04318c..77ebae47435 100644
--- a/app/src/main/res/xml/settings_updates.xml
+++ b/app/src/main/res/xml/settings_updates.xml
@@ -7,21 +7,19 @@
         <Preference
             android:title="@string/check_for_update"
             app:icon="@drawable/ic_baseline_system_update_24"
-            app:key="@string/manual_check_update_key"
-            app:summary="@string/app_version" />
-        <SwitchPreference
+            app:key="@string/manual_check_update_key" />
+
+        <Preference
             android:icon="@drawable/ic_baseline_developer_mode_24"
-            android:summary="@string/uprereleases_settings_des"
-            android:title="@string/uprereleases_settings"
-            app:defaultValue="@bool/is_prerelease"
-            app:key="@string/prerelease_update_key" />
+            android:title="@string/install_prerelease"
+            app:key="@string/install_prerelease_key" />
 
         <Preference
             android:icon="@drawable/netflix_download"
             android:key="@string/apk_installer_key"
             android:title="@string/apk_installer_settings"
-            android:summary="@string/apk_installer_settings_des"
-            />
+            android:summary="@string/apk_installer_settings_des" />
+
         <SwitchPreference
             android:icon="@drawable/ic_baseline_notifications_active_24"
             android:summary="@string/updates_settings_des"
@@ -84,12 +82,5 @@
             android:icon="@drawable/ic_baseline_construction_24"
             android:title="@string/redo_setup_process"
             app:key="@string/redo_setup_key" />
-        <!--<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" />-->
     </PreferenceCategory>
 </PreferenceScreen>
diff --git a/app/src/test/java/com/lagradost/cloudstream3/ProviderTests.kt b/app/src/test/java/com/lagradost/cloudstream3/ProviderTests.kt
index 846dfdb5c57..e09e194efd8 100644
--- a/app/src/test/java/com/lagradost/cloudstream3/ProviderTests.kt
+++ b/app/src/test/java/com/lagradost/cloudstream3/ProviderTests.kt
@@ -48,14 +48,14 @@ class ProviderTests {
 //         var searchResult: List<SearchResponse>? = null
 //         for (query in searchQueries) {
 //             val response = try {
-//                 api.search(query)
+//                 api.search(query, 1)
 //             } catch (e: Exception) {
 //                 if (e.cause is NotImplementedError) {
 //                     Assert.fail("Provider has not implemented .search")
 //                 }
 //                 logError(e)
 //                 null
-//             }
+//             }?.items
 //             if (!response.isNullOrEmpty()) {
 //                 correctResponses++
 //                 if (searchResult == null) {
@@ -143,14 +143,14 @@ class ProviderTests {
 
 //     @Test
 //     fun providerCorrectData() {
-//         val isoNames = SubtitleHelper.languages.map { it.ISO_639_1 }
-//         Assert.assertFalse("ISO does not contain any languages", isoNames.isNullOrEmpty())
+//         val langTagsIETF = SubtitleHelper.languages.map { it.IETF_tag }
+//         Assert.assertFalse("langTagsIETF does not contain any languages", langTagsIETF.isNullOrEmpty())
 //         for (api in getAllProviders()) {
 //             Assert.assertTrue("Api does not contain a mainUrl", api.mainUrl != "NONE")
 //             Assert.assertTrue("Api does not contain a name", api.name != "NONE")
 //             Assert.assertTrue(
 //                 "Api ${api.name} does not contain a valid language code",
-//                 isoNames.contains(api.lang)
+//                 langTagsIETF.contains(api.lang)
 //             )
 //             Assert.assertTrue(
 //                 "Api ${api.name} does not contain any supported types",
diff --git a/app/src/test/java/com/lagradost/cloudstream3/SubtitleSelectionTest.kt b/app/src/test/java/com/lagradost/cloudstream3/SubtitleSelectionTest.kt
new file mode 100644
index 00000000000..93dc9dc0cd0
--- /dev/null
+++ b/app/src/test/java/com/lagradost/cloudstream3/SubtitleSelectionTest.kt
@@ -0,0 +1,140 @@
+package com.lagradost.cloudstream3
+
+import com.lagradost.cloudstream3.ui.player.SubtitleData
+import com.lagradost.cloudstream3.ui.player.SubtitleOrigin
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNull
+import org.junit.Test
+
+/** Ensure partial subtitle language finding is reliable. */
+class SubtitleLanguageTagTest {
+    fun getQuickSubtitle(originalName: String, languageCode: String?): SubtitleData {
+        return SubtitleData(
+            originalName = originalName,
+            nameSuffix = "1",
+            url = "https://example.com/test.vtt",
+            origin = SubtitleOrigin.URL,
+            mimeType = "text/vtt",
+            headers = emptyMap(),
+            languageCode = languageCode
+        )
+    }
+
+    @Test
+    fun `returns languageCode directly if already valid IETF tag`() {
+        val subtitle = getQuickSubtitle(
+            originalName = "Anything",
+            languageCode = "en"
+        )
+
+        assertEquals("en", subtitle.getIETF_tag())
+    }
+
+    @Test
+    fun `matches exact language name`() {
+        val subtitle = getQuickSubtitle(
+            originalName = "English",
+            languageCode = null
+        )
+
+        assertEquals("en", subtitle.getIETF_tag())
+    }
+
+    @Test
+    fun `matches native language name`() {
+        val subtitle = getQuickSubtitle(
+            originalName = "Español",
+            languageCode = null
+        )
+
+        assertEquals("es", subtitle.getIETF_tag())
+    }
+
+    @Test
+    fun `matches fuzzy partial language name`() {
+        val subtitle = getQuickSubtitle(
+            originalName = "English [SUB]",
+            languageCode = null
+        )
+
+        assertEquals("en", subtitle.getIETF_tag())
+    }
+
+    @Test
+    fun `returns null when no language matches`() {
+        val subtitle = getQuickSubtitle(
+            originalName = "Klingon",
+            languageCode = null
+        )
+
+        assertNull(subtitle.getIETF_tag())
+    }
+
+
+    @Test
+    fun `returns the correct language variant`() {
+        val subtitle1 = getQuickSubtitle(
+            originalName = "Chinese",
+            languageCode = null
+        )
+        val subtitle2 = getQuickSubtitle(
+            originalName = "Chinese (subtitle)",
+            languageCode = null
+        )
+        val subtitleSimplified1 = getQuickSubtitle(
+            originalName = "Chinese (simplified)",
+            languageCode = null
+        )
+        val subtitleSimplified2 = getQuickSubtitle(
+            originalName = "Chinese - simplified",
+            languageCode = null
+        )
+        val subtitleSimplified3 = getQuickSubtitle(
+            originalName = "Chinese simplified",
+            languageCode = "zhh"
+        )
+        val subtitleSimplified4 = getQuickSubtitle(
+            originalName = "Chinese (simplified)2",
+            languageCode = "zh-hans"
+        )
+        val subtitleSimplified5 = getQuickSubtitle(
+            originalName = "汉语",
+            languageCode = null
+        )
+        val subtitleSimplified6 = getQuickSubtitle(
+            originalName = "",
+            languageCode = "zh-hans"
+        )
+        assertEquals("zh", subtitle1.getIETF_tag())
+        assertEquals("zh", subtitle2.getIETF_tag())
+        assertEquals("zh-hans", subtitleSimplified1.getIETF_tag())
+        assertEquals("zh-hans", subtitleSimplified2.getIETF_tag())
+        assertEquals("zh-hans", subtitleSimplified3.getIETF_tag())
+        assertEquals("zh-hans", subtitleSimplified4.getIETF_tag())
+        assertEquals("zh-hans", subtitleSimplified5.getIETF_tag())
+        assertEquals("zh-hans", subtitleSimplified6.getIETF_tag())
+    }
+
+
+    @Test
+    fun `returns exact language matches`() {
+        val subtitle = getQuickSubtitle(
+            originalName = "en",
+            languageCode = null
+        )
+
+        assertEquals("en", subtitle.getIETF_tag())
+    }
+
+
+    @Test
+    fun `returns partial language matches`() {
+        val subtitle = getQuickSubtitle(
+            originalName = "Englis",
+            languageCode = null
+        )
+
+        assertEquals("en", subtitle.getIETF_tag())
+    }
+}
+
diff --git a/build.gradle.kts b/build.gradle.kts
index 8ef47fa5774..e35c1f61148 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,23 +1,16 @@
-buildscript {
-    repositories {
-        google()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath(libs.gradle)
-        classpath(libs.jetbrains.kotlin.gradle.plugin)
-        classpath(libs.dokka.gradle.plugin)
-        // Universal build config
-        classpath(libs.buildkonfig.gradle.plugin)
-    }
+plugins {
+    alias(libs.plugins.android.application) apply false
+    alias(libs.plugins.android.lint) apply false
+    alias(libs.plugins.android.multiplatform.library) apply false
+    alias(libs.plugins.buildkonfig) apply false // Universal build config
+    alias(libs.plugins.dokka) apply false
+    alias(libs.plugins.kotlin.jvm) apply false
+    alias(libs.plugins.kotlin.multiplatform) apply false
 }
 
 allprojects {
-    repositories {
-        google()
-        mavenCentral()
-        mavenLocal()
-        maven("https://jitpack.io")
+    // https://docs.gradle.org/current/userguide/upgrading_major_version_9.html#test_task_fails_when_no_tests_are_discovered
+    tasks.withType<AbstractTestTask>().configureEach {
+        failOnNoDiscoveredTests = false
     }
-}
\ No newline at end of file
+}
diff --git a/discoverium.yml b/discoverium.yml
new file mode 100644
index 00000000000..7d3fae8c50b
--- /dev/null
+++ b/discoverium.yml
@@ -0,0 +1,8 @@
+app:
+  name: CloudStream
+  authors: recloudstream
+  category: entertainment
+  description: Android app for streaming and downloading media.
+  icon: https://raw.githubusercontent.com/recloudstream/cloudstream/refs/heads/master/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
+  releases:
+    url: https://github.com/recloudstream/cloudstream/releases
\ No newline at end of file
diff --git a/docs/build.gradle.kts b/docs/build.gradle.kts
index 203b938181e..8f5be2a2dbe 100644
--- a/docs/build.gradle.kts
+++ b/docs/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
-    kotlin("jvm")
-    id("org.jetbrains.dokka")
+    alias(libs.plugins.kotlin.jvm)
+    alias(libs.plugins.dokka)
 }
 
 dependencies {
@@ -10,4 +10,4 @@ dependencies {
 
 dokka {
     moduleName = "Cloudstream"
-}
\ No newline at end of file
+}
diff --git a/fastlane/metadata/android/ar/full_description.txt b/fastlane/metadata/android/ar/full_description.txt
index 9bbe01ef275..81859f66576 100644
--- a/fastlane/metadata/android/ar/full_description.txt
+++ b/fastlane/metadata/android/ar/full_description.txt
@@ -3,10 +3,8 @@
 يأتي التطبيق بدون أي إعلانات وتحليلات.
 و يدعم العديد من مواقع البث الاولي(التريلر) والأفلام والمزيد. وتشمل الميزات:
 
-إشارات مرجعية
+الإشارات المرجعية
 
-قم بتنزيل ودفق الأفلام والبرامج التلفزيونية والأنيمي
+تنزيل الترجمات
 
-تنزيلات الترجمة
-
-دعم كروم كاست
+دعم الكروم كاست (Chromecast)
diff --git a/fastlane/metadata/android/as/full_description.txt b/fastlane/metadata/android/as/full_description.txt
index 84bfe12bc38..4f8a72fdc1e 100644
--- a/fastlane/metadata/android/as/full_description.txt
+++ b/fastlane/metadata/android/as/full_description.txt
@@ -1,10 +1,10 @@
-ক্লাউডষ্ট্ৰীম-3-য়ে আপোনাক চলচ্চিত্ৰ, টিভি-চিৰিজ আৰু এনিমে ষ্ট্ৰীম আৰু ডাউনলোড কৰিবলৈ দিয়ে।
+ক্লাউডষ্ট্ৰিম-৩ৰ সৈতে চলচ্চিত্ৰ, টিভি শৃঙ্খলা আৰু এনিমে ষ্ট্ৰিম আৰু ডাউনলোড কৰক।
 
-এপ্পটো কোনো বিজ্ঞাপন আৰু বিশ্লেষণ অবিহনে আহে আৰু
-একাধিক ট্ৰেইলাৰ আৰু চলচ্চিত্ৰ ছাইট সমৰ্থন কৰে, আৰু অধিক, উদাহৰণ স্বৰূপে।
+এই এপত কোনো বিজ্ঞাপন বা বিশ্লেষণ নাই আৰু
+একাধিক ট্ৰেইলাৰ আৰু চলচ্চিত্ৰ ছাইট সমৰ্থন কৰে, আৰু বহুতো, যেনে:
 
-বুকমাৰ্কসমূহ
+বুকমাৰ্ক
 
-উপশীৰ্ষক ডাউনলোডসমূহ
+উপশিৰোনামা ডাউনলোড
 
-ক্ৰোমকাষ্ট সমৰ্থন
+ক্ৰ’মকাষ্ট সমৰ্থন
diff --git a/fastlane/metadata/android/as/short_description.txt b/fastlane/metadata/android/as/short_description.txt
index a37c6826ad7..84d0f2883f7 100644
--- a/fastlane/metadata/android/as/short_description.txt
+++ b/fastlane/metadata/android/as/short_description.txt
@@ -1 +1 @@
-চলচ্চিত্ৰ, টিভি শৃংখলা , এনিম ষ্ট্ৰীম আৰু ডাউনলোড কৰক।
+চলচ্চিত্ৰ, টিভি শৃঙ্খলা আৰু এনিমে ষ্ট্ৰিম আৰু ডাউনলোড কৰক।
diff --git a/fastlane/metadata/android/be/changelogs/2.txt b/fastlane/metadata/android/be/changelogs/2.txt
new file mode 100644
index 00000000000..38bfcb0fc87
--- /dev/null
+++ b/fastlane/metadata/android/be/changelogs/2.txt
@@ -0,0 +1 @@
+- Дададзены спіс змен!
diff --git a/fastlane/metadata/android/be/full_description.txt b/fastlane/metadata/android/be/full_description.txt
new file mode 100644
index 00000000000..29f8851563e
--- /dev/null
+++ b/fastlane/metadata/android/be/full_description.txt
@@ -0,0 +1,10 @@
+CloudStream-3 дазваляе вам трансліраваць і спампоўваць фільмы, тэлесерыялы і анімэ.
+
+Праграма пастаўляецца без рэкламы і аналітыкі і
+падтрымлівае шматлікія сайты з трэйлерамі і фільмамі і іншае, напрыклад
+
+Закладкі
+
+Спампоўку субцітраў
+
+Chromecast
diff --git a/fastlane/metadata/android/be/short_description.txt b/fastlane/metadata/android/be/short_description.txt
new file mode 100644
index 00000000000..9cdb0479dd2
--- /dev/null
+++ b/fastlane/metadata/android/be/short_description.txt
@@ -0,0 +1 @@
+Трансліруйце і спампоўвайце фільмы, тэлесерыялы і анімэ.
diff --git a/fastlane/metadata/android/be/title.txt b/fastlane/metadata/android/be/title.txt
new file mode 100644
index 00000000000..dde89d58fcf
--- /dev/null
+++ b/fastlane/metadata/android/be/title.txt
@@ -0,0 +1 @@
+CloudStream
diff --git a/fastlane/metadata/android/ca/changelogs/2.txt b/fastlane/metadata/android/ca/changelogs/2.txt
new file mode 100644
index 00000000000..b4917865f60
--- /dev/null
+++ b/fastlane/metadata/android/ca/changelogs/2.txt
@@ -0,0 +1 @@
+- Registre de canvis afegit!
diff --git a/fastlane/metadata/android/ca/full_description.txt b/fastlane/metadata/android/ca/full_description.txt
new file mode 100644
index 00000000000..58cea878221
--- /dev/null
+++ b/fastlane/metadata/android/ca/full_description.txt
@@ -0,0 +1,10 @@
+Cloudstream-3 et permet mirar i descarregar pel·licules, sèries televisives i anime
+
+L'aplicació no conté publicitat ni rastrejament, i
+suporta diverses pàgines de tràilers i pel·licules, i més, com ara:
+
+Favorits
+
+Descàrrega de subtítols
+
+Compatibilitat amb Chromecast
diff --git a/fastlane/metadata/android/ca/short_description.txt b/fastlane/metadata/android/ca/short_description.txt
new file mode 100644
index 00000000000..97ff745ef88
--- /dev/null
+++ b/fastlane/metadata/android/ca/short_description.txt
@@ -0,0 +1 @@
+Mira i descarrega pel·licules, sèries televisives i anime.
diff --git a/fastlane/metadata/android/ca/title.txt b/fastlane/metadata/android/ca/title.txt
new file mode 100644
index 00000000000..dde89d58fcf
--- /dev/null
+++ b/fastlane/metadata/android/ca/title.txt
@@ -0,0 +1 @@
+CloudStream
diff --git a/fastlane/metadata/android/ckb/changelogs/2.txt b/fastlane/metadata/android/ckb/changelogs/2.txt
new file mode 100644
index 00000000000..07f3a2d59c4
--- /dev/null
+++ b/fastlane/metadata/android/ckb/changelogs/2.txt
@@ -0,0 +1 @@
+- گۆڕانکاريەکان زيادکرا!
diff --git a/fastlane/metadata/android/ckb/full_description.txt b/fastlane/metadata/android/ckb/full_description.txt
new file mode 100644
index 00000000000..f8934e41cd9
--- /dev/null
+++ b/fastlane/metadata/android/ckb/full_description.txt
@@ -0,0 +1,10 @@
+CloudStream-3 ڕێگەت پێدەدات فیلم و زنجیرەی تیڤی و ئەنیمێ ستریم و دابەزێنى.
+
+ئەپەکە بەبێ هیچ ڕیکلام و شیکارییەک دێت هەروەها
+پشتگیری لە چەندین سایتی ترەیلەر و فیلم دەکات، و زیاتر، بۆ نموونە.
+
+ئاماژەکان
+
+داونڵۆدکردنى ‌ژێرنووس
+
+پشتگيرى chromecast دەکات
diff --git a/fastlane/metadata/android/ckb/short_description.txt b/fastlane/metadata/android/ckb/short_description.txt
new file mode 100644
index 00000000000..65edb4b0dfd
--- /dev/null
+++ b/fastlane/metadata/android/ckb/short_description.txt
@@ -0,0 +1 @@
+ستریم و دابەزاندنی فیلم، و زنجیرە تەلەفزیۆنی و ئەنیمێ.
diff --git a/fastlane/metadata/android/ckb/title.txt b/fastlane/metadata/android/ckb/title.txt
new file mode 100644
index 00000000000..ffb1ecb7d7c
--- /dev/null
+++ b/fastlane/metadata/android/ckb/title.txt
@@ -0,0 +1 @@
+کلاود ستريم
diff --git a/fastlane/metadata/android/es-AR/full_description.txt b/fastlane/metadata/android/es-AR/full_description.txt
index 32582b59b98..745456a1589 100644
--- a/fastlane/metadata/android/es-AR/full_description.txt
+++ b/fastlane/metadata/android/es-AR/full_description.txt
@@ -1,11 +1,10 @@
-CloudStream-3 te permite ver y descargar Películas, Series de TV y Anime. La app viene sin anuncios ni análisis. Soporta varios sitios de películas, trailers... Y
-Más. Características incluídas: 
+CloudStream-3 le permite transmitir y descargar películas, series de TV y Anime.
 
+La aplicación viene sin anuncios y análisis y
+soporta múltiples sitios de película de trailer y más, por ejemplo.
 
-Marcadores
+Marcas
 
-Descargar y mirar streams de películas, shows de TV y anime
+Subtítulos descargas
 
-Descargar subtítulos
-
-Soporte para Chromecast
+Apoyo Chromecast
diff --git a/fastlane/metadata/android/es-ES/changelogs/2.txt b/fastlane/metadata/android/es-ES/changelogs/2.txt
index 68e0b99b322..38a88e310f2 100644
--- a/fastlane/metadata/android/es-ES/changelogs/2.txt
+++ b/fastlane/metadata/android/es-ES/changelogs/2.txt
@@ -1 +1 @@
-- ¡Cambios añadidos!
+- ¡Registro de cambios añadido!
diff --git a/fastlane/metadata/android/es-ES/full_description.txt b/fastlane/metadata/android/es-ES/full_description.txt
index 9f6accba777..da210b4e9d2 100644
--- a/fastlane/metadata/android/es-ES/full_description.txt
+++ b/fastlane/metadata/android/es-ES/full_description.txt
@@ -1,7 +1,7 @@
 CloudStream-3 te permite ver y descargar películas, series de TV y anime.
 
 La aplicación viene sin ningún tipo de anuncios y análisis y
-soporta múltiples tráilers y páginas de películas, y más, por ejemplo
+soporta varias páginas de trailers y películas, y más, como:
 
 Marcadores
 
diff --git a/fastlane/metadata/android/hr/full_description.txt b/fastlane/metadata/android/hr/full_description.txt
index 9272be26034..65adcdae57e 100644
--- a/fastlane/metadata/android/hr/full_description.txt
+++ b/fastlane/metadata/android/hr/full_description.txt
@@ -1,4 +1,4 @@
-CloudStream-3 omogućuje emitiranje i preuzimanje filmova, TV serija i animea.
+CloudStream-3 omogućuje gledanje i preuzimanje filmova, TV serija i animea.
 
 Aplikacija ne koristi oglase i analitike te
 podržava stranice s trailerima, filmovima i više, npr.
diff --git a/fastlane/metadata/android/hr/short_description.txt b/fastlane/metadata/android/hr/short_description.txt
index 09b5d4c50cc..f43f8e38171 100644
--- a/fastlane/metadata/android/hr/short_description.txt
+++ b/fastlane/metadata/android/hr/short_description.txt
@@ -1 +1 @@
-Emitirajte i preuzmite filmove, TV serije i anime.
+Gledajte i preuzmite filmove, TV serije i anime.
diff --git a/fastlane/metadata/android/ja-JP/full_description.txt b/fastlane/metadata/android/ja-JP/full_description.txt
new file mode 100644
index 00000000000..fea7edd1722
--- /dev/null
+++ b/fastlane/metadata/android/ja-JP/full_description.txt
@@ -0,0 +1,10 @@
+CloudStream-3は映画、TVシリーズ、アニメのストリーミングとダウンロードを可能にします。
+
+このアプリは広告やアナリティクスが一切なく、
+、複数の予告編や映画サイトなどをサポートしています。
+
+ブックマーク
+
+字幕ダウンロード
+
+Chromecastサポート
diff --git a/fastlane/metadata/android/ja-JP/short_description.txt b/fastlane/metadata/android/ja-JP/short_description.txt
new file mode 100644
index 00000000000..6384c1200f6
--- /dev/null
+++ b/fastlane/metadata/android/ja-JP/short_description.txt
@@ -0,0 +1 @@
+映画、TVシリーズ、アニメのストリーミングとダウンロード。
diff --git a/fastlane/metadata/android/lv/changelogs/2.txt b/fastlane/metadata/android/lv/changelogs/2.txt
new file mode 100644
index 00000000000..e76c643025a
--- /dev/null
+++ b/fastlane/metadata/android/lv/changelogs/2.txt
@@ -0,0 +1 @@
+- Pievienots izmaiņu žurnāls!
diff --git a/fastlane/metadata/android/lv/full_description.txt b/fastlane/metadata/android/lv/full_description.txt
new file mode 100644
index 00000000000..0e3c3f8183d
--- /dev/null
+++ b/fastlane/metadata/android/lv/full_description.txt
@@ -0,0 +1,10 @@
+CloudStream-3 ļauj straumēt un lejupielādēt filmas, seriālus, raidījumus un anime.
+
+Lietotne nesatur reklāmu un analītiku un
+atbalsta daudzas reklāmrullīšu un filmu vietnes, kā arī, piem.
+
+Grāmatzīmes
+
+Subtitru lejupielādi
+
+Chromecast
diff --git a/fastlane/metadata/android/lv/short_description.txt b/fastlane/metadata/android/lv/short_description.txt
new file mode 100644
index 00000000000..4afa2596493
--- /dev/null
+++ b/fastlane/metadata/android/lv/short_description.txt
@@ -0,0 +1 @@
+Straumēt un lejupielādēt filmas, seriālus, raidījumus un anime.
diff --git a/fastlane/metadata/android/lv/title.txt b/fastlane/metadata/android/lv/title.txt
new file mode 100644
index 00000000000..dde89d58fcf
--- /dev/null
+++ b/fastlane/metadata/android/lv/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 988078cbaca..f675f698305 100644
--- a/fastlane/metadata/android/mk-MK/full_description.txt
+++ b/fastlane/metadata/android/mk-MK/full_description.txt
@@ -5,6 +5,6 @@ CloudStream-3 овозможува пренос и преземање филмо
 
 Обележувачи
 
-Преземања на титлови
+Преземања на преводи
 
 Поддршка за Chromecast
diff --git a/fastlane/metadata/android/nl-NL/short_description.txt b/fastlane/metadata/android/nl-NL/short_description.txt
new file mode 100644
index 00000000000..15ec550c587
--- /dev/null
+++ b/fastlane/metadata/android/nl-NL/short_description.txt
@@ -0,0 +1 @@
+Stream en download films, tv-shows en anime.
diff --git a/fastlane/metadata/android/nl-NL/title.txt b/fastlane/metadata/android/nl-NL/title.txt
new file mode 100644
index 00000000000..dde89d58fcf
--- /dev/null
+++ b/fastlane/metadata/android/nl-NL/title.txt
@@ -0,0 +1 @@
+CloudStream
diff --git a/fastlane/metadata/android/ro/short_description.txt b/fastlane/metadata/android/ro/short_description.txt
index 1d8b97a1c8a..16341b06484 100644
--- a/fastlane/metadata/android/ro/short_description.txt
+++ b/fastlane/metadata/android/ro/short_description.txt
@@ -1 +1 @@
-Transmiteți și descărcați filme, seriale TV și anime.
+Urmăriți și descărcați filme, seriale TV și anime.
diff --git a/fastlane/metadata/android/sq/changelogs/2.txt b/fastlane/metadata/android/sq/changelogs/2.txt
new file mode 100644
index 00000000000..209d5f4c7a1
--- /dev/null
+++ b/fastlane/metadata/android/sq/changelogs/2.txt
@@ -0,0 +1 @@
+- U shtua regjistri i ndryshimeve!
diff --git a/fastlane/metadata/android/sq/full_description.txt b/fastlane/metadata/android/sq/full_description.txt
new file mode 100644
index 00000000000..f9d6e6f9eb0
--- /dev/null
+++ b/fastlane/metadata/android/sq/full_description.txt
@@ -0,0 +1,10 @@
+CloudStream-3 ju lejon të shikoni dhe shkarkoni filma, seriale televizive dhe anime.
+
+Aplikacioni vjen pa asnjë reklamë dhe analitikë
+dhe suporton faqe të shumta trailerash dhe filmash dhe më shumë, p.sh.
+
+Të ruajturat
+
+Shkarkime titrash
+
+Chromecast
diff --git a/fastlane/metadata/android/sq/short_description.txt b/fastlane/metadata/android/sq/short_description.txt
new file mode 100644
index 00000000000..a2a07e19c6f
--- /dev/null
+++ b/fastlane/metadata/android/sq/short_description.txt
@@ -0,0 +1 @@
+Shiko dhe shkarko filma, seriale televizive dhe anime.
diff --git a/fastlane/metadata/android/sq/title.txt b/fastlane/metadata/android/sq/title.txt
new file mode 100644
index 00000000000..dde89d58fcf
--- /dev/null
+++ b/fastlane/metadata/android/sq/title.txt
@@ -0,0 +1 @@
+CloudStream
diff --git a/gradle.properties b/gradle.properties
index 80d525834c1..b6d502f9a2a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,7 +6,7 @@
 # http://www.gradle.org/docs/current/userguide/build_environment.html
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx4G -Dfile.encoding=UTF-8
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
@@ -15,8 +15,6 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 # Android operating system, and which are packaged with your app"s APK
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
-# Automatically convert third-party libraries to use AndroidX
-# android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
 android.nonTransitiveRClass=true
@@ -24,6 +22,5 @@ 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
+# Compiling with Java 8 is deprecated but we still use it for now
+android.javaCompile.suppressSourceTargetDeprecationWarning=true
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index badf5879f40..a97145c3f81 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,61 +1,67 @@
+# https://docs.gradle.org/current/userguide/plugins.html#sec:version_catalog_plugin_application
+# https://docs.gradle.org/current/userguide/dependency_versions.html#sec:strict-version
 [versions]
-acraCore = "5.12.0"
-appcompat = "1.7.0"
-biometric = "1.4.0-alpha03"
-buildkonfigGradlePlugin = "0.15.2"
-coil = "3.1.0"
-colorpicker = "6b46b49bd5"
-conscryptAndroid = "2.5.2"
+activityKtx = "1.13.0"
+androidGradlePlugin = "9.1.1"
+animeDb = "1.0.2"
+annotation = "1.10.0"
+appcompat = "1.7.1"
+biometric = "1.4.0-alpha06"
+buildkonfigGradlePlugin = "0.18.0"
+coil = { strictly = "3.3.0" } # Later versions require jvmTarget 11 or later
+colorpicker = "6b46b49"
+conscryptAndroid = { strictly = "2.5.2" } # 2.5.3 crashes everything
 constraintlayout = "2.2.1"
-coreKtx = "1.16.0"
+coreKtx = "1.18.0"
 desugar_jdk_libs_nio = "2.1.5"
-dokkaGradlePlugin = "2.0.0"
-espressoCore = "3.6.1"
+dokkaGradlePlugin = "2.2.0"
+espressoCore = "3.7.0"
+fragmentKtx = "1.8.9"
 fuzzywuzzy = "1.4.0"
-gradle = "8.9.2"
-jacksonModuleKotlin = "2.13.1"
-json = "20250107"
+jacksonModuleKotlin = { strictly = "2.13.1" } # Later versions don't support minSdk <26 (Crashes on Android TV's and FireSticks)
+json = "20251224"
+jsoup = "1.22.1"
 junit = "4.13.2"
-junitKtx = "1.2.1"
-junitVersion = "1.2.1"
+junitKtx = "1.3.0"
+junitVersion = "1.3.0"
 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.8.0-beta01"
-navigationKtx = "2.8.9"
-newpipeextractor = "v0.24.6"
-nextlibMedia3 = "0.8.4"
-nicehttp = "0.4.13"
+kotlinGradlePlugin = "2.3.20"
+kotlinxCollectionsImmutable = "0.4.0"
+kotlinxCoroutinesCore = "1.10.2"
+lifecycleKtx = "2.10.0"
+material = "1.14.0-beta01"
+media3 = "1.9.3"
+navigationKtx = "2.9.7"
+newpipeextractor = "v0.26.0"
+nextlibMedia3 = "1.9.3-0.12.0"
+nicehttp = "0.4.18"
 overlappingpanels = "0.1.5"
 paletteKtx = "1.0.0"
 preferenceKtx = "1.2.1"
 previewseekbarMedia3 = "1.1.1.0"
-qrcodeKotlin = "4.3.0"
-rhino = "1.8.0"
+qrcodeKotlin = "4.5.0"
+rhino = { strictly = "1.8.1" } # Requires minSdk 26 or later beginning at version 1.9.0
 safefile = "0.0.8"
 shimmer = "0.5.0"
-swiperefreshlayout = "1.1.0"
-tmdbJava = "2.11.0"
-torrentserver = "7861970e038b35cd8c6918384e49caf26903e09e"
-tvprovider = "1.0.0"
+tmdbJava = "2.13.0"
+torrentserver = "7861970"
+tvprovider = "1.1.0"
 video = "1.0.0"
-workRuntime = "2.10.0"
-workRuntimeKtx = "2.10.0"
+workRuntimeKtx = "2.11.2"
+zipline = "1.27.0"
 
 jvmTarget = "1.8"
-minSdk = "21"
-compileSdk = "35"
-targetSdk = "35"
+jdkToolchain = "17"
+minSdk = "23"
+compileSdk = "36"
+targetSdk = "36"
 
 [libraries]
-acra-core = { module = "ch.acra:acra-core", version.ref = "acraCore" }
-acra-toast = { module = "ch.acra:acra-toast", version.ref = "acraCore" }
+activity-ktx = { module = "androidx.activity:activity-ktx", version.ref = "activityKtx" }
+anime-db = { module = "com.github.recloudstream:anime-db", version.ref = "animeDb" }
+annotation = { module = "androidx.annotation:annotation", version.ref = "annotation" }
 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.github.recloudstream:color-picker-android", version.ref = "colorpicker" }
@@ -63,24 +69,27 @@ conscrypt-android = { module = "org.conscrypt:conscrypt-android", version.ref =
 constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "constraintlayout" }
 core = { module = "androidx.test:core" }
 core-ktx = { module = "androidx.core:core-ktx", version.ref = "coreKtx" }
+databinding = { module = "androidx.databinding:viewbinding", version.ref = "androidGradlePlugin" }
 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" }
+fragment-ktx = { module = "androidx.fragment:fragment-ktx", version.ref = "fragmentKtx" }
 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" }
+jsoup = { module = "org.jsoup:jsoup", version.ref = "jsoup" }
 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-collections-immutable = { module = "org.jetbrains.kotlinx:kotlinx-collections-immutable", version.ref = "kotlinxCollectionsImmutable" }
 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" }
+lifecycle-livedata-ktx = { module = "androidx.lifecycle:lifecycle-livedata-ktx", version.ref = "lifecycleKtx" }
+lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "lifecycleKtx" }
 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-container  = { module = "androidx.media3:media3-container", version.ref = "media3" }
+media3-datasource-cronet = { group = "androidx.media3", name = "media3-datasource-cronet", 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" }
@@ -90,8 +99,8 @@ media3-ui = { module = "androidx.media3:media3-ui", version.ref = "media3" }
 navigation-fragment-ktx = { module = "androidx.navigation:navigation-fragment-ktx", version.ref = "navigationKtx" }
 navigation-ui-ktx = { module = "androidx.navigation:navigation-ui-ktx", version.ref = "navigationKtx" }
 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" }
+nextlib-media3ext = { module = "io.github.anilbeesetti:nextlib-media3ext", version.ref = "nextlibMedia3" }
+nextlib-mediainfo = { module = "io.github.anilbeesetti: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" }
@@ -99,20 +108,27 @@ preference-ktx = { module = "androidx.preference:preference-ktx", version.ref =
 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" }
+zipline = { module = "app.cash.zipline:zipline-android", version.ref = "zipline" }
 
 [plugins]
+android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
+android-lint = { id = "com.android.lint", version.ref = "androidGradlePlugin" }
+android-multiplatform-library = { id = "com.android.kotlin.multiplatform.library", version.ref = "androidGradlePlugin" }
+buildkonfig = { id = "com.codingfeline.buildkonfig", version.ref = "buildkonfigGradlePlugin" }
+dokka = { id = "org.jetbrains.dokka", version.ref = "dokkaGradlePlugin" }
+kotlin-jvm = { id = "org.jetbrains.kotlin.jvm" , version.ref = "kotlinGradlePlugin" }
+kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlinGradlePlugin" }
 
 [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"]
-navigationKtx = ["navigation-ui-ktx", "navigation-fragment-ktx"]
+coil = ["coil", "coil-network-okhttp"]
+lifecycle = ["lifecycle-livedata-ktx", "lifecycle-viewmodel-ktx"]
+media3 = ["media3-cast", "media3-common", "media3-container", "media3-datasource-cronet", "media3-datasource-okhttp", "media3-exoplayer", "media3-exoplayer-dash", "media3-exoplayer-hls", "media3-session", "media3-ui"]
+navigation = ["navigation-fragment-ktx", "navigation-ui-ktx"]
+nextlib = ["nextlib-media3ext", "nextlib-mediainfo"]
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index f6b961fd5a8..d997cfc60f4 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0adea89079e..17cc7e4310a 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,9 @@
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 distributionPath=wrapper/dists
+# Binary-only ZIP Checksum: https://gradle.org/release-checksums/
+distributionSha256Sum=2ab2958f2a1e51120c326cad6f385153bb11ee93b3c216c5fccebfdfbb7ec6cb
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
+zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
\ No newline at end of file
diff --git a/gradlew b/gradlew
index cccdd3d517f..739907dfd15 100755
--- a/gradlew
+++ b/gradlew
@@ -1,78 +1,128 @@
-#!/usr/bin/env sh
+#!/bin/sh
+
+#
+# Copyright © 2015 the original authors.
+#
+# 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
+#
+#      https://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.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/2d6327017519d23b96af35865dc997fcb544fb40/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
 
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -81,92 +131,118 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    JAVACMD=java
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
 fi
 
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
     # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
         fi
-        i=$((i+1))
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
     done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=$(save "$@")
-
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
 fi
 
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
 exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index f9553162f12..e509b2dd8fe 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,84 +1,93 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/library/build.gradle.kts b/library/build.gradle.kts
index b79d3ac9f26..073e49e6483 100644
--- a/library/build.gradle.kts
+++ b/library/build.gradle.kts
@@ -6,30 +6,59 @@ 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")
+    id("maven-publish") // Gradle core plugin
+    alias(libs.plugins.kotlin.multiplatform)
+    alias(libs.plugins.android.lint)
+    alias(libs.plugins.android.multiplatform.library)
+    alias(libs.plugins.buildkonfig)
+    alias(libs.plugins.dokka)
 }
 
 val javaTarget = JvmTarget.fromTarget(libs.versions.jvmTarget.get())
 
 kotlin {
-    version = "1.0.0"
-    androidTarget()
+    version = "1.0.1"
+
+    android {
+        // If this is the same com.lagradost.cloudstream3.R stops working
+        namespace = "com.lagradost.api"
+
+        compileSdk = libs.versions.compileSdk.get().toInt()
+        minSdk = libs.versions.minSdk.get().toInt()
+
+        compilerOptions {
+            jvmTarget.set(javaTarget)
+        }
+
+        lint {
+            targetSdk = libs.versions.targetSdk.get().toInt()
+        }
+    }
+
     jvm()
 
     compilerOptions {
-        freeCompilerArgs.add("-Xexpect-actual-classes")
+        freeCompilerArgs.addAll(
+            "-Xexpect-actual-classes",
+            "-Xannotation-default-target=param-property"
+        )
     }
 
     sourceSets {
+        all {
+            languageSettings {
+                optIn("com.lagradost.cloudstream3.InternalAPI")
+                optIn("com.lagradost.cloudstream3.Prerelease")
+            }
+        }
+
         commonMain.dependencies {
+            implementation(libs.annotation) // Annotations
             implementation(libs.nicehttp) // HTTP Lib
             implementation(libs.jackson.module.kotlin) // JSON Parser
             implementation(libs.kotlinx.coroutines.core)
             implementation(libs.fuzzywuzzy) // Match Extractors
+            implementation(libs.jsoup) // HTML Parser
             implementation(libs.rhino) // Run JavaScript
             implementation(libs.newpipeextractor)
             implementation(libs.tmdb.java) // TMDB API v3 Wrapper Made with RetroFit
@@ -48,50 +77,16 @@ buildkonfig {
     exposeObjectWithName = "BuildConfig"
 
     defaultConfigs {
-        val isDebug = kotlin.runCatching { extra.get("isDebug") }.getOrNull() == true
-        if (isDebug) {
-            logger.quiet("Compiling library with debug flag")
-        } else {
-            logger.quiet("Compiling library with release flag")
-        }
-        buildConfigField(FieldSpec.Type.BOOLEAN, "DEBUG", isDebug.toString())
-
         // Reads local.properties
         val localProperties = gradleLocalProperties(rootDir, project.providers)
-
         buildConfigField(
             FieldSpec.Type.STRING,
-            "MDL_API_KEY", (System.getenv("MDL_API_KEY") ?: localProperties["mdl.key"]).toString()
+            "MDL_API_KEY",
+            (System.getenv("MDL_API_KEY") ?: localProperties["mdl.key"]).toString()
         )
     }
 }
 
-android {
-    compileSdk = libs.versions.compileSdk.get().toInt()
-    sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
-
-    defaultConfig {
-        minSdk = libs.versions.minSdk.get().toInt()
-    }
-
-    // If this is the same com.lagradost.cloudstream3.R stops working
-    namespace = "com.lagradost.api"
-
-    compileOptions {
-        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> {
@@ -117,4 +112,4 @@ dokka {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/library/lint.xml b/library/lint.xml
new file mode 100644
index 00000000000..6f4e202227b
--- /dev/null
+++ b/library/lint.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lint>
+    <issue id="TrulyRandom">
+        <ignore path="**/CryptoJS.class" />
+    </issue>
+</lint>
diff --git a/library/src/androidMain/kotlin/com/lagradost/cloudstream3/network/WebViewResolver.android.kt b/library/src/androidMain/kotlin/com/lagradost/cloudstream3/network/WebViewResolver.android.kt
index fc11c472165..975572d054c 100644
--- a/library/src/androidMain/kotlin/com/lagradost/cloudstream3/network/WebViewResolver.android.kt
+++ b/library/src/androidMain/kotlin/com/lagradost/cloudstream3/network/WebViewResolver.android.kt
@@ -3,9 +3,8 @@ package com.lagradost.cloudstream3.network
 import android.annotation.SuppressLint
 import android.content.Context
 import android.net.http.SslError
-import android.os.Handler
-import android.os.Looper
 import android.webkit.*
+import com.lagradost.api.Log
 import com.lagradost.api.getContext
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.mvvm.debugException
@@ -13,6 +12,7 @@ import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.mvvm.safe
 import com.lagradost.cloudstream3.utils.Coroutines.main
 import com.lagradost.cloudstream3.utils.Coroutines.mainWork
+import com.lagradost.cloudstream3.utils.Coroutines.runOnMainThread
 import com.lagradost.cloudstream3.utils.Coroutines.threadSafeListOf
 import com.lagradost.nicehttp.requestCreator
 import kotlinx.coroutines.delay
@@ -44,8 +44,9 @@ actual class WebViewResolver actual constructor(
     Interceptor {
 
     actual companion object {
-        var webViewUserAgent: String? = null
+        actual var webViewUserAgent: String? = null
         actual val DEFAULT_TIMEOUT = 60_000L
+        private const val TAG = "WebViewResolver"
 
         @JvmName("getWebViewUserAgent1")
         fun getWebViewUserAgent(): String? {
@@ -69,15 +70,24 @@ actual class WebViewResolver actual constructor(
         }
     }
 
-    suspend fun resolveUsingWebView(
+    actual suspend fun resolveUsingWebView(
         url: String,
-        referer: String? = null,
-        method: String = "GET",
-        requestCallBack: (Request) -> Boolean = { false },
+        referer: String?,
+        method: String,
+        requestCallBack: (Request) -> Boolean,
+    ): Pair<Request?, List<Request>> =
+        resolveUsingWebView(url, referer, emptyMap(), method, requestCallBack)
+
+    actual suspend fun resolveUsingWebView(
+        url: String,
+        referer: String?,
+        headers: Map<String, String>,
+        method: String,
+        requestCallBack: (Request) -> Boolean,
     ): Pair<Request?, List<Request>> {
         return try {
             resolveUsingWebView(
-                requestCreator(method, url, referer = referer), requestCallBack
+                requestCreator(method, url, referer = referer, headers = headers), requestCallBack
             )
         } catch (e: java.lang.IllegalArgumentException) {
             logError(e)
@@ -86,18 +96,14 @@ actual class WebViewResolver actual constructor(
         }
     }
 
-    /**
-     * @param requestCallBack asynchronously return matched requests by either interceptUrl or additionalUrls. If true, destroy WebView.
-     * @return the final request (by interceptUrl) and all the collected urls (by additionalUrls).
-     * */
     @SuppressLint("SetJavaScriptEnabled")
-    suspend fun resolveUsingWebView(
+    actual suspend fun resolveUsingWebView(
         request: Request,
-        requestCallBack: (Request) -> Boolean = { false }
+        requestCallBack: (Request) -> Boolean
     ): Pair<Request?, List<Request>> {
         val url = request.url.toString()
         val headers = request.headers
-        println("Initial web-view request: $url")
+        Log.i(TAG, "Initial web-view request: $url")
         var webView: WebView? = null
         // Extra assurance it exits as it should.
         var shouldExit = false
@@ -108,7 +114,7 @@ actual class WebViewResolver actual constructor(
                 webView?.destroy()
                 webView = null
                 shouldExit = true
-                println("Destroyed webview")
+                Log.i(TAG, "Destroyed webview")
             }
         }
 
@@ -116,8 +122,6 @@ actual class WebViewResolver actual constructor(
         val extraRequestList = threadSafeListOf<Request>()
 
         main {
-            // Useful for debugging
-            WebView.setWebContentsDebuggingEnabled(true)
             try {
                 webView = WebView(
                     (getContext() as? Context)
@@ -142,12 +146,11 @@ actual class WebViewResolver actual constructor(
                         request: WebResourceRequest
                     ): WebResourceResponse? = runBlocking {
                         val webViewUrl = request.url.toString()
-                        println("Loading WebView URL: $webViewUrl")
+                        Log.i(TAG, "Loading WebView URL: $webViewUrl")
 
                         if (script != null) {
-                            val handler = Handler(Looper.getMainLooper())
-                            handler.post {
-                                view.evaluateJavascript("$script")
+                            runOnMainThread {
+                                view.evaluateJavascript(script)
                                 { scriptCallback?.invoke(it) }
                             }
                         }
@@ -156,7 +159,7 @@ actual class WebViewResolver actual constructor(
                             fixedRequest = request.toRequest()?.also {
                                 requestCallBack(it)
                             }
-                            println("Web-view request finished: $webViewUrl")
+                            Log.i(TAG, "Web-view request finished: $webViewUrl")
                             destroyWebView()
                             return@runBlocking null
                         }
@@ -205,8 +208,7 @@ actual class WebViewResolver actual constructor(
                          *  They don't contain all the headers the browser actually gives.
                          *  Overriding with okhttp might fuck up otherwise working requests,
                          *  e.g the recaptcha request.
-                         * **/
-
+                         * */
                         return@runBlocking try {
                             when {
                                 blacklistedFiles.any { URI(webViewUrl).path.contains(it) } || webViewUrl.endsWith(
@@ -216,6 +218,7 @@ actual class WebViewResolver actual constructor(
                                     null,
                                     null
                                 )
+
                                 webViewUrl.contains("recaptcha") || webViewUrl.contains("/cdn-cgi/") -> super.shouldInterceptRequest(
                                     view,
                                     request
@@ -236,11 +239,12 @@ actual class WebViewResolver actual constructor(
                                     request
                                 )
                             }
-                        } catch (e: Exception) {
+                        } catch (_: Exception) {
                             null
                         }
                     }
 
+                    @SuppressLint("WebViewClientOnReceivedSslError")
                     override fun onReceivedSslError(
                         view: WebView?,
                         handler: SslErrorHandler?,
@@ -268,11 +272,10 @@ actual class WebViewResolver actual constructor(
             loop += 1
         }
 
-        println("Web-view timeout after ${totalTime / 1000}s")
+        Log.i(TAG, "Web-view timeout after ${totalTime / 1000}s")
         destroyWebView()
         return fixedRequest to extraRequestList
     }
-
 }
 
 fun WebResourceRequest.toRequest(): Request? {
diff --git a/library/src/androidMain/kotlin/com/lagradost/cloudstream3/utils/Coroutines.android.kt b/library/src/androidMain/kotlin/com/lagradost/cloudstream3/utils/Coroutines.android.kt
index 48a709eb4ed..048e7fc0237 100644
--- a/library/src/androidMain/kotlin/com/lagradost/cloudstream3/utils/Coroutines.android.kt
+++ b/library/src/androidMain/kotlin/com/lagradost/cloudstream3/utils/Coroutines.android.kt
@@ -2,10 +2,13 @@ package com.lagradost.cloudstream3.utils
 
 import android.os.Handler
 import android.os.Looper
+import androidx.annotation.AnyThread
+import androidx.annotation.MainThread
 
-actual fun runOnMainThreadNative(work: () -> Unit) {
+@AnyThread
+actual fun runOnMainThreadNative(@MainThread work: () -> Unit) {
     val mainHandler = Handler(Looper.getMainLooper())
     mainHandler.post {
         work()
     }
-}
\ 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 beb95403535..c590165a1ad 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt
@@ -6,6 +6,7 @@
 
 package com.lagradost.cloudstream3
 
+import com.fasterxml.jackson.annotation.JsonAutoDetect
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.databind.DeserializationFeature
 import com.fasterxml.jackson.databind.json.JsonMapper
@@ -18,6 +19,8 @@ import com.lagradost.cloudstream3.utils.AppUtils.toJson
 import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
 import com.lagradost.cloudstream3.utils.Coroutines.mainWork
 import com.lagradost.cloudstream3.utils.Coroutines.threadSafeListOf
+import com.lagradost.cloudstream3.utils.SubtitleHelper.fromCodeToLangTagIETF
+import com.lagradost.cloudstream3.utils.SubtitleHelper.fromLanguageToTagIETF
 import com.lagradost.nicehttp.RequestBodyTypes
 import okhttp3.Interceptor
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
@@ -28,12 +31,37 @@ import java.util.*
 import kotlin.io.encoding.Base64
 import kotlin.io.encoding.ExperimentalEncodingApi
 import kotlin.math.absoluteValue
+import kotlin.math.roundToInt
 
-/** Api has not yet been published to stable, and will cause `NoSuchMethodException` on stable */
+/**
+ * API available only on prerelease builds.
+ * Using it will cause stable to crash with `NoSuchMethodException`.
+ */
 @MustBeDocumented // Same as java.lang.annotation.Documented
-@Retention(AnnotationRetention.SOURCE) // This is only an IDE hint, and will not be used in the runtime
+@Retention(AnnotationRetention.BINARY) // This is only an IDE hint, and will not be used in the runtime
+@RequiresOptIn(
+    message = "This API is only available on prerelease builds. " +
+              "Using it will cause CloudStream stable to crash.",
+    level = RequiresOptIn.Level.ERROR
+)
 annotation class Prerelease
 
+@Retention(AnnotationRetention.BINARY) // This is only an IDE hint, and will not be used in the runtime
+@RequiresOptIn(
+    message = "This API is marked as internal and should not be used by extensions. " +
+              "Using it could cause catastrophic build or runtime errors and may " +
+              "be changed or removed at any time.",
+    level = RequiresOptIn.Level.ERROR
+)
+annotation class InternalAPI
+
+@Retention(AnnotationRetention.BINARY) // This is only an IDE hint, and will not be used in the runtime
+@RequiresOptIn(
+    message = "Only use this if you know what you are doing and you need to bypass the SSL certificate checks. Never use this for sensitive network requests such as logins.",
+    level = RequiresOptIn.Level.WARNING
+)
+annotation class UnsafeSSL
+
 /**
  * Defines the constant for the all languages preference, if this is set then it is
  * the equivalent of all languages being set
@@ -220,6 +248,7 @@ object APIHolder {
 
             Tracker(
                 res.idMal,
+                null,
                 res.id.toString(),
                 res.coverImage?.extraLarge ?: res.coverImage?.large,
                 res.bannerImage
@@ -391,7 +420,7 @@ fun newHomePageResponse(
     list: List<SearchResponse>,
     hasNext: Boolean? = null,
 ): HomePageResponse {
-    @Suppress("DEPRECATION")
+    @Suppress("DEPRECATION_ERROR")
     return HomePageResponse(
         listOf(HomePageList(name, list)),
         hasNext = hasNext ?: list.isNotEmpty()
@@ -403,7 +432,7 @@ fun newHomePageResponse(
     list: List<SearchResponse>,
     hasNext: Boolean? = null,
 ): HomePageResponse {
-    @Suppress("DEPRECATION")
+    @Suppress("DEPRECATION_ERROR")
     return HomePageResponse(
         listOf(HomePageList(data.name, list, data.horizontalImages)),
         hasNext = hasNext ?: list.isNotEmpty()
@@ -411,15 +440,30 @@ fun newHomePageResponse(
 }
 
 fun newHomePageResponse(list: HomePageList, hasNext: Boolean? = null): HomePageResponse {
-    @Suppress("DEPRECATION")
+    @Suppress("DEPRECATION_ERROR")
     return HomePageResponse(listOf(list), hasNext = hasNext ?: list.list.isNotEmpty())
 }
 
 fun newHomePageResponse(list: List<HomePageList>, hasNext: Boolean? = null): HomePageResponse {
-    @Suppress("DEPRECATION")
+    @Suppress("DEPRECATION_ERROR")
     return HomePageResponse(list, hasNext = hasNext ?: list.any { it.list.isNotEmpty() })
 }
 
+fun newSearchResponseList(
+    list: List<SearchResponse>,
+    hasNext: Boolean? = null,
+): SearchResponseList {
+    @Suppress("DEPRECATION_ERROR")
+    return SearchResponseList(
+        list,
+        hasNext = hasNext ?: list.isNotEmpty()
+    )
+}
+
+fun List<SearchResponse>.toNewSearchResponseList(hasNext: Boolean? = null) : SearchResponseList {
+    return newSearchResponseList(this, hasNext)
+}
+
 /**Every provider will **not** have try catch built in, so handle exceptions when calling these functions*/
 abstract class MainAPI {
     companion object {
@@ -463,7 +507,17 @@ abstract class MainAPI {
     /** used to keep track when last homepage request was in unixtime ms */
     var lastHomepageRequest: Long = 0L
 
-    open var lang = "en" // ISO_639_1 check SubtitleHelper
+    /**
+     * The language as an IETF BCP 47 conformant tag.
+     * Check [com.lagradost.cloudstream3.utils.SubtitleHelper].
+     *
+     * See locales on:
+     * https://github.com/unicode-org/cldr-json/blob/main/cldr-json/cldr-core/availableLocales.json
+     * https://www.iana.org/assignments/language-subtag-registry/language-subtag-registry
+     * https://android.googlesource.com/platform/frameworks/base/+/android-16.0.0_r2/core/res/res/values/locale_config.xml
+     * https://iso639-3.sil.org/code_tables/639/data/all
+    */
+    open var lang = "en"
 
     /**If link is stored in the "data" string, so links can be instantly loaded*/
     open val instantLinkLoading = false
@@ -490,35 +544,35 @@ abstract class MainAPI {
      *
      * Note that this is only a hint, and may not get respected if you request something too long.
      * */
-    open val loadLinksTimeoutMs : Long? = null
+    open val loadLinksTimeoutMs: Long? = null
 
     /**
      * The timeout on the `getMainPage` functions in milliseconds.
      *
      * Note that this is only a hint, and may not get respected if you request something too long.
      * */
-    open val getMainPageTimeoutMs : Long? = null
+    open val getMainPageTimeoutMs: Long? = null
 
     /**
      * The timeout on the `search` functions in milliseconds.
      *
      * Note that this is only a hint, and may not get respected if you request something too long.
      * */
-    open val searchTimeoutMs : Long? = null
+    open val searchTimeoutMs: Long? = null
 
     /**
      * The timeout on the `quickSearch` functions in milliseconds.
      *
      * Note that this is only a hint, and may not get respected if you request something too long.
      * */
-    open val quickSearchTimeoutMs : Long? = null
+    open val quickSearchTimeoutMs: Long? = null
 
     /**
      * The timeout on the `loadSearch` functions in milliseconds.
      *
      * Note that this is only a hint, and may not get respected if you request something too long.
      * */
-    open val loadTimeoutMs : Long? = null
+    open val loadTimeoutMs: Long? = null
 
 
     /**
@@ -557,6 +611,16 @@ abstract class MainAPI {
         throw NotImplementedError()
     }
 
+    /** Paginated search, starts with page: 1 */
+    open suspend fun search(query: String, page: Int): SearchResponseList? {
+        val searchResults = search(query) ?: return null
+
+        return newSearchResponseList(
+            searchResults,
+            false
+        )
+    }
+
     // @WorkerThread
     open suspend fun search(query: String): List<SearchResponse>? {
         throw NotImplementedError()
@@ -691,7 +755,7 @@ fun capitalizeStringNullable(str: String?): String? {
     if (str == null)
         return null
     return try {
-        str.replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else it.toString() }
+        str.replaceFirstChar(Char::titlecase)
     } catch (e: Exception) {
         str
     }
@@ -700,7 +764,7 @@ fun capitalizeStringNullable(str: String?): String? {
 fun fixTitle(str: String): String {
     return str.split(" ").joinToString(" ") {
         it.lowercase()
-            .replaceFirstChar { char -> if (char.isLowerCase()) char.titlecase(Locale.getDefault()) else it }
+            .replaceFirstChar(Char::titlecase)
     }
 }
 
@@ -770,6 +834,214 @@ enum class DubStatus(val id: Int) {
     Subbed(0),
 }
 
+/** This is the primary way to store score/rating. Use Score.from or Score.from10 to parse the score
+ * as it does not have a public constructor. Use toInt/toFloat to get back the score.
+ *
+ * Internally it stores it as an int up to 10^9 to represent up to 10 significant digits. So think
+ * of this as a decimal class specifically for ratings.
+ * */
+@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY)
+class Score private constructor(
+    /** Decimal between [0, 10^9] representing the min score and max score respectively */
+    @JsonProperty("data")
+    private val data: Int,
+) {
+    override fun hashCode(): Int = this.data.hashCode()
+    override fun equals(other: Any?): Boolean = other is Score && this.data == other.data
+
+    @Deprecated(
+        "toOld() is deprecated. Use other Score methods instead.",
+        level = DeprecationLevel.ERROR
+    )
+    fun toOld(): Int = toInt(10000)
+
+    fun toByte(maxScore: Int): Byte = toLong(maxScore).toByte()
+
+    fun toInt(maxScore: Int = 10): Int = toLong(maxScore).toInt()
+
+    fun toLong(maxScore: Int = 10): Long = (data.toLong() * maxScore.toLong()) / MAX.toLong()
+
+    fun toFloat(maxScore: Int = 10): Float =
+        (data.toFloat() / MAX.toFloat()) * maxScore.toFloat()
+
+    fun toDouble(maxScore: Int = 10): Double =
+        (data.toDouble() / MAX.toDouble()) * maxScore.toDouble()
+
+    override fun toString(): String = this.toString(10)
+
+    /** Formats the rating to a human readable format (with no rounding)
+     *
+     * However it may also return null if the score is less than the minimum score,
+     * this is to avoid 0.0/10.0 in case of default = 0
+     * */
+    @Throws(IllegalArgumentException::class)
+    fun toStringNull(
+        minScore: Double,
+        maxScore: Int,
+        decimals: Int = 1,
+        removeTrailingZeros: Boolean = true,
+        decimalChar: Char = '.'
+    ): String? {
+        if (toDouble() < minScore) return null
+        return toString(maxScore, decimals, removeTrailingZeros, decimalChar)
+    }
+
+    /** Formats the rating to a human readable format (with no rounding) */
+    @Throws(IllegalArgumentException::class)
+    fun toString(
+        maxScore: Int,
+        decimals: Int = 1,
+        removeTrailingZeros: Boolean = true,
+        decimalChar: Char = '.'
+    ): String {
+        require(maxScore in 1..1000) {
+            "maxScore ∈ [1,1000]"
+        }
+        require(decimals in 0..MAX_ZEROS) {
+            "decimals ∈ [0,$MAX_ZEROS]"
+        }
+        var number = data.toLong() * maxScore.toLong()
+        val chars = CharArray(MAX_ZEROS + 6)
+
+        for (i in chars.indices) {
+            chars[i] = (number % 10L).toInt().digitToChar()
+            number /= 10L
+        }
+
+        var trailingZeros = MAX_ZEROS - decimals
+        for (i in (MAX_ZEROS - decimals) until chars.size) {
+            if (chars[i] != '0') {
+                break
+            }
+            trailingZeros += 1
+        }
+
+        var leadingZeros = 0
+        for (i in chars.indices.reversed()) {
+            if (chars[i] != '0') {
+                break
+            }
+            leadingZeros += 1
+        }
+
+        val stringBuilder = StringBuilder()
+        for (i in maxOf(MAX_ZEROS, (chars.size - leadingZeros - 1)) downTo MAX_ZEROS) {
+            stringBuilder.append(chars[i])
+        }
+
+        val end = if (removeTrailingZeros) {
+            maxOf(MAX_ZEROS - decimals, trailingZeros)
+        } else {
+            MAX_ZEROS - decimals
+        }
+
+        if (end <= MAX_ZEROS - 1) {
+            stringBuilder.append(decimalChar)
+            for (i in MAX_ZEROS - 1 downTo end) {
+                stringBuilder.append(chars[i])
+            }
+        }
+
+        return stringBuilder.toString()
+    }
+
+    companion object {
+        const val MAX: Int = 1000_000_000
+        const val MIN: Int = 0
+        const val MAX_ZEROS: Int = 9
+        private const val TAG: String = "Score"
+
+        @Deprecated(
+            "Score.fromOld is deprecated. Use other Score.from* methods instead.",
+            level = DeprecationLevel.ERROR
+        )
+        fun fromOld(value: Int?): Score? {
+            if (value == null) return null
+            if (value < 0 || value > 10000) {
+                com.lagradost.api.Log.w(TAG, "old: $value ∉ [0, 10000]")
+                return null
+            }
+            return Score(value * 100_000)
+        }
+
+        /** `value ∈ [0, maxScore]` */
+        fun from(value: Int?, maxScore: Int): Score? {
+            if (value == null) {
+                return null
+            }
+            if (value < 0 || value > maxScore) {
+                com.lagradost.api.Log.w(TAG, "fromInt: $value ∉ [0, $maxScore]")
+                return null
+            }
+            return Score((MAX / maxScore) * value)
+        }
+
+        /** `value ∈ [0.0, maxScore]` */
+        fun from(value: Double?, maxScore: Int): Score? {
+            if (value == null) {
+                return null
+            }
+            if (value < 0.0 || value > maxScore) {
+                com.lagradost.api.Log.w(TAG, "fromDouble: $value ∉ [0.0, $maxScore]")
+                return null
+            }
+            return Score(((MAX / maxScore).toDouble() * value).roundToInt())
+        }
+
+        /** `value ∈ [0.0f, maxScore]` */
+        fun from(value: Float?, maxScore: Int): Score? {
+            if (value == null) {
+                return null
+            }
+            if (value < 0.0 || value > maxScore) {
+                com.lagradost.api.Log.w(TAG, "fromFloat: $value ∉ [0.0f, $maxScore]")
+                return null
+            }
+            return Score(((MAX / maxScore).toFloat() * value).roundToInt())
+        }
+
+        /** `value ∈ ["0.0", maxScore]` */
+        fun from(value: String?, maxScore: Int): Score? =
+            from(value?.trim()?.toDoubleOrNull()?.absoluteValue, maxScore)
+
+        /** `value ∈ [0, 5]` */
+        fun from5(value: Int?): Score? = from(value, 5)
+
+        /** `value ∈ [0, 10]` */
+        fun from10(value: Int?): Score? = from(value, 10)
+
+        /** `value ∈ [0, 100]` */
+        fun from100(value: Int?): Score? = from(value, 100)
+
+        /** `value ∈ [0.0, 5.0]` */
+        fun from5(value: Double?): Score? = from(value, 5)
+
+        /** `value ∈ [0.0, 10.0]` */
+        fun from10(value: Double?): Score? = from(value, 10)
+
+        /** `value ∈ [0.0, 100.0]` */
+        fun from100(value: Double?): Score? = from(value, 100)
+
+        /** `value ∈ [0.0f, 5.0f]` */
+        fun from5(value: Float?): Score? = from(value, 5)
+
+        /** `value ∈ [0.0f, 10.0f]` */
+        fun from10(value: Float?): Score? = from(value, 10)
+
+        /** `value ∈ [0.0f, 100.0f]` */
+        fun from100(value: Float?): Score? = from(value, 100)
+
+        /** `value ∈ ["0.0", "5.0"]` */
+        fun from5(value: String?): Score? = from(value, 5)
+
+        /** `value ∈ ["0.0", "10.0"]` */
+        fun from10(value: String?): Score? = from(value, 10)
+
+        /** `value ∈ ["0.0", "100.0"]` */
+        fun from100(value: String?): Score? = from(value, 100)
+    }
+}
+
 @Suppress("UNUSED_PARAMETER")
 enum class TvType(value: Int?) {
     Movie(1),
@@ -792,6 +1064,8 @@ enum class TvType(value: Int?) {
 
     Audio(16),
     Podcast(17),
+    @Prerelease
+    Video(18),
 }
 
 enum class AutoDownloadMode(val value: Int) {
@@ -807,14 +1081,15 @@ enum class AutoDownloadMode(val value: Int) {
 }
 
 /** 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.
+ * @return If the type is AnimeMovie, Live, Movie, Torrent, Video returns true otherwise returns false.
  * */
 fun TvType.isMovieType(): Boolean {
     return when (this) {
         TvType.AnimeMovie,
         TvType.Live,
         TvType.Movie,
-        TvType.Torrent -> true
+        TvType.Torrent,
+        TvType.Video -> true
 
         else -> false
     }
@@ -851,15 +1126,75 @@ fun TvType.isAnimeOp(): Boolean {
 /** Data class for the Subtitle file info.
  * @property lang Subtitle file language.
  * @property url Subtitle file url to download/load the file.
+ * @see newSubtitleFile
  * */
-data class SubtitleFile(val lang: String, val url: String)
+@ConsistentCopyVisibility
+data class SubtitleFile private constructor(
+    var lang: String,
+    var url: String,
+    var headers: Map<String, String>?
+) {
+    @Deprecated("Use newSubtitleFile method", level = DeprecationLevel.WARNING)
+    constructor(lang: String, url: String) : this(lang = lang, url = url, headers = null)
+
+    /** Language code to properly filter auto select / download subtitles */
+    val langTag: String?
+        get() = fromCodeToLangTagIETF(lang) ?: fromLanguageToTagIETF(lang, true)
+
+    /** Backwards compatible copy */
+    fun copy(
+        lang: String = this.lang, url: String = this.url
+    ): SubtitleFile = SubtitleFile(lang = lang, url = url, headers = this.headers)
+}
+
+// No `MainAPI.` to be able to use this in extractors
+suspend fun newSubtitleFile(
+    lang: String,
+    url: String,
+    initializer: suspend SubtitleFile.() -> Unit = { }
+): SubtitleFile {
+    @Suppress("DEPRECATION")
+    val builder = SubtitleFile(
+        lang, url
+    )
+    builder.initializer()
+
+    return builder
+}
+
+/** Data class for the Audio file/track info.
+ * @property lang Audio track language.
+ * @property url Audio file url to download/load the file.
+ * @property label Optional label to display (e.g., "English 5.1", "Japanese Stereo").
+ * @property headers Optional headers for the audio file request.
+ * @see newAudioFile
+ * */
+@ConsistentCopyVisibility
+data class AudioFile internal constructor(
+    var url: String,
+    var headers: Map<String, String>? = null
+)
+
+/** Creates an AudioFile with optional initializer for setting additional properties.
+ * @param url Audio file url.
+ * @param initializer Lambda to configure additional properties like headers.
+ * @return Configured AudioFile instance.
+ * */
+suspend fun newAudioFile(
+    url: String,
+    initializer: suspend AudioFile.() -> Unit = { }
+): AudioFile {
+    val builder = AudioFile(url)
+    builder.initializer()
+    return builder
+}
 
 /** 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)
+@Deprecated("Use newHomePageResponse method", level = DeprecationLevel.ERROR)
 constructor(
     val items: List<HomePageList>,
     val hasNext: Boolean = false
@@ -876,6 +1211,17 @@ data class HomePageList(
     val isHorizontalImages: Boolean = false
 )
 
+/** Data class for the Search results.
+ * @property items list of [SearchResponse] items that will be added to the search row.
+ * @property hasNext if there is a next page or not.
+ * */
+data class SearchResponseList
+@Deprecated("Use newSearchResponseList method", level = DeprecationLevel.ERROR)
+constructor(
+    val items: List<SearchResponse>,
+    val hasNext: Boolean = false
+)
+
 /** enum class holds search quality.
  *
  * [Movie release types](https://en.wikipedia.org/wiki/Pirated_movie_release_types)**/
@@ -992,6 +1338,7 @@ interface SearchResponse {
     var posterHeaders: Map<String, String>?
     var id: Int?
     var quality: SearchQuality?
+    var score: Score?
 }
 
 fun MainAPI.newTorrentSearchResponse(
@@ -1001,7 +1348,7 @@ fun MainAPI.newTorrentSearchResponse(
     fix: Boolean = true,
     initializer: TorrentSearchResponse.() -> Unit = { },
 ): TorrentSearchResponse {
-    @Suppress("DEPRECATION")
+    @Suppress("DEPRECATION_ERROR")
     val builder = TorrentSearchResponse(
         name = name,
         url = if (fix) fixUrl(url) else url,
@@ -1021,7 +1368,7 @@ fun MainAPI.newMovieSearchResponse(
     fix: Boolean = true,
     initializer: MovieSearchResponse.() -> Unit = { },
 ): MovieSearchResponse {
-    @Suppress("DEPRECATION")
+    @Suppress("DEPRECATION_ERROR")
     val builder = MovieSearchResponse(name, if (fix) fixUrl(url) else url, this.name, type)
     builder.initializer()
 
@@ -1035,7 +1382,7 @@ fun MainAPI.newLiveSearchResponse(
     fix: Boolean = true,
     initializer: LiveSearchResponse.() -> Unit = { },
 ): LiveSearchResponse {
-    @Suppress("DEPRECATION")
+    @Suppress("DEPRECATION_ERROR")
     val builder = LiveSearchResponse(
         name = name,
         url = if (fix) fixUrl(url) else url,
@@ -1053,7 +1400,7 @@ fun MainAPI.newTvSeriesSearchResponse(
     fix: Boolean = true,
     initializer: TvSeriesSearchResponse.() -> Unit = { },
 ): TvSeriesSearchResponse {
-    @Suppress("DEPRECATION")
+    @Suppress("DEPRECATION_ERROR")
     val builder = TvSeriesSearchResponse(name, if (fix) fixUrl(url) else url, this.name, type)
     builder.initializer()
 
@@ -1067,7 +1414,7 @@ fun MainAPI.newAnimeSearchResponse(
     fix: Boolean = true,
     initializer: AnimeSearchResponse.() -> Unit = { },
 ): AnimeSearchResponse {
-    @Suppress("DEPRECATION")
+    @Suppress("DEPRECATION_ERROR")
     val builder = AnimeSearchResponse(name, if (fix) fixUrl(url) else url, this.name, type)
     builder.initializer()
 
@@ -1132,7 +1479,7 @@ data class ActorData(
  * @see newAnimeSearchResponse
  * */
 data class AnimeSearchResponse
-@Deprecated("Use newAnimeSearchResponse", level = DeprecationLevel.WARNING)
+@Deprecated("Use newAnimeSearchResponse", level = DeprecationLevel.ERROR)
 constructor(
     override val name: String,
     override val url: String,
@@ -1149,7 +1496,44 @@ constructor(
     override var id: Int? = null,
     override var quality: SearchQuality? = null,
     override var posterHeaders: Map<String, String>? = null,
-) : SearchResponse
+    override var score: Score? = null,
+) : SearchResponse {
+    @Suppress("DEPRECATION_ERROR")
+    @Deprecated(
+        "Use newAnimeSearchResponse",
+        level = DeprecationLevel.ERROR
+    )
+    constructor(
+        name: String,
+        url: String,
+        apiName: String,
+        type: TvType? = null,
+
+        posterUrl: String? = null,
+        year: Int? = null,
+        dubStatus: EnumSet<DubStatus>? = null,
+
+        otherName: String? = null,
+        episodes: MutableMap<DubStatus, Int> = mutableMapOf(),
+
+        id: Int? = null,
+        quality: SearchQuality? = null,
+        posterHeaders: Map<String, String>? = null,
+    ) : this(
+        name,
+        url,
+        apiName,
+        type,
+        posterUrl,
+        year,
+        dubStatus,
+        otherName,
+        episodes,
+        id,
+        quality,
+        posterHeaders, null
+    )
+}
 
 fun AnimeSearchResponse.addDubStatus(status: DubStatus, episodes: Int? = null) {
     this.dubStatus = dubStatus?.also { it.add(status) } ?: EnumSet.of(status)
@@ -1197,7 +1581,7 @@ fun AnimeSearchResponse.addDubStatus(status: String, episodes: Int? = null) {
  * @see newTorrentSearchResponse
  * */
 data class TorrentSearchResponse
-@Deprecated("Use newTorrentSearchResponse", level = DeprecationLevel.WARNING)
+@Deprecated("Use newTorrentSearchResponse", level = DeprecationLevel.ERROR)
 constructor(
     override val name: String,
     override val url: String,
@@ -1208,13 +1592,30 @@ constructor(
     override var id: Int? = null,
     override var quality: SearchQuality? = null,
     override var posterHeaders: Map<String, String>? = null,
-) : SearchResponse
+    override var score: Score? = null,
+) : SearchResponse {
+    @Suppress("DEPRECATION_ERROR")
+    @Deprecated(
+        "Use newTorrentSearchResponse",
+        level = DeprecationLevel.ERROR
+    )
+    constructor(
+        name: String,
+        url: String,
+        apiName: String,
+        type: TvType?,
+        posterUrl: String?,
+        id: Int? = null,
+        quality: SearchQuality? = null,
+        posterHeaders: Map<String, String>? = null
+    ) : this(name, url, apiName, type, posterUrl, id, quality, posterHeaders, null)
+}
 
 /** Data class of [SearchResponse] interface for Movies.
  * @see newMovieSearchResponse
  * */
 data class MovieSearchResponse
-@Deprecated("Use newMovieSearchResponse", level = DeprecationLevel.WARNING)
+@Deprecated("Use newMovieSearchResponse", level = DeprecationLevel.ERROR)
 constructor(
     override val name: String,
     override val url: String,
@@ -1225,14 +1626,32 @@ constructor(
     var year: Int? = null,
     override var id: Int? = null,
     override var quality: SearchQuality? = null,
-    override var posterHeaders: Map<String, String>? = null
-) : SearchResponse
+    override var posterHeaders: Map<String, String>? = null,
+    override var score: Score? = null,
+) : SearchResponse {
+    @Suppress("DEPRECATION_ERROR")
+    @Deprecated(
+        "Use newMovieSearchResponse",
+        level = DeprecationLevel.ERROR
+    )
+    constructor(
+        name: String,
+        url: String,
+        apiName: String,
+        type: TvType?,
+        posterUrl: String?,
+        year: Int? = null,
+        id: Int? = null,
+        quality: SearchQuality? = null,
+        posterHeaders: Map<String, String>? = null
+    ) : this(name, url, apiName, type, posterUrl, id, year, quality, posterHeaders, null)
+}
 
 /** Data class of [SearchResponse] interface for Live streams.
  * @see newLiveSearchResponse
  * */
 data class LiveSearchResponse
-@Deprecated("Use newLiveSearchResponse", level = DeprecationLevel.WARNING)
+@Deprecated("Use newLiveSearchResponse", level = DeprecationLevel.ERROR)
 constructor(
     override val name: String,
     override val url: String,
@@ -1244,13 +1663,31 @@ constructor(
     override var quality: SearchQuality? = null,
     override var posterHeaders: Map<String, String>? = null,
     var lang: String? = null,
-) : SearchResponse
+    override var score: Score? = null,
+) : SearchResponse {
+    @Suppress("DEPRECATION_ERROR")
+    @Deprecated(
+        "Use newLiveSearchResponse",
+        level = DeprecationLevel.ERROR
+    )
+    constructor(
+        name: String,
+        url: String,
+        apiName: String,
+        type: TvType?,
+        posterUrl: String?,
+        id: Int? = null,
+        quality: SearchQuality? = null,
+        posterHeaders: Map<String, String>? = null,
+        lang: String? = null,
+    ) : this(name, url, apiName, type, posterUrl, id, quality, posterHeaders, lang, null)
+}
 
 /** Data class of [SearchResponse] interface for Tv series.
  * @see newTvSeriesSearchResponse
  * */
 data class TvSeriesSearchResponse
-@Deprecated("Use newTvSeriesSearchResponse", level = DeprecationLevel.WARNING)
+@Deprecated("Use newTvSeriesSearchResponse", level = DeprecationLevel.ERROR)
 constructor(
     override val name: String,
     override val url: String,
@@ -1263,7 +1700,38 @@ constructor(
     override var id: Int? = null,
     override var quality: SearchQuality? = null,
     override var posterHeaders: Map<String, String>? = null,
-) : SearchResponse
+    override var score: Score? = null,
+) : SearchResponse {
+    @Suppress("DEPRECATION_ERROR")
+    @Deprecated(
+        "Use newTvSeriesSearchResponse",
+        level = DeprecationLevel.ERROR
+    )
+    constructor(
+        name: String,
+        url: String,
+        apiName: String,
+        type: TvType?,
+        posterUrl: String?,
+        year: Int? = null,
+        episodes: Int? = null,
+        id: Int? = null,
+        quality: SearchQuality? = null,
+        posterHeaders: Map<String, String>? = null,
+    ) : this(
+        name,
+        url,
+        apiName,
+        type,
+        posterUrl,
+        year,
+        episodes,
+        id,
+        quality,
+        posterHeaders,
+        null
+    )
+}
 
 /** Data class of Trailer data.
  * @property extractorUrl Url string of the Trailer video.
@@ -1287,7 +1755,8 @@ data class TrailerData(
  * @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 score Rating of the media, appears on result page.
+ * Use it with addScore or by assigning a score like `Score.from(string/float/int/double, 10)` or `Score.from10(string/float/int/double)`
  * @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.
@@ -1297,6 +1766,7 @@ data class TrailerData(
  * @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 logoUrl Image URL used as a visual title replacement.If the logo loads successfully, it is shown instead of the text title. If the logo is null or fails to load, the text title is displayed.
  * @property contentRating content rating of the media, appears on result page.
  * @property uniqueUrl The key used for storing the persistent data about an entry.
  * On older versions `url` was used instead, but this was added to support JSON that can change as the url parameter.
@@ -1311,7 +1781,8 @@ interface LoadResponse {
     var posterUrl: String?
     var year: Int?
     var plot: String?
-    var rating: Int? // 0-10000
+
+    var score: Score?
     var tags: List<String>?
     var duration: Int? // in minutes
     var trailers: MutableList<TrailerData>
@@ -1322,13 +1793,29 @@ interface LoadResponse {
     var syncData: MutableMap<String, String>
     var posterHeaders: Map<String, String>?
     var backgroundPosterUrl: String?
+
+    var logoUrl: String?
     var contentRating: String?
 
-    @Prerelease
-    var uniqueUrl : String
+    var uniqueUrl: String
+
+    @Deprecated(
+        "`rating` is the old scoring system, use score instead",
+        replaceWith = ReplaceWith("score"),
+        level = DeprecationLevel.ERROR
+    )
+    var rating: Int?
+        set(value) {
+            @Suppress("DEPRECATION_ERROR")
+            this.score = Score.fromOld(value)
+        }
+        @Suppress("DEPRECATION_ERROR")
+        get() = score?.toOld()
 
     companion object {
         var malIdPrefix = "" //malApi.idPrefix
+
+        var kitsuIdPrefix = "" //kitsuApi.idPrefix
         var aniListIdPrefix = "" //aniListApi.idPrefix
         var simklIdPrefix = "" //simklApi.idPrefix
         var isTrailersEnabled = true
@@ -1389,6 +1876,9 @@ interface LoadResponse {
             return this.syncData[malIdPrefix]
         }
 
+        fun LoadResponse.getKitsuId(): String? {
+            return this.syncData[kitsuIdPrefix]
+        }
         fun LoadResponse.getAniListId(): String? {
             return this.syncData[aniListIdPrefix]
         }
@@ -1410,6 +1900,10 @@ interface LoadResponse {
             this.addSimklId(SimklSyncServices.Mal, id.toString())
         }
 
+        fun LoadResponse.addKitsuId(id: Int?) {
+            this.syncData[kitsuIdPrefix] = (id ?: return).toString()
+        }
+
         fun LoadResponse.addAniListId(id: Int?) {
             this.syncData[aniListIdPrefix] = (id ?: return).toString()
             this.addSimklId(SimklSyncServices.AniList, id.toString())
@@ -1514,24 +2008,12 @@ interface LoadResponse {
             this.addSimklId(SimklSyncServices.Imdb, id)
         }
 
-        @Deprecated("Outdated API due to misspelling", ReplaceWith("addTraktId(id)"))
-        fun LoadResponse.addTrackId(id: String?) {
-            this.addTraktId(id)
-        }
-
-        @Deprecated("Outdated API due to missing capitalization", ReplaceWith("addKitsuId(id)"))
-        fun LoadResponse.addkitsuId(id: String?) {
-            this.addKitsuId(id)
-        }
-
         @Suppress("UNUSED_PARAMETER")
-        @Prerelease
         fun LoadResponse.addTraktId(id: String?) {
             // TODO add Trakt sync
         }
 
         @Suppress("UNUSED_PARAMETER")
-        @Prerelease
         fun LoadResponse.addKitsuId(id: String?) {
             // TODO add Kitsu sync
         }
@@ -1541,15 +2023,31 @@ interface LoadResponse {
             this.addSimklId(SimklSyncServices.Tmdb, id)
         }
 
+        fun LoadResponse.addScore(score: String?, maxValue: Int = 10) {
+            this.score = Score.from(score, maxValue)
+        }
+
+        fun LoadResponse.addScore(score: Score?) {
+            this.score = score
+        }
+
+        @Deprecated(
+            "Use addScore",
+            replaceWith = ReplaceWith("addScore"),
+            level = DeprecationLevel.ERROR
+        )
         fun LoadResponse.addRating(text: String?) {
-            addRating(text.toRatingInt())
+            this.score = Score.from10(text)
         }
 
+        @Deprecated(
+            "Use addScore",
+            replaceWith = ReplaceWith("addScore"),
+            level = DeprecationLevel.ERROR
+        )
         fun LoadResponse.addRating(value: Int?) {
-            if ((value ?: return) < 0 || value > 10000) {
-                return
-            }
-            this.rating = value
+            @Suppress("DEPRECATION_ERROR")
+            this.score = Score.fromOld(value)
         }
 
         fun LoadResponse.addDuration(input: String?) {
@@ -1667,6 +2165,7 @@ fun TvType.getFolderPrefix(): String {
         TvType.Podcast -> "Podcasts"
         TvType.Torrent -> "Torrents"
         TvType.TvSeries -> "TVSeries"
+        TvType.Video -> "Videos"
     }
 }
 
@@ -1679,20 +2178,7 @@ data class NextAiring(
     val episode: Int,
     val unixTime: Long,
     val season: Int? = null,
-) {
-    /**
-     * Secondary constructor for backwards compatibility without season.
-     *  TODO Remove this constructor after there is a new stable release and extensions are updated to support season.
-     */
-    constructor(
-        episode: Int,
-        unixTime: Long,
-    ) : this(
-        episode,
-        unixTime,
-        null
-    )
-}
+)
 
 /** Data class holds season info.
  * @param season To be mapped with episode season, not shown in UI if displaySeason is defined
@@ -1741,7 +2227,7 @@ fun EpisodeResponse.addSeasonNames(names: List<SeasonData>) {
  * @see newTorrentLoadResponse
  */
 data class TorrentLoadResponse
-@Deprecated("Use newTorrentLoadResponse method", level = DeprecationLevel.WARNING)
+@Deprecated("Use newTorrentLoadResponse method", level = DeprecationLevel.ERROR)
 constructor(
     override var name: String,
     override var url: String,
@@ -1752,7 +2238,7 @@ constructor(
     override var type: TvType = TvType.Torrent,
     override var posterUrl: String? = null,
     override var year: Int? = null,
-    override var rating: Int? = null,
+    override var score: Score? = null,
     override var tags: List<String>? = null,
     override var duration: Int? = null,
     override var trailers: MutableList<TrailerData> = mutableListOf(),
@@ -1762,62 +2248,10 @@ constructor(
     override var syncData: MutableMap<String, String> = mutableMapOf(),
     override var posterHeaders: Map<String, String>? = null,
     override var backgroundPosterUrl: String? = null,
+    override var logoUrl: String? = null,
     override var contentRating: String? = null,
-    @Prerelease
-    override var uniqueUrl : String = url
-) : LoadResponse {
-    /**
-     * 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,
-        apiName: String,
-        magnet: String?,
-        torrent: String?,
-        plot: String?,
-        type: TvType = TvType.Torrent,
-        posterUrl: String? = null,
-        year: Int? = null,
-        rating: Int? = null,
-        tags: List<String>? = null,
-        duration: Int? = null,
-        trailers: MutableList<TrailerData> = mutableListOf(),
-        recommendations: List<SearchResponse>? = null,
-        actors: List<ActorData>? = null,
-        comingSoon: Boolean = false,
-        syncData: MutableMap<String, String> = mutableMapOf(),
-        posterHeaders: Map<String, String>? = null,
-        backgroundPosterUrl: String? = null,
-    ) : this(
-        name,
-        url,
-        apiName,
-        magnet,
-        torrent,
-        plot,
-        type,
-        posterUrl,
-        year,
-        rating,
-        tags,
-        duration,
-        trailers,
-        recommendations,
-        actors,
-        comingSoon,
-        syncData,
-        posterHeaders,
-        backgroundPosterUrl,
-        null
-    )
-}
+    override var uniqueUrl: String = url
+) : LoadResponse
 
 suspend fun MainAPI.newTorrentLoadResponse(
     name: String,
@@ -1826,7 +2260,7 @@ suspend fun MainAPI.newTorrentLoadResponse(
     torrent: String? = null,
     initializer: suspend TorrentLoadResponse.() -> Unit = { }
 ): TorrentLoadResponse {
-    @Suppress("DEPRECATION")
+    @Suppress("DEPRECATION_ERROR")
     val builder = TorrentLoadResponse(
         name = name,
         url = url,
@@ -1845,7 +2279,7 @@ suspend fun MainAPI.newTorrentLoadResponse(
  * @see newAnimeLoadResponse
  * */
 data class AnimeLoadResponse
-@Deprecated("Use newAnimeLoadResponse method", level = DeprecationLevel.WARNING)
+@Deprecated("Use newAnimeLoadResponse method", level = DeprecationLevel.ERROR)
 constructor(
     var engName: String? = null,
     var japName: String? = null,
@@ -1864,7 +2298,7 @@ constructor(
     override var tags: List<String>? = null,
     var synonyms: List<String>? = null,
 
-    override var rating: Int? = null,
+    override var score: Score? = null,
     override var duration: Int? = null,
     override var trailers: MutableList<TrailerData> = mutableListOf(),
     override var recommendations: List<SearchResponse>? = null,
@@ -1875,10 +2309,11 @@ constructor(
     override var nextAiring: NextAiring? = null,
     override var seasonNames: List<SeasonData>? = null,
     override var backgroundPosterUrl: String? = null,
+    override var logoUrl: String? = null,
     override var contentRating: String? = null,
-    @Prerelease
-    override var uniqueUrl : String = url
+    override var uniqueUrl: String = url
 ) : LoadResponse, EpisodeResponse {
+
     override fun getLatestEpisodes(): Map<DubStatus, Int?> {
         return episodes.map { (status, episodes) ->
             val maxSeason = episodes.maxOfOrNull { it.season ?: Int.MIN_VALUE }
@@ -1903,68 +2338,6 @@ constructor(
             }
         } + episode
     }
-
-    /**
-     * 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,
-        name: String,
-        url: String,
-        apiName: String,
-        type: TvType,
-        posterUrl: String? = null,
-        year: Int? = null,
-        episodes: MutableMap<DubStatus, List<Episode>> = mutableMapOf(),
-        showStatus: ShowStatus? = null,
-        plot: String? = null,
-        tags: List<String>? = null,
-        synonyms: List<String>? = null,
-        rating: Int? = null,
-        duration: Int? = null,
-        trailers: MutableList<TrailerData> = mutableListOf(),
-        recommendations: List<SearchResponse>? = null,
-        actors: List<ActorData>? = null,
-        comingSoon: Boolean = false,
-        syncData: MutableMap<String, String> = mutableMapOf(),
-        posterHeaders: Map<String, String>? = null,
-        nextAiring: NextAiring? = null,
-        seasonNames: List<SeasonData>? = null,
-        backgroundPosterUrl: String? = null,
-    ) : this(
-        engName,
-        japName,
-        name,
-        url,
-        apiName,
-        type,
-        posterUrl,
-        year,
-        episodes,
-        showStatus,
-        plot,
-        tags,
-        synonyms,
-        rating,
-        duration,
-        trailers,
-        recommendations,
-        actors,
-        comingSoon,
-        syncData,
-        posterHeaders,
-        nextAiring,
-        seasonNames,
-        backgroundPosterUrl,
-        null
-    )
 }
 
 /**
@@ -1982,7 +2355,7 @@ suspend fun MainAPI.newAnimeLoadResponse(
     comingSoonIfNone: Boolean = true,
     initializer: suspend AnimeLoadResponse.() -> Unit = { },
 ): AnimeLoadResponse {
-    @Suppress("DEPRECATION")
+    @Suppress("DEPRECATION_ERROR")
     val builder = AnimeLoadResponse(name = name, url = url, apiName = this.name, type = type)
     builder.initializer()
     if (comingSoonIfNone) {
@@ -2000,7 +2373,7 @@ suspend fun MainAPI.newAnimeLoadResponse(
  * @see newLiveStreamLoadResponse
  * */
 data class LiveStreamLoadResponse
-@Deprecated("Use newLiveStreamLoadResponse method", level = DeprecationLevel.WARNING)
+@Deprecated("Use newLiveStreamLoadResponse method", level = DeprecationLevel.ERROR)
 constructor(
     override var name: String,
     override var url: String,
@@ -2012,7 +2385,7 @@ constructor(
     override var plot: String? = null,
 
     override var type: TvType = TvType.Live,
-    override var rating: Int? = null,
+    override var score: Score? = null,
     override var tags: List<String>? = null,
     override var duration: Int? = null,
     override var trailers: MutableList<TrailerData> = mutableListOf(),
@@ -2022,43 +2395,10 @@ constructor(
     override var syncData: MutableMap<String, String> = mutableMapOf(),
     override var posterHeaders: Map<String, String>? = null,
     override var backgroundPosterUrl: String? = null,
+    override var logoUrl: String? = null,
     override var contentRating: String? = null,
-    @Prerelease
-    override var uniqueUrl : String = url
-) : LoadResponse {
-    /**
-     * 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,
-        apiName: String,
-        dataUrl: String,
-        posterUrl: String? = null,
-        year: Int? = null,
-        plot: String? = null,
-        type: TvType = TvType.Live,
-        rating: Int? = null,
-        tags: List<String>? = null,
-        duration: Int? = null,
-        trailers: MutableList<TrailerData> = mutableListOf(),
-        recommendations: List<SearchResponse>? = null,
-        actors: List<ActorData>? = null,
-        comingSoon: Boolean = false,
-        syncData: MutableMap<String, String> = mutableMapOf(),
-        posterHeaders: Map<String, String>? = null,
-        backgroundPosterUrl: String? = null,
-    ) : this(
-        name, url, apiName, dataUrl, posterUrl, year, plot, type, rating, tags, duration, trailers,
-        recommendations, actors, comingSoon, syncData, posterHeaders, backgroundPosterUrl, null
-    )
-}
+    override var uniqueUrl: String = url
+) : LoadResponse
 
 suspend fun MainAPI.newLiveStreamLoadResponse(
     name: String,
@@ -2066,7 +2406,7 @@ suspend fun MainAPI.newLiveStreamLoadResponse(
     dataUrl: String,
     initializer: suspend LiveStreamLoadResponse.() -> Unit = { }
 ): LiveStreamLoadResponse {
-    @Suppress("DEPRECATION")
+    @Suppress("DEPRECATION_ERROR")
     val builder = LiveStreamLoadResponse(
         name = name,
         url = url,
@@ -2082,7 +2422,7 @@ suspend fun MainAPI.newLiveStreamLoadResponse(
  * @see newMovieLoadResponse
  * */
 data class MovieLoadResponse
-@Deprecated("Use newMovieLoadResponse method", level = DeprecationLevel.WARNING)
+@Deprecated("Use newMovieLoadResponse method", level = DeprecationLevel.ERROR)
 constructor(
     override var name: String,
     override var url: String,
@@ -2094,7 +2434,7 @@ constructor(
     override var year: Int? = null,
     override var plot: String? = null,
 
-    override var rating: Int? = null,
+    override var score: Score? = null,
     override var tags: List<String>? = null,
     override var duration: Int? = null,
     override var trailers: MutableList<TrailerData> = mutableListOf(),
@@ -2104,43 +2444,10 @@ constructor(
     override var syncData: MutableMap<String, String> = mutableMapOf(),
     override var posterHeaders: Map<String, String>? = null,
     override var backgroundPosterUrl: String? = null,
+    override var logoUrl: String? = null,
     override var contentRating: String? = null,
-    @Prerelease
-    override var uniqueUrl : String = url
-) : LoadResponse {
-    /**
-     * 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,
-        apiName: String,
-        type: TvType,
-        dataUrl: String,
-        posterUrl: String? = null,
-        year: Int? = null,
-        plot: String? = null,
-        rating: Int? = null,
-        tags: List<String>? = null,
-        duration: Int? = null,
-        trailers: MutableList<TrailerData> = mutableListOf(),
-        recommendations: List<SearchResponse>? = null,
-        actors: List<ActorData>? = null,
-        comingSoon: Boolean = false,
-        syncData: MutableMap<String, String> = mutableMapOf(),
-        posterHeaders: Map<String, String>? = null,
-        backgroundPosterUrl: String? = null,
-    ) : this(
-        name, url, apiName, type, dataUrl, posterUrl, year, plot, rating, tags, duration, trailers,
-        recommendations, actors, comingSoon, syncData, posterHeaders, backgroundPosterUrl, null
-    )
-}
+    override var uniqueUrl: String = url
+) : LoadResponse
 
 suspend fun <T> MainAPI.newMovieLoadResponse(
     name: String,
@@ -2159,7 +2466,7 @@ suspend fun <T> MainAPI.newMovieLoadResponse(
     )
     val dataUrl = data?.toJson() ?: ""
 
-    @Suppress("DEPRECATION")
+    @Suppress("DEPRECATION_ERROR")
     val builder = MovieLoadResponse(
         name = name,
         url = url,
@@ -2179,7 +2486,7 @@ suspend fun MainAPI.newMovieLoadResponse(
     dataUrl: String,
     initializer: suspend MovieLoadResponse.() -> Unit = { }
 ): MovieLoadResponse {
-    @Suppress("DEPRECATION")
+    @Suppress("DEPRECATION_ERROR")
     val builder = MovieLoadResponse(
         name = name,
         url = url,
@@ -2198,47 +2505,39 @@ suspend fun MainAPI.newMovieLoadResponse(
  * @property season Season number.
  * @property episode Episode number.
  * @property posterUrl URL of Episode's poster image.
- * @property rating Episode rating.
+ * @property score 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)
+@Deprecated("Use newEpisode method", level = DeprecationLevel.ERROR)
 constructor(
     var data: String,
     var name: String? = null,
     var season: Int? = null,
     var episode: Int? = null,
     var posterUrl: String? = null,
-    var rating: Int? = null,
+    var score: Score? = 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
+    @Deprecated(
+        "`rating` is the old scoring system, use score instead",
+        replaceWith = ReplaceWith("score"),
+        level = DeprecationLevel.ERROR
     )
+    var rating: Int?
+        set(value) {
+            this.score = Score.from(value, 100)
+        }
+        get() = score?.toInt(100)
 }
 
 fun Episode.addDate(date: String?, format: String = "yyyy-MM-dd") {
     try {
-        this.date = SimpleDateFormat(format).parse(date ?: return)?.time
+        this.date = SimpleDateFormat(format, Locale.getDefault()).parse(date ?: return)?.time
     } catch (e: Exception) {
         logError(e)
     }
@@ -2253,7 +2552,7 @@ fun MainAPI.newEpisode(
     initializer: Episode.() -> Unit = { },
     fix: Boolean = true,
 ): Episode {
-    @Suppress("DEPRECATION")
+    @Suppress("DEPRECATION_ERROR")
     val builder = Episode(
         data = if (fix) fixUrl(url) else url
     )
@@ -2270,7 +2569,7 @@ fun <T> MainAPI.newEpisode(
         initializer = initializer
     ) // just in case java is wack
 
-    @Suppress("DEPRECATION")
+    @Suppress("DEPRECATION_ERROR")
     val builder = Episode(
         data = data?.toJson() ?: throw ErrorLoadingException("invalid newEpisode")
     )
@@ -2300,7 +2599,7 @@ enum class SimklSyncServices(val originalName: String) {
  * @see newTvSeriesLoadResponse
  * */
 data class TvSeriesLoadResponse
-@Deprecated("Use newTvSeriesLoadResponse method", level = DeprecationLevel.WARNING)
+@Deprecated("Use newTvSeriesLoadResponse method", level = DeprecationLevel.ERROR)
 constructor(
     override var name: String,
     override var url: String,
@@ -2313,7 +2612,7 @@ constructor(
     override var plot: String? = null,
 
     override var showStatus: ShowStatus? = null,
-    override var rating: Int? = null,
+    override var score: Score? = null,
     override var tags: List<String>? = null,
     override var duration: Int? = null,
     override var trailers: MutableList<TrailerData> = mutableListOf(),
@@ -2325,9 +2624,9 @@ constructor(
     override var nextAiring: NextAiring? = null,
     override var seasonNames: List<SeasonData>? = null,
     override var backgroundPosterUrl: String? = null,
+    override var logoUrl: String? = null,
     override var contentRating: String? = null,
-    @Prerelease
-    override var uniqueUrl : String = url
+    override var uniqueUrl: String = url
 ) : LoadResponse, EpisodeResponse {
     override fun getLatestEpisodes(): Map<DubStatus, Int?> {
         val maxSeason =
@@ -2350,62 +2649,6 @@ constructor(
             episodeSeason in 1..<season
         } + episode
     }
-
-    /**
-     * 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,
-        apiName: String,
-        type: TvType,
-        episodes: List<Episode>,
-        posterUrl: String? = null,
-        year: Int? = null,
-        plot: String? = null,
-        showStatus: ShowStatus? = null,
-        rating: Int? = null,
-        tags: List<String>? = null,
-        duration: Int? = null,
-        trailers: MutableList<TrailerData> = mutableListOf(),
-        recommendations: List<SearchResponse>? = null,
-        actors: List<ActorData>? = null,
-        comingSoon: Boolean = false,
-        syncData: MutableMap<String, String> = mutableMapOf(),
-        posterHeaders: Map<String, String>? = null,
-        nextAiring: NextAiring? = null,
-        seasonNames: List<SeasonData>? = null,
-        backgroundPosterUrl: String? = null,
-    ) : this(
-        name,
-        url,
-        apiName,
-        type,
-        episodes,
-        posterUrl,
-        year,
-        plot,
-        showStatus,
-        rating,
-        tags,
-        duration,
-        trailers,
-        recommendations,
-        actors,
-        comingSoon,
-        syncData,
-        posterHeaders,
-        nextAiring,
-        seasonNames,
-        backgroundPosterUrl,
-        null
-    )
 }
 
 suspend fun MainAPI.newTvSeriesLoadResponse(
@@ -2415,7 +2658,7 @@ suspend fun MainAPI.newTvSeriesLoadResponse(
     episodes: List<Episode>,
     initializer: suspend TvSeriesLoadResponse.() -> Unit = { }
 ): TvSeriesLoadResponse {
-    @Suppress("DEPRECATION")
+    @Suppress("DEPRECATION_ERROR")
     val builder = TvSeriesLoadResponse(
         name = name,
         url = url,
@@ -2437,11 +2680,16 @@ fun fetchUrls(text: String?): List<String> {
     return linkRegex.findAll(text).map { it.value.trim().removeSurrounding("\"") }.toList()
 }
 
+@Deprecated(
+    "toRatingInt() is deprecated. Use new score API instead.",
+    level = DeprecationLevel.ERROR
+)
 fun String?.toRatingInt(): Int? =
     this?.replace(" ", "")?.trim()?.toDoubleOrNull()?.absoluteValue?.times(1000f)?.toInt()
 
 data class Tracker(
     val malId: Int? = null,
+    val kitsuId: String? = null,
     val aniId: String? = null,
     val image: String? = null,
     val cover: String? = null,
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainActivity.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainActivity.kt
index 6502cc83166..4b163867de3 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainActivity.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainActivity.kt
@@ -8,8 +8,7 @@ import com.lagradost.nicehttp.ResponseParser
 import kotlin.reflect.KClass
 
 // Short name for requests client to make it nicer to use
-
-var app = Requests(responseParser = object : ResponseParser {
+private val jacksonResponseParser = object : ResponseParser {
     val mapper: ObjectMapper = jacksonObjectMapper().configure(
         DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES,
         false
@@ -30,6 +29,18 @@ var app = Requests(responseParser = object : ResponseParser {
     override fun writeValueAsString(obj: Any): String {
         return mapper.writeValueAsString(obj)
     }
-}).apply {
+}
+
+/** The default networking helper. This helper performs SSL checks.
+ * If you need to make requests to websites with invalid SSL certificates use insecureApp instead. */
+var app = Requests(responseParser = jacksonResponseParser).apply {
+    defaultHeaders = mapOf("user-agent" to USER_AGENT)
+}
+
+/** Same as the default app networking helper, but this instance ignores SSL certificates.
+ * This should NEVER be used for sensitive networking operations such as logins. Only use this when required. */
+@Prerelease
+@UnsafeSSL
+var insecureApp = Requests(responseParser = jacksonResponseParser).apply {
     defaultHeaders = mapOf("user-agent" to USER_AGENT)
 }
\ No newline at end of file
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/ParCollections.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/ParCollections.kt
index d210708fceb..9e6cb99e5be 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/ParCollections.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/ParCollections.kt
@@ -20,7 +20,8 @@ suspend fun <K, V, R> Map<out K, V>.amap(f: suspend (Map.Entry<K, V>) -> R): Lis
  */
 @Deprecated(
     "This blocks with runBlocking, and should not be used inside a suspended context",
-    replaceWith = ReplaceWith("amap(f)", "com.lagradost.cloudstream3.amap")
+    replaceWith = ReplaceWith("amap(f)", "com.lagradost.cloudstream3.amap"),
+    level = DeprecationLevel.ERROR
 )
 @Throws(CancellationException::class)
 fun <K, V, R> Map<out K, V>.apmap(f: suspend (Map.Entry<K, V>) -> R): List<R> = runBlocking {
@@ -43,7 +44,8 @@ suspend fun <A, B> List<A>.amap(f: suspend (A) -> B): List<B> =
  */
 @Deprecated(
     "This blocks with runBlocking, and should not be used inside a suspended context",
-    replaceWith = ReplaceWith("amap(f)", "com.lagradost.cloudstream3.amap")
+    replaceWith = ReplaceWith("amap(f)", "com.lagradost.cloudstream3.amap"),
+    level = DeprecationLevel.ERROR
 )
 @Throws(CancellationException::class)
 fun <A, B> List<A>.apmap(f: suspend (A) -> B): List<B> = runBlocking {
@@ -55,7 +57,8 @@ fun <A, B> List<A>.apmap(f: suspend (A) -> B): List<B> = runBlocking {
  */
 @Deprecated(
     "This blocks with runBlocking, and should not be used inside a suspended context",
-    replaceWith = ReplaceWith("amapIndexed(f)", "com.lagradost.cloudstream3.amapIndexed")
+    replaceWith = ReplaceWith("amapIndexed(f)", "com.lagradost.cloudstream3.amapIndexed"),
+    level = DeprecationLevel.ERROR
 )
 @Throws(CancellationException::class)
 fun <A, B> List<A>.apmapIndexed(f: suspend (index: Int, A) -> B): List<B> = runBlocking {
@@ -81,7 +84,8 @@ suspend fun <A, B> List<A>.amapIndexed(f: suspend (index: Int, A) -> B): List<B>
  */
 @Deprecated(
     "This blocks with runBlocking, and should not be used inside a suspended context",
-    replaceWith = ReplaceWith("runAllAsync(transforms)", "com.lagradost.cloudstream3.runAllAsync")
+    replaceWith = ReplaceWith("runAllAsync(transforms)", "com.lagradost.cloudstream3.runAllAsync"),
+    level = DeprecationLevel.ERROR
 )
 @Throws(CancellationException::class)
 fun <R> argamap(
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/AStreamHub.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/AStreamHub.kt
deleted file mode 100644
index 9320ef9c5f3..00000000000
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/AStreamHub.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.lagradost.cloudstream3.extractors
-
-import com.lagradost.api.Log
-import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.utils.ExtractorApi
-import com.lagradost.cloudstream3.utils.ExtractorLink
-import com.lagradost.cloudstream3.utils.ExtractorLinkType
-import com.lagradost.cloudstream3.utils.Qualities
-import com.lagradost.cloudstream3.utils.newExtractorLink
-
-open class AStreamHub : ExtractorApi() {
-    override val name = "AStreamHub"
-    override val mainUrl = "https://astreamhub.com"
-    override val requiresReferer = true
-
-    override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink> {
-        val sources = mutableListOf<ExtractorLink>()
-        app.get(url).document.selectFirst("body > script").let { script ->
-            val text = script?.html() ?: ""
-            Log.i("Dev", "text => $text")
-            if (text.isNotBlank()) {
-                val m3link = "(?<=file:)(.*)(?=,)".toRegex().find(text)
-                    ?.groupValues?.get(0)?.trim()?.trim('"') ?: ""
-                Log.i("Dev", "m3link => $m3link")
-                if (m3link.isNotBlank()) {
-                    sources.add(
-                        newExtractorLink(
-                            name = name,
-                            source = name,
-                            url = m3link,
-                            type = ExtractorLinkType.M3U8
-                        ) {
-                            this.quality = Qualities.Unknown.value
-                            this.referer = referer ?: url
-                        }
-                    )
-                }
-            }
-        }
-        return sources
-    }
-
-}
\ No newline at end of file
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/AsianLoad.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/AsianLoad.kt
deleted file mode 100644
index 2566816792b..00000000000
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/AsianLoad.kt
+++ /dev/null
@@ -1,48 +0,0 @@
-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.M3u8Helper
-import com.lagradost.cloudstream3.utils.getQualityFromName
-import com.lagradost.cloudstream3.utils.newExtractorLink
-import java.net.URI
-
-open class AsianLoad : ExtractorApi() {
-    override var name = "AsianLoad"
-    override var mainUrl = "https://asianhdplay.pro"
-    override val requiresReferer = true
-
-    private val sourceRegex = Regex("""sources:[\W\w]*?file:\s*?["'](.*?)["']""")
-    override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink> {
-        val extractedLinksList: MutableList<ExtractorLink> = mutableListOf()
-        with(app.get(url, referer = referer)) {
-            sourceRegex.findAll(this.text).forEach { sourceMatch ->
-                val extractedUrl = sourceMatch.groupValues[1]
-                // Trusting this isn't mp4, may fuck up stuff
-                if (URI(extractedUrl).path.endsWith(".m3u8")) {
-                    M3u8Helper.generateM3u8(
-                        name,
-                        extractedUrl,
-                        url,
-                        headers = mapOf("referer" to this.url)
-                    ).forEach { link ->
-                        extractedLinksList.add(link)
-                    }
-                } else if (extractedUrl.endsWith(".mp4")) {
-                    extractedLinksList.add(
-                        newExtractorLink(
-                            source = name,
-                            name = name,
-                            url = extractedUrl,
-                        ) {
-                            this.referer = url.replace(" ", "%20")
-                            this.quality = getQualityFromName(sourceMatch.groupValues[2])
-                        }
-                    )
-                }
-            }
-            return extractedLinksList
-        }
-    }
-}
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Bigwarp.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Bigwarp.kt
deleted file mode 100644
index 50a68c62f27..00000000000
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Bigwarp.kt
+++ /dev/null
@@ -1,51 +0,0 @@
-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.newExtractorLink
-
-open class BigwarpIO : ExtractorApi() {
-    override var name = "Bigwarp"
-    override var mainUrl = "https://bigwarp.io"
-    override val requiresReferer = false
-
-    private val sourceRegex = Regex("""file:\s*['"](.*?)['"],label:\s*['"](.*?)['"]""")
-    private val qualityRegex = Regex("""\d+x(\d+) .*""")
-
-    override suspend fun getUrl(
-        url: String,
-        referer: String?,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
-    ) {
-        val resp = app.get(url).text
-
-        for (sourceMatch in sourceRegex.findAll(resp)) {
-            val label = sourceMatch.groupValues[2]
-
-            callback.invoke(
-                newExtractorLink(
-                    name,
-                    "$name ${label.split(" ", limit = 2).getOrNull(1)}",
-                    sourceMatch.groupValues[1], // streams are usually in mp4 format
-                ) {
-                    this.referer = url
-                    this.quality =
-                        qualityRegex.find(label)?.groupValues?.getOrNull(1)?.toIntOrNull()
-                            ?: Qualities.Unknown.value
-                }
-            )
-        }
-    }
-}
-
-class BgwpCC : BigwarpIO() {
-    override var mainUrl = "https://bgwp.cc"
-}
-
-class BigwarpArt : BigwarpIO() {
-    override var mainUrl = "https://bigwarp.art"
-}
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/BullStream.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/BullStream.kt
deleted file mode 100644
index 71fa7066bbe..00000000000
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/BullStream.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-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.M3u8Helper
-
-open class BullStream : ExtractorApi() {
-    override val name = "BullStream"
-    override val mainUrl = "https://bullstream.xyz"
-    override val requiresReferer = false
-    val regex = Regex("(?<=sniff\\()(.*)(?=\\)\\);)")
-
-    override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink>? {
-        val data = regex.find(app.get(url).text)?.value
-            ?.replace("\"", "")
-            ?.split(",")
-            ?: return null
-
-        val m3u8 = "$mainUrl/m3u8/${data[1]}/${data[2]}/master.txt?s=1&cache=${data[4]}"
-        //println("shiv : $m3u8")
-        return M3u8Helper.generateM3u8(
-            name,
-            m3u8,
-            url,
-            headers = mapOf("referer" to url, "accept" to "*/*")
-        )
-    }
-}
\ No newline at end of file
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/ByseSX.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/ByseSX.kt
new file mode 100644
index 00000000000..38d35da2eda
--- /dev/null
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/ByseSX.kt
@@ -0,0 +1,187 @@
+package com.lagradost.cloudstream3.extractors
+
+import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.cloudstream3.SubtitleFile
+import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.base64DecodeArray
+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.URI
+import java.nio.charset.StandardCharsets
+import javax.crypto.Cipher
+import javax.crypto.spec.GCMParameterSpec
+import javax.crypto.spec.SecretKeySpec
+
+class Bysezejataos  : ByseSX() {
+    override var name = "Bysezejataos"
+    override var mainUrl = "https://bysezejataos.com"
+}
+
+class ByseBuho : ByseSX() {
+    override var name = "ByseBuho"
+    override var mainUrl = "https://bysebuho.com"
+}
+
+class ByseVepoin : ByseSX() {
+    override var name = "ByseVepoin"
+    override var mainUrl = "https://bysevepoin.com"
+}
+
+class ByseQekaho : ByseSX() {
+    override var name = "ByseQekaho"
+    override var mainUrl = "https://byseqekaho.com"
+}
+
+open class ByseSX : ExtractorApi() {
+    override var name = "Byse"
+    override var mainUrl = "https://byse.sx"
+    override val requiresReferer = true
+
+    private fun b64UrlDecode(s: String): ByteArray {
+        val fixed = s.replace('-', '+').replace('_', '/')
+        val pad = (4 - fixed.length % 4) % 4
+        return base64DecodeArray(fixed + "=".repeat(pad))
+    }
+
+    private fun getBaseUrl(url: String): String {
+        return URI(url).let { "${it.scheme}://${it.host}" }
+    }
+
+    private fun getCodeFromUrl(url: String): String {
+        val path = URI(url).path ?: ""
+        return path.trimEnd('/').substringAfterLast('/')
+    }
+
+    private suspend fun getDetails(mainUrl: String): DetailsRoot? {
+        val base = getBaseUrl(mainUrl)
+        val code = getCodeFromUrl(mainUrl)
+        val url = "$base/api/videos/$code/embed/details"
+        return app.get(url).parsedSafe<DetailsRoot>()
+    }
+
+    private suspend fun getPlayback(mainUrl: String): PlaybackRoot? {
+        val details = getDetails(mainUrl) ?: return null
+        val embedFrameUrl = details.embedFrameUrl
+        val embedBase = getBaseUrl(embedFrameUrl)
+        val code = getCodeFromUrl(embedFrameUrl)
+        val playbackUrl = "$embedBase/api/videos/$code/embed/playback"
+        val headers = mapOf(
+            "accept" to "*/*",
+            "accept-language" to "en-US,en;q=0.5",
+            "priority" to "u=1, i",
+            "referer" to embedFrameUrl,
+            "x-embed-parent" to mainUrl,
+        )
+        return app.get(playbackUrl, headers = headers).parsedSafe<PlaybackRoot>()
+    }
+
+    private fun buildAesKey(playback: Playback): ByteArray {
+        val p1 = b64UrlDecode(playback.keyParts[0])
+        val p2 = b64UrlDecode(playback.keyParts[1])
+        return p1 + p2
+    }
+
+    private fun decryptPlayback(playback: Playback): String? {
+        val keyBytes = buildAesKey(playback)
+        val ivBytes = b64UrlDecode(playback.iv)
+        val cipherBytes = b64UrlDecode(playback.payload)
+
+        val cipher = Cipher.getInstance("AES/GCM/NoPadding")
+        val spec = GCMParameterSpec(128, ivBytes)
+        val secretKey = SecretKeySpec(keyBytes, "AES")
+        cipher.init(Cipher.DECRYPT_MODE, secretKey, spec)
+
+        val plainBytes = cipher.doFinal(cipherBytes)
+        var jsonStr = String(plainBytes, StandardCharsets.UTF_8)
+
+        if (jsonStr.startsWith("\uFEFF")) jsonStr = jsonStr.substring(1)
+
+        val root = try {
+            tryParseJson<PlaybackDecrypt>((jsonStr))
+        } catch (_: Exception) {
+            return null
+        }
+
+        return root?.sources?.firstOrNull()?.url
+    }
+
+
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
+        val refererUrl = getBaseUrl(url)
+        val playbackRoot = getPlayback(url) ?: return
+        val streamUrl  = decryptPlayback(playbackRoot.playback) ?: return
+
+
+        val headers = mapOf("Referer" to refererUrl)
+        M3u8Helper.generateM3u8(
+            name,
+            streamUrl,
+            mainUrl,
+            headers = headers
+        ).forEach(callback)
+    }
+}
+
+data class DetailsRoot(
+    val id: Long,
+    val code: String,
+    val title: String,
+    @JsonProperty("poster_url")
+    val posterUrl: String,
+    val description: String,
+    @JsonProperty("created_at")
+    val createdAt: String,
+    @JsonProperty("owner_private")
+    val ownerPrivate: Boolean,
+    @JsonProperty("embed_frame_url")
+    val embedFrameUrl: String,
+)
+
+data class PlaybackRoot(
+    val playback: Playback,
+)
+
+data class Playback(
+    val algorithm: String,
+    val iv: String,
+    val payload: String,
+    @JsonProperty("key_parts")
+    val keyParts: List<String>,
+    @JsonProperty("expires_at")
+    val expiresAt: String,
+    @JsonProperty("decrypt_keys")
+    val decryptKeys: DecryptKeys,
+    val iv2: String,
+    val payload2: String,
+)
+
+data class DecryptKeys(
+    @JsonProperty("edge_1")
+    val edge1: String,
+    @JsonProperty("edge_2")
+    val edge2: String,
+    @JsonProperty("legacy_fallback")
+    val legacyFallback: String,
+)
+
+data class PlaybackDecrypt(
+    val sources: List<PlaybackDecryptSource>,
+)
+
+data class PlaybackDecryptSource(
+    val quality: String,
+    val label: String,
+    @JsonProperty("mime_type")
+    val mimeType: String,
+    val url: String,
+    @JsonProperty("bitrate_kbps")
+    val bitrateKbps: Long,
+    val height: Any?,
+)
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/ByteShare.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/ByteShare.kt
deleted file mode 100644
index ca9504d2c6d..00000000000
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/ByteShare.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.lagradost.cloudstream3.extractors
-
-import com.lagradost.cloudstream3.utils.*
-
-open class ByteShare : ExtractorApi() {
-    override val name = "ByteShare"
-    override val mainUrl = "https://byteshare.to"
-    override val requiresReferer = false
-
-    override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink> {
-        val sources = mutableListOf<ExtractorLink>()
-        sources.add(
-            newExtractorLink(
-                source = name,
-                name = name,
-                url = url.replace("/embed/", "/download/"),
-            )
-        )
-        return sources
-    }
-}
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Chillx.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Chillx.kt
deleted file mode 100644
index de132ad14fc..00000000000
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Chillx.kt
+++ /dev/null
@@ -1,183 +0,0 @@
-package com.lagradost.cloudstream3.extractors
-
-
-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.INFER_TYPE
-import com.lagradost.cloudstream3.utils.Qualities
-import com.lagradost.cloudstream3.utils.newExtractorLink
-import java.security.MessageDigest
-
-
-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() {
-    override val name = "Bestx"
-    override val mainUrl = "https://bestx.stream"
-}
-
-class Playerx : Chillx() {
-    override val name = "Playerx"
-    override val mainUrl = "https://playerx.stream"
-}
-
-class Moviesapi : Chillx() {
-    override val name = "Moviesapi"
-    override val mainUrl = "https://w1.moviesapi.club"
-}
-
-class AnimesagaStream : Chillx() {
-    override val name = "Animesaga"
-    override val mainUrl = "https://stream.animesaga.in"
-}
-
-class Anplay : Chillx() {
-    override val name = "Anplay"
-    override val mainUrl = "https://stream.anplay.in"
-}
-
-class Kinogeru : Chillx() {
-    override val name = "Kinoger"
-    override val mainUrl = "https://kinoger.ru"
-}
-
-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
-
-    override suspend fun getUrl(
-        url: String,
-        referer: String?,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
-    ) {
-        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(
-            newExtractorLink(
-                source = name,
-                name = name,
-                url = m3u8,
-            ) {
-                this.referer = mainUrl
-                this.quality = Qualities.P1080.value
-                this.headers = header
-            }
-        )
-
-        val subtitles = extractSrtSubtitles(decoded)
-
-        subtitles.forEachIndexed { _, (language, url) ->
-            subtitleCallback.invoke(
-                SubtitleFile(
-                    language,
-                    url
-                )
-            )
-        }
-
-    }
-
-    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/CineMMRedirect.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/CineMMRedirect.kt
new file mode 100644
index 00000000000..62c45007371
--- /dev/null
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/CineMMRedirect.kt
@@ -0,0 +1,101 @@
+package com.lagradost.cloudstream3.extractors
+
+import com.lagradost.cloudstream3.SubtitleFile
+import com.lagradost.cloudstream3.utils.ExtractorApi
+import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.loadExtractor
+import okhttp3.HttpUrl.Companion.toHttpUrl
+
+// deobfuscated from https://hglink.to/main.js?v=1.1.3 using https://deobfuscate.io/
+private val mirrors = arrayOf(
+    "hgplaycdn.com",
+    "habetar.com",
+    "yuguaab.com",
+    "guxhag.com",
+    "auvexiug.com",
+    "xenolyzb.com",
+    "haxloppd.com",
+    "cavanhabg.com",
+    "dumbalag.com",
+    "uasopt.com"
+)
+
+class HgplayCDN: VidHidePro() {
+    override val name: String = "CineMM"
+    override val mainUrl: String = "https://hgplaycdn.com"
+}
+
+class Habetar: VidHidePro() {
+    override val name: String = "CineMM"
+    override val mainUrl: String = "https://habetar.com"
+}
+
+class Yuguaab: VidHidePro() {
+    override val name: String = "CineMM"
+    override val mainUrl: String = "https://yuguaab.com"
+}
+
+class Guxhag: VidHidePro() {
+    override val name: String = "CineMM"
+    override val mainUrl: String = "https://guxhag.com"
+}
+
+class Auvexiug: VidHidePro() {
+    override val name: String = "CineMM"
+    override val mainUrl: String = "https://auvexiug.com"
+}
+
+class Xenolyzb: VidHidePro() {
+    override val name: String = "CineMM"
+    override val mainUrl: String = "https://xenolyzb.com"
+}
+
+class Haxloppd: VidHidePro() {
+    override val name: String = "CineMM"
+    override val mainUrl: String = "https://haxloppd.com"
+}
+
+class Cavanhabg: VidHidePro() {
+    override val name: String = "CineMM"
+    override val mainUrl: String = "https://cavanhabg.com"
+}
+
+class Dumbalag: VidHidePro() {
+    override val name: String = "CineMM"
+    override val mainUrl: String = "https://dumbalag.com"
+}
+
+class Uasopt: VidHidePro() {
+    override val name: String = "CineMM"
+    override val mainUrl: String = "https://uasopt.com"
+}
+
+class Dhcplay: CineMMRedirect() {
+    override val mainUrl: String = "https://dhcplay.com"
+}
+
+class HglinkTo: CineMMRedirect() {
+    override val mainUrl: String = "https://hglink.to"
+}
+
+// These providers redirect to one of the other mirrors immediately,
+// i.e. they pick a random one of the links above
+abstract class CineMMRedirect : ExtractorApi() {
+    override val name: String = "CineMMRedirect"
+    override val requiresReferer: Boolean = false
+
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
+        val videoId = url.toHttpUrl().encodedPath
+        val mirror = mirrors.random()
+
+        // re-use existing extractors by calling the ExtractorApi
+        // of the randomly selected mirror URL
+        val mirrorUrlWithVideoId = "https://$mirror$videoId"
+        loadExtractor(mirrorUrlWithVideoId, referer, subtitleCallback, callback)
+    }
+}
\ 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 56241ac524a..dba2e926787 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/ContentXExtractor.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/ContentXExtractor.kt
@@ -17,15 +17,15 @@ open class ContentX : ExtractorApi() {
         val iSource  = app.get(url, referer=extRef).text
         val iExtract = Regex("""window\.openPlayer\('([^']+)'""").find(iSource)!!.groups[1]?.value ?: throw ErrorLoadingException("iExtract is null")
 
-		val subUrls = mutableSetOf<String>()
+        val subUrls = mutableSetOf<String>()
         Regex("""\"file\":\"([^\"]+)\",\"label\":\"([^\"]+)\"""").findAll(iSource).forEach {
             val (subUrl, subLang) = it.destructured
 
-			if (subUrl in subUrls) { return@forEach }
- 			subUrls.add(subUrl)
+            if (subUrl in subUrls) { return@forEach }
+            subUrls.add(subUrl)
 
             subtitleCallback.invoke(
-                SubtitleFile(
+                newSubtitleFile(
                     lang = subLang.replace("\\u0131", "ı").replace("\\u0130", "İ").replace("\\u00fc", "ü").replace("\\u00e7", "ç"),
                     url  = fixUrl(subUrl.replace("\\", ""))
                 )
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 6b9cf7ae7ff..db6db39d588 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Dailymotion.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Dailymotion.kt
@@ -1,14 +1,16 @@
 package com.lagradost.cloudstream3.extractors
 
-import com.fasterxml.jackson.annotation.JsonProperty
+import com.google.gson.Gson
 import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
+import com.lagradost.cloudstream3.newSubtitleFile
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.M3u8Helper.Companion.generateM3u8
 import java.net.URI
 
+
+
 class Geodailymotion : Dailymotion() {
     override val name = "GeoDailymotion"
     override val mainUrl = "https://geo.dailymotion.com"
@@ -20,11 +22,8 @@ open class Dailymotion : ExtractorApi() {
     override val requiresReferer = false
     private val baseUrl = "https://www.dailymotion.com"
 
-    @Suppress("RegExpSimplifiable")
-    private val videoIdRegex = "^[kx][a-zA-Z0-9]+\$".toRegex()
+    private val videoIdRegex = "^[kx][a-zA-Z0-9]+$".toRegex()
 
-    // https://www.dailymotion.com/video/k3JAHfletwk94ayCVIu
-    // https://www.dailymotion.com/embed/video/k3JAHfletwk94ayCVIu
     override suspend fun getUrl(
         url: String,
         referer: String?,
@@ -32,77 +31,76 @@ open class Dailymotion : ExtractorApi() {
         callback: (ExtractorLink) -> Unit
     ) {
         val embedUrl = getEmbedUrl(url) ?: return
-        val req = app.get(embedUrl)
-        val prefix = "window.__PLAYER_CONFIG__ = "
-        val configStr = req.document.selectFirst("script:containsData($prefix)")?.data() ?: return
-        val config = tryParseJson<Config>(configStr.substringAfter(prefix).substringBefore(";").trim()) ?: return
         val id = getVideoId(embedUrl) ?: return
-        val dmV1st = config.dmInternalData.v1st
-        val dmTs = config.dmInternalData.ts
-        val embedder = config.context.embedder
-        val metaDataUrl = "$baseUrl/player/metadata/video/$id?embedder=$embedder&locale=en-US&dmV1st=$dmV1st&dmTs=$dmTs&is_native_app=0"
-        val metaData = app.get(metaDataUrl, referer = embedUrl, cookies = req.cookies)
-            .parsedSafe<MetaData>() ?: return
-        metaData.qualities.forEach { (_, video) ->
-            video.forEach {
-                getStream(it.url, this.name, callback)
+        val metaDataUrl = "$baseUrl/player/metadata/video/$id"
+
+        val response = app.get(metaDataUrl, referer = embedUrl).text
+        val gson = Gson()
+        val meta = gson.fromJson(response, MetaData::class.java)
+
+        meta.qualities?.get("auto")?.forEach { quality ->
+            val videoUrl = quality.url
+            if (!videoUrl.isNullOrEmpty() && videoUrl.contains(".m3u8")) {
+                getStream(videoUrl, this.name, callback)
+            }
+        }
+
+        meta.subtitles?.data?.forEach { (_, subData) ->
+            subData.urls.forEach { subUrl ->
+                subtitleCallback(
+                    newSubtitleFile(
+                        subData.label,
+                        subUrl
+                    )
+                )
             }
         }
     }
 
+
     private fun getEmbedUrl(url: String): String? {
-		if (url.contains("/embed/") || url.contains("/video/")) {
-        return url
+        if (url.contains("/embed/") || url.contains("/video/")) return url
+        if (url.contains("geo.dailymotion.com")) {
+            val videoId = url.substringAfter("video=")
+            return "$baseUrl/embed/video/$videoId"
+        }
+        return null
     }
-		if (url.contains("geo.dailymotion.com")) {
-			val videoId = url.substringAfter("video=")
-			return "$baseUrl/embed/video/$videoId"
-		}
-		return null
-	}
+
 
     private fun getVideoId(url: String): String? {
         val path = URI(url).path
         val id = path.substringAfter("/video/")
-        if (id.matches(videoIdRegex)) {
-            return id
-        }
-        return null
+        return if (id.matches(videoIdRegex)) id else null
     }
 
     private suspend fun getStream(
         streamLink: String,
         name: String,
         callback: (ExtractorLink) -> Unit
-    )  {
-        return generateM3u8(
-            name,
-            streamLink,
-            "",
-        ).forEach(callback)
+    ) {
+        return generateM3u8(name, streamLink, "").forEach(callback)
     }
-    data class Config(
-        val context: Context,
-        val dmInternalData: InternalData
-    )
 
-    data class InternalData(
-        val ts: Long,
-        val v1st: String
+
+    data class MetaData(
+        val qualities: Map<String, List<Quality>>?,
+        val subtitles: SubtitlesWrapper?
     )
 
-    data class Context(
-        @JsonProperty("access_token") val accessToken: String?,
-        val embedder: String?,
+    data class Quality(
+        val type: String?,
+        val url: String?
     )
 
-    data class MetaData(
-        val qualities: Map<String, List<VideoLink>>
+    data class SubtitlesWrapper(
+        val enable: Boolean,
+        val data: Map<String, SubtitleData>?
     )
 
-    data class VideoLink(
-        val type: String,
-        val url: String
+    data class SubtitleData(
+        val label: String,
+        val urls: List<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 58b6396a85a..12bc5a0c53d 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/DoodExtractor.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/DoodExtractor.kt
@@ -1,14 +1,21 @@
 package com.lagradost.cloudstream3.extractors
 
+import com.lagradost.cloudstream3.Prerelease
 import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
-import com.lagradost.cloudstream3.utils.INFER_TYPE
 import com.lagradost.cloudstream3.utils.getQualityFromName
 import com.lagradost.cloudstream3.utils.newExtractorLink
 import java.net.URI
-import kotlin.random.Random
+
+class Doodspro : DoodLaExtractor() {
+    override var mainUrl = "https://doods.pro"
+}
+
+class Dsvplay : DoodLaExtractor() {
+    override var mainUrl = "https://dsvplay.com"
+}
 
 class D0000d : DoodLaExtractor() {
     override var mainUrl = "https://d0000d.com"
@@ -73,11 +80,24 @@ class Ds2video : DoodLaExtractor() {
     override var mainUrl = "https://ds2video.com"
 }
 
+class Vide0Net: DoodLaExtractor() {
+    override var mainUrl = "https://vide0.net"
+}
+
+class MyVidPlay : DoodLaExtractor() {
+    override var mainUrl = "https://myvidplay.com"
+}
+
+@Prerelease
+class Playmogo : DoodLaExtractor() {
+    override var mainUrl = "https://playmogo.com"
+}
+
 open class DoodLaExtractor : ExtractorApi() {
     override var name = "DoodStream"
     override var mainUrl = "https://dood.la"
     override val requiresReferer = false
-	
+
     private val alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"
 
     override suspend fun getUrl(
@@ -87,18 +107,17 @@ open class DoodLaExtractor : ExtractorApi() {
         callback: (ExtractorLink) -> Unit
     ) {
         val embedUrl = url.replace("/d/", "/e/")
-		val req = app.get(embedUrl)
+        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 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")
+        val quality = Regex("\\d{3,4}p")
             .find(response0.substringAfter("<title>").substringBefore("</title>"))
             ?.groupValues
             ?.getOrNull(0)
-		
-	callback.invoke(
+
+        callback.invoke(
             newExtractorLink(
                 this.name,
                 this.name,
@@ -108,19 +127,17 @@ open class DoodLaExtractor : ExtractorApi() {
                 this.quality = getQualityFromName(quality)
             }
         )
-
     }
-	
-private fun createHashTable(): String {
-    return buildString {
-        repeat(10) {
-            append(alphabet.random())
+
+    private fun createHashTable(): String {
+        return buildString {
+            repeat(10) {
+                append(alphabet.random())
+            }
         }
     }
-}
 
-	
-private fun getBaseUrl(url: String): String {
+    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/EPlay.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/EPlay.kt
deleted file mode 100644
index 146859cf43a..00000000000
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/EPlay.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.lagradost.cloudstream3.extractors
-
-import com.fasterxml.jackson.annotation.JsonProperty
-import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.utils.*
-import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
-
-open class EPlayExtractor : ExtractorApi() {
-    override var name = "EPlay"
-    override var mainUrl = "https://eplayvid.net"
-    override val requiresReferer = true
-
-    override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink>? {
-        val response = app.get(url).document
-        val trueUrl = response.select("source").attr("src")
-        return listOf(
-                newExtractorLink(
-                        this.name,
-                        this.name,
-                        trueUrl,
-                ) {
-                    this.referer = mainUrl
-                    this.quality = getQualityFromName("") // this needs to be auto
-                }
-        )
-    }
-}
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Fastream.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Fastream.kt
index e8f8c49aca0..94ddaf61e0e 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Fastream.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Fastream.kt
@@ -1,54 +1,44 @@
 package com.lagradost.cloudstream3.extractors
 
+import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.amap
 import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.extractors.helper.JwPlayerHelper
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
-import com.lagradost.cloudstream3.utils.M3u8Helper.Companion.generateM3u8
 import com.lagradost.cloudstream3.utils.getAndUnpack
-import org.jsoup.nodes.Document
+import com.lagradost.cloudstream3.utils.getPacked
 
-open class Fastream: ExtractorApi() {
+open class Fastream : ExtractorApi() {
     override var mainUrl = "https://fastream.to"
     override var name = "Fastream"
     override val requiresReferer = false
-    suspend fun getstream(
-        response: Document,
-        sources: ArrayList<ExtractorLink>): Boolean{
-        response.select("script").amap { script ->
-            if (script.data().contains(Regex("eval\\(function\\(p,a,c,k,e,[rd]"))) {
-                val unpacked = getAndUnpack(script.data())
-                //val m3u8regex = Regex("((https:|http:)\\/\\/.*\\.m3u8)")
-                val newm3u8link = unpacked.substringAfter("file:\"").substringBefore("\"")
-                //val m3u8link = m3u8regex.find(unpacked)?.value ?: return@forEach
-                generateM3u8(
-                    name,
-                    newm3u8link,
-                    mainUrl
-                ).forEach { link ->
-                    sources.add(link)
-                }
-            }
-        }
-        return true
-    }
 
-    override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink> {
-        val sources = ArrayList<ExtractorLink>()
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
         val idregex = Regex("emb.html\\?(.*)=")
-        if (url.contains(Regex("(emb.html.*fastream)"))) {
+        val response = if (url.contains(Regex("(emb.html.*fastream)"))) {
             val id = idregex.find(url)?.destructured?.component1() ?: ""
-            val response = app.post("https://fastream.to/dl", allowRedirects = false,
+            app.post(
+                "$mainUrl/dl", allowRedirects = false,
                 data = mapOf(
                     "op" to "embed",
                     "file_code" to id,
                     "auto" to "1"
                 )
             ).document
-            getstream(response, sources)
+        } else {
+            app.get(url, referer = url).document
+        }
+        response.select("script").amap { script ->
+            if (getPacked(script.data()) != null) {
+                val unPacked = getAndUnpack(script.data())
+                JwPlayerHelper.extractStreamLinks(unPacked, name, mainUrl, callback, subtitleCallback)
+            }
         }
-        val response = app.get(url, referer = url).document
-        getstream(response, sources)
-        return sources
     }
 }
\ No newline at end of file
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Filegram.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Filegram.kt
index df7e0337365..7756f729087 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Filegram.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Filegram.kt
@@ -3,10 +3,9 @@ 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.extractors.helper.JwPlayerHelper
 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
 
@@ -32,32 +31,22 @@ open class Filegram : ExtractorApi() {
             "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)
-        }
+
+        JwPlayerHelper.extractStreamLinks(unpackedJs, name, mainUrl, callback, subtitleCallback, headers = header)
     }
 
-  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
-	}
-     }
+    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/Filemoon.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Filemoon.kt
new file mode 100644
index 00000000000..ad4def1defc
--- /dev/null
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Filemoon.kt
@@ -0,0 +1,118 @@
+package com.lagradost.cloudstream3.extractors
+
+import com.lagradost.api.Log
+import com.lagradost.cloudstream3.SubtitleFile
+import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.extractors.helper.JwPlayerHelper
+import com.lagradost.cloudstream3.network.WebViewResolver
+import com.lagradost.cloudstream3.utils.ExtractorApi
+import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.JsUnpacker
+import com.lagradost.cloudstream3.utils.M3u8Helper
+
+
+class FileMoon : FilemoonV2() {
+    override var mainUrl = "https://filemoon.to"
+    override var name = "FileMoon"
+}
+
+class FileMoonIn : FilemoonV2() {
+    override var mainUrl = "https://filemoon.in"
+    override var name = "FileMoon"
+}
+
+class FileMoonSx : FilemoonV2() {
+    override var mainUrl = "https://filemoon.sx"
+    override var name = "FileMoonSx"
+}
+
+
+open class FilemoonV2 : ExtractorApi() {
+    override var name = "Filemoon"
+    override var mainUrl = "https://filemoon.to"
+    override val requiresReferer = true
+
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
+        val defaultHeaders = mapOf(
+            "Referer" to url,
+            "Sec-Fetch-Dest" to "iframe",
+            "Sec-Fetch-Mode" to "navigate",
+            "Sec-Fetch-Site" to "cross-site",
+            "User-Agent" to "Mozilla/5.0 (X11; Linux x86_64; rv:137.0) Gecko/20100101 Firefox/137.0"
+        )
+
+        val initialResponse = app.get(url, defaultHeaders)
+        val iframeSrcUrl = initialResponse.document.selectFirst("iframe")?.attr("src")
+
+        if (iframeSrcUrl.isNullOrEmpty()) {
+            val fallbackScriptData = initialResponse.document
+                .selectFirst("script:containsData(function(p,a,c,k,e,d))")
+                ?.data().orEmpty()
+            val unpackedScript = JsUnpacker(fallbackScriptData).unpack()
+
+            val linkFound = JwPlayerHelper.extractStreamLinks(
+                unpackedScript.orEmpty(),
+                name,
+                mainUrl,
+                callback,
+                subtitleCallback,
+                defaultHeaders
+            )
+
+            if (!linkFound) {
+                Log.d("FilemoonV2", "No iframe and no video URL found in script fallback.")
+            }
+            return
+        }
+
+        // If iframe was found, continue processing
+        val iframeHeaders = defaultHeaders + ("Accept-Language" to "en-US,en;q=0.5")
+        val iframeResponse = app.get(iframeSrcUrl, headers = iframeHeaders)
+
+        val iframeScriptData = iframeResponse.document
+            .selectFirst("script:containsData(function(p,a,c,k,e,d))")
+            ?.data().orEmpty()
+
+        val unpackedScript = JsUnpacker(iframeScriptData).unpack()
+
+        val linkFound = JwPlayerHelper.extractStreamLinks(
+            unpackedScript.orEmpty(),
+            name,
+            mainUrl,
+            callback,
+            subtitleCallback
+        )
+
+        if (!linkFound) {
+            // Last-resort fallback using WebView interception
+            val resolver = WebViewResolver(
+                interceptUrl = Regex("""(m3u8|master\.txt)"""),
+                additionalUrls = listOf(Regex("""(m3u8|master\.txt)""")),
+                useOkhttp = false,
+                timeout = 15_000L
+            )
+
+            val interceptedUrl = app.get(
+                iframeSrcUrl,
+                referer = referer,
+                interceptor = resolver
+            ).url
+
+            if (interceptedUrl.isNotEmpty()) {
+                M3u8Helper.generateM3u8(
+                    name,
+                    interceptedUrl,
+                    mainUrl,
+                    headers = defaultHeaders
+                ).forEach(callback)
+            } else {
+                Log.d("FilemoonV2", "No video URL intercepted in WebView fallback.")
+            }
+        }
+    }
+}
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 55a3a62b0e0..51e127e3fef 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Filesim.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Filesim.kt
@@ -3,7 +3,13 @@ package com.lagradost.cloudstream3.extractors
 import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.utils.*
-import com.lagradost.cloudstream3.utils.M3u8Helper.Companion.generateM3u8
+import com.lagradost.api.Log
+import com.lagradost.cloudstream3.extractors.helper.JwPlayerHelper
+import com.lagradost.cloudstream3.network.WebViewResolver
+
+class Multimoviesshg : Filesim() {
+    override var mainUrl = "https://multimoviesshg.com"
+}
 
 class Guccihide : Filesim() {
     override val name = "Guccihide"
@@ -20,11 +26,6 @@ class Moviesm4u : Filesim() {
     override val name = "Moviesm4u"
 }
 
-class FileMoonIn : Filesim() {
-    override val mainUrl = "https://filemoon.in"
-    override val name = "FileMoon"
-}
-
 class StreamhideTo : Filesim() {
     override val mainUrl = "https://streamhide.to"
     override val name = "Streamhide"
@@ -44,15 +45,6 @@ class Ztreamhub : Filesim() {
     override val mainUrl: String = "https://ztreamhub.com" //Here 'cause works
     override val name = "Zstreamhub"
 }
-class FileMoon : Filesim() {
-    override val mainUrl = "https://filemoon.to"
-    override val name = "FileMoon"
-}
-
-class FileMoonSx : Filesim() {
-    override val mainUrl = "https://filemoon.sx"
-    override val name = "FileMoonSx"
-}
 
 open class Filesim : ExtractorApi() {
     override val name = "Filesim"
@@ -65,29 +57,54 @@ open class Filesim : ExtractorApi() {
         subtitleCallback: (SubtitleFile) -> Unit,
         callback: (ExtractorLink) -> Unit
     ) {
-        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(
+        val embedUrl = url.replace("/download/", "/e/")
+        var pageResponse = app.get(embedUrl, referer = referer)
+
+        val iframeElement = pageResponse.document.selectFirst("iframe")
+        if (iframeElement != null) {
+            val iframeUrl = iframeElement.attr("src")
+            pageResponse = app.get(
+                iframeUrl,
+                headers = mapOf(
                     "Accept-Language" to "en-US,en;q=0.5",
                     "Sec-Fetch-Dest" to "iframe"
-                ), referer = response.url
+                ),
+                referer = pageResponse.url
             )
         }
 
-        val script = if (!getPacked(response.text).isNullOrEmpty()) {
-            getAndUnpack(response.text)
+        val scriptData = if (!getPacked(pageResponse.text).isNullOrEmpty()) {
+            getAndUnpack(pageResponse.text)
         } else {
-            response.document.selectFirst("script:containsData(sources:)")?.data()
-        } ?: return
-
-        val m3u8 =
-            Regex("file:\\s*\"(.*?m3u8.*?)\"").find(script)?.groupValues?.getOrNull(1)
-        generateM3u8(
-            name,
-            m3u8 ?: return,
-            mainUrl
-        ).forEach(callback)
+            pageResponse.document.selectFirst("script:containsData(sources:)")?.data()
+        }
+
+        val linkFound = JwPlayerHelper.extractStreamLinks(scriptData.orEmpty(), name, mainUrl, callback, subtitleCallback)
+
+        if (!linkFound) {
+            // Fallback using WebViewResolver
+            val resolver = WebViewResolver(
+                interceptUrl = Regex("""(m3u8|master\.txt)"""),
+                additionalUrls = listOf(Regex("""(m3u8|master\.txt)""")),
+                useOkhttp = false,
+                timeout = 15_000L
+            )
+
+            val interceptedUrl = app.get(
+                url = pageResponse.url,
+                referer = referer,
+                interceptor = resolver
+            ).url
+
+            if (interceptedUrl.isNotEmpty()) {
+                M3u8Helper.generateM3u8(
+                    name,
+                    interceptedUrl,
+                    mainUrl
+                ).forEach(callback)
+            } else {
+                Log.d("Filesim", "No m3u8 found via script or WebView fallback.")
+            }
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/GDMirrorbot.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/GDMirrorbot.kt
index 32a909cee50..e0fefe8aae8 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/GDMirrorbot.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/GDMirrorbot.kt
@@ -1,6 +1,5 @@
 package com.lagradost.cloudstream3.extractors
 
-import com.google.gson.JsonObject
 import com.google.gson.JsonParser
 import com.lagradost.api.Log
 import com.lagradost.cloudstream3.SubtitleFile
@@ -11,6 +10,12 @@ import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.loadExtractor
 import java.net.URI
 
+class Techinmind: GDMirrorbot() {
+    override var name = "Techinmind Cloud AIO"
+    override var mainUrl = "https://stream.techinmind.space"
+    override var requiresReferer = true
+}
+
 open class GDMirrorbot : ExtractorApi() {
     override var name = "GDMirrorbot"
     override var mainUrl = "https://gdmirrorbot.nl"
@@ -22,67 +27,83 @@ open class GDMirrorbot : ExtractorApi() {
         subtitleCallback: (SubtitleFile) -> Unit,
         callback: (ExtractorLink) -> Unit
     ) {
-        val host = getBaseUrl(app.get(url).url)
-        val embedId = url.substringAfterLast("/")
-        val postData = mapOf("sid" to embedId)
+        val (sid, host) = if (!url.contains("key=")) {
+            Pair(url.substringAfterLast("embed/"), getBaseUrl(app.get(url).url))
+        } else {
+            var pageText = app.get(url).text
+            val finalId = Regex("""FinalID\s*=\s*"([^"]+)"""").find(pageText)?.groupValues?.get(1)
+            val myKey = Regex("""myKey\s*=\s*"([^"]+)"""").find(pageText)?.groupValues?.get(1)
+            val idType = Regex("""idType\s*=\s*"([^"]+)"""").find(pageText)?.groupValues?.get(1) ?: "imdbid"
+            val baseUrl = Regex("""let\s+baseUrl\s*=\s*"([^"]+)"""").find(pageText)?.groupValues?.get(1)
+            val hostUrl = baseUrl?.let { getBaseUrl(it) }
+
+            if (finalId != null && myKey != null) {
+                val apiUrl = if (url.contains("/tv/")) {
+                    val season = Regex("""/tv/\d+/(\d+)/""").find(url)?.groupValues?.get(1) ?: "1"
+                    val episode = Regex("""/tv/\d+/\d+/(\d+)""").find(url)?.groupValues?.get(1) ?: "1"
+                    "$mainUrl/myseriesapi?tmdbid=$finalId&season=$season&epname=$episode&key=$myKey"
+                } else {
+                    "$mainUrl/mymovieapi?$idType=$finalId&key=$myKey"
+                }
+                pageText = app.get(apiUrl).text
+            }
+
+            val jsonElement = JsonParser.parseString(pageText)
+            if (!jsonElement.isJsonObject) return
+            val jsonObject = jsonElement.asJsonObject
+
+            val embedId = url.substringAfterLast("/")
+            val sidValue = jsonObject["data"]?.asJsonArray
+                ?.takeIf { it.size() > 0 }
+                ?.get(0)?.asJsonObject
+                ?.get("fileslug")?.asString
+                ?.takeIf { it.isNotBlank() } ?: embedId
+
+            Pair(sidValue, hostUrl)
+        }
 
-        val responseJson = app.post("$host/embedhelper.php", data = postData).text
-        val jsonElement = JsonParser.parseString(responseJson)
-        if (!jsonElement.isJsonObject) return
+        val postData = mapOf("sid" to sid)
+        val responseText = app.post("$host/embedhelper.php", data = postData).text
+
+        val rootElement = JsonParser.parseString(responseText)
+        if (!rootElement.isJsonObject) return
+        val root = rootElement.asJsonObject
 
-        val root = jsonElement.asJsonObject
         val siteUrls = root["siteUrls"]?.asJsonObject ?: return
         val siteFriendlyNames = root["siteFriendlyNames"]?.asJsonObject
 
-        val decodedMresult: JsonObject = when {
-            root["mresult"]?.isJsonObject == true -> {
-                root["mresult"]?.asJsonObject!!
-            }
-            root["mresult"]?.isJsonPrimitive == true -> {
-                val mresultBase64 = root["mresult"]?.asString ?: return
-                try {
-                    val jsonStr = base64Decode(mresultBase64)
-                    JsonParser.parseString(jsonStr).asJsonObject
-                } catch (e: Exception) {
-                    Log.e("Error:", "Failed to decode mresult base64: $e")
-                    return
-                }
+        val decodedMresult = when {
+            root["mresult"]?.isJsonObject == true -> root["mresult"]!!.asJsonObject
+            root["mresult"]?.isJsonPrimitive == true -> try {
+                base64Decode(root["mresult"]!!.asString)
+                    .let { JsonParser.parseString(it).asJsonObject }
+            } catch (e: Exception) {
+                Log.e("GDMirrorbot", "Failed to decode mresult: $e")
+                return
             }
             else -> return
         }
 
-        val commonKeys = siteUrls.keySet().intersect(decodedMresult.keySet())
-
-        for (key in commonKeys) {
-            val base = siteUrls[key]?.asString?.trimEnd('/') ?: continue
-            val path = decodedMresult[key]?.asString?.trimStart('/') ?: continue
+        siteUrls.keySet().intersect(decodedMresult.keySet()).forEach { key ->
+            val base = siteUrls[key]?.asString?.trimEnd('/') ?: return@forEach
+            val path = decodedMresult[key]?.asString?.trimStart('/') ?: return@forEach
             val fullUrl = "$base/$path"
-
             val friendlyName = siteFriendlyNames?.get(key)?.asString ?: key
+
             try {
                 when (friendlyName) {
-                    "EarnVids" -> {
-                        VidhideExtractor().getUrl(fullUrl, referer, subtitleCallback, callback)
-                    }
-                    "StreamHG" -> {
-                        VidHidePro().getUrl(fullUrl, referer, subtitleCallback, callback)
-                    }
-                    "RpmShare", "UpnShare", "StreamP2p" -> {
-                        VidStack().getUrl(fullUrl, referer, subtitleCallback, callback)
-                    }
-                    else -> {
-                        loadExtractor(fullUrl, referer ?: mainUrl, subtitleCallback, callback)
-                    }
+                    "StreamHG","EarnVids" -> VidHidePro().getUrl(fullUrl, referer, subtitleCallback, callback)
+                    "RpmShare", "UpnShare", "StreamP2p" -> VidStack().getUrl(fullUrl, referer, subtitleCallback, callback)
+                    else -> loadExtractor(fullUrl, referer ?: mainUrl, subtitleCallback, callback)
                 }
             } catch (e: Exception) {
-                Log.e("Error:", "Failed to extract from $friendlyName at $fullUrl")
-                continue
+                Log.e("GDMirrorbot", "Failed to extract from $friendlyName at $fullUrl: $e")
             }
         }
-
     }
 
     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/GMPlayer.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/GMPlayer.kt
deleted file mode 100644
index 7aa4ed53f20..00000000000
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/GMPlayer.kt
+++ /dev/null
@@ -1,47 +0,0 @@
-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.ExtractorLinkType
-import com.lagradost.cloudstream3.utils.Qualities
-import com.lagradost.cloudstream3.utils.newExtractorLink
-
-open class GMPlayer : ExtractorApi() {
-    override val name = "GM Player"
-    override val mainUrl = "https://gmplayer.xyz"
-    override val requiresReferer = true
-
-    override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink>? {
-        val ref = referer ?: return null
-        val id = url.substringAfter("/video/").substringBefore("/")
-
-        val m3u8 = app.post(
-            "$mainUrl/player/index.php?data=$id&do=getVideo",
-            mapOf(
-                "accept" to "*/*",
-                "referer" to ref,
-                "x-requested-with" to "XMLHttpRequest",
-                "origin" to mainUrl
-            ),
-            data = mapOf("hash" to id, "r" to ref)
-        ).parsed<GmResponse>().videoSource ?: return null
-
-        return listOf(
-            newExtractorLink(
-                source = this.name,
-                name = this.name,
-                url = m3u8,
-                type = ExtractorLinkType.M3U8
-            ) {
-                this.referer = ref
-                this.quality = Qualities.Unknown.value
-                this.headers = mapOf("accept" to "*/*")
-            }
-        )
-    }
-
-    private data class GmResponse(
-        val videoSource: String? = null
-    )
-}
\ No newline at end of file
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/GUpload.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/GUpload.kt
new file mode 100644
index 00000000000..7daaa55cc94
--- /dev/null
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/GUpload.kt
@@ -0,0 +1,54 @@
+package com.lagradost.cloudstream3.extractors
+
+import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.cloudstream3.SubtitleFile
+import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.base64Decode
+import com.lagradost.cloudstream3.utils.AppUtils
+import com.lagradost.cloudstream3.utils.ExtractorApi
+import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.getQualityFromName
+import com.lagradost.cloudstream3.utils.newExtractorLink
+
+open class GUpload: ExtractorApi() {
+    override val name: String = "GUpload"
+    override val mainUrl: String = "https://gupload.xyz"
+    override val requiresReferer: Boolean = false
+
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
+        val response = app.get(url, referer = referer).text
+
+        val playerConfigEncoded = response.substringAfter("decodePayload('").substringBefore("');")
+        val playerConfigString = base64Decode(playerConfigEncoded).substringAfter("|")
+
+        val playerConfig = AppUtils.parseJson<VideoInfo>(playerConfigString)
+
+        callback.invoke(
+            newExtractorLink(
+                source = name,
+                name = name,
+                url = playerConfig.videoUrl.replace("\\", ""),
+            ) {
+                Regex("/(\\d+p)\\.").find(playerConfig.videoUrl)?.groupValues?.get(1)?.let {
+                    quality = getQualityFromName(it)
+                }
+            }
+        )
+    }
+
+    private data class VideoInfo(
+        @JsonProperty("videoUrl") val videoUrl: String,
+        @JsonProperty("posterUrl") val posterUrl: String? = null,
+        @JsonProperty("videoId") val videoId: String? = null,
+        @JsonProperty("primaryColor") val primaryColor: String? = null,
+        @JsonProperty("audioTracks") val audioTracks: List<Any?> = emptyList(),
+        @JsonProperty("subtitleTracks") val subtitleTracks: List<Any?> = emptyList(),
+        @JsonProperty("vastFallbackList") val vastFallbackList: List<String> = emptyList(),
+        @JsonProperty("videoOwnerId") val videoOwnerId: Long = 0,
+    )
+}
\ 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
index 7e00dbf9596..85212e6bb5b 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/GamoVideo.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/GamoVideo.kt
@@ -1,7 +1,10 @@
 package com.lagradost.cloudstream3.extractors
 
+import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.utils.*
+import com.lagradost.cloudstream3.extractors.helper.JwPlayerHelper
+import com.lagradost.cloudstream3.utils.ExtractorApi
+import com.lagradost.cloudstream3.utils.ExtractorLink
 
 
 open class GamoVideo : ExtractorApi() {
@@ -11,21 +14,13 @@ open class GamoVideo : ExtractorApi() {
 
     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(
-                newExtractorLink(
-                    name,
-                    name,
-                    it,
-                ) {
-                    this.referer = url
-                    this.quality = Qualities.Unknown.value
-                }
-            )
-        }
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
+        app.get(url, referer = referer).document.select("script")
+            .firstOrNull { JwPlayerHelper.canParseJwScript(it.data()) }!!.let {
+                JwPlayerHelper.extractStreamLinks(it.data(), name, mainUrl, callback, subtitleCallback)
+            }
     }
 }
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Gdriveplayer.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Gdriveplayer.kt
index 67494d789ce..61c22e9291b 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Gdriveplayer.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Gdriveplayer.kt
@@ -109,7 +109,7 @@ open class Gdriveplayer : ExtractorApi() {
         subData?.addMarks("file")?.addMarks("kind")?.addMarks("label").let { dataSub ->
             tryParseJson<List<Tracks>>("[$dataSub]")?.map { sub ->
                 subtitleCallback.invoke(
-                    SubtitleFile(
+                    newSubtitleFile(
                         sub.label,
                         httpsify(sub.file)
                     )
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Gofile.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Gofile.kt
index defd6f698f8..ced827eecb7 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Gofile.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Gofile.kt
@@ -5,6 +5,7 @@ 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.ExtractorLinkType
 import com.lagradost.cloudstream3.utils.Qualities
 import com.lagradost.cloudstream3.utils.newExtractorLink
 
@@ -20,27 +21,45 @@ open class Gofile : ExtractorApi() {
         subtitleCallback: (SubtitleFile) -> Unit,
         callback: (ExtractorLink) -> Unit
     ) {
-        val id = Regex("/(?:\\?c=|d/)([\\da-zA-Z-]+)").find(url)?.groupValues?.get(1)
-        val token = app.get("$mainApi/createAccount").parsedSafe<Account>()?.data?.get("token")
-        val websiteToken = app.get("$mainUrl/dist/js/alljs.js").text.let {
-            Regex("fetchData.wt\\s*=\\s*\"([^\"]+)").find(it)?.groupValues?.get(1)
-        }
-        app.get("$mainApi/getContent?contentId=$id&token=$token&wt=$websiteToken")
-            .parsedSafe<Source>()?.data?.contents?.forEach {
-                callback.invoke(
-                    newExtractorLink(
-                        this.name,
-                        this.name,
-                        it.value["link"] ?: return,
-                    ) {
-                        this.quality = getQuality(it.value["name"])
-                        this.headers = mapOf(
-                            "Cookie" to "accountToken=$token"
-                        )
-                    }
-                )
-            }
+        val id = Regex("/(?:\\?c=|d/)([\\da-zA-Z-]+)").find(url)?.groupValues?.get(1) ?: return
+
+        val token = app.post(
+            "$mainApi/accounts",
+        ).parsedSafe<AccountResponse>()?.data?.token ?: return
+
+        val globalRes = app.get("$mainUrl/dist/js/config.js").text
+        val wt = Regex("""appdata\.wt\s*=\s*[\"']([^\"']+)[\"']""").find(globalRes)?.groupValues?.get(1) ?: return
+
+        val headers = mapOf(
+            "Authorization" to "Bearer $token",
+            "X-Website-Token" to wt
+        )
+
+        val parsedResponse = app.get(
+            "$mainApi/contents/$id?contentFilter=&page=1&pageSize=1000&sortField=name&sortDirection=1",
+            headers = headers
+        ).parsedSafe<GofileResponse>()
+
+        val childrenMap = parsedResponse?.data?.children ?: return
+
+        for ((_, file) in childrenMap) {
+            if (file.link.isNullOrEmpty() || file.type != "file") continue
+            val fileName = file.name ?: ""
+            val size = file.size ?: 0L
+            val formattedSize = formatBytes(size)
 
+            callback.invoke(
+                newExtractorLink(
+                    "Gofile",
+                    "[Gofile] $fileName [$formattedSize]",
+                    file.link,
+                    ExtractorLinkType.VIDEO
+                ) {
+                    this.quality = getQuality(fileName)
+                    this.headers = mapOf("Cookie" to "accountToken=$token")
+                }
+            )
+        }
     }
 
     private fun getQuality(str: String?): Int {
@@ -48,16 +67,33 @@ open class Gofile : ExtractorApi() {
             ?: Qualities.Unknown.value
     }
 
-    data class Account(
-        @JsonProperty("data") val data: HashMap<String, String>? = null,
+    private fun formatBytes(bytes: Long): String {
+        return when {
+            bytes < 1024L * 1024 * 1024 -> "%.2f MB".format(bytes.toDouble() / (1024 * 1024))
+            else -> "%.2f GB".format(bytes.toDouble() / (1024 * 1024 * 1024))
+        }
+    }
+
+    data class AccountResponse(
+        @JsonProperty("data") val data: AccountData? = null
     )
 
-    data class Data(
-        @JsonProperty("contents") val contents: HashMap<String, HashMap<String, String>>? = null,
+    data class AccountData(
+        @JsonProperty("token") val token: String? = null
     )
 
-    data class Source(
-        @JsonProperty("data") val data: Data? = null,
+    data class GofileResponse(
+        @JsonProperty("data") val data: GofileData? = null
     )
 
+    data class GofileData(
+        @JsonProperty("children") val children: Map<String, GofileFile>? = null
+    )
+
+    data class GofileFile(
+        @JsonProperty("type") val type: String? = null,
+        @JsonProperty("name") val name: String? = null,
+        @JsonProperty("link") val link: String? = null,
+        @JsonProperty("size") val size: Long? = 0L
+    )
 }
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/GuardareStream.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/GuardareStream.kt
deleted file mode 100644
index 138092e553d..00000000000
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/GuardareStream.kt
+++ /dev/null
@@ -1,88 +0,0 @@
-package com.lagradost.cloudstream3.extractors
-
-import com.fasterxml.jackson.annotation.JsonProperty
-import com.lagradost.cloudstream3.SubtitleFile
-import com.lagradost.cloudstream3.utils.ExtractorLink
-import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.utils.*
-
-class Vanfem : GuardareStream() {
-    override var name = "Vanfem"
-    override var mainUrl = "https://vanfem.com/"
-}
-
-class CineGrabber : GuardareStream() {
-    override var name = "CineGrabber"
-    override var mainUrl = "https://cinegrabber.com"
-}
-
-open class GuardareStream : ExtractorApi() {
-    override var name = "Guardare"
-    override var mainUrl = "https://guardare.stream"
-    override val requiresReferer = false
-
-    data class GuardareJsonData(
-        @JsonProperty("data") val data: List<GuardareData>,
-        @JsonProperty("captions") val captions: List<GuardareCaptions?>?,
-    )
-
-    data class GuardareData(
-        @JsonProperty("file") val file: String,
-        @JsonProperty("label") val label: String,
-        @JsonProperty("type") val type: String
-    )
-
-
-    // https://cinegrabber.com/asset/userdata/224879/caption/gqdmzh-71ez76z8/876438.srt
-    data class GuardareCaptions(
-        @JsonProperty("id") val id: String,
-        @JsonProperty("hash") val hash: String,
-        @JsonProperty("language") val language: String?,
-        @JsonProperty("extension") val extension: String
-    ) {
-        fun getUrl(mainUrl: String, userId: String): String {
-            return "$mainUrl/asset/userdata/$userId/caption/$hash/$id.$extension"
-        }
-    }
-
-    override suspend fun getUrl(
-        url: String,
-        referer: String?,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
-    ) {
-        val response =
-            app.post(url.replace("/v/", "/api/source/"), data = mapOf("d" to mainUrl)).text
-
-        val jsonVideoData = AppUtils.parseJson<GuardareJsonData>(response)
-        jsonVideoData.data.forEach {
-            callback.invoke(
-                newExtractorLink(
-                    this.name,
-                    this.name,
-                    it.file + ".${it.type}",
-                ) {
-                    this.referer = mainUrl
-                    this.quality = it.label.filter { it.isDigit() }.toInt()
-                }
-            )
-        }
-
-        if (!jsonVideoData.captions.isNullOrEmpty()){
-            val iframe = app.get(url)
-            // var USER_ID = '224879';
-            val userIdRegex = Regex("""USER_ID.*?(\d+)""")
-            val userId = userIdRegex.find(iframe.text)?.groupValues?.getOrNull(1) ?: return
-            jsonVideoData.captions.forEach {
-                if (it == null) return@forEach
-                val subUrl = it.getUrl(mainUrl, userId)
-                subtitleCallback.invoke(
-                    SubtitleFile(
-                        it.language ?: "",
-                        subUrl
-                    )
-                )
-            }
-        }
-    }
-}
\ No newline at end of file
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 ccad13c2fa1..ea6fba73b85 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/HDMomPlayerExtractor.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/HDMomPlayerExtractor.kt
@@ -39,7 +39,7 @@ open class HDMomPlayer : ExtractorApi() {
                     if (track.label.contains("Forced")) continue
 
                     subtitleCallback.invoke(
-                        SubtitleFile(
+                        newSubtitleFile(
                             lang = track.label,
                             url  = fixUrl(mainUrl + track.file)
                         )
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/HubCloud.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/HubCloud.kt
new file mode 100644
index 00000000000..4f83bad2545
--- /dev/null
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/HubCloud.kt
@@ -0,0 +1,209 @@
+package com.lagradost.cloudstream3.extractors
+
+import com.lagradost.api.Log
+import com.lagradost.cloudstream3.SubtitleFile
+import com.lagradost.cloudstream3.amap
+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.loadExtractor
+import com.lagradost.cloudstream3.utils.newExtractorLink
+import java.net.URI
+
+class HubCloud : ExtractorApi() {
+    override val name = "Hub-Cloud"
+    override val mainUrl = "https://hubcloud.*"
+    override val requiresReferer = false
+
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
+        val tag = "HubCloud"
+        val realUrl = url.takeIf {
+            try { URI(it).toURL(); true } catch (e: Exception) { Log.e(tag, "Invalid URL: ${e.message}"); false }
+        } ?: return
+
+        val baseUrl=getBaseUrl(realUrl)
+
+        val href = try {
+            if ("hubcloud.php" in realUrl) {
+                realUrl
+            } else {
+                val rawHref = app.get(realUrl).document.select("#download").attr("href")
+                if (rawHref.startsWith("http", ignoreCase = true)) {
+                    rawHref
+                } else {
+                    baseUrl.trimEnd('/') + "/" + rawHref.trimStart('/')
+                }
+            }
+        } catch (e: Exception) {
+            Log.e(tag, "Failed to extract href: ${e.message}")
+            ""
+        }
+
+        if (href.isBlank()) {
+            Log.w(tag, "No valid href found")
+            return
+        }
+
+        val document = app.get(href).document
+        val size = document.selectFirst("i#size")?.text().orEmpty()
+        val header = document.selectFirst("div.card-header")?.text().orEmpty()
+
+        val headerDetails = cleanTitle(header)
+
+        val labelExtras = buildString {
+            if (headerDetails.isNotEmpty()) append("[$headerDetails]")
+            if (size.isNotEmpty()) append("[$size]")
+        }
+        val quality = getIndexQuality(header)
+
+        document.select("div.card-body h2 a.btn").amap { element ->
+            val link = element.attr("href")
+            val text = element.text()
+
+            when {
+                text.contains("FSL Server", ignoreCase = true) -> {
+                    callback.invoke(
+                        newExtractorLink(
+                            "$referer [FSL Server]",
+                            "$referer [FSL Server] $labelExtras",
+                            link,
+                        ) { this.quality = quality }
+                    )
+                }
+
+                text.contains("Download File", ignoreCase = true) -> {
+                    callback.invoke(
+                        newExtractorLink(
+                            "$referer",
+                            "$referer $labelExtras",
+                            link,
+                        ) { this.quality = quality }
+                    )
+                }
+
+                text.contains("BuzzServer", ignoreCase = true) -> {
+                    val buzzResp = app.get("$link/download", referer = link, allowRedirects = false)
+                    val dlink = buzzResp.headers["hx-redirect"].orEmpty()
+                    if (dlink.isNotBlank()) {
+                        callback.invoke(
+                            newExtractorLink(
+                                "$referer [BuzzServer]",
+                                "$referer [BuzzServer] $labelExtras",
+                                dlink,
+                            ) { this.quality = quality }
+                        )
+                    } else {
+                        Log.w(tag, "BuzzServer: No redirect")
+                    }
+                }
+
+                text.contains("pixeldra", ignoreCase = true) || text.contains("pixel", ignoreCase = true) -> {
+                    val baseUrlLink = getBaseUrl(link)
+                    val finalURL = if (link.contains("download", true)) link
+                    else "$baseUrlLink/api/file/${link.substringAfterLast("/")}?download"
+
+                    callback(
+                        newExtractorLink(
+                            "Pixeldrain",
+                            "Pixeldrain $labelExtras",
+                            finalURL
+                        ) { this.quality = quality }
+                    )
+                }
+
+                text.contains("S3 Server", ignoreCase = true) -> {
+                    callback.invoke(
+                        newExtractorLink(
+                            "$referer S3 Server",
+                            "$referer S3 Server $labelExtras",
+                            link,
+                        ) { this.quality = quality }
+                    )
+                }
+
+                text.contains("FSLv2", ignoreCase = true) -> {
+                    callback.invoke(
+                        newExtractorLink(
+                            "$referer FSLv2",
+                            "$referer FSLv2 $labelExtras",
+                            link,
+                        ) { this.quality = quality }
+                    )
+                }
+
+                text.contains("Mega Server", ignoreCase = true) -> {
+                    callback.invoke(
+                        newExtractorLink(
+                            "$referer [Mega Server]",
+                            "$referer [Mega Server] $labelExtras",
+                            link,
+                        ) { this.quality = quality }
+                    )
+                }
+                
+                else -> {
+                    loadExtractor(link, "", subtitleCallback, callback)
+                }
+            }
+        }
+    }
+
+    private fun getIndexQuality(str: String?): Int {
+        return Regex("(\\d{3,4})[pP]").find(str.orEmpty())?.groupValues?.getOrNull(1)?.toIntOrNull()
+            ?: Qualities.P2160.value
+    }
+
+    private fun getBaseUrl(url: String): String {
+        return try {
+            URI(url).let { "${it.scheme}://${it.host}" }
+        } catch (_: Exception) {
+            ""
+        }
+    }
+
+    fun cleanTitle(title: String): String {
+        val parts = title.split(".", "-", "_")
+
+        val qualityTags = listOf(
+            "WEBRip", "WEB-DL", "WEB", "BluRay", "HDRip", "DVDRip", "HDTV",
+            "CAM", "TS", "R5", "DVDScr", "BRRip", "BDRip", "DVD", "PDTV",
+            "HD"
+        )
+
+        val audioTags = listOf(
+            "AAC", "AC3", "DTS", "MP3", "FLAC", "DD5", "EAC3", "Atmos"
+        )
+
+        val subTags = listOf(
+            "ESub", "ESubs", "Subs", "MultiSub", "NoSub", "EnglishSub", "HindiSub"
+        )
+
+        val codecTags = listOf(
+            "x264", "x265", "H264", "HEVC", "AVC"
+        )
+
+        val startIndex = parts.indexOfFirst { part ->
+            qualityTags.any { tag -> part.contains(tag, ignoreCase = true) }
+        }
+
+        val endIndex = parts.indexOfLast { part ->
+            subTags.any { tag -> part.contains(tag, ignoreCase = true) } ||
+                    audioTags.any { tag -> part.contains(tag, ignoreCase = true) } ||
+                    codecTags.any { tag -> part.contains(tag, ignoreCase = true) }
+        }
+
+        return if (startIndex != -1 && endIndex != -1 && endIndex >= startIndex) {
+            parts.subList(startIndex, endIndex + 1).joinToString(".")
+        } else if (startIndex != -1) {
+            parts.subList(startIndex, parts.size).joinToString(".")
+        } else {
+            parts.takeLast(3).joinToString(".")
+        }
+    }
+}
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Hxfile.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Hxfile.kt
index 8a56783b1f6..8f8a0c0cec2 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Hxfile.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Hxfile.kt
@@ -1,9 +1,9 @@
 package com.lagradost.cloudstream3.extractors
 
-import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.extractors.helper.JwPlayerHelper
 import com.lagradost.cloudstream3.utils.*
-import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
 
 class Neonime7n : Hxfile() {
     override val name = "Neonime7n"
@@ -39,64 +39,22 @@ open class Hxfile : ExtractorApi() {
     override val requiresReferer = false
     open val redirect = true
 
-    override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink>? {
-        val sources = mutableListOf<ExtractorLink>()
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
         val document = app.get(url, allowRedirects = redirect, referer = referer).document
         with(document) {
             this.select("script").map { script ->
-                if (script.data().contains("eval(function(p,a,c,k,e,d)")) {
-                    val data =
-                        getAndUnpack(script.data()).substringAfter("sources:[").substringBefore("]")
-                    tryParseJson<List<ResponseSource>>("[$data]")?.map {
-                        sources.add(
-                            newExtractorLink(
-                                name,
-                                name,
-                                it.file,
-                            ) {
-                                this.referer = mainUrl
-                                this.quality = when {
-                                    url.contains("hxfile.co") -> getQualityFromName(
-                                        Regex("\\d\\.(.*?).mp4").find(
-                                            document.select("title").text()
-                                        )?.groupValues?.get(1).toString()
-                                    )
-                                    else -> getQualityFromName(it.label)
-                                }
-                            }
-                        )
-                    }
-                } else if (script.data().contains("\"sources\":[")) {
-                    val data = script.data().substringAfter("\"sources\":[").substringBefore("]")
-                    tryParseJson<List<ResponseSource>>("[$data]")?.map {
-                        sources.add(
-                            newExtractorLink(
-                                name,
-                                name,
-                                it.file,
-                            ) {
-                                this.referer = mainUrl
-                                this.quality = when {
-                                    it.label?.contains("HD") == true -> Qualities.P720.value
-                                    it.label?.contains("SD") == true -> Qualities.P480.value
-                                    else -> getQualityFromName(it.label)
-                                }
-                            }
-                        )
-                    }
-                }
-                else {
-                    null
+                if (getPacked(script.data()) != null) {
+                    val data = getAndUnpack(script.data())
+                    JwPlayerHelper.extractStreamLinks(data, name, mainUrl, callback, subtitleCallback)
+                } else if (JwPlayerHelper.canParseJwScript(script.data())) {
+                    JwPlayerHelper.extractStreamLinks(script.data(), name, mainUrl, callback, subtitleCallback)
                 }
             }
         }
-        return sources
     }
-
-    private data class ResponseSource(
-        @JsonProperty("file") val file: String,
-        @JsonProperty("type") val type: String?,
-        @JsonProperty("label") val label: String?
-    )
-
 }
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/InternetArchive.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/InternetArchive.kt
index b5cc46c519f..40d817e99c2 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/InternetArchive.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/InternetArchive.kt
@@ -3,6 +3,7 @@ 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.newSubtitleFile
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.Qualities
@@ -51,7 +52,7 @@ open class InternetArchive : ExtractorApi() {
         subtitleLinks.forEach {
             val subtitleUrl = mainUrl + it.attr("href")
             val fileName = subtitleUrl.substringAfterLast('/')
-            val subtitleFile = SubtitleFile(
+            val subtitleFile = newSubtitleFile(
                 lang = fileName.substringBeforeLast(".")
                     .substringAfterLast("."),
                 url = subtitleUrl
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/JWPlayer.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/JWPlayer.kt
index e744fdb3977..324640355c4 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/JWPlayer.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/JWPlayer.kt
@@ -1,13 +1,10 @@
 package com.lagradost.cloudstream3.extractors
 
-import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
+import com.lagradost.cloudstream3.extractors.helper.JwPlayerHelper
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
-import com.lagradost.cloudstream3.utils.Qualities
-import com.lagradost.cloudstream3.utils.getQualityFromName
-import com.lagradost.cloudstream3.utils.newExtractorLink
 
 class Meownime : JWPlayer() {
     override val name = "Meownime"
@@ -34,50 +31,36 @@ class DesuOdvip : JWPlayer() {
     override val mainUrl = "https://desustream.me/odvip/"
 }
 
+class VidNest : JWPlayer() {
+    override var name = "Vidnest"
+    override var mainUrl = "https://vidnest.io"
+}
+
+open class BigwarpIO : JWPlayer() {
+    override var name = "Bigwarp"
+    override var mainUrl = "https://bigwarp.io"
+}
+
+class BgwpCC : BigwarpIO() {
+    override var mainUrl = "https://bgwp.cc"
+}
+
+class BigwarpArt : BigwarpIO() {
+    override var mainUrl = "https://bigwarp.art"
+}
+
 open class JWPlayer : ExtractorApi() {
     override val name = "JWPlayer"
     override val mainUrl = "https://www.jwplayer.com"
     override val requiresReferer = false
 
-    override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink>? {
-        val sources = mutableListOf<ExtractorLink>()
-        with(app.get(url).document) {
-            val data = this.select("script").mapNotNull { script ->
-                if (script.data().contains("sources: [")) {
-                    script.data().substringAfter("sources: [")
-                        .substringBefore("],").replace("'", "\"")
-                } else if (script.data().contains("otakudesu('")) {
-                    script.data().substringAfter("otakudesu('")
-                        .substringBefore("');")
-                } else {
-                    null
-                }
-            }
-
-            tryParseJson<List<ResponseSource>>("$data")?.map {
-                sources.add(
-                    newExtractorLink(
-                        name,
-                        name,
-                        it.file,
-                    ) {
-                        this.referer = url
-                        this.quality = getQualityFromName(
-                            Regex("(\\d{3,4}p)").find(it.file)?.groupValues?.get(
-                                1
-                            )
-                        )
-                    }
-                )
-            }
-        }
-        return sources
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
+        val script = app.get(url).document.selectFirst("script:containsData(sources:)") ?: return
+        JwPlayerHelper.extractStreamLinks(script.data(), name, mainUrl, callback, subtitleCallback)
     }
-
-    private data class ResponseSource(
-        @JsonProperty("file") val file: String,
-        @JsonProperty("type") val type: String?,
-        @JsonProperty("label") val label: String?
-    )
-
 }
\ No newline at end of file
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Jawcloud.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Jawcloud.kt
deleted file mode 100644
index 203a266c11c..00000000000
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Jawcloud.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-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.M3u8Helper
-
-
-open class Jawcloud : ExtractorApi() {
-    override var name = "Jawcloud"
-    override var mainUrl = "https://jawcloud.co"
-    override val requiresReferer = false
-
-    override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink>? {
-        val doc = app.get(url).document
-        val urlString = doc.select("html body div source").attr("src")
-        val sources = mutableListOf<ExtractorLink>()
-        if (urlString.contains("m3u8"))
-            M3u8Helper.generateM3u8(
-                name,
-                urlString,
-                url,
-                headers = app.get(url).headers.toMap()
-            ).forEach { link -> sources.add(link) }
-        return sources
-    }
-}
\ No newline at end of file
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Jeniusplay.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Jeniusplay.kt
index 11b66d993ad..896228b5110 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Jeniusplay.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Jeniusplay.kt
@@ -3,8 +3,12 @@ package com.lagradost.cloudstream3.extractors
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.utils.*
-import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
+import com.lagradost.cloudstream3.extractors.helper.JwPlayerHelper
+import com.lagradost.cloudstream3.utils.ExtractorApi
+import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.M3u8Helper
+import com.lagradost.cloudstream3.utils.getAndUnpack
+import com.lagradost.cloudstream3.utils.getPacked
 
 open class Jeniusplay : ExtractorApi() {
     override val name = "Jeniusplay"
@@ -33,40 +37,17 @@ open class Jeniusplay : ExtractorApi() {
             url,
         ).forEach(callback)
 
-
         document.select("script").map { script ->
-            if (script.data().contains("eval(function(p,a,c,k,e,d)")) {
-                val subData =
-                    getAndUnpack(script.data()).substringAfter("\"tracks\":[").substringBefore("],")
-                tryParseJson<List<Tracks>>("[$subData]")?.map { subtitle ->
-                    subtitleCallback.invoke(
-                        SubtitleFile(
-                            getLanguage(subtitle.label ?: ""),
-                            subtitle.file
-                        )
-                    )
-                }
+            if (getPacked(script.data()) != null) {
+                val unpacked = getAndUnpack(script.data())
+                JwPlayerHelper.extractStreamLinks(unpacked, name, mainUrl, callback, subtitleCallback)
             }
         }
     }
 
-    private fun getLanguage(str: String): String {
-        return when {
-            str.contains("indonesia", true) || str
-                .contains("bahasa", true) -> "Indonesian"
-            else -> str
-        }
-    }
-
     data class ResponseSource(
         @JsonProperty("hls") val hls: Boolean,
         @JsonProperty("videoSource") val videoSource: String,
         @JsonProperty("securedLink") val securedLink: String?,
     )
-
-    data class Tracks(
-        @JsonProperty("kind") val kind: String?,
-        @JsonProperty("file") val file: String,
-        @JsonProperty("label") val label: String?,
-    )
 }
\ 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
index c130ca2de92..dec67959410 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/LuluStream.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/LuluStream.kt
@@ -1,12 +1,15 @@
 package com.lagradost.cloudstream3.extractors
 
 import com.lagradost.cloudstream3.SubtitleFile
+import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.extractors.helper.JwPlayerHelper
 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
-import com.lagradost.cloudstream3.utils.newExtractorLink
+
+
+class Luluvdoo : LuluStream() {
+    override var mainUrl = "https://luluvdoo.com"
+}
 
 class Lulustream1 : LuluStream() {
     override val name = "Lulustream"
@@ -42,18 +45,7 @@ open class LuluStream : ExtractorApi() {
         ).document
         post.selectFirst("script:containsData(vplayer)")?.data()
             ?.let { script ->
-                Regex("file:\"(.*)\"").find(script)?.groupValues?.get(1)?.let { link ->
-                    callback(
-                        newExtractorLink(
-                            name,
-                            name,
-                            link,
-                        ) {
-                            this.referer = mainUrl
-                            this.quality = Qualities.P1080.value
-                        }
-                    )
-                }
+                JwPlayerHelper.extractStreamLinks(script, name, mainUrl, callback, subtitleCallback)
             }
     }
 }
\ No newline at end of file
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Minoplres.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Minoplres.kt
deleted file mode 100644
index 702501a1e0c..00000000000
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Minoplres.kt
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.lagradost.cloudstream3.extractors
-
-import com.fasterxml.jackson.annotation.JsonProperty
-import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
-import com.lagradost.cloudstream3.utils.ExtractorApi
-import com.lagradost.cloudstream3.utils.ExtractorLink
-import com.lagradost.cloudstream3.utils.M3u8Helper
-
-open class Minoplres : ExtractorApi() {
-
-    override val name = "Minoplres" // formerly SpeedoStream
-    override val requiresReferer = true
-    override val mainUrl = "https://minoplres.xyz" // formerly speedostream.bond
-    private val hostUrl = "https://minoplres.xyz"
-
-    override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink> {
-        val sources = mutableListOf<ExtractorLink>()
-        app.get(url, referer = referer).document.select("script").map { script ->
-            if (script.data().contains("jwplayer(\"vplayer\").setup(")) {
-                val data = script.data().substringAfter("sources: [")
-                    .substringBefore("],").replace("file", "\"file\"").trim()
-                tryParseJson<File>(data)?.let {
-                    M3u8Helper.generateM3u8(
-                        name,
-                        it.file,
-                        "$hostUrl/",
-                    ).forEach { m3uData -> sources.add(m3uData) }
-                }
-            }
-        }
-        return sources
-    }
-
-    private data class File(
-        @JsonProperty("file") val file: String,
-    )
-}
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 746dc7eb3ad..75ac299d858 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/MixDrop.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/MixDrop.kt
@@ -3,6 +3,22 @@ package com.lagradost.cloudstream3.extractors
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.utils.*
 
+class MixDropPs : MixDrop() {
+    override var mainUrl = "https://mixdrop.ps"
+}
+
+class Mdy : MixDrop() {
+    override var mainUrl = "https://mdy48tn97.com"
+}
+
+class MxDropTo : MixDrop() {
+    override var mainUrl = "https://mxdrop.to"
+}
+
+class MixDropSi : MixDrop() {
+    override var mainUrl = "https://mixdrop.si"
+}
+
 class MixDropBz : MixDrop(){
     override var mainUrl = "https://mixdrop.bz"
 }
@@ -47,4 +63,4 @@ open class MixDrop : ExtractorApi() {
         }
         return null
     }
-}
\ No newline at end of file
+}
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Moviehab.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Moviehab.kt
index 51939cc276c..b7e65e65b94 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Moviehab.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Moviehab.kt
@@ -2,6 +2,7 @@ package com.lagradost.cloudstream3.extractors
 
 import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.newSubtitleFile
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.M3u8Helper
@@ -33,7 +34,7 @@ open class Moviehab : ExtractorApi() {
 
             Regex("src[\"|'],\\s[\"|'](\\S+)[\"|']\\)").find(res.text)?.groupValues?.get(1).let {sub ->
                 subtitleCallback.invoke(
-                    SubtitleFile(
+                    newSubtitleFile(
                         it.select("track").attr("label"),
                         "$mainUrl/$sub"
                     )
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/MultiQuality.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/MultiQuality.kt
deleted file mode 100644
index 802d9ea3af6..00000000000
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/MultiQuality.kt
+++ /dev/null
@@ -1,63 +0,0 @@
-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.ExtractorLinkType
-import com.lagradost.cloudstream3.utils.Qualities
-import com.lagradost.cloudstream3.utils.getQualityFromName
-import com.lagradost.cloudstream3.utils.newExtractorLink
-import java.net.URI
-
-open class MultiQuality : ExtractorApi() {
-    override var name = "MultiQuality"
-    override var mainUrl = "https://anihdplay.com"
-    private val sourceRegex = Regex("""file:\s*['"](.*?)['"],label:\s*['"](.*?)['"]""")
-    private val m3u8Regex = Regex(""".*?(\d*).m3u8""")
-    private val urlRegex = Regex("""(.*?)([^/]+$)""")
-    override val requiresReferer = false
-
-    override fun getExtractorUrl(id: String): String {
-        return "$mainUrl/loadserver.php?id=$id"
-    }
-
-    override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink> {
-        val extractedLinksList: MutableList<ExtractorLink> = mutableListOf()
-        with(app.get(url)) {
-            sourceRegex.findAll(this.text).forEach { sourceMatch ->
-                val extractedUrl = sourceMatch.groupValues[1]
-                // Trusting this isn't mp4, may fuck up stuff
-                if (URI(extractedUrl).path.endsWith(".m3u8")) {
-                    with(app.get(extractedUrl)) {
-                        m3u8Regex.findAll(this.text).forEach { match ->
-                            extractedLinksList.add(
-                                newExtractorLink(
-                                    source = name,
-                                    name = name,
-                                    url = urlRegex.find(this.url)!!.groupValues[1] + match.groupValues[0],
-                                    type = ExtractorLinkType.M3U8
-                                ) {
-                                    this.referer = url
-                                    this.quality = getQualityFromName(match.groupValues[1])
-                                }
-                            )
-                        }
-
-                    }
-                } else if (extractedUrl.endsWith(".mp4")) {
-                    extractedLinksList.add(
-                        newExtractorLink(
-                            name,
-                            "$name ${sourceMatch.groupValues[2]}",
-                            extractedUrl,
-                        ) {
-                            this.referer = url.replace(" ", "%20")
-                            this.quality = Qualities.Unknown.value
-                        }
-                    )
-                }
-            }
-            return extractedLinksList
-        }
-    }
-}
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/OkRuExtractor.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/OkRuExtractor.kt
index 824481eb56e..d9803fa3ef8 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/OkRuExtractor.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/OkRuExtractor.kt
@@ -2,12 +2,20 @@
 
 package com.lagradost.cloudstream3.extractors
 
-class OkRuSSL : Odnoklassniki() {
+open class OkRuSSL : Odnoklassniki() {
     override var name    = "OkRuSSL"
     override var mainUrl = "https://ok.ru"
 }
 
-class OkRuHTTP : Odnoklassniki() {
+open class OkRuHTTP : Odnoklassniki() {
     override var name    = "OkRuHTTP"
     override var mainUrl = "http://ok.ru"
 }
+
+class OkRuSSLMobile : OkRuSSL() {
+    override var mainUrl = "https://m.ok.ru"
+}
+
+class OkRuHTTPMobile : OkRuHTTP() {
+    override var mainUrl = "http://m.ok.ru"
+}
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Okrulink.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Okrulink.kt
deleted file mode 100644
index 2c47018558e..00000000000
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Okrulink.kt
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.lagradost.cloudstream3.extractors
-
-import com.fasterxml.jackson.annotation.JsonProperty
-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.newExtractorLink
-
-data class Okrulinkdata (
-    @JsonProperty("status" ) var status : String? = null,
-    @JsonProperty("url"    ) var url    : String? = null
-)
-
-open class Okrulink: ExtractorApi() {
-    override var mainUrl = "https://okru.link"
-    override var name = "Okrulink"
-    override val requiresReferer = false
-
-    override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink> {
-        val sources = mutableListOf<ExtractorLink>()
-        val key = url.substringAfter("html?t=")
-        val request = app.post("https://apizz.okru.link/decoding", allowRedirects = false,
-            data = mapOf("video" to key)
-        ).parsedSafe<Okrulinkdata>()
-        if (request?.url != null) {
-            sources.add(
-                newExtractorLink(
-                    name,
-                    name,
-                    request.url!!
-                )
-            )
-        }
-        return sources
-    }
-}
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Pelisplus.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Pelisplus.kt
deleted file mode 100644
index c871280a245..00000000000
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Pelisplus.kt
+++ /dev/null
@@ -1,101 +0,0 @@
-package com.lagradost.cloudstream3.extractors
-
-import com.lagradost.cloudstream3.SubtitleFile
-import com.lagradost.cloudstream3.amap
-import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.mvvm.safeAsync
-import com.lagradost.cloudstream3.utils.ExtractorLink
-import com.lagradost.cloudstream3.utils.INFER_TYPE
-import com.lagradost.cloudstream3.utils.extractorApis
-import com.lagradost.cloudstream3.utils.getQualityFromName
-import com.lagradost.cloudstream3.utils.loadExtractor
-import com.lagradost.cloudstream3.utils.newExtractorLink
-import org.jsoup.Jsoup
-
-/**
- * overrideMainUrl is necessary for for other vidstream clones like vidembed.cc
- * If they diverge it'd be better to make them separate.
- * */
-open class Pelisplus(val mainUrl: String) {
-    val name: String = "Vidstream"
-
-    private fun getExtractorUrl(id: String): String {
-        return "$mainUrl/play?id=$id"
-    }
-
-    private fun getDownloadUrl(id: String): String {
-        return "$mainUrl/download?id=$id"
-    }
-
-    private val normalApis = arrayListOf(MultiQuality())
-
-    // https://gogo-stream.com/streaming.php?id=MTE3NDg5
-    suspend fun getUrl(
-        id: String,
-        isCasting: Boolean = false,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
-    ): Boolean {
-        try {
-            normalApis.amap { api ->
-                val url = api.getExtractorUrl(id)
-                api.getSafeUrl(url, subtitleCallback = subtitleCallback, callback = callback)
-            }
-            val extractorUrl = getExtractorUrl(id)
-
-            /** Stolen from GogoanimeProvider.kt extractor */
-            safeAsync {
-                val link = getDownloadUrl(id)
-                println("Generated vidstream download link: $link")
-                val page = app.get(link, referer = extractorUrl)
-
-                val pageDoc = Jsoup.parse(page.text)
-                val qualityRegex = Regex("(\\d+)P")
-
-                //a[download]
-                pageDoc.select(".dowload > a")?.amap { element ->
-                    val href = element.attr("href") ?: return@amap
-                    val qual = if (element.text()
-                            .contains("HDP")
-                    ) "1080" else qualityRegex.find(element.text())?.destructured?.component1()
-                        .toString()
-
-                    if (!loadExtractor(href, link, subtitleCallback, callback)) {
-                        callback.invoke(
-                            newExtractorLink(
-                                this.name,
-                                name = this.name,
-                                href
-                            ) {
-                                this.referer = page.url
-                                this.quality = getQualityFromName(qual)
-                            }
-                        )
-                    }
-                }
-            }
-
-            with(app.get(extractorUrl)) {
-                val document = Jsoup.parse(this.text)
-                val primaryLinks = document.select("ul.list-server-items > li.linkserver")
-                //val extractedLinksList: MutableList<ExtractorLink> = mutableListOf()
-
-                // All vidstream links passed to extractors
-                primaryLinks.distinctBy { it.attr("data-video") }.forEach { element ->
-                    val link = element.attr("data-video")
-                    //val name = element.text()
-
-                    // Matches vidstream links with extractors
-                    extractorApis.filter { !it.requiresReferer || !isCasting }.amap { api ->
-                        if (link.startsWith(api.mainUrl)) {
-                            api.getSafeUrl(link, extractorUrl, subtitleCallback, callback)
-                        }
-                    }
-                }
-                return true
-            }
-        } catch (e: Exception) {
-            return false
-        }
-    }
-}
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 ef120504cca..d97e1ca064c 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/PixelDrainExtractor.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/PixelDrainExtractor.kt
@@ -5,6 +5,10 @@ package com.lagradost.cloudstream3.extractors
 import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.utils.*
 
+class PixelDrainDev : PixelDrain() {
+    override var mainUrl = "https://pixeldrain.dev"
+}
+
 open class PixelDrain : ExtractorApi() {
     override val name            = "PixelDrain"
     override val mainUrl         = "https://pixeldrain.com"
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/PlayLtXyz.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/PlayLtXyz.kt
index 50d5395189a..c59022abbb7 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/PlayLtXyz.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/PlayLtXyz.kt
@@ -24,7 +24,7 @@ open class PlayLtXyz: ExtractorApi() {
         val doc = app.get(url, referer = referer).document
         //Log.i(this.name, "Result => (url, script) $url / ${doc.select("script")}")
         bodyText = doc.select("script").firstOrNull {
-            val text = it?.toString() ?: ""
+            val text = it.toString()
             text.contains("var idUser")
         }?.toString() ?: ""
         //Log.i(this.name, "Result => (bodyText) $bodyText")
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Rabbitstream.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Rabbitstream.kt
index 2df81bc67b6..98598dd2865 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Rabbitstream.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Rabbitstream.kt
@@ -6,6 +6,7 @@ import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.base64DecodeArray
 import com.lagradost.cloudstream3.base64Encode
+import com.lagradost.cloudstream3.newSubtitleFile
 import com.lagradost.cloudstream3.utils.AppUtils
 import com.lagradost.cloudstream3.utils.AppUtils.parseJson
 import com.lagradost.cloudstream3.utils.ExtractorApi
@@ -116,7 +117,7 @@ open class Rabbitstream : ExtractorApi() {
 
         decryptedSources?.tracks?.map { track ->
             subtitleCallback.invoke(
-                SubtitleFile(
+                newSubtitleFile(
                     track?.label ?: return@map,
                     track.file ?: return@map
                 )
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 326304e5ae1..9654e5f3805 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/RapidVidExtractor.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/RapidVidExtractor.kt
@@ -15,15 +15,15 @@ open class RapidVid : ExtractorApi() {
         val extRef   = referer ?: ""
         val videoReq = app.get(url, referer=extRef).text
 
-		val subUrls = mutableSetOf<String>()
+        val subUrls = mutableSetOf<String>()
         Regex("""captions\",\"file\":\"([^\"]+)\",\"label\":\"([^\"]+)\"""").findAll(videoReq).forEach {
             val (subUrl, subLang) = it.destructured
 
-			if (subUrl in subUrls) { return@forEach }
- 			subUrls.add(subUrl)
+            if (subUrl in subUrls) { return@forEach }
+            subUrls.add(subUrl)
 
             subtitleCallback.invoke(
-                SubtitleFile(
+                newSubtitleFile(
                     lang = subLang.replace("\\u0131", "ı").replace("\\u0130", "İ").replace("\\u00fc", "ü").replace("\\u00e7", "ç"),
                     url  = fixUrl(subUrl.replace("\\", ""))
                 )
@@ -35,7 +35,7 @@ open class RapidVid : ExtractorApi() {
 
         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")
+            decoded   = String(bytes, Charsets.UTF_8)
         } 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("\\\\", "\\")
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/SecvideoOnline.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/SecvideoOnline.kt
index 2f7caec84c0..6b807417b7e 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/SecvideoOnline.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/SecvideoOnline.kt
@@ -2,6 +2,7 @@ package com.lagradost.cloudstream3.extractors
 
 import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.newSubtitleFile
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.ExtractorLinkType
@@ -53,7 +54,7 @@ open class SecvideoOnline : ExtractorApi() {
             for (subtitle in subtitles) {
                 val languageAndSourceMatch = labelSourceRegex.find(subtitle) ?: continue
                 subtitleCallback.invoke(
-                    SubtitleFile(
+                    newSubtitleFile(
                         lang = languageAndSourceMatch.groupValues[1],
                         url = languageAndSourceMatch.groupValues[2]
                     )
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Solidfiles.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Solidfiles.kt
deleted file mode 100644
index 9c6fd614e0d..00000000000
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Solidfiles.kt
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.lagradost.cloudstream3.extractors
-
-import com.fasterxml.jackson.annotation.JsonProperty
-import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
-import com.lagradost.cloudstream3.utils.ExtractorApi
-import com.lagradost.cloudstream3.utils.ExtractorLink
-import com.lagradost.cloudstream3.utils.getQualityFromName
-import com.lagradost.cloudstream3.utils.newExtractorLink
-
-
-open class Solidfiles : ExtractorApi() {
-    override val name = "Solidfiles"
-    override val mainUrl = "https://www.solidfiles.com"
-    override val requiresReferer = false
-
-    override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink> {
-        val sources = mutableListOf<ExtractorLink>()
-        with(app.get(url).document) {
-            this.select("script").map { script ->
-                if (script.data().contains("\"streamUrl\":")) {
-                    val data = script.data().substringAfter("constant('viewerOptions', {").substringBefore("});")
-                    val source = tryParseJson<ResponseSource>("{$data}")
-                    val quality = Regex("\\d{3,4}p").find(source!!.nodeName)?.groupValues?.get(0)
-                    sources.add(
-                        newExtractorLink(
-                            name,
-                            name,
-                            source.streamUrl,
-                        ) {
-                            this.referer = url
-                            this.quality = getQualityFromName(quality)
-                        }
-                    )
-                }
-            }
-        }
-        return sources
-    }
-
-
-    private data class ResponseSource(
-        @JsonProperty("streamUrl") val streamUrl: String,
-        @JsonProperty("nodeName") val nodeName: String
-    )
-
-}
\ No newline at end of file
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/StreamEmbed.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/StreamEmbed.kt
new file mode 100644
index 00000000000..c89f4d226cb
--- /dev/null
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/StreamEmbed.kt
@@ -0,0 +1,43 @@
+package com.lagradost.cloudstream3.extractors
+
+import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.cloudstream3.SubtitleFile
+import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.utils.AppUtils.parseJson
+import com.lagradost.cloudstream3.utils.ExtractorApi
+import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.M3u8Helper
+
+open class StreamEmbed : ExtractorApi() {
+    override var name = "StreamEmbed"
+    override var mainUrl = "https://watch.gxplayer.xyz"
+    override val requiresReferer = true
+
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
+        val jsonString = app.get(url, referer = mainUrl).text
+            .substringAfter("var video = ").substringBefore(";")
+        val video = parseJson<Details>(jsonString)
+
+        M3u8Helper.generateM3u8(
+            this.name,
+            "$mainUrl/m3u8/${video.uid}/${video.md5}/master.txt?s=1&id=${video.id}&cache=${video.status}",
+            referer = "$mainUrl/",
+        ).forEach(callback)
+    }
+
+    private data class Details(
+        @JsonProperty("id") val id: String,
+        @JsonProperty("uid") val uid: String,
+        @JsonProperty("slug") val slug: String,
+        @JsonProperty("title") val title: String,
+        @JsonProperty("quality") val quality: String,
+        @JsonProperty("type") val type: String,
+        @JsonProperty("status") val status: String,
+        @JsonProperty("md5") val md5: String,
+    )
+}
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/StreamSB.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/StreamSB.kt
index df050cf36f6..67cf1f8da9c 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/StreamSB.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/StreamSB.kt
@@ -3,6 +3,7 @@ package com.lagradost.cloudstream3.extractors
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.newSubtitleFile
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.M3u8Helper
@@ -165,7 +166,7 @@ open class StreamSB : ExtractorApi() {
 
         mapped.streamData.subs?.map {sub ->
             subtitleCallback.invoke(
-                SubtitleFile(
+                newSubtitleFile(
                     sub.label.toString(),
                     sub.file ?: return@map null,
                 )
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 47fb96a8947..211b5ecf946 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/StreamTape.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/StreamTape.kt
@@ -7,6 +7,10 @@ import com.lagradost.cloudstream3.utils.Qualities
 import com.lagradost.cloudstream3.utils.newExtractorLink
 import org.mozilla.javascript.Context
 
+class Watchadsontape : StreamTape() {
+    override var mainUrl = "https://watchadsontape.com"
+}
+
 class StreamTapeNet : StreamTape() {
     override var mainUrl = "https://streamtape.net"
 }
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 51ad0276ed4..c721db6b95f 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/StreamWishExtractor.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/StreamWishExtractor.kt
@@ -1,13 +1,17 @@
 package com.lagradost.cloudstream3.extractors
 
+import com.lagradost.api.Log
 import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.USER_AGENT
 import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.extractors.helper.JwPlayerHelper
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.M3u8Helper
 import com.lagradost.cloudstream3.utils.getAndUnpack
 import com.lagradost.cloudstream3.utils.getPacked
+import com.lagradost.cloudstream3.network.WebViewResolver
+
 
 class Mwish : StreamWishExtractor() {
     override val name = "Mwish"
@@ -133,6 +137,16 @@ class Playerwish : StreamWishExtractor() {
     override val mainUrl = "https://playerwish.com"
 }
 
+class StreamHLS : StreamWishExtractor() {
+    override val name = "StreamHLS"
+    override val mainUrl = "https://streamhls.to"
+}
+
+class HlsWish : StreamWishExtractor() {
+    override val name = "HlsWish"
+    override val mainUrl = "https://hlswish.com"
+}
+
 open class StreamWishExtractor : ExtractorApi() {
     override val name = "Streamwish"
     override val mainUrl = "https://streamwish.to"
@@ -150,39 +164,61 @@ open class StreamWishExtractor : ExtractorApi() {
             "Sec-Fetch-Dest" to "empty",
             "Sec-Fetch-Mode" to "cors",
             "Sec-Fetch-Site" to "cross-site",
+            "Referer" to "$mainUrl/",
             "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()
+
+        val pageResponse = app.get(resolveEmbedUrl(url), referer = referer)
+
+        val playerScriptData = when {
+            !getPacked(pageResponse.text).isNullOrEmpty() -> getAndUnpack(pageResponse.text)
+            pageResponse.document.select("script").any { it.html().contains("jwplayer(\"vplayer\").setup(") } ->
+                pageResponse.document.select("script").firstOrNull {
+                    it.html().contains("jwplayer(\"vplayer\").setup(")
+                }?.html()
+            else -> pageResponse.document.selectFirst("script:containsData(sources:)")?.data()
+        }
+
+        val linkFound = JwPlayerHelper.extractStreamLinks(playerScriptData.orEmpty(), name, mainUrl, callback, subtitleCallback, headers)
+
+        if (!linkFound) {
+            val webViewM3u8Resolver = WebViewResolver(
+                interceptUrl = Regex("""txt|m3u8"""),
+                additionalUrls = listOf(Regex("""txt|m3u8""")),
+                useOkhttp = false,
+                timeout = 15_000L
+            )
+
+            val interceptedStreamUrl = app.get(
+                url,
+                referer = referer,
+                interceptor = webViewM3u8Resolver
+            ).url
+
+            if (interceptedStreamUrl.isNotEmpty()) {
+                M3u8Helper.generateM3u8(
+                    name,
+                    interceptedStreamUrl,
+                    mainUrl,
+                    headers = headers
+                ).forEach(callback)
+            } else {
+                Log.d("StreamwishExtractor", "No m3u8 found in fallback either.")
+            }
         }
-        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/")
+    private fun resolveEmbedUrl(inputUrl: String): String {
+        return if (inputUrl.contains("/f/")) {
+            val videoId = inputUrl.substringAfter("/f/")
+            "$mainUrl/$videoId"
+        } else if (inputUrl.contains("/e/")) {
+            val videoId = inputUrl.substringAfter("/e/")
             "$mainUrl/$videoId"
         } else {
-            url
+            inputUrl
         }
     }
-
 }
+
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/StreamoUpload.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/StreamoUpload.kt
index 7fafe05bec7..b7f618e9553 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/StreamoUpload.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/StreamoUpload.kt
@@ -1,42 +1,30 @@
 package com.lagradost.cloudstream3.extractors
 
-import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
+import com.lagradost.cloudstream3.extractors.helper.JwPlayerHelper
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.getAndUnpack
-import com.lagradost.cloudstream3.utils.Qualities
-import com.lagradost.cloudstream3.utils.M3u8Helper
+import com.lagradost.cloudstream3.utils.getPacked
 
 open class StreamoUpload : ExtractorApi() {
     override val name = "StreamoUpload"
     override val mainUrl = "https://streamoupload.xyz"
     override val requiresReferer = true
 
-    override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink> {
-        val sources = mutableListOf<ExtractorLink>()
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
         val response = app.get(url, referer = referer)
-        val scriptElements = response.document.select("script").map { script ->
-            if (script.data().contains("eval(function(p,a,c,k,e,d)")) {
+        response.document.select("script").map { script ->
+            if (getPacked(script.data()) != null) {
                 val data = getAndUnpack(script.data())
-                    .substringAfter("sources:[")
-                    .substringBefore("],")
-                    .replace("file", "\"file\"")
-                    .trim()
-                tryParseJson<File>(data)?.let {
-                    M3u8Helper.generateM3u8(
-                        name,
-                        it.file,
-                        "$mainUrl/",
-                    ).forEach { m3uData -> sources.add(m3uData) }
-                }
+                JwPlayerHelper.extractStreamLinks(data, name, mainUrl, callback, subtitleCallback)
             }
         }
-        return sources
     }
-
-    private data class File(
-        @JsonProperty("file") val file: String,
-    )
 }
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Streamup.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Streamup.kt
new file mode 100644
index 00000000000..ea85a005ea0
--- /dev/null
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Streamup.kt
@@ -0,0 +1,69 @@
+package com.lagradost.cloudstream3.extractors
+
+import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.cloudstream3.SubtitleFile
+import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.newSubtitleFile
+import com.lagradost.cloudstream3.utils.ExtractorApi
+import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.ExtractorLinkType
+import com.lagradost.cloudstream3.utils.newExtractorLink
+
+class Streamix(): Streamup() {
+    override val name: String = "Streamix"
+    override val mainUrl = "https://streamix.so"
+}
+
+class Vidara(): Streamup() {
+    override val name: String = "Vidara"
+    override val mainUrl = "https://vidara.to"
+    override val apiPath: String = "/api/stream"
+}
+
+open class Streamup() : ExtractorApi() {
+    override val name: String = "Streamup"
+    override val mainUrl: String = "https://strmup.to"
+    override val requiresReferer: Boolean = false
+    open val apiPath: String = "/ajax/stream"
+
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
+        val fileCode = url.substringAfterLast("/")
+        val fileInfo = app.get("$mainUrl$apiPath?filecode=$fileCode")
+            .parsed<StreamUpFileInfo>()
+
+        callback.invoke(
+            newExtractorLink(
+                source = name,
+                name = name,
+                url = fileInfo.streamingUrl,
+                type = ExtractorLinkType.M3U8
+            )
+        )
+
+        fileInfo.subtitles?.forEach { subtitle ->
+            subtitleCallback.invoke(
+                newSubtitleFile(subtitle.language, subtitle.filePath)
+            )
+        }
+    }
+
+    private data class StreamUpFileInfo(
+        val title: String,
+        val thumbnail: String,
+        @JsonProperty("streaming_url")
+        val streamingUrl: String,
+        val subtitles: List<StreamUpSubtitle>?
+    )
+
+    private data class StreamUpSubtitle(
+        @JsonProperty("file_path")
+        val filePath: String,
+        @JsonProperty("language")
+        val language: String,
+    )
+}
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 e70cae6bdf8..5e47dd2decf 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Supervideo.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Supervideo.kt
@@ -1,42 +1,27 @@
 package com.lagradost.cloudstream3.extractors
 
-import com.fasterxml.jackson.annotation.JsonProperty
-import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.utils.*
-import com.lagradost.cloudstream3.utils.AppUtils.parseJson
-
-data class Files(
-    @JsonProperty("file") val id: String,
-    @JsonProperty("label") val label: String? = null,
-)
+import com.lagradost.cloudstream3.extractors.helper.JwPlayerHelper
+import com.lagradost.cloudstream3.utils.ExtractorApi
+import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.JsUnpacker
 
 open class Supervideo : ExtractorApi() {
     override var name = "Supervideo"
     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()
+
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
         val response = app.get(url).text
         val jstounpack = Regex("eval((.|\\n)*?)</script>").find(response)?.groups?.get(1)?.value
-        val unpacjed = JsUnpacker(jstounpack).unpack()
-        val extractedUrl =
-            unpacjed?.let { Regex("""sources:((.|\n)*?)image""").find(it) }?.groups?.get(1)?.value.toString()
-                .replace("file", """"file"""").replace("label", """"label"""")
-                .substringBeforeLast(",")
-        val parsedlinks = parseJson<List<Files>>(extractedUrl)
-        parsedlinks.forEach { data ->
-            if (data.label.isNullOrBlank()) { // mp4 links (with labels) are slow. Use only m3u8 link.
-                M3u8Helper.generateM3u8(
-                    name,
-                    data.id,
-                    url,
-                    headers = mapOf("referer" to url)
-                ).forEach { link ->
-                    extractedLinksList.add(link)
-                }
-            }
-        }
-        return extractedLinksList
+        val unpacked = JsUnpacker(jstounpack).unpack()
+
+        JwPlayerHelper.extractStreamLinks(unpacked.orEmpty(), name, mainUrl, callback, subtitleCallback)
     }
 }
\ No newline at end of file
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 c8796896c09..1348f74d501 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/TRsTXExtractor.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/TRsTXExtractor.kt
@@ -29,7 +29,7 @@ open class TRsTX : ExtractorApi() {
             )
         }
 
-		val vidLinks = mutableSetOf<String>()
+        val vidLinks = mutableSetOf<String>()
         val vidMap   = mutableListOf<Map<String, String>>()
         for (item in postJson) {
             if (item.file == null || item.title == null) continue
@@ -37,8 +37,8 @@ open class TRsTX : ExtractorApi() {
             val fileUrl   = "${mainUrl}/playlist/" + item.file.substring(1) + ".txt"
             val videoData = app.post(fileUrl, referer=extRef).text
 
-			if (videoData in vidLinks) { continue }
- 			vidLinks.add(videoData)
+            if (videoData in vidLinks) { continue }
+            vidLinks.add(videoData)
 
             vidMap.add(mapOf(
                 "title"     to item.title,
@@ -46,12 +46,11 @@ open class TRsTX : ExtractorApi() {
             ))
         }
 
-
         for (mapEntry in vidMap) {
             val title    = mapEntry["title"] ?: continue
             val m3uLink = mapEntry["videoData"] ?: continue
 
-	        callback.invoke(
+            callback.invoke(
                 newExtractorLink(
                     source  = this.name,
                     name    = "${this.name} - ${title}",
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Tomatomatela.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Tomatomatela.kt
deleted file mode 100644
index b8d131ad9fa..00000000000
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Tomatomatela.kt
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.lagradost.cloudstream3.extractors
-
-import com.lagradost.cloudstream3.utils.*
-import com.lagradost.cloudstream3.app
-import com.fasterxml.jackson.annotation.JsonProperty
-import com.fasterxml.jackson.module.kotlin.readValue
-import com.lagradost.cloudstream3.USER_AGENT
-import com.lagradost.cloudstream3.mapper
-import com.lagradost.cloudstream3.utils.AppUtils.parseJson
-
-
-class Cinestart: Tomatomatela() {
-    override var name: String = "Cinestart"
-    override val mainUrl: String = "https://cinestart.net"
-    override val details = "vr.php?v="
-}
-
-class TomatomatelalClub: Tomatomatela() {
-    override var name: String = "Tomatomatela"
-    override val mainUrl: String = "https://tomatomatela.club"
-}
-
-open class Tomatomatela : ExtractorApi() {
-    override var name = "Tomatomatela"
-    override val mainUrl = "https://tomatomatela.com"
-    override val requiresReferer = false
-    private data class Tomato (
-        @JsonProperty("status") val status: Int,
-        @JsonProperty("file") val file: String?
-    )
-    open val details = "details.php?v="
-    open val embeddetails = "/embed.html#"
-    override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink>? {
-        val link = url.replace("$mainUrl$embeddetails","$mainUrl/$details")
-        val sources = ArrayList<ExtractorLink>()
-        val server = app.get(link, allowRedirects = false,
-            headers = mapOf(
-                "User-Agent" to USER_AGENT,
-                "Accept" to "application/json, text/javascript, */*; q=0.01",
-                "Accept-Language" to "en-US,en;q=0.5",
-                "X-Requested-With" to "XMLHttpRequest",
-                "DNT" to "1",
-                "Connection" to "keep-alive",
-                "Sec-Fetch-Dest" to "empty",
-                "Sec-Fetch-Mode" to "cors",
-                "Sec-Fetch-Site" to "same-origin"
-
-            )
-        ).parsedSafe<Tomato>()
-        if (server?.file != null) {
-            sources.add(
-                newExtractorLink(
-                    name,
-                    name,
-                    server.file,
-                )
-            )
-        }
-        return sources
-    }
-}
\ No newline at end of file
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Up4Stream.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Up4Stream.kt
new file mode 100644
index 00000000000..b72213e66ea
--- /dev/null
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Up4Stream.kt
@@ -0,0 +1,53 @@
+package com.lagradost.cloudstream3.extractors
+
+import com.lagradost.api.Log
+import com.lagradost.cloudstream3.SubtitleFile
+import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.extractors.helper.JwPlayerHelper
+import com.lagradost.cloudstream3.utils.ExtractorApi
+import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.JsUnpacker
+import com.lagradost.cloudstream3.utils.fixUrl
+import kotlinx.coroutines.delay
+
+class Up4FunTop : Up4Stream() {
+    override var mainUrl: String = "https://up4fun.top"
+}
+
+open class Up4Stream : ExtractorApi() {
+    override var name = "Up4Stream"
+    override var mainUrl = "https://up4stream.com"
+    override val requiresReferer = true
+
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
+        val movieId = url.substringAfterLast("/").substringBefore(".html")
+
+        // redirect from "wait 5 seconds" page to actual movie page
+        val redirectResponse = app.get(url, cookies = mapOf("id" to movieId))
+        val redirectForm = redirectResponse.document.selectFirst("form[method=POST]") ?: return
+        val redirectUrl = fixUrl(redirectForm.attr("action"))
+        val redirectParams = redirectForm.select("input[type=hidden]").associate { input ->
+            input.attr("name") to input.attr("value")
+        }
+
+        // wait for 5 seconds, otherwise the below md5 hash is invalid
+        delay(5000)
+        val response = app.post(redirectUrl, data = redirectParams).document
+
+        // starting here, this works similar to many other extractors like StreamWish
+        val extractedpack =
+            response.selectFirst("script:containsData(function(p,a,c,k,e,d))")?.data()
+        if (extractedpack == null) {
+            Log.e("up4stream", "file not ready: delay too short")
+        }
+
+        JsUnpacker(extractedpack).unpack()?.let { unPacked ->
+            JwPlayerHelper.extractStreamLinks(unPacked, name, mainUrl, callback, subtitleCallback)
+        }
+    }
+}
\ No newline at end of file
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Uqload.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Uqload.kt
index a267c87ee6e..803973ef46c 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Uqload.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Uqload.kt
@@ -2,6 +2,12 @@ package com.lagradost.cloudstream3.extractors
 
 import com.lagradost.cloudstream3.utils.*
 import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.SubtitleFile
+import com.lagradost.cloudstream3.USER_AGENT
+import com.lagradost.cloudstream3.newSubtitleFile
+import com.lagradost.cloudstream3.utils.*
+
+// import android.util.Log
 
 class Uqload1 : Uqload() {
     override var mainUrl = "https://uqload.com"
@@ -11,27 +17,40 @@ class Uqload2 : Uqload() {
     override var mainUrl = "https://uqload.co"
 }
 
+class Uqloadcx : Uqload() {
+    override var mainUrl = "https://uqload.cx"
+}
+
+class Uqloadbz : Uqload() {
+    override var mainUrl = "https://uqload.bz"
+}
+
 open class Uqload : ExtractorApi() {
-    override val name: String = "Uqload"
-    override val mainUrl: String = "https://www.uqload.com"
-    private val srcRegex = Regex("""sources:.\[(.*?)\]""")  // would be possible to use the parse and find src attribute
+    override var name: String = "Uqload"
+    override var mainUrl: String = "https://www.uqload.com"
     override val requiresReferer = true
 
+    private val  srcRegex = Regex("""sources:.*"(.*?)".*""")  // would be possible to use the parse and find src attribute
 
-    override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink>? {
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
         with(app.get(url)) {  // raised error ERROR_CODE_PARSING_CONTAINER_UNSUPPORTED (3003) is due to the response: "error_nofile"
-            srcRegex.find(this.text)?.groupValues?.get(1)?.replace("\"", "")?.let { link ->
-                return listOf(
+            srcRegex.find(this.text)?.groupValues?.get(1)?.let { link ->
+                // Log.d("CS3debugUQload","decoded URL: $link")
+                callback.invoke(
                     newExtractorLink(
-                        name,
-                        name,
-                        link
+                        source = name,
+                        name = name,
+                        url = link
                     ) {
-                        this.referer = url
+                        this.referer = "$mainUrl/"
                     }
                 )
             }
         }
-        return null
     }
 }
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VidHidePro.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VidHidePro.kt
index 5a3bba08e8c..849b2b6d96b 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VidHidePro.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VidHidePro.kt
@@ -3,16 +3,22 @@ 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
+import com.lagradost.cloudstream3.extractors.helper.JwPlayerHelper
+import com.lagradost.cloudstream3.utils.ExtractorApi
+import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.getAndUnpack
+import com.lagradost.cloudstream3.utils.getPacked
+
+class Ryderjet: VidHidePro() {
+    override var mainUrl = "https://ryderjet.com"
+}
 
-class VidHidePro1 : VidHidePro() {
-    override var mainUrl = "https://filelions.live"
+class VidHideHub : VidHidePro() {
+    override var mainUrl = "https://vidhidehub.com"
 }
 
-class Dhcplay: VidHidePro() {
-    override var name = "DHC Play"
-    override var mainUrl = "https://dhcplay.com"
+class VidHidePro1 : VidHidePro() {
+    override var mainUrl = "https://filelions.live"
 }
 
 class VidHidePro2 : VidHidePro() {
@@ -71,24 +77,12 @@ open class VidHidePro : ExtractorApi() {
         
         val response = app.get(getEmbedUrl(url), referer = referer)
         val script = if (!getPacked(response.text).isNullOrEmpty()) {
-            var result = getAndUnpack(response.text)
-            if(result.contains("var links")){
-                result = result.substringAfter("var links")
-            }
-            result
+            getAndUnpack(response.text)
         } else {
             response.document.selectFirst("script:containsData(sources:)")?.data()
         } ?: return
 
-        // m3u8 urls could be prefixed by 'file:', 'hls2:' or 'hls4:', so we just match ':'
-        Regex(":\\s*\"(.*?m3u8.*?)\"").findAll(script).forEach { m3u8Match ->
-            generateM3u8(
-                name,
-                fixUrl(m3u8Match.groupValues[1]),
-                referer = "$mainUrl/",
-                headers = headers
-            ).forEach(callback)
-        }
+        JwPlayerHelper.extractStreamLinks(script, name, mainUrl, callback, subtitleCallback, headers)
     }
 
     private fun getEmbedUrl(url: String): String {
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 eb8e62ca292..36acf7f7ad5 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VidMoxyExtractor.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VidMoxyExtractor.kt
@@ -15,15 +15,15 @@ open class VidMoxy : ExtractorApi() {
         val extRef   = referer ?: ""
         val videoReq = app.get(url, referer=extRef).text
 
-		val subUrls = mutableSetOf<String>()
+        val subUrls = mutableSetOf<String>()
         Regex("""captions\",\"file\":\"([^\"]+)\",\"label\":\"([^\"]+)\"""").findAll(videoReq).forEach {
             val (subUrl, subLang) = it.destructured
 
-			if (subUrl in subUrls) { return@forEach }
- 			subUrls.add(subUrl)
+            if (subUrl in subUrls) { return@forEach }
+            subUrls.add(subUrl)
 
             subtitleCallback.invoke(
-                SubtitleFile(
+                newSubtitleFile(
                     lang = subLang.replace("\\u0131", "ı").replace("\\u0130", "İ").replace("\\u00fc", "ü").replace("\\u00e7", "ç"),
                     url  = fixUrl(subUrl.replace("\\", ""))
                 )
@@ -35,7 +35,7 @@ open class VidMoxy : ExtractorApi() {
 
         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")
+            decoded   = String(bytes, Charsets.UTF_8)
         } 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("\\\\", "\\")
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VidSrcExtractor.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VidSrcExtractor.kt
deleted file mode 100644
index 0ef44aa1b22..00000000000
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VidSrcExtractor.kt
+++ /dev/null
@@ -1,256 +0,0 @@
-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.ExtractorApi
-import com.lagradost.cloudstream3.utils.ExtractorLink
-import com.lagradost.cloudstream3.utils.ExtractorLinkType
-import com.lagradost.cloudstream3.utils.Qualities
-import com.lagradost.cloudstream3.utils.loadExtractor
-import com.lagradost.cloudstream3.utils.newExtractorLink
-import java.util.Base64
-
-class VidSrcExtractor2 : VidSrcExtractor() {
-    override val mainUrl = "https://vidsrc.me"
-}
-
-open class VidSrcExtractor : ExtractorApi() {
-    override val name = "VidSrc"
-    override val mainUrl = "https://vidsrc.net"
-    private val apiUrl = "https://vidsrc.stream"
-    override val requiresReferer = false
-
-    override suspend fun getUrl(
-        url: String,
-        referer: String?,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
-    ) {
-        val iframedoc = app.get(url).document
-
-        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"
-            }
-
-        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(
-                    newExtractorLink(
-                        source = this.name,
-                        name = this.name,
-                        url = decodedUrl,
-                        type = ExtractorLinkType.M3U8
-                    ) {
-                        this.referer = apiUrl
-                        this.quality = Qualities.Unknown.value
-                    }
-                )
-            } else {
-                loadExtractor(res.url, url, subtitleCallback, callback)
-            }
-        }
-    }
-
-    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
deleted file mode 100644
index fa1e9796a15..00000000000
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VidSrcTo.kt
+++ /dev/null
@@ -1,135 +0,0 @@
-package com.lagradost.cloudstream3.extractors
-
-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.mvvm.logError
-import com.lagradost.cloudstream3.utils.ExtractorApi
-import com.lagradost.cloudstream3.utils.ExtractorLink
-import java.net.URLDecoder
-import javax.crypto.Cipher
-import javax.crypto.spec.SecretKeySpec
-import kotlin.io.encoding.Base64
-import kotlin.io.encoding.ExperimentalEncodingApi
-
-@OptIn(ExperimentalEncodingApi::class)
-open class VidSrcTo : ExtractorApi() {
-    override val name = "VidSrcTo"
-    override val mainUrl = "https://vidsrc2.to"
-    override val requiresReferer = true
-
-    override suspend fun getUrl(
-            url: String,
-            referer: String?,
-            subtitleCallback: (SubtitleFile) -> Unit,
-            callback: (ExtractorLink) -> Unit
-    ) {
-        val mediaId = app.get(url).document.selectFirst("ul.episodes li a")?.attr("data-id") ?: return
-        val subtitlesLink = "$mainUrl/ajax/embed/episode/$mediaId/subtitles"
-        val subRes = app.get(subtitlesLink).parsedSafe<Array<VidsrctoSubtitles>>()
-        subRes?.forEach {
-            if (it.kind.equals("captions")) subtitleCallback.invoke(SubtitleFile(it.label, it.file))
-        }
-        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 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) {
-                    "Server 1" -> AnyVidplay(finalUrl.substringBefore("/e/")).getUrl(finalUrl, referer, subtitleCallback, callback)
-                    "Server 2" -> FileMoon().getUrl(finalUrl, referer, subtitleCallback, callback)
-                }
-            } catch (e: Exception) {
-                logError(e)
-            }
-        }
-    }
-
-    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)
-        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(
-            @JsonProperty("status") val status: Int,
-            @JsonProperty("result") val result: List<VidsrctoResult>?
-    )
-
-    data class VidsrctoResult(
-            @JsonProperty("id") val id: String,
-            @JsonProperty("title") val title: String
-    )
-
-    data class VidsrctoEmbedSource(
-            @JsonProperty("status") val status: Int,
-            @JsonProperty("result") val result: VidsrctoUrl
-    )
-
-    data class VidsrctoSubtitles(
-            @JsonProperty("file") val file: String,
-            @JsonProperty("label") val label: String,
-            @JsonProperty("kind") val kind: String
-    )
-
-    data class VidsrctoUrl(@JsonProperty("url") val encUrl: String)
-}
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VidStack.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VidStack.kt
index 1211759dd34..846fd851db9 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VidStack.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VidStack.kt
@@ -3,10 +3,12 @@ package com.lagradost.cloudstream3.extractors
 import com.lagradost.api.Log
 import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.newSubtitleFile
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.ExtractorLinkType
 import com.lagradost.cloudstream3.utils.Qualities
+import com.lagradost.cloudstream3.utils.fixUrl
 import com.lagradost.cloudstream3.utils.newExtractorLink
 import java.net.URI
 import javax.crypto.Cipher
@@ -52,16 +54,31 @@ open class VidStack : ExtractorApi() {
         val m3u8 = Regex("\"source\":\"(.*?)\"").find(decryptedText)
             ?.groupValues?.get(1)
             ?.replace("\\/", "/") ?: ""
+        val subtitlePattern = Regex("\"([^\"]+)\":\\s*\"([^\"]+)\"")
+        val subtitleSection = Regex("\"subtitle\":\\{(.*?)\\}").find(decryptedText)?.groupValues?.get(1)
+
+        subtitleSection?.let { section ->
+            subtitlePattern.findAll(section).forEach { match ->
+                val lang = match.groupValues[1]
+                val rawPath = match.groupValues[2].split("#")[0]
+                if (rawPath.isNotEmpty()) {
+                    val path = rawPath.replace("\\/", "/")
+                    val subUrl = "$mainUrl$path"
+                    subtitleCallback(newSubtitleFile(lang, fixUrl(subUrl)))
+                }
+            }
+        }
 
         callback.invoke(
-            ExtractorLink(
-                this.name,
-                this.name,
-                m3u8,
-                url,
-                Qualities.P1080.value,
-                type = ExtractorLinkType.M3U8,
-            )
+            newExtractorLink(
+                source = this.name,
+                name = this.name,
+                url = m3u8,
+                type = ExtractorLinkType.M3U8
+            ) {
+                this.referer = url
+                this.quality = Qualities.Unknown.value
+            }
         )
     }
 
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Videa.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Videa.kt
new file mode 100644
index 00000000000..47840a08aad
--- /dev/null
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Videa.kt
@@ -0,0 +1,216 @@
+// Adapted for CloudStream - taken from https://github.com/vargalex/ResolveURL/blob/fix/videa-resolver-add-cookie/script.module.resolveurl/lib/resolveurl/plugins/videa.py
+package com.lagradost.cloudstream3.extractors
+
+import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.SubtitleFile
+import com.lagradost.cloudstream3.utils.*
+import com.lagradost.cloudstream3.base64DecodeArray
+
+/**
+ * Extractor for Videa.hu video hosting service
+ * Handles encrypted XML responses and redirect chains
+ */
+class Videa : ExtractorApi() {
+    override val name = "Videa"
+    override val mainUrl = "https://videa.hu"
+    override val requiresReferer = false
+
+    private val videaSecret = "xHb0ZvME5q8CBcoQi6AngerDu3FGO9fkUlwPmLVY_RTzj2hJIS4NasXWKy1td7p"
+
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
+        var currentUrl = url
+        var key = ""
+        // Handle redirect loop until we get valid XML
+        val visitedUrls = mutableSetOf<String>()
+        var count = 10
+        while (!visitedUrls.contains(currentUrl) && count > 0) {
+            visitedUrls += currentUrl
+            count -= 1
+
+            val webUrl = getXmlUrl(currentUrl) { cookie -> /* no-op, cookie not used */ } ?: return
+            val response = app.get(webUrl)
+            val body = response.body
+            val rawBytes = body.bytes()
+            body.close()
+
+            // Check if response starts with XML declaration
+            val isXml = rawBytes.size >= 5 &&
+                    rawBytes[0] == 0x3C.toByte() &&  // '<'
+                    rawBytes[1] == 0x3F.toByte() &&  // '?'
+                    rawBytes[2] == 0x78.toByte() &&  // 'x'
+                    rawBytes[3] == 0x6D.toByte() &&  // 'm'
+                    rawBytes[4] == 0x6C.toByte()     // 'l'
+
+            val videaXml = if (isXml) {
+                String(rawBytes, Charsets.UTF_8)
+            } else {
+                // Handle encrypted XML response
+                val xsHeader = response.headers["X-Videa-Xs"] ?: return
+                key += xsHeader
+                rc4DecryptBytes(rawBytes, key)
+            }
+
+            // Check for redirect in XML error
+            val redirectMatch = """<error.*?"noembed".*>(.*)</error>""".toRegex().find(videaXml)
+
+            if (redirectMatch != null && redirectMatch.groupValues[1] != currentUrl) {
+                currentUrl = redirectMatch.groupValues[1]
+            } else {
+                parseVideoSources(videaXml, callback)
+                break
+            }
+        }
+    }
+
+    private suspend fun getXmlUrl(url: String, cookieCallback: (String) -> Unit = {}): String? {
+        val response = app.get(url)
+        val size = response.size
+        /* OOM Protection */
+        if(size != null && size > 5_000_000) {
+            // You tried to use a video here
+            return null
+        }
+        val html = response.text
+
+        // Extract sl cookie if present
+        response.headers["Set-Cookie"]?.let { cookieHeader ->
+            """sl=([^;]+)""".toRegex().find(cookieHeader)?.let {
+                cookieCallback(it.value)
+            }
+        }
+
+        // Determine if this is a player URL or needs iframe extraction
+        val playerUrl = if ("/player" in url) {
+            url
+        } else {
+            val iframeMatch = """<iframe.*?src="(/player\?[^\"]+)""".toRegex().find(html)
+            iframeMatch?.let { "$mainUrl${it.groupValues[1]}" } ?: return null
+        }
+
+        // Get player page to extract tokens
+        val playerResponse = app.get(playerUrl)
+        val playerHtml = playerResponse.text
+
+        // Update cookie from player response
+        playerResponse.headers["Set-Cookie"]?.let { cookieHeader ->
+            """sl=([^;]+)""".toRegex().find(cookieHeader)?.let {
+                cookieCallback(it.value)
+            }
+        }
+
+        // Extract nonce and generate tokens
+        val nonceMatch = """_xt\s*=\s*"([^"]+)""".toRegex().find(playerHtml) ?: return null
+        val (s, t, key) = generateTokens(nonceMatch.groupValues[1])
+
+        // Extract video parameter
+        val videoParam = when {
+            "f=" in playerUrl -> "f=" + playerUrl.substringAfter("f=").substringBefore("&")
+            "v=" in playerUrl -> "v=" + playerUrl.substringAfter("v=").substringBefore("&")
+            else -> return null
+        }
+
+        return "$mainUrl/player/xml?platform=desktop&$videoParam&_s=$s&_t=$t"
+    }
+
+    private fun generateTokens(nonce: String): Triple<String, String, String> {
+        val lo = nonce.take(32)
+        val s = nonce.substring(32)
+        var result = ""
+
+        for (i in 0 until 32) {
+            val index = videaSecret.indexOf(lo[i]) - 31
+            result += s[i - index]
+        }
+
+        // Generate random seed
+        val chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
+        val randomSeed = (1..8).map { chars.random() }.joinToString("")
+
+        val key = result.substring(16) + randomSeed
+        return Triple(randomSeed, result.take(16), key)
+    }
+
+    private suspend fun parseVideoSources(xml: String, callback: (ExtractorLink) -> Unit) {
+        val sourceRegex = """video_source\s*name="([^"]+)".*exp="([^"]+)"[^>]*>([^<]+)""".toRegex()
+        val sources = sourceRegex.findAll(xml).toList()
+
+        for (sourceMatch in sources) {
+            val sourceName = sourceMatch.groupValues[1]
+            val exp = sourceMatch.groupValues[2]
+            var sourceUrl = sourceMatch.groupValues[3]
+
+            // Add https if needed
+            if (sourceUrl.startsWith("//")) {
+                sourceUrl = "https:$sourceUrl"
+            }
+
+            // Extract hash for this source
+            val hashMatch = """<hash_value_$sourceName>([^<]+)<""".toRegex().find(xml)
+
+            hashMatch?.let { match ->
+                val hash = match.groupValues[1]
+                val finalUrl = "$sourceUrl?md5=$hash&expires=$exp".replace("&amp;", "&")
+
+                callback(
+                    newExtractorLink(
+                        name,
+                        "$sourceName - $name",
+                        finalUrl,
+                        ExtractorLinkType.VIDEO
+                    ) {
+                        this.quality = Qualities.Unknown.value
+                        this.referer = mainUrl
+                    }
+                )
+            }
+        }
+    }
+
+    private fun rc4DecryptBytes(encryptedBytes: ByteArray, key: String): String {
+        // Check if data is Base64 encoded
+        val isBase64 = encryptedBytes.all { byte ->
+            val char = byte.toInt() and 0xFF
+            char in 32..126 || char == 10 || char == 13
+        }
+
+        val actualEncryptedBytes = if (isBase64) {
+            val base64String = String(encryptedBytes, Charsets.UTF_8)
+                .replace("\r", "")
+                .replace("\n", "")
+                .replace(" ", "")
+                .trim()
+            base64DecodeArray(base64String)
+        } else {
+            encryptedBytes
+        }
+
+        val keyBytes = key.toByteArray(Charsets.UTF_8)
+
+        // RC4 key-scheduling algorithm (KSA)
+        val s = IntArray(256) { it }
+        var j = 0
+        for (i in 0..255) {
+            j = (j + s[i] + (keyBytes[i % keyBytes.size].toInt() and 0xFF)) % 256
+            s[i] = s[j].also { s[j] = s[i] }
+        }
+
+        // RC4 pseudo-random generation algorithm (PRGA)
+        var i = 0
+        j = 0
+        val result = ByteArray(actualEncryptedBytes.size)
+        for (k in actualEncryptedBytes.indices) {
+            i = (i + 1) % 256
+            j = (j + s[i]) % 256
+            s[i] = s[j].also { s[j] = s[i] }
+            val keyStreamByte = s[(s[i] + s[j]) % 256]
+            result[k] = ((actualEncryptedBytes[k].toInt() and 0xFF) xor keyStreamByte).toByte()
+        }
+
+        return String(result, Charsets.UTF_8)
+    }
+}
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 0aed4997ed9..583d92322a9 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VideoSeyredExtractor.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VideoSeyredExtractor.kt
@@ -21,12 +21,12 @@ open class VideoSeyred : ExtractorApi() {
 
         val responseRaw                          = app.get(videoUrl)
         val responseList:List<VideoSeyredSource> = jacksonObjectMapper().readValue(responseRaw.text) ?: throw ErrorLoadingException("VideoSeyred")
-        val response                              = responseList[0] ?: throw ErrorLoadingException("VideoSeyred")
+        val response                              = responseList[0]
 
         for (track in response.tracks) {
             if (track.label != null && track.kind == "captions") {
                 subtitleCallback.invoke(
-                    SubtitleFile(
+                    newSubtitleFile(
                         lang = track.label,
                         url  = fixUrl(track.file)
                     )
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VideoVard.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VideoVard.kt
deleted file mode 100644
index 30a1d8fe62c..00000000000
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VideoVard.kt
+++ /dev/null
@@ -1,271 +0,0 @@
-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.M3u8Helper.Companion.generateM3u8
-import kotlinx.coroutines.delay
-import java.math.BigInteger
-
-class VideovardSX : WcoStream() {
-    override var mainUrl = "https://videovard.sx"
-}
-
-open class VideoVard : ExtractorApi() {
-    override var name = "Videovard" // Cause works for animekisa and wco
-    override var mainUrl = "https://videovard.to"
-    override val requiresReferer = false
-
-    //The following code was extracted from https://github.com/saikou-app/saikou/blob/main/app/src/main/java/ani/saikou/parsers/anime/extractors/VideoVard.kt
-    override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink> {
-        val id = url.substringAfter("e/").substringBefore("/")
-        val sources = mutableListOf<ExtractorLink>()
-        val hash = app.get("$mainUrl/api/make/download/$id").parsed<HashResponse>()
-        delay(11_000)
-        val resm3u8 = app.post(
-            "$mainUrl/api/player/setup",
-            mapOf("Referer" to "$mainUrl/"),
-            data = mapOf(
-                "cmd" to "get_stream",
-                "file_code" to id,
-                "hash" to hash.hash!!
-            )
-        ).parsed<SetupResponse>()
-        val m3u8 = decode(resm3u8.src!!, resm3u8.seed)
-        sources.addAll(
-            generateM3u8(
-                name,
-                m3u8,
-                mainUrl,
-                headers = mapOf("Referer" to mainUrl)
-            )
-        )
-        return sources
-    }
-
-    companion object {
-        private val big0 = 0.toBigInteger()
-        private val big3 = 3.toBigInteger()
-        private val big4 = 4.toBigInteger()
-        private val big15 = 15.toBigInteger()
-        private val big16 = 16.toBigInteger()
-        private val big255 = 255.toBigInteger()
-
-        private fun decode(dataFile: String, seed: String): String {
-            val dataSeed = replace(seed)
-            val newDataSeed = binaryDigest(dataSeed)
-            val newDataFile = bytes2blocks(ascii2bytes(dataFile))
-            var list = listOf(1633837924, 1650680933).map { it.toBigInteger() }
-            val xorList = mutableListOf<BigInteger>()
-            for (i in newDataFile.indices step 2) {
-                val temp = newDataFile.slice(i..i + 1)
-                xorList += xorBlocks(list, tearDecode(temp, newDataSeed))
-                list = temp
-            }
-
-            val result = replace(unPad(blocks2bytes(xorList)).map { it.toInt().toChar() }.joinToString(""))
-            return padLastChars(result)
-        }
-
-        private fun binaryDigest(input: String): List<BigInteger> {
-            val keys = listOf(1633837924, 1650680933, 1667523942, 1684366951).map { it.toBigInteger() }
-            var list1 = keys.slice(0..1)
-            var list2 = list1
-            val blocks = bytes2blocks(digestPad(input))
-
-            for (i in blocks.indices step 4) {
-                list1 = tearCode(xorBlocks(blocks.slice(i..i + 1), list1), keys).toMutableList()
-                list2 = tearCode(xorBlocks(blocks.slice(i + 2..i + 3), list2), keys).toMutableList()
-
-                val temp = list1[0]
-                list1[0] = list1[1]
-                list1[1] = list2[0]
-                list2[0] = list2[1]
-                list2[1] = temp
-            }
-
-            return listOf(list1[0], list1[1], list2[0], list2[1])
-        }
-
-        private fun tearDecode(a90: List<BigInteger>, a91: List<BigInteger>): MutableList<BigInteger> {
-            var (a95, a96) = a90
-
-            var a97 = (-957401312).toBigInteger()
-            for (_i in 0 until 32) {
-                a96 -= ((((a95 shl 4) xor rShift(a95, 5)) + a95) xor (a97 + a91[rShift(a97, 11).and(3.toBigInteger()).toInt()]))
-                a97 += 1640531527.toBigInteger()
-                a95 -= ((((a96 shl 4) xor rShift(a96, 5)) + a96) xor (a97 + a91[a97.and(3.toBigInteger()).toInt()]))
-
-            }
-
-            return mutableListOf(a95, a96)
-        }
-
-        private fun digestPad(string: String): List<BigInteger> {
-            val empList = mutableListOf<BigInteger>()
-            val length = string.length
-            val extra = big15 - (length.toBigInteger() % big16)
-            empList.add(extra)
-            for (i in 0 until length) {
-                empList.add(string[i].code.toBigInteger())
-            }
-            for (i in 0 until extra.toInt()) {
-                empList.add(big0)
-            }
-
-            return empList
-        }
-
-        private fun bytes2blocks(a22: List<BigInteger>): List<BigInteger> {
-            val empList = mutableListOf<BigInteger>()
-            val length = a22.size
-            var listIndex = 0
-
-            for (i in 0 until length) {
-                val subIndex = i % 4
-                val shiftedByte = a22[i] shl (3 - subIndex) * 8
-
-                if (subIndex == 0) {
-                    empList.add(shiftedByte)
-                } else {
-                    empList[listIndex] = empList[listIndex] or shiftedByte
-                }
-
-                if (subIndex == 3) listIndex += 1
-            }
-
-            return empList
-        }
-
-        private fun blocks2bytes(inp: List<BigInteger>): List<BigInteger> {
-            val tempList = mutableListOf<BigInteger>()
-            inp.indices.forEach { i ->
-                tempList += (big255 and rShift(inp[i], 24))
-                tempList += (big255 and rShift(inp[i], 16))
-                tempList += (big255 and rShift(inp[i], 8))
-                tempList += (big255 and inp[i])
-            }
-            return tempList
-        }
-
-        private fun unPad(a46: List<BigInteger>): List<BigInteger> {
-            val evenOdd = a46[0].toInt().mod(2)
-            return (1 until (a46.size - evenOdd)).map {
-                a46[it]
-            }
-        }
-
-        private fun xorBlocks(a76: List<BigInteger>, a77: List<BigInteger>): List<BigInteger> {
-            return listOf(a76[0] xor a77[0], a76[1] xor a77[1])
-        }
-
-        private fun rShift(input: BigInteger, by: Int): BigInteger {
-            return (input.mod(4294967296.toBigInteger()) shr by)
-        }
-
-        private fun tearCode(list1: List<BigInteger>, list2: List<BigInteger>): MutableList<BigInteger> {
-            var a1 = list1[0]
-            var a2 = list1[1]
-            var temp = big0
-
-            for (_i in 0 until 32) {
-                a1 += (a2 shl 4 xor rShift(a2, 5)) + a2 xor temp + list2[(temp and big3).toInt()]
-                temp -= 1640531527.toBigInteger()
-                a2 += (a1 shl 4 xor rShift(a1, 5)) + a1 xor temp + list2[(rShift(temp, 11) and big3).toInt()]
-            }
-            return mutableListOf(a1, a2)
-        }
-
-        private fun ascii2bytes(input: String): List<BigInteger> {
-            val abc = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_"
-            val abcMap = abc.mapIndexed { i, c -> c to i.toBigInteger() }.toMap()
-            var index = -1
-            val length = input.length
-            var listIndex = 0
-            val bytes = mutableListOf<BigInteger>()
-
-            while (true) {
-                for (i in input) {
-                    if (abc.contains(i)) {
-                        index++
-                        break
-                    }
-                }
-
-                bytes.add((abcMap[input.getOrNull(index)?:return bytes]!! * big4))
-
-                while (true) {
-                    index++
-                    if (abc.contains(input[index])) {
-                        break
-                    }
-                }
-
-                var temp = abcMap[input[index]]!!
-
-                bytes[listIndex] = bytes[listIndex] or rShift(temp, 4)
-                listIndex++
-                temp = (big15.and(temp))
-
-                if ((temp == big0) && (index == (length - 1))) return bytes
-
-                bytes.add((temp * big4 * big4))
-
-                while (true) {
-                    index++
-                    if (index >= length) return bytes
-                    if (abc.contains(input[index])) break
-                }
-
-                temp = abcMap[input[index]]!!
-                bytes[listIndex] = bytes[listIndex] or rShift(temp, 2)
-                listIndex++
-                temp = (big3 and temp)
-                if ((temp == big0) && (index == (length - 1))) {
-                    return bytes
-                }
-                bytes.add((temp shl 6))
-                for (i in input) {
-                    index++
-                    if (abc.contains(input[index])) {
-                        break
-                    }
-                }
-                bytes[listIndex] = bytes[listIndex] or abcMap[input[index]]!!
-                listIndex++
-            }
-        }
-
-        private fun replace(a: String): String {
-            val map = mapOf(
-                '0' to '5',
-                '1' to '6',
-                '2' to '7',
-                '5' to '0',
-                '6' to '1',
-                '7' to '2'
-            )
-            var b = ""
-            a.forEach {
-                b += if (map.containsKey(it)) map[it] else it
-            }
-            return b
-        }
-
-        private fun padLastChars(input:String):String{
-            return if(input.reversed()[3].isDigit()) input
-            else input.dropLast(4)
-        }
-
-        private data class HashResponse(
-            val hash: String? = null,
-            val version:String? = null
-        )
-
-        private data class SetupResponse(
-            val seed: String,
-            val src: String?=null,
-            val link:String?=null
-        )
-    }
-}
\ No newline at end of file
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vidguard.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vidguard.kt
deleted file mode 100644
index 03a16c0a705..00000000000
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vidguard.kt
+++ /dev/null
@@ -1,139 +0,0 @@
-package com.lagradost.cloudstream3.extractors
-
-import com.lagradost.api.Log
-import com.lagradost.cloudstream3.SubtitleFile
-import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.utils.AppUtils
-import com.lagradost.cloudstream3.utils.ExtractorApi
-import com.lagradost.cloudstream3.utils.ExtractorLink
-import com.lagradost.cloudstream3.utils.INFER_TYPE
-import com.lagradost.cloudstream3.utils.Qualities
-import com.lagradost.cloudstream3.utils.newExtractorLink
-import org.mozilla.javascript.Context
-import org.mozilla.javascript.NativeJSON
-import org.mozilla.javascript.NativeObject
-import org.mozilla.javascript.Scriptable
-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"
-    override val mainUrl = "https://vidguard.to"
-    override val requiresReferer = false
-
-    override suspend fun getUrl(
-        url: String,
-        referer: String?,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
-    ) {
-        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)
-
-            callback.invoke(
-                newExtractorLink(
-                    this.name,
-                    name,
-                    watchlink,
-                ) {
-                    this.referer = mainUrl
-                }
-            )
-        }
-    }
-
-    @OptIn(ExperimentalEncodingApi::class)
-	private fun sigDecode(url: String): String {
-        val sig = url.split("sig=")[1].split("&")[0]
-        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 {
-        var result = ""
-        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()
-            }
-        }
-        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 6abecf4b13e..11927c50752 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vidmoly.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vidmoly.kt
@@ -1,85 +1,50 @@
 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
+import com.lagradost.cloudstream3.extractors.helper.JwPlayerHelper
+import com.lagradost.cloudstream3.utils.ExtractorApi
+import com.lagradost.cloudstream3.utils.ExtractorLink
 
 class Vidmolyme : Vidmoly() {
     override val mainUrl = "https://vidmoly.me"
 }
 
+class Vidmolyto : Vidmoly() {
+    override val mainUrl = "https://vidmoly.to"
+}
+
+class Vidmolybiz : Vidmoly() {
+    override val mainUrl = "https://vidmoly.biz"
+}
+
 open class Vidmoly : ExtractorApi() {
     override val name = "Vidmoly"
-    override val mainUrl = "https://vidmoly.to"
+    override val mainUrl = "https://vidmoly.net"
     override val requiresReferer = true
 
-    private fun String.addMarks(str: String): String {
-        return this.replace(Regex("\"?$str\"?"), "\"$str\"")
-    }
-
     override suspend fun getUrl(
         url: String,
         referer: String?,
         subtitleCallback: (SubtitleFile) -> Unit,
         callback: (ExtractorLink) -> Unit
     ) {
-        val headers  = mapOf(
-            "user-agent"     to USER_AGENT,
+        val headers = mapOf(
+            "user-agent" to USER_AGENT,
             "Sec-Fetch-Dest" to "iframe"
         )
-        val newUrl = if(url.contains("/w/"))
-            url.replaceFirst("/w/", "/embed-")+"-920x360.html"
+        
+        val newUrl = if (url.contains("/w/")) 
+            url.replaceFirst("/w/", "/embed-") + ".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")
-            ?.addMarks("label")?.addMarks("kind")
-
-        tryParseJson<Source>(videoData)?.file?.let { m3uLink ->
-            M3u8Helper.generateM3u8(
-                name,
-                m3uLink,
-                "$mainUrl/"
-            ).forEach(callback)
-        }
 
-        tryParseJson<List<SubSource>>("[${subData}]")
-            ?.filter { it.kind == "captions" }?.map {
-                subtitleCallback.invoke(
-                    SubtitleFile(
-                        it.label.toString(),
-                        fixUrl(it.file.toString())
-                    )
-                )
-            }
+        val script = app.get(newUrl, headers = headers, referer = referer)
+            .document.select("script")
+            .firstOrNull { it.data().contains("sources:") }
+            ?.data()
 
+        // Extracts and parses videoData
+        JwPlayerHelper.extractStreamLinks(script.orEmpty(), name, mainUrl, callback, subtitleCallback)
     }
-
-    private data class Source(
-        @JsonProperty("file") val file: String? = null,
-    )
-
-    private data class SubSource(
-        @JsonProperty("file") val file: String? = null,
-        @JsonProperty("label") val label: String? = null,
-        @JsonProperty("kind") val kind: String? = null,
-    )
-
 }
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vidoza.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vidoza.kt
new file mode 100644
index 00000000000..df663f97f6c
--- /dev/null
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vidoza.kt
@@ -0,0 +1,62 @@
+package com.lagradost.cloudstream3.extractors
+
+import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.api.Log
+import com.lagradost.cloudstream3.SubtitleFile
+import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.utils.AppUtils
+import com.lagradost.cloudstream3.utils.ExtractorApi
+import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.getQualityFromName
+import com.lagradost.cloudstream3.utils.newExtractorLink
+
+class Videzz: Vidoza() {
+    override val mainUrl: String = "https://videzz.net"
+}
+
+open class Vidoza: ExtractorApi() {
+    override val name: String = "Vidoza"
+    override val mainUrl: String = "https://vidoza.net"
+    override val requiresReferer: Boolean = false
+
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
+        val response = app.get(url).document
+        val script = response.selectFirst("script:containsData(sourcesCode)")?.data()
+            ?: throw RuntimeException("couldn't find script containing video data")
+
+        // e.g. sourcesCode: [{ src: "https://str38.vidoza.net/vod/v2/.../v.mp4", type: "video/mp4", label:"SD", res:"720"}],
+        var sourcesArray = script.substringAfter("sourcesCode:").substringBefore("\n")
+        arrayOf("src", "type", "label", "res").forEach {
+            // add missing quotation marks, e.g. src: "https..." -> "src": "https..."
+            sourcesArray = sourcesArray
+                .replace(Regex(""""?$it"?:"""), """"$it":""")
+        }
+        val videoData = AppUtils.parseJson<VinovoDataList>(sourcesArray)
+
+        for (stream in videoData) {
+            callback.invoke(
+                newExtractorLink(
+                    source = name,
+                    name = name,
+                    url = stream.source
+                ) {
+                    quality = getQualityFromName(stream.resolution)
+                }
+            )
+        }
+    }
+
+    private class VinovoDataList: ArrayList<VinovoVideoData>()
+
+    private data class VinovoVideoData(
+        @JsonProperty("src") val source: String,
+        @JsonProperty("type") val type: String?,
+        @JsonProperty("label") val label: String?,
+        @JsonProperty("res") val resolution: String?,
+    )
+}
\ No newline at end of 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
deleted file mode 100644
index 5e07023d4c9..00000000000
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vidplay.kt
+++ /dev/null
@@ -1,183 +0,0 @@
-package com.lagradost.cloudstream3.extractors
-
-import com.fasterxml.jackson.annotation.JsonProperty
-import com.lagradost.cloudstream3.ErrorLoadingException
-import com.lagradost.cloudstream3.SubtitleFile
-import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.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.io.encoding.Base64
-
-// Code found in https://github.com/KillerDogeEmpire/vidplay-keys
-// special credits to @KillerDogeEmpire for providing key
-
-class AnyVidplay(hostUrl: String) : Vidplay() {
-    override val mainUrl = hostUrl
-}
-
-class MyCloud : Vidplay() {
-    override val name = "MyCloud"
-    override val mainUrl = "https://mcloud.bz"
-}
-
-class MegaF : Vidplay() {
-    override val name = "MegaF"
-    override val mainUrl = "https://megaf.cc"
-}
-
-class VidplayOnline : Vidplay() {
-    override val mainUrl = "https://vidplay.online"
-}
-
-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(),
-    )
-
-    data class Step(
-        @JsonProperty("sequence") val sequence: Int,
-        @JsonProperty("method") val method: String,
-        @JsonProperty("keys") val keys: List<String>? = null
-    )
-
-    private const val SOURCE = "https://rowdy-avocado.github.io/multi-keys/"
-
-    private var keys: KeysData? = null
-
-    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,
-        referer: String?,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
-    ) {
-        val myKeys = RowdyAvocadoKeys.getKeys()
-        val domain = url.substringBefore("/e/")
-        val id = url.substringBefore("?").substringAfterLast("/")
-        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)
-        }
-
-        res?.tracks?.filter { it.kind == "captions" }?.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 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 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)
-        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(
-        @JsonProperty("file") val file: String? = null,
-        @JsonProperty("label") val label: String? = null,
-        @JsonProperty("kind") val kind: String? = null,
-    )
-
-    data class Sources(
-        @JsonProperty("file") val file: String? = null,
-    )
-
-    data class Result(
-        @JsonProperty("sources") val sources: ArrayList<Sources>? = arrayListOf(),
-        @JsonProperty("tracks") val tracks: ArrayList<Tracks>? = arrayListOf(),
-    )
-
-    data class Response(@JsonProperty("result") val result: String? = null)
-
-}
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vidsonic.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vidsonic.kt
new file mode 100644
index 00000000000..5c871b54b93
--- /dev/null
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vidsonic.kt
@@ -0,0 +1,61 @@
+package com.lagradost.cloudstream3.extractors
+
+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.ExtractorLinkType
+import com.lagradost.cloudstream3.utils.newExtractorLink
+
+class Vidsonic() : ExtractorApi() {
+    override val name: String = "Vidsonic"
+    override val mainUrl: String = "https://vidsonic.net"
+    override val requiresReferer: Boolean = false
+
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
+        // Extracted JavaScript code that decodes the encrypted m3u8 stream URL:
+        //
+        // const _0x1 = '3363616238|3638666534|6264323565|3666616366|6636333662|6230626339|30613d3564|6d26743130|6b74693170|336563793d|64695f656c|6966263634|3332363033|3737313d73|6572697078|6526333d64|695f726576|7265733f38|75336d2e72|657473616d|2f7431306b|7469317033|6563792f38|392f657275|6365732f74|656e2e6369|6e6f736469|762e31302d|73752d7473|2f2f3a7370|747468';
+        // const _0x2 = function(_0x3) {
+        //    const _0x4 = _0x3.split('|').join('');
+        //    let _0x5 = '';
+        //     for (let _0x6 = 0; _0x6 < _0x4.length; _0x6 += 2) {
+        //       _0x5 += String.fromCharCode(parseInt(_0x4.substr(_0x6, 2), 16));
+        //     }
+        //     return _0x5.split('').reverse().join('');
+        // };
+        // const _0x7 = _0x2(_0x1); <-- now contains the stream URL
+
+        val response = app.get(url).text
+        val encodedStreamUrl = response
+            .substringAfter("const _0x1 = ")
+            .substringBefore(";")
+            .replace("'", "")
+
+        // (improved) Java implementation of the JavaScript code from above
+        val streamUrl = encodedStreamUrl
+            .replace("|", "")
+            // always two base16 digits together build one ASCII char
+            .chunked(2)
+            .map {
+                Integer.parseInt(it, 16).toChar()
+            }
+            .joinToString("")
+            .reversed()
+
+        callback.invoke(
+            newExtractorLink(
+                source = name,
+                name = name,
+                url = streamUrl,
+                type = ExtractorLinkType.M3U8
+            )
+        )
+    }
+}
\ No newline at end of file
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vidstream.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vidstream.kt
deleted file mode 100644
index 7995c8b10c2..00000000000
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vidstream.kt
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.lagradost.cloudstream3.extractors
-
-import com.lagradost.cloudstream3.SubtitleFile
-import com.lagradost.cloudstream3.amap
-import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.runAllAsync
-import com.lagradost.cloudstream3.utils.ExtractorLink
-import com.lagradost.cloudstream3.utils.INFER_TYPE
-import com.lagradost.cloudstream3.utils.extractorApis
-import com.lagradost.cloudstream3.utils.getQualityFromName
-import com.lagradost.cloudstream3.utils.loadExtractor
-import com.lagradost.cloudstream3.utils.newExtractorLink
-import org.jsoup.Jsoup
-
-/**
- * overrideMainUrl is necessary for for other vidstream clones like vidembed.cc
- * If they diverge it'd be better to make them separate.
- * */
-class Vidstream(val mainUrl: String) {
-    val name: String = "Vidstream"
-
-    private fun getExtractorUrl(id: String): String {
-        return "$mainUrl/streaming.php?id=$id"
-    }
-
-    private fun getDownloadUrl(id: String): String {
-        return "$mainUrl/download?id=$id"
-    }
-
-    private val normalApis = arrayListOf(MultiQuality())
-
-    // https://gogo-stream.com/streaming.php?id=MTE3NDg5
-    suspend fun getUrl(
-        id: String,
-        isCasting: Boolean = false,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit,
-    ): Boolean {
-        val extractorUrl = getExtractorUrl(id)
-        runAllAsync(
-            {
-                normalApis.amap { api ->
-                    val url = api.getExtractorUrl(id)
-                    api.getSafeUrl(
-                        url,
-                        callback = callback,
-                        subtitleCallback = subtitleCallback
-                    )
-                }
-            }, {
-                /** Stolen from GogoanimeProvider.kt extractor */
-                val link = getDownloadUrl(id)
-                println("Generated vidstream download link: $link")
-                val page = app.get(link, referer = extractorUrl)
-
-                val pageDoc = Jsoup.parse(page.text)
-                val qualityRegex = Regex("(\\d+)P")
-
-                //a[download]
-                pageDoc.select(".dowload > a")?.amap { element ->
-                    val href = element.attr("href") ?: return@amap
-                    val qual = if (element.text()
-                            .contains("HDP")
-                    ) "1080" else qualityRegex.find(element.text())?.destructured?.component1()
-                        .toString()
-
-                    if (!loadExtractor(href, link, subtitleCallback, callback)) {
-                        callback.invoke(
-                            newExtractorLink(
-                                this.name,
-                                name = this.name,
-                                href,
-                                type = INFER_TYPE
-                            ) {
-                                this.referer = page.url
-                                this.quality = getQualityFromName(qual)
-                            }
-                        )
-                    }
-                }
-            }, {
-                with(app.get(extractorUrl)) {
-                    val document = Jsoup.parse(this.text)
-                    val primaryLinks = document.select("ul.list-server-items > li.linkserver")
-                    //val extractedLinksList: MutableList<ExtractorLink> = mutableListOf()
-
-                    // All vidstream links passed to extractors
-                    primaryLinks.distinctBy { it.attr("data-video") }.forEach { element ->
-                        val link = element.attr("data-video")
-                        //val name = element.text()
-
-                        // Matches vidstream links with extractors
-                        extractorApis.filter { !it.requiresReferer || !isCasting }.amap { api ->
-                            if (link.startsWith(api.mainUrl)) {
-                                api.getSafeUrl(link, extractorUrl, subtitleCallback, callback)
-                            }
-                        }
-                    }
-                }
-            }
-        )
-        return true
-    }
-}
\ No newline at end of file
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VkExtractor.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VkExtractor.kt
new file mode 100644
index 00000000000..8e454087436
--- /dev/null
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VkExtractor.kt
@@ -0,0 +1,94 @@
+// Made by @kraptor123 for cs-kraptor
+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.ExtractorLinkType
+import com.lagradost.cloudstream3.utils.getQualityFromName
+import com.lagradost.cloudstream3.utils.newExtractorLink
+
+open class VkExtractor : ExtractorApi() {
+    override val name = "Vk"
+    override val mainUrl = "https://vkvideo.ru"
+    override val requiresReferer = true
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
+        val headers = mapOf(
+            "User-Agent" to "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:144.0) Gecko/20100101 Firefox/144.0",
+            "Accept" to "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8",
+            "Accept-Language" to "en-US,en;q=0.5",
+            "Sec-GPC" to "1",
+            "Connection" to "keep-alive",
+            "Upgrade-Insecure-Requests" to "1",
+            "Sec-Fetch-Dest" to "document",
+            "Sec-Fetch-Mode" to "navigate",
+            "Sec-Fetch-Site" to "none",
+            "Sec-Fetch-User" to "?1",
+            "Priority" to "u=0, i",
+            "Pragma" to "no-cache",
+            "Cache-Control" to "no-cache"
+        )
+        val cookie = app.get(url, headers = headers, allowRedirects = false).cookies
+        val response = app.get(url, headers = headers, allowRedirects = false, cookies = cookie).text
+        val listUrl = listOf("url", "dash_sep", "hls")
+
+        listUrl.forEach { linkType ->
+            if (linkType == "url") {
+                val regex = Regex(pattern = "\"url([0-9]+)\":\"([^\"]*)\"", options = setOf(RegexOption.IGNORE_CASE))
+                regex.findAll(response).forEach { url ->
+                    val video = url.groupValues[2].replace("\\", "")
+                    val quality = url.groupValues[1].replace("\\", "")
+                    callback.invoke(
+                        newExtractorLink(
+                            this.name,
+                            this.name,
+                            video,
+                            ExtractorLinkType.VIDEO
+                        ) {
+                            this.referer = "${mainUrl}/"
+                            this.headers = mapOf(
+                                "User-Agent" to "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:144.0) Gecko/20100101 Firefox/144.0",
+                                "Accept" to "*/*",
+                                "Accept-Language" to "en-US,en;q=0.5",
+                                "Referer" to "${mainUrl}/",
+                            )
+                            this.quality = getQualityFromName(quality)
+                        })
+                }
+            } else {
+                val regex = Regex(pattern = "\"$linkType\":\"([^\"]*)\"", options = setOf(RegexOption.IGNORE_CASE))
+                val video = regex.find(response)?.groupValues?.getOrNull(1)?.replace("\\", "") ?: return@forEach
+                val type = when {
+                    linkType.contains("hls") -> "HLS"
+                    linkType.contains("dash") -> "Dash"
+                    else -> ""
+                }
+                callback.invoke(
+                    newExtractorLink(
+                        "${this.name} $type",
+                        "${this.name} $type",
+                        video,
+                        when {
+                            linkType.contains("dash") -> ExtractorLinkType.DASH
+                            linkType.contains("hls") -> ExtractorLinkType.M3U8
+                            else -> ExtractorLinkType.VIDEO
+                        }
+                    ) {
+                        this.referer = "${mainUrl}/"
+                        this.headers = mapOf(
+                            "User-Agent" to "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:144.0) Gecko/20100101 Firefox/144.0",
+                            "Accept" to "*/*",
+                            "Accept-Language" to "en-US,en;q=0.5",
+                            "Referer" to "${mainUrl}/",
+                        )
+                    })
+            }
+        }
+    }
+}
\ No newline at end of file
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 860f9b540ce..67eb49c9a55 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Voe.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Voe.kt
@@ -45,6 +45,10 @@ class Voe1 : Voe() {
     override val mainUrl = "https://donaldlineelse.com"
 }
 
+class Voe2 : Voe() {
+    override val mainUrl = "https://charlestoughrace.com"
+}
+
 open class Voe : ExtractorApi() {
     override val name = "Voe"
     override val mainUrl = "https://voe.sx"
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vtbe.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vtbe.kt
index 0f078b3bb9f..2fdd7082a34 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vtbe.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vtbe.kt
@@ -1,15 +1,11 @@
 package com.lagradost.cloudstream3.extractors
 
-import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.utils.*
-import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
-import com.lagradost.cloudstream3.utils.JsUnpacker
+import com.lagradost.cloudstream3.extractors.helper.JwPlayerHelper
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
-import com.lagradost.cloudstream3.utils.Qualities
-import com.lagradost.cloudstream3.utils.getQualityFromName
-import java.net.URI
+import com.lagradost.cloudstream3.utils.JsUnpacker
 
 
 open class Vtbe : ExtractorApi() {
@@ -17,23 +13,16 @@ open class Vtbe : ExtractorApi() {
     override var mainUrl = "https://vtbe.to"
     override val requiresReferer = true
 
-    override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink>? {
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
         val response = app.get(url,referer=mainUrl).document
-        val extractedpack =response.selectFirst("script:containsData(function(p,a,c,k,e,d))")?.data().toString()
-            JsUnpacker(extractedpack).unpack()?.let { unPacked ->
-                Regex("sources:\\[\\{file:\"(.*?)\"").find(unPacked)?.groupValues?.get(1)?.let { link ->
-                    return listOf(
-                        newExtractorLink(
-                            this.name,
-                            this.name,
-                            link,
-                        ) {
-                            this.referer = referer ?: ""
-                            this.quality = Qualities.Unknown.value
-                        }
-                    )
-                }
-            }
-            return null
+        val extractedpack = response.selectFirst("script:containsData(function(p,a,c,k,e,d))")?.data().toString()
+        JsUnpacker(extractedpack).unpack()?.let { unPacked ->
+            JwPlayerHelper.extractStreamLinks(unPacked, name, mainUrl, callback, subtitleCallback)
+        }
     }
 }
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/WcoStream.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/WcoStream.kt
deleted file mode 100644
index 0488c0d3878..00000000000
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/WcoStream.kt
+++ /dev/null
@@ -1,142 +0,0 @@
-package com.lagradost.cloudstream3.extractors
-
-import com.fasterxml.jackson.annotation.JsonProperty
-import com.lagradost.cloudstream3.ErrorLoadingException
-import com.lagradost.cloudstream3.extractors.helper.NineAnimeHelper.cipher
-import com.lagradost.cloudstream3.extractors.helper.NineAnimeHelper.encrypt
-import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.utils.ExtractorApi
-import com.lagradost.cloudstream3.utils.ExtractorLink
-import com.lagradost.cloudstream3.utils.newExtractorLink
-import com.lagradost.cloudstream3.utils.INFER_TYPE
-import com.lagradost.cloudstream3.utils.Qualities
-
-class Vidstreamz : WcoStream() {
-    override var mainUrl = "https://vidstreamz.online"
-}
-
-class Vizcloud : WcoStream() {
-    override var mainUrl = "https://vizcloud2.ru"
-}
-
-class Vizcloud2 : WcoStream() {
-    override var mainUrl = "https://vizcloud2.online"
-}
-
-class VizcloudOnline : WcoStream() {
-    override var mainUrl = "https://vizcloud.online"
-}
-
-class VizcloudXyz : WcoStream() {
-    override var mainUrl = "https://vizcloud.xyz"
-}
-
-class VizcloudLive : WcoStream() {
-    override var mainUrl = "https://vizcloud.live"
-}
-
-class VizcloudInfo : WcoStream() {
-    override var mainUrl = "https://vizcloud.info"
-}
-
-class MwvnVizcloudInfo : WcoStream() {
-    override var mainUrl = "https://mwvn.vizcloud.info"
-}
-
-class VizcloudDigital : WcoStream() {
-    override var mainUrl = "https://vizcloud.digital"
-}
-
-class VizcloudCloud : WcoStream() {
-    override var mainUrl = "https://vizcloud.cloud"
-}
-
-class VizcloudSite : WcoStream() {
-    override var mainUrl = "https://vizcloud.site"
-}
-
-class Mcloud : WcoStream() {
-    override var name = "Mcloud"
-    override var mainUrl = "https://mcloud.to"
-    override val requiresReferer = true
-}
-
-open class WcoStream : ExtractorApi() {
-    override var name = "VidStream" // Cause works for animekisa and wco
-    override var mainUrl = "https://vidstream.pro"
-    override val requiresReferer = false
-    private val regex = Regex("(.+?/)e(?:mbed)?/([a-zA-Z0-9]+)")
-
-    companion object {
-        // taken from https://github.com/saikou-app/saikou/blob/b35364c8c2a00364178a472fccf1ab72f09815b4/app/src/main/java/ani/saikou/parsers/anime/extractors/VizCloud.kt
-        // GNU General Public License v3.0 https://github.com/saikou-app/saikou/blob/main/LICENSE.md
-        private var lastChecked = 0L
-        private const val jsonLink =
-            "https://raw.githubusercontent.com/chenkaslowankiya/BruhFlow/main/keys.json"
-        private var cipherKey: VizCloudKey? = null
-        suspend fun getKey(): VizCloudKey {
-            cipherKey =
-                if (cipherKey != null && (lastChecked - System.currentTimeMillis()) < 1000 * 60 * 30) cipherKey!!
-                else {
-                    lastChecked = System.currentTimeMillis()
-                    app.get(jsonLink).parsed()
-                }
-            return cipherKey!!
-        }
-
-        data class VizCloudKey(
-            @JsonProperty("cipherKey") val cipherKey: String,
-            @JsonProperty("mainKey") val mainKey: String,
-            @JsonProperty("encryptKey") val encryptKey: String,
-            @JsonProperty("dashTable") val dashTable: String
-        )
-
-        private const val baseTable =
-            "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+=/_"
-
-        private fun dashify(id: String, dashTable: String): String {
-            val table = dashTable.split(" ")
-            return id.mapIndexedNotNull { i, c ->
-                table.getOrNull((baseTable.indexOf(c) * 16) + (i % 16))
-            }.joinToString("-")
-        }
-    }
-
-    //private val key = "LCbu3iYC7ln24K7P" // key credits @Modder4869
-    override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink> {
-        val group = regex.find(url)?.groupValues!!
-
-        val host = group[1]
-        val viz = getKey()
-        val id = encrypt(
-            cipher(
-                viz.cipherKey,
-                encrypt(group[2], viz.encryptKey).also { println(it) }
-            ).also { println(it) },
-            viz.encryptKey
-        ).also { println(it) }
-
-        val link =
-            "${host}mediainfo/${dashify(id, viz.dashTable)}?key=${viz.mainKey}" //
-        val response = app.get(link, referer = referer)
-
-        data class Sources(@JsonProperty("file") val file: String)
-        data class Media(@JsonProperty("sources") val sources: List<Sources>)
-        data class Data(@JsonProperty("media") val media: Media)
-        data class Response(@JsonProperty("data") val data: Data)
-
-
-        if (!response.text.startsWith("{")) throw ErrorLoadingException("Seems like 9Anime kiddies changed stuff again, Go touch some grass for bout an hour Or use a different Server")
-        return response.parsed<Response>().data.media.sources.map {
-            newExtractorLink(
-                name,
-                it.file,
-                it.file,
-                type = INFER_TYPE
-            ) {
-                this.referer = host
-                this.quality = Qualities.Unknown.value
-            }
-        }
-    }
-}
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/XStreamCdn.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/XStreamCdn.kt
index 59bbc9649b8..6e3a8126def 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/XStreamCdn.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/XStreamCdn.kt
@@ -3,6 +3,7 @@ package com.lagradost.cloudstream3.extractors
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.newSubtitleFile
 import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
@@ -137,7 +138,7 @@ open class XStreamCdn : ExtractorApi() {
             val userData = sources?.player?.poster_file?.split("/")?.get(2)
             sources?.captions?.map {
                 subtitleCallback.invoke(
-                    SubtitleFile(
+                    newSubtitleFile(
                         it?.language.toString(),
                         "$mainUrl/asset/userdata/$userData/caption/${it?.hash}/${it?.id}.${it?.extension}"
                     )
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 e36fede244c..dd8511eaee2 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/YoutubeExtractor.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/YoutubeExtractor.kt
@@ -1,25 +1,17 @@
 package com.lagradost.cloudstream3.extractors
 
 import com.lagradost.cloudstream3.SubtitleFile
-import com.lagradost.cloudstream3.mvvm.logError
+import com.lagradost.cloudstream3.newAudioFile
+import com.lagradost.cloudstream3.newSubtitleFile
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
-import com.lagradost.cloudstream3.utils.ExtractorLinkType
-import com.lagradost.cloudstream3.utils.INFER_TYPE
-import com.lagradost.cloudstream3.utils.Qualities
 import com.lagradost.cloudstream3.utils.newExtractorLink
-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 com.lagradost.cloudstream3.utils.ExtractorLinkType
+import org.schabi.newpipe.extractor.stream.StreamInfo
+import org.schabi.newpipe.extractor.stream.StreamType
 
 class YoutubeShortLinkExtractor : YoutubeExtractor() {
     override val mainUrl = "https://youtu.be"
-
-    override fun getExtractorUrl(id: String): String {
-        return "$mainUrl/$id"
-    }
 }
 
 class YoutubeMobileExtractor : YoutubeExtractor() {
@@ -31,18 +23,10 @@ class YoutubeNoCookieExtractor : YoutubeExtractor() {
 }
 
 open class YoutubeExtractor : ExtractorApi() {
+
     override val mainUrl = "https://www.youtube.com"
-    override val requiresReferer = false
     override val name = "YouTube"
-
-    companion object {
-        private var ytVideos: MutableMap<String, String> = mutableMapOf()
-        private var ytVideosSubtitles: MutableMap<String, List<SubtitlesStream>> = mutableMapOf()
-    }
-
-    override fun getExtractorUrl(id: String): String {
-        return "$mainUrl/watch?v=$id"
-    }
+    override val requiresReferer = false
 
     override suspend fun getUrl(
         url: String,
@@ -50,52 +34,94 @@ open class YoutubeExtractor : ExtractorApi() {
         subtitleCallback: (SubtitleFile) -> Unit,
         callback: (ExtractorLink) -> Unit
     ) {
-        if (ytVideos[url].isNullOrEmpty()) {
-            val link =
-                YoutubeStreamLinkHandlerFactory.getInstance().fromUrl(
-                    url.replace(
-                        schemaStripRegex, ""
-                    )
-                )
+        val videoId = extractYouTubeId(url)
+        val watchUrl = "$mainUrl/watch?v=$videoId"
+
+        val info = StreamInfo.getInfo(watchUrl)
 
-            val s = object : YoutubeStreamExtractor(
-                ServiceList.YouTube,
-                link
-            ) {
-
-            }
-            s.fetchPage()
-            val streamUrl = s.hlsUrl.takeIf { !it.isNullOrEmpty() }
-            ?: s.dashMpdUrl.takeIf { !it.isNullOrEmpty() }
-            ?: s.videoStreams?.firstOrNull()?.url
-
-            if (!streamUrl.isNullOrEmpty()) {
-                ytVideos[url] = streamUrl
-            }
-
-            ytVideosSubtitles[url] = try {
-                s.subtitlesDefault.filterNotNull()
-            } catch (e: Exception) {
-                logError(e)
-                emptyList()
-            }
+        val isLive =
+            info.streamType == StreamType.LIVE_STREAM
+                    || info.streamType == StreamType.AUDIO_LIVE_STREAM
+                    || info.streamType == StreamType.POST_LIVE_STREAM
+                    || info.streamType == StreamType.POST_LIVE_AUDIO_STREAM
+
+        if (isLive && info.hlsUrl != null) {
+            callback(
+                newExtractorLink(
+                    source = name,
+                    name = "YouTube Live",
+                    url = info.hlsUrl
+                ) {
+                    type = ExtractorLinkType.M3U8
+                }
+            )
+        } else {
+            processVideo(info, subtitleCallback, callback)
         }
-        ytVideos[url]?.let {
+    }
+
+    private suspend fun processVideo(
+        info: StreamInfo,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ): Boolean {
+
+        val videoStreams = info.videoOnlyStreams.orEmpty()
+
+        if (videoStreams.isEmpty()) return false
+
+        val audioStreams = info.audioStreams.orEmpty()
+
+        videoStreams.forEach { video ->
+
             callback(
                 newExtractorLink(
-                    source = this.name,
-                    name = this.name,
-                    url = it,
-                    type = INFER_TYPE
-                )
+                    source = name,
+                    name = "YouTube ${normalizeCodec(video.codec)}",
+                    url = video.content
+                ) {
+                    quality = video.height
+                    audioTracks = audioStreams.map { newAudioFile(it.content) }
+                }
             )
         }
 
-        ytVideosSubtitles[url]?.mapNotNull {
-            SubtitleFile(
-                it.languageTag ?: return@mapNotNull null,
-                it.content ?: return@mapNotNull null
+
+        info.subtitles.forEach { subtitle ->
+            subtitleCallback(
+                newSubtitleFile(
+                    lang = subtitle.displayLanguageName
+                        ?: subtitle.languageTag
+                        ?: "Unknown",
+                    url = subtitle.content
+                )
             )
-        }?.forEach(subtitleCallback)
+        }
+
+        return true
     }
-}
+
+    // ---------------- HELPERS ----------------
+
+    private fun extractYouTubeId(url: String): String {
+        val regex = Regex(
+            "(?:youtu\\.be/|youtube(?:-nocookie)?\\.com/(?:.*v=|v/|u/\\w/|embed/|shorts/|live/))([\\w-]{11})"
+        )
+        return regex.find(url)?.groupValues?.get(1)
+            ?: throw IllegalArgumentException("Invalid YouTube URL: $url")
+    }
+
+    private fun normalizeCodec(codec: String?): String {
+        if (codec.isNullOrBlank()) return ""
+
+        val c = codec.lowercase()
+
+        return when {
+            c.startsWith("av01") -> "AV1"
+            c.startsWith("vp9") -> "VP9"
+            c.startsWith("avc1") || c.startsWith("h264") -> "H264"
+            c.startsWith("hev1") || c.startsWith("hvc1") || c.startsWith("hevc") -> "H265"
+            else -> codec.substringBefore('.').uppercase()
+        }
+    }
+}
\ No newline at end of file
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Zorofile.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Zorofile.kt
deleted file mode 100644
index 43c4eefb2c2..00000000000
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Zorofile.kt
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.lagradost.cloudstream3.extractors
-
-import com.fasterxml.jackson.annotation.JsonProperty
-import com.lagradost.cloudstream3.APIHolder.getCaptchaToken
-import com.lagradost.cloudstream3.ErrorLoadingException
-import com.lagradost.cloudstream3.SubtitleFile
-import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
-import com.lagradost.cloudstream3.utils.ExtractorApi
-import com.lagradost.cloudstream3.utils.ExtractorLink
-import com.lagradost.cloudstream3.utils.M3u8Helper
-
-open class Zorofile : ExtractorApi() {
-    override val name = "Zorofile"
-    override val mainUrl = "https://zorofile.com"
-    override val requiresReferer = true
-
-    override suspend fun getUrl(
-        url: String,
-        referer: String?,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
-    ) {
-        val id = url.split("?").first().split("/").last()
-        val token = app.get(
-            url,
-            referer = referer
-        ).document.select("button.g-recaptcha").attr("data-sitekey").let { captchaKey ->
-            getCaptchaToken(
-                url,
-                captchaKey,
-                referer = referer
-            )
-        } ?: throw ErrorLoadingException("can't bypass captcha")
-
-        val data = app.post(
-            "$mainUrl/dl",
-            data = mapOf(
-                "op" to "embed",
-                "file_code" to id,
-                "auto" to "1",
-                "referer" to "$referer/",
-                "g-recaptcha-response" to token
-            ),
-            referer = url,
-            headers = mapOf(
-                "Accept" to "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,*/*;q=0.8",
-                "Content-Type" to "application/x-www-form-urlencoded",
-                "Origin" to mainUrl,
-                "Sec-Fetch-Dest" to "iframe",
-                "Sec-Fetch-Mode" to "navigate",
-                "Sec-Fetch-Site" to "same-origin",
-                "Sec-Fetch-User" to "?1",
-                "Upgrade-Insecure-Requests" to "1",
-            )
-        ).document.select("script").find { it.data().contains("var holaplayer;") }?.data()
-            ?.substringAfter("sources: [")?.substringBefore("],")?.replace("src", "\"src\"")
-            ?.replace("type", "\"type\"")
-
-        tryParseJson<Sources>("$data")?.let { res ->
-            return M3u8Helper.generateM3u8(
-                name,
-                res.src ?: return@let,
-                "$mainUrl/",
-                headers = mapOf(
-                    "Origin" to mainUrl,
-                )
-            ).forEach(callback)
-        }
-    }
-
-    private data class Sources(
-        @JsonProperty("src") val src: String? = null,
-        @JsonProperty("type") val type: String? = null,
-    )
-}
\ No newline at end of file
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/AsianEmbedHelper.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/AsianEmbedHelper.kt
index bd42424f60a..39be8c9d609 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/AsianEmbedHelper.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/AsianEmbedHelper.kt
@@ -19,7 +19,7 @@ class AsianEmbedHelper {
             val links = doc.select("div#list-server-more > ul > li.linkserver")
             if (!links.isNullOrEmpty()) {
                 links.amap {
-                    val datavid = it.attr("data-video") ?: ""
+                    val datavid = it.attr("data-video")
                     //Log.i("AsianEmbed", "Result => (datavid) ${datavid}")
                     if (datavid.isNotBlank()) {
                         val res = loadExtractor(datavid, url, subtitleCallback, callback)
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
index a13db65cc36..af59b6f7d2d 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/CryptoJSHelper.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/CryptoJSHelper.kt
@@ -1,7 +1,8 @@
 package com.lagradost.cloudstream3.extractors.helper
 
+import com.lagradost.cloudstream3.base64DecodeArray
+import com.lagradost.cloudstream3.base64Encode
 import java.util.Arrays
-import java.util.Base64
 import java.security.MessageDigest
 import java.security.SecureRandom
 import javax.crypto.Cipher
@@ -51,8 +52,7 @@ object CryptoJS {
         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)
+        return base64Encode(b)
     }
 
     /**
@@ -62,7 +62,7 @@ object CryptoJS {
      * @param cipherText encrypted string
      */
     fun decrypt(password: String, cipherText: String): String {
-        val ctBytes         = Base64.getDecoder().decode(cipherText.toByteArray())
+        val ctBytes         = base64DecodeArray(cipherText)
         val saltBytes       = Arrays.copyOfRange(ctBytes, 8, 16)
         val cipherTextBytes = Arrays.copyOfRange(ctBytes, 16, ctBytes.size)
 
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/JWPlayerHelper.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/JWPlayerHelper.kt
new file mode 100644
index 00000000000..43ceb2314cf
--- /dev/null
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/JWPlayerHelper.kt
@@ -0,0 +1,155 @@
+package com.lagradost.cloudstream3.extractors.helper
+
+import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.api.Log
+import com.lagradost.cloudstream3.Prerelease
+import com.lagradost.cloudstream3.SubtitleFile
+import com.lagradost.cloudstream3.newSubtitleFile
+import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
+import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.M3u8Helper
+import com.lagradost.cloudstream3.utils.newExtractorLink
+import kotlin.collections.orEmpty
+
+@Prerelease
+object JwPlayerHelper {
+    private val sourceRegex = Regex(""""?sources"?:\s*(\[.*?\])""")
+    private val tracksRegex = Regex(""""?tracks"?:\s*(\[.*?\])""")
+    private val m3u8Regex = Regex("""[:=]\s*\"([^\"\s]+(\.m3u8|master\.txt)[^\"\s]*)""")
+
+    /**
+     * Get stream links the "sources" attribute inside a JWPlayer script, e.g.
+     *
+     * ```js
+     * <script>
+     * jwplayer("vplayer").setup({
+     *     sources: [{file:"https://example.com/master.m3u8"}],
+     *     tracks: [{file: "https://example.com/subtitles.vtt", kind: "captions", label: "en"}],
+     * }
+     *  ```
+     *
+     *  @param script The content of a HTML <script> tag containing the jwplayer code.
+     *  @return whether any extractor or subtitle link was found
+     */
+    suspend fun extractStreamLinks(
+        script: String,
+        sourceName: String,
+        mainUrl: String,
+        callback: (ExtractorLink) -> Unit,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        headers: Map<String, String> = mapOf()
+    ): Boolean {
+        val sourceMatches = sourceRegex.findAll(script).flatMap { sourceMatch ->
+            val match = sourceMatch.groupValues[1]
+                .addMarks("file")
+                .addMarks("label")
+                .addMarks("type")
+            tryParseJson<List<Source>>(match).orEmpty()
+        }.toList()
+
+        var extractedLinks = sourceMatches.flatMap { link ->
+            if (link.file.contains(".m3u8")) {
+                try {
+                    M3u8Helper.generateM3u8(
+                        source = sourceName,
+                        streamUrl = link.file,
+                        referer = mainUrl,
+                        headers = headers
+                    )
+                } catch (e: Exception) {
+                    Log.d("JW_PLAYER_HELPER", "Error generating M3U8 links: ${e.message}")
+                    emptyList()
+                }
+            } else {
+                listOf(
+                    newExtractorLink(
+                        source = sourceName,
+                        name = sourceName,
+                        url = fixUrl(link.file, mainUrl),
+                    ) {
+                        this.referer = url
+                        this.headers = headers
+                    }
+                )
+            }
+        }
+
+        // Fallback to searching for HLS streams, e.g.
+        // var links = {
+        //  "hls3": "https://mmmmmmmmmm.qqqqqqqqqqqq.space/#########/hls3/01/00000/ggggggggg_l/master.txt",
+        //  "hls4": "/stream/zzzzzzzzzzzzzzz/hhhhhhhhhhh/123456789/123456/master.m3u8",
+        //  "hls2": "https://mmmmmmmmmm.qqqqqqqqqqqq.com/hls2/01/00000/ggggggggg_l/master.m3u8?t=##################&s=123456"
+        // };
+        // jwplayer("vplayer").setup({
+        //  sources: [{
+        //    file: links.hls4 || links.hls3 || links.hls2,
+        //    type: "hls"
+        //  }],
+        if (extractedLinks.isEmpty()) {
+            extractedLinks = m3u8Regex.findAll(script).toList().map { match ->
+                val link = match.groupValues[1]
+
+                newExtractorLink(
+                    source = sourceName,
+                    name = sourceName,
+                    url = fixUrl(link, mainUrl)
+                ) {
+                    this.referer = url
+                    this.headers = headers
+                }
+            }
+        }
+
+        val tracksMatches = tracksRegex.findAll(script).flatMap { trackMatch ->
+            val match = trackMatch.groupValues[1]
+                .addMarks("file")
+                .addMarks("label")
+                .addMarks("kind")
+            tryParseJson<List<Track>>(match).orEmpty()
+        }.toList()
+
+        val subtitleFiles =
+            tracksMatches.filter {
+                (it.kind.orEmpty().contains("caption") || it.kind.orEmpty()
+                    .contains("subtitle")) && it.file != null && it.label != null
+            }.map {
+                newSubtitleFile(
+                    lang = it.label!!,
+                    url = fixUrl(it.file!!, mainUrl)
+                )
+            }
+
+        extractedLinks.forEach { callback.invoke(it) }
+        subtitleFiles.forEach { subtitleCallback.invoke(it) }
+
+        return sourceMatches.isNotEmpty() || subtitleFiles.isNotEmpty()
+    }
+
+    fun canParseJwScript(script: String): Boolean {
+        return sourceRegex.containsMatchIn(script)
+    }
+
+    private fun fixUrl(url: String, mainUrl: String): String {
+        return when {
+            url.startsWith("/") -> mainUrl + url
+            url.startsWith("http") -> url
+            else -> "$mainUrl/$url"
+        }
+    }
+
+    private fun String.addMarks(str: String): String {
+        return this.replace(Regex("\"?$str\"?"), "\"$str\"")
+    }
+
+    private data class Source(
+        @JsonProperty("file") val file: String,
+        @JsonProperty("label") val label: String?,
+        @JsonProperty("type") val type: String?,
+    )
+
+    data class Track(
+        @JsonProperty("file") val file: String? = null,
+        @JsonProperty("label") val label: String? = null,
+        @JsonProperty("kind") val kind: String? = null,
+    )
+}
\ No newline at end of file
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/VstreamhubHelper.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/VstreamhubHelper.kt
index db79d587b41..e79422ebce9 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/VstreamhubHelper.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/VstreamhubHelper.kt
@@ -21,8 +21,8 @@ class VstreamhubHelper {
             if (url.startsWith(baseUrl)) {
                 // Fetch links
                 val doc = app.get(url).document.select("script")
-                doc?.forEach {
-                    val innerText = it?.toString()
+                doc.forEach {
+                    val innerText = it.toString()
                     if (!innerText.isNullOrEmpty()) {
                         if (innerText.contains("file:")) {
                             val startString = "file: "
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/metaproviders/CrossTmdbProvider.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/metaproviders/CrossTmdbProvider.kt
index a9910502d3b..6fde6efe3b3 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/metaproviders/CrossTmdbProvider.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/metaproviders/CrossTmdbProvider.kt
@@ -7,11 +7,12 @@ 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.SearchResponseList
 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.toNewSearchResponseList
 import com.lagradost.cloudstream3.utils.AppUtils.toJson
 import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
 import com.lagradost.cloudstream3.utils.ExtractorLink
@@ -62,8 +63,12 @@ class CrossTmdbProvider : TmdbProvider() {
         return false
     }
 
-    override suspend fun search(query: String): List<SearchResponse>? {
-        return super.search(query)?.filterIsInstance<MovieSearchResponse>() // TODO REMOVE
+    override suspend fun search(query: String, page: Int): SearchResponseList? {
+        // TODO REMOVE
+        return super.search(query, page)
+            ?.items
+            ?.filterIsInstance<MovieSearchResponse>()
+            ?.toNewSearchResponseList()
     }
 
     override suspend fun load(url: String): LoadResponse? {
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/metaproviders/MyDramaList.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/metaproviders/MyDramaList.kt
index 1dd2ee79e38..cf3e28a8de0 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/metaproviders/MyDramaList.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/metaproviders/MyDramaList.kt
@@ -12,6 +12,7 @@ import com.lagradost.cloudstream3.LoadResponse.Companion.addTrailer
 import com.lagradost.cloudstream3.MainAPI
 import com.lagradost.cloudstream3.MainPageRequest
 import com.lagradost.cloudstream3.ProviderType
+import com.lagradost.cloudstream3.Score
 import com.lagradost.cloudstream3.SearchResponse
 import com.lagradost.cloudstream3.ShowStatus
 import com.lagradost.cloudstream3.TvType
@@ -173,7 +174,7 @@ abstract class MyDramaListAPI : MainAPI() {
         this.posterUrl = media.images.poster
         this.year = media.mediaYear
         this.plot = media.synopsis
-        this.rating = media.mediaRating.times(1000).toInt()
+        this.score = Score.from10(media.mediaRating)
         this.tags = media.fixGenres()
         this.duration = media.runtime.toInt()
         this.recommendations = media.fetchRecommendations().map { it.toSearchResponse() }
@@ -316,12 +317,13 @@ abstract class MyDramaListAPI : MainAPI() {
         }
 
         fun fixGenres(): List<String> {
-            return (genres as List<*>).mapNotNull {
-                when (it) {
-                    is String -> it
-                    else -> (it as? Map<String, String>)?.getValue("name")
+            return (genres as? List<*>)?.mapNotNull { item ->
+                when (item) {
+                    is String -> item
+                    is Map<*, *> -> item["name"] as? String
+                    else -> null
                 }
-            }
+            } ?: emptyList()
         }
     }
 
@@ -350,7 +352,7 @@ abstract class MyDramaListAPI : MainAPI() {
                 season = null
                 episode = ep.episodeNumber
                 posterUrl = null
-                rating = ep.rating.times(1000).toInt()
+                score = Score.from10(ep.rating)
                 description = null
                 runTime = null
                 addDate(ep.releasedAt)
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/metaproviders/TmdbProvider.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/metaproviders/TmdbProvider.kt
index 70732c5ef65..89f935da327 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/metaproviders/TmdbProvider.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/metaproviders/TmdbProvider.kt
@@ -2,6 +2,7 @@ package com.lagradost.cloudstream3.metaproviders
 
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.Actor
+import com.lagradost.cloudstream3.Episode
 import com.lagradost.cloudstream3.ErrorLoadingException
 import com.lagradost.cloudstream3.HomePageList
 import com.lagradost.cloudstream3.HomePageResponse
@@ -14,7 +15,8 @@ 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.Score
+import com.lagradost.cloudstream3.SearchResponseList
 import com.lagradost.cloudstream3.TvSeriesLoadResponse
 import com.lagradost.cloudstream3.TvSeriesSearchResponse
 import com.lagradost.cloudstream3.TvType
@@ -25,6 +27,7 @@ import com.lagradost.cloudstream3.newMovieSearchResponse
 import com.lagradost.cloudstream3.newTvSeriesLoadResponse
 import com.lagradost.cloudstream3.newTvSeriesSearchResponse
 import com.lagradost.cloudstream3.runAllAsync
+import com.lagradost.cloudstream3.toNewSearchResponseList
 import com.lagradost.cloudstream3.utils.AppUtils.toJson
 import com.uwetrottmann.tmdb2.Tmdb
 import com.uwetrottmann.tmdb2.entities.AppendToResponse
@@ -41,6 +44,7 @@ import com.uwetrottmann.tmdb2.entities.Videos
 import com.uwetrottmann.tmdb2.enumerations.AppendToResponseItem
 import com.uwetrottmann.tmdb2.enumerations.VideoType
 import retrofit2.awaitResponse
+import retrofit2.Response
 import java.util.Calendar
 
 /**
@@ -92,6 +96,7 @@ open class TmdbProvider : MainAPI() {
         ) {
             this.id = this@toSearchResponse.id
             this.posterUrl = getImageUrl(poster_path)
+            this.score = Score.from10(vote_average)
             this.year = first_air_date?.let {
                 Calendar.getInstance().apply {
                     time = it
@@ -109,6 +114,7 @@ open class TmdbProvider : MainAPI() {
         ) {
             this.id = this@toSearchResponse.id
             this.posterUrl = getImageUrl(poster_path)
+            this.score = Score.from10(vote_average)
             this.year = release_date?.let {
                 Calendar.getInstance().apply {
                     time = it
@@ -127,41 +133,39 @@ open class TmdbProvider : MainAPI() {
     }
 
     private suspend fun TvShow.toLoadResponse(): TvSeriesLoadResponse {
-        val episodes = this.seasons?.filter { !disableSeasonZero || (it.season_number ?: 0) != 0 }
-            ?.mapNotNull { season ->
-                season.episodes?.map { 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()
-                    ) {
-                        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 ->
-                    newEpisode(
-                        TmdbLink(
-                            this.external_ids?.imdb_id,
-                            this.id,
-                            episodeNum,
-                            season.season_number,
-                            this.name ?: this.original_name,
-                        ).toJson()
-                    ) {
-                        this.episode = episodeNum
-                        this.season = season.season_number
-                    }
+        val tvSeasonsService = tmdb.tvSeasonsService()
+        val episodes = mutableListOf<Episode>()
+
+        val validSeasons = this.seasons?.filter { !disableSeasonZero || (it.season_number ?: 0) != 0 } ?: emptyList()
+        for (season in validSeasons) {
+            val seasonNumber = season.season_number ?: continue
+
+            val response: Response<TvSeason> = tmdb.tvSeasonsService()
+                .season(this.id, seasonNumber, "external_ids,images,episodes")
+                .awaitResponse()
+
+            val fullSeason = response.body() ?: continue
+
+            fullSeason.episodes?.forEach { episode ->
+                episodes += 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()
+                ) {
+                    this.name = episode.name
+                    this.season = episode.season_number
+                    this.episode = episode.episode_number
+                    this.score = Score.from10(episode.vote_average)
+                    this.description = episode.overview
+                    this.date = episode.air_date?.time
+                    this.posterUrl = getImageUrl(episode.still_path)
                 }
-            }?.flatten() ?: listOf()
+            }
+        }
 
         return newTvSeriesLoadResponse(
             this.name ?: this.original_name,
@@ -177,16 +181,13 @@ open class TmdbProvider : MainAPI() {
             }
             plot = overview
             addImdbId(external_ids?.imdb_id)
-
             tags = genres?.mapNotNull { it.name }
             duration = episode_run_time?.average()?.toInt()
-            rating = this@toLoadResponse.rating
+            score = Score.from10(vote_average)
             addTrailer(videos.toTrailers())
-
             recommendations = (this@toLoadResponse.recommendations
                 ?: this@toLoadResponse.similar)?.results?.map { it.toSearchResponse() }
             addActors(credits?.cast?.toList().toActors())
-
             contentRating = fetchContentRating(id, "US")
         }
     }
@@ -224,7 +225,7 @@ open class TmdbProvider : MainAPI() {
             addImdbId(external_ids?.imdb_id)
             tags = genres?.mapNotNull { it.name }
             duration = runtime
-            rating = this@toLoadResponse.rating
+            score = Score.from10(vote_average)
             addTrailer(videos.toTrailers())
 
             recommendations = (this@toLoadResponse.recommendations
@@ -238,12 +239,12 @@ open class TmdbProvider : MainAPI() {
     override suspend fun getMainPage(page: Int, request: MainPageRequest): HomePageResponse {
 
         // SAME AS DISCOVER IT SEEMS
-//        val popularSeries = tmdb.tvService().popular(1, "en-US").execute().body()?.results?.map {
+//        val popularSeries = tmdb.tvService().popular(page, "en-US").execute().body()?.results?.map {
 //            it.toSearchResponse()
 //        } ?: listOf()
 //
 //        val popularMovies =
-//            tmdb.moviesService().popular(1, "en-US", "840").execute().body()?.results?.map {
+//            tmdb.moviesService().popular(page, "en-US", "840").execute().body()?.results?.map {
 //                it.toSearchResponse()
 //            } ?: listOf()
 
@@ -253,23 +254,23 @@ open class TmdbProvider : MainAPI() {
         var topSeries: List<TvSeriesSearchResponse> = listOf()
         runAllAsync(
             {
-                discoverMovies = tmdb.discoverMovie().build().awaitResponse().body()?.results?.map {
+                discoverMovies = tmdb.discoverMovie().page(page).build().awaitResponse().body()?.results?.map {
                     it.toSearchResponse()
                 } ?: listOf()
             }, {
-                discoverSeries = tmdb.discoverTv().build().awaitResponse().body()?.results?.map {
+                discoverSeries = tmdb.discoverTv().page(page).build().awaitResponse().body()?.results?.map {
                     it.toSearchResponse()
                 } ?: listOf()
             }, {
                 // https://en.wikipedia.org/wiki/ISO_3166-1
                 topMovies =
-                    tmdb.moviesService().topRated(1, "en-US", "US").awaitResponse()
+                    tmdb.moviesService().topRated(page, "en-US", "US").awaitResponse()
                         .body()?.results?.map {
                             it.toSearchResponse()
                         } ?: listOf()
             }, {
                 topSeries =
-                    tmdb.tvService().topRated(1, "en-US").awaitResponse().body()?.results?.map {
+                    tmdb.tvService().topRated(page, "en-US").awaitResponse().body()?.results?.map {
                         it.toSearchResponse()
                     } ?: listOf()
             }
@@ -395,7 +396,7 @@ open class TmdbProvider : MainAPI() {
         } else {
             loadFromTmdb(id)?.let { return it }
             if (isTvSeries) {
-                tmdb.tvService().externalIds(id, "en-US").awaitResponse().body()?.imdb_id?.let {
+                tmdb.tvService().externalIds(id).awaitResponse().body()?.imdb_id?.let {
                     val fromImdb = loadFromImdb(it)
                     val result = if (fromImdb == null) {
                         val details = tmdb.tvService().tv(id, "en-US").awaitResponse().body()
@@ -406,16 +407,16 @@ open class TmdbProvider : MainAPI() {
                     result
                 }
             } else {
-                tmdb.moviesService().externalIds(id, "en-US").awaitResponse()
+                tmdb.moviesService().externalIds(id).awaitResponse()
                     .body()?.imdb_id?.let { loadFromImdb(it) }
             }
         }
     }
 
-    override suspend fun search(query: String): List<SearchResponse>? {
-        return tmdb.searchService().multi(query, 1, "en-Us", "US", includeAdult).awaitResponse()
+    override suspend fun search(query: String, page: Int): SearchResponseList? {
+        return tmdb.searchService().multi(query, page, "en-US", "US", includeAdult).awaitResponse()
             .body()?.results?.mapNotNull {
                 it.movie?.toSearchResponse() ?: it.tvShow?.toSearchResponse()
-            }
+            }?.toNewSearchResponseList()
     }
 }
\ No newline at end of file
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/metaproviders/TraktProvider.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/metaproviders/TraktProvider.kt
index 1dd0df7df74..63f6d564c4b 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/metaproviders/TraktProvider.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/metaproviders/TraktProvider.kt
@@ -15,26 +15,26 @@ import com.lagradost.cloudstream3.MainAPI
 import com.lagradost.cloudstream3.MainPageRequest
 import com.lagradost.cloudstream3.NextAiring
 import com.lagradost.cloudstream3.ProviderType
+import com.lagradost.cloudstream3.Score
 import com.lagradost.cloudstream3.SearchResponse
+import com.lagradost.cloudstream3.SearchResponseList
 import com.lagradost.cloudstream3.ShowStatus
 import com.lagradost.cloudstream3.TvType
 import com.lagradost.cloudstream3.addDate
 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
+import com.lagradost.cloudstream3.newSearchResponseList
 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
 
 open class TraktProvider : MainAPI() {
     override var name = "Trakt"
@@ -47,8 +47,8 @@ open class TraktProvider : MainAPI() {
     )
 
     private val traktClientId =
-        base64Decode("N2YzODYwYWQzNGI4ZTZmOTdmN2I5MTA0ZWQzMzEwOGI0MmQ3MTdlMTM0MmM2NGMxMTg5NGE1MjUyYTQ3NjE3Zg==")
-    private val traktApiUrl = base64Decode("aHR0cHM6Ly9hcGl6LnRyYWt0LnR2")
+        "d9f434f48b55683a279ffe88ddc68351cc04c9dc9372bd95af5de780b794e770"
+    private val traktApiUrl = "https://api.trakt.tv"
 
     override val mainPage = mainPageOf(
         "$traktApiUrl/movies/trending" to "Trending Movies", //Most watched movies right now
@@ -58,8 +58,7 @@ open class TraktProvider : MainAPI() {
     )
 
     override suspend fun getMainPage(page: Int, request: MainPageRequest): HomePageResponse {
-
-        val apiResponse = getApi("${request.data}?extended=cloud9,full&page=$page")
+        val apiResponse = getApi("${request.data}?extended=full,images&page=$page")
 
         val results = parseJson<List<MediaDetails>>(apiResponse).map { element ->
             element.toSearchResponse()
@@ -72,9 +71,8 @@ open class TraktProvider : MainAPI() {
         val media = this.media ?: this
         val mediaType = if (media.ids?.tvdb == null) TvType.Movie else TvType.TvSeries
         val poster = media.images?.poster?.firstOrNull()
-
-        if (mediaType == TvType.Movie) {
-            return newMovieSearchResponse(
+        return if (mediaType == TvType.Movie) {
+            newMovieSearchResponse(
                 name = media.title ?: "",
                 url = Data(
                     type = mediaType,
@@ -82,10 +80,11 @@ open class TraktProvider : MainAPI() {
                 ).toJson(),
                 type = TvType.Movie,
             ) {
+                score = Score.from10(media.rating)
                 posterUrl = fixPath(poster)
             }
         } else {
-            return newTvSeriesSearchResponse(
+            newTvSeriesSearchResponse(
                 name = media.title ?: "",
                 url = Data(
                     type = mediaType,
@@ -93,53 +92,51 @@ open class TraktProvider : MainAPI() {
                 ).toJson(),
                 type = TvType.TvSeries,
             ) {
+                score = Score.from10(media.rating)
                 this.posterUrl = fixPath(poster)
             }
         }
     }
 
-    override suspend fun search(query: String): List<SearchResponse>? {
+    override suspend fun search(query: String, page: Int): SearchResponseList? {
         val apiResponse =
-            getApi("$traktApiUrl/search/movie,show?extended=cloud9,full&limit=20&page=1&query=$query")
+            getApi("$traktApiUrl/search/movie,show?extended=full,images&limit=20&page=$page&query=$query")
 
-        val results = parseJson<List<MediaDetails>>(apiResponse).map { element ->
+        return newSearchResponseList(parseJson<List<MediaDetails>>(apiResponse).map { element ->
             element.toSearchResponse()
-        }
-
-        return results
+        })
     }
 
     override suspend fun load(url: String): LoadResponse {
-
         val data = parseJson<Data>(url)
         val mediaDetails = data.mediaDetails
         val moviesOrShows = if (data.type == TvType.Movie) "movies" else "shows"
 
-        val posterUrl = mediaDetails?.images?.poster?.firstOrNull()
-        val backDropUrl = mediaDetails?.images?.fanart?.firstOrNull()
+        val posterUrl = fixPath(mediaDetails?.images?.poster?.firstOrNull())
+        val backDropUrl = fixPath(mediaDetails?.images?.fanart?.firstOrNull())
 
         val resActor =
-            getApi("$traktApiUrl/$moviesOrShows/${mediaDetails?.ids?.trakt}/people?extended=cloud9,full")
+            getApi("$traktApiUrl/$moviesOrShows/${mediaDetails?.ids?.trakt}/people?extended=full,images")
 
         val actors = parseJson<People>(resActor).cast?.map {
             ActorData(
                 Actor(
                     name = it.person?.name!!,
-                    image = getWidthImageUrl(it.person.images?.headshot?.firstOrNull(), "w500")
+                    image = fixPath(it.person.images?.headshot?.firstOrNull())
                 ),
                 roleString = it.character
             )
         }
 
         val resRelated =
-            getApi("$traktApiUrl/$moviesOrShows/${mediaDetails?.ids?.trakt}/related?extended=cloud9,full&limit=20")
+            getApi("$traktApiUrl/$moviesOrShows/${mediaDetails?.ids?.trakt}/related?extended=full,images&limit=20")
 
         val relatedMedia = parseJson<List<MediaDetails>>(resRelated).map { it.toSearchResponse() }
 
         val isCartoon =
             mediaDetails?.genres?.contains("animation") == true || mediaDetails?.genres?.contains("anime") == true
         val isAnime =
-            isCartoon && (mediaDetails?.language == "zh" || mediaDetails?.language == "ja")
+            isCartoon && (mediaDetails.language == "zh" || mediaDetails.language == "ja")
         val isAsian = !isAnime && (mediaDetails?.language == "zh" || mediaDetails?.language == "ko")
         val isBollywood = mediaDetails?.country == "in"
         val uniqueUrl = data.mediaDetails?.ids?.trakt?.toJson() ?: data.toJson()
@@ -175,17 +172,17 @@ open class TraktProvider : MainAPI() {
                 this.uniqueUrl = uniqueUrl
                 this.name = mediaDetails.title
                 this.type = if (isAnime) TvType.AnimeMovie else TvType.Movie
-                this.posterUrl = getOriginalWidthImageUrl(posterUrl)
+                this.posterUrl = posterUrl
                 this.year = mediaDetails.year
                 this.plot = mediaDetails.overview
-                this.rating = mediaDetails.rating?.times(1000)?.roundToInt()
+                this.score = Score.from10(mediaDetails.rating)
                 this.tags = mediaDetails.genres
                 this.duration = mediaDetails.runtime
                 this.recommendations = relatedMedia
                 this.actors = actors
                 this.comingSoon = isUpcoming(mediaDetails.released)
                 //posterHeaders
-                this.backgroundPosterUrl = getOriginalWidthImageUrl(backDropUrl)
+                this.backgroundPosterUrl = backDropUrl
                 this.contentRating = mediaDetails.certification
                 addTrailer(mediaDetails.trailer)
                 addImdbId(mediaDetails.ids?.imdb)
@@ -194,7 +191,7 @@ open class TraktProvider : MainAPI() {
         } else {
 
             val resSeasons =
-                getApi("$traktApiUrl/shows/${mediaDetails?.ids?.trakt.toString()}/seasons?extended=cloud9,full,episodes")
+                getApi("$traktApiUrl/shows/${mediaDetails?.ids?.trakt.toString()}/seasons?extended=full,images,episodes")
             val episodes = mutableListOf<Episode>()
             val seasons = parseJson<List<Seasons>>(resSeasons)
             var nextAir: NextAiring? = null
@@ -236,8 +233,9 @@ open class TraktProvider : MainAPI() {
                             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.posterUrl = fixPath( episode.images?.screenshot?.firstOrNull())
+                            //this.rating = episode.rating?.times(10)?.roundToInt()
+                            this.score = Score.from10(episode.rating)
 
                             this.addDate(episode.firstAired, "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
                             if (nextAir == null && this.date != null && this.date!! > unixTimeMS && this.season != 0) {
@@ -262,11 +260,11 @@ open class TraktProvider : MainAPI() {
                 this.name = mediaDetails.title
                 this.type = if (isAnime) TvType.Anime else TvType.TvSeries
                 this.episodes = episodes
-                this.posterUrl = getOriginalWidthImageUrl(posterUrl)
+                this.posterUrl = posterUrl
                 this.year = mediaDetails.year
                 this.plot = mediaDetails.overview
                 this.showStatus = getStatus(mediaDetails.status)
-                this.rating = mediaDetails.rating?.times(1000)?.roundToInt()
+                this.score = Score.from10(mediaDetails.rating)
                 this.tags = mediaDetails.genres
                 this.duration = mediaDetails.runtime
                 this.recommendations = relatedMedia
@@ -274,7 +272,7 @@ open class TraktProvider : MainAPI() {
                 this.comingSoon = isUpcoming(mediaDetails.released)
                 //posterHeaders
                 this.nextAiring = nextAir
-                this.backgroundPosterUrl = getOriginalWidthImageUrl(backDropUrl)
+                this.backgroundPosterUrl = backDropUrl
                 this.contentRating = mediaDetails.certification
                 addTrailer(mediaDetails.trailer)
                 addImdbId(mediaDetails.ids?.imdb)
@@ -318,19 +316,6 @@ open class TraktProvider : MainAPI() {
         return "https://$url"
     }
 
-    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(path).path?.substringAfterLast('/') ?: return null
-        return "https://image.tmdb.org/t/p/${width}/${fileName}"
-    }
-
-    private fun getOriginalWidthImageUrl(path: String?): String? {
-        if (path == null) return null
-        if (!path.contains("image.tmdb.org")) return fixPath(path)
-        return getWidthImageUrl(path, "original")
-    }
-
     data class Data(
         val type: TvType? = null,
         val mediaDetails: MediaDetails? = null,
@@ -381,10 +366,10 @@ open class TraktProvider : MainAPI() {
     )
 
     data class Images(
-        @JsonProperty("fanart") val fanart: List<String>? = null,
         @JsonProperty("poster") val poster: List<String>? = null,
+        @JsonProperty("fanart") val fanart: List<String>? = null,
         @JsonProperty("logo") val logo: List<String>? = null,
-        @JsonProperty("clearart") val clearart: List<String>? = null,
+        @JsonProperty("clearart") val clearArt: List<String>? = null,
         @JsonProperty("banner") val banner: List<String>? = null,
         @JsonProperty("thumb") val thumb: List<String>? = null,
         @JsonProperty("screenshot") val screenshot: List<String>? = null,
@@ -444,30 +429,30 @@ open class TraktProvider : MainAPI() {
     )
 
     data class LinkData(
-        val id: Int? = null,
-        val traktId: Int? = null,
-        val traktSlug: String? = null,
-        val tmdbId: Int? = null,
-        val imdbId: String? = null,
-        val tvdbId: Int? = null,
-        val tvrageId: String? = null,
-        val type: String? = null,
-        val season: Int? = null,
-        val episode: Int? = null,
-        val aniId: String? = null,
-        val animeId: String? = null,
-        val title: String? = null,
-        val year: Int? = null,
-        val orgTitle: String? = null,
-        val isAnime: Boolean = false,
-        val airedYear: Int? = null,
-        val lastSeason: Int? = null,
-        val epsTitle: String? = null,
-        val jpTitle: String? = null,
-        val date: String? = null,
-        val airedDate: String? = null,
-        val isAsian: Boolean = false,
-        val isBollywood: Boolean = false,
-        val isCartoon: Boolean = false,
+        @JsonProperty("id") val id: Int? = null,
+        @JsonProperty("trakt_id") val traktId: Int? = null,
+        @JsonProperty("trakt_slug") val traktSlug: String? = null,
+        @JsonProperty("tmdb_id") val tmdbId: Int? = null,
+        @JsonProperty("imdb_id") val imdbId: String? = null,
+        @JsonProperty("tvdb_id") val tvdbId: Int? = null,
+        @JsonProperty("tvrage_id") val tvrageId: String? = null,
+        @JsonProperty("type") val type: String? = null,
+        @JsonProperty("season") val season: Int? = null,
+        @JsonProperty("episode") val episode: Int? = null,
+        @JsonProperty("ani_id") val aniId: String? = null,
+        @JsonProperty("anime_id") val animeId: String? = null,
+        @JsonProperty("title") val title: String? = null,
+        @JsonProperty("year") val year: Int? = null,
+        @JsonProperty("org_title") val orgTitle: String? = null,
+        @JsonProperty("is_anime") val isAnime: Boolean = false,
+        @JsonProperty("aired_year") val airedYear: Int? = null,
+        @JsonProperty("last_season") val lastSeason: Int? = null,
+        @JsonProperty("eps_title") val epsTitle: String? = null,
+        @JsonProperty("jp_title") val jpTitle: String? = null,
+        @JsonProperty("date") val date: String? = null,
+        @JsonProperty("aired_date") val airedDate: String? = null,
+        @JsonProperty("is_asian") val isAsian: Boolean = false,
+        @JsonProperty("is_bollywood") val isBollywood: Boolean = false,
+        @JsonProperty("is_cartoon") val isCartoon: Boolean = false,
     )
 }
\ No newline at end of file
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 3dfdc9a9387..e13bcf5ec65 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/mvvm/ArchComponentExt.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/mvvm/ArchComponentExt.kt
@@ -1,9 +1,8 @@
 package com.lagradost.cloudstream3.mvvm
 
-import com.lagradost.api.BuildConfig
 import com.lagradost.api.Log
 import com.lagradost.cloudstream3.ErrorLoadingException
-import com.lagradost.cloudstream3.Prerelease
+import com.lagradost.cloudstream3.utils.AppDebug
 import kotlinx.coroutines.*
 import java.io.InterruptedIOException
 import java.net.SocketTimeoutException
@@ -19,31 +18,31 @@ const val DEBUG_PRINT = "DEBUG PRINT"
 class DebugException(message: String) : Exception("$DEBUG_EXCEPTION\n$message")
 
 inline fun debugException(message: () -> String) {
-    if (BuildConfig.DEBUG) {
+    if (AppDebug.isDebug) {
         throw DebugException(message.invoke())
     }
 }
 
 inline fun debugPrint(tag: String = DEBUG_PRINT, message: () -> String) {
-    if (BuildConfig.DEBUG) {
+    if (AppDebug.isDebug) {
         Log.d(tag, message.invoke())
     }
 }
 
 inline fun debugWarning(message: () -> String) {
-    if (BuildConfig.DEBUG) {
+    if (AppDebug.isDebug) {
         logError(DebugException(message.invoke()))
     }
 }
 
 inline fun debugAssert(assert: () -> Boolean, message: () -> String) {
-    if (BuildConfig.DEBUG && assert.invoke()) {
+    if (AppDebug.isDebug && assert.invoke()) {
         throw DebugException(message.invoke())
     }
 }
 
 inline fun debugWarning(assert: () -> Boolean, message: () -> String) {
-    if (BuildConfig.DEBUG && assert.invoke()) {
+    if (AppDebug.isDebug && assert.invoke()) {
         logError(DebugException(message.invoke()))
     }
 }
@@ -56,6 +55,17 @@ sealed class Resource<out T> {
     ) : Resource<Nothing>()
 
     data class Loading(val url: String? = null) : Resource<Nothing>()
+
+    companion object {
+        fun <T> fromResult(result: Result<T>) : Resource<T> {
+            val value = result.getOrNull()
+            return if(value != null) {
+                Success(value)
+            } else {
+                throwAbleToResource(result.exceptionOrNull() ?: Exception("this should not be possible"))
+            }
+        }
+    }
 }
 
 fun logError(throwable: Throwable) {
@@ -67,9 +77,9 @@ fun logError(throwable: Throwable) {
 }
 
 @Deprecated(
-    "Outdated function, use `safe` instead when the new stable is released",
-    ReplaceWith("safe"),
-    level = DeprecationLevel.WARNING
+    "Outdated function, use `safe` instead",
+    replaceWith = ReplaceWith("safe"),
+    level = DeprecationLevel.ERROR
 )
 fun <T> normalSafeApiCall(apiCall: () -> T): T? {
     return try {
@@ -82,7 +92,6 @@ fun <T> normalSafeApiCall(apiCall: () -> T): T? {
 
 /** Catches any exception (or error) and only logs it.
  * Will return null on exceptions. */
-@Prerelease
 fun <T> safe(apiCall: () -> T): T? {
     return try {
         apiCall.invoke()
@@ -94,7 +103,6 @@ fun <T> safe(apiCall: () -> T): T? {
 
 /** Catches any exception (or error) and only logs it.
  * Will return null on exceptions. */
-@Prerelease
 suspend fun <T> safeAsync(apiCall: suspend () -> T): T? {
     return try {
         apiCall.invoke()
@@ -105,9 +113,9 @@ suspend fun <T> safeAsync(apiCall: suspend () -> T): T? {
 }
 
 @Deprecated(
-    "Outdated function, use `safeAsync` instead when the new stable is released",
-    ReplaceWith("safeAsync"),
-    level = DeprecationLevel.WARNING
+    "Outdated function, use `safeAsync` instead",
+    replaceWith = ReplaceWith("safeAsync"),
+    level = DeprecationLevel.ERROR
 )
 suspend fun <T> suspendSafeApiCall(apiCall: suspend () -> T): T? {
     return try {
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/network/WebViewResolver.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/network/WebViewResolver.kt
index 8baf2f31df3..c0a2d95250d 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/network/WebViewResolver.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/network/WebViewResolver.kt
@@ -2,6 +2,7 @@ package com.lagradost.cloudstream3.network
 
 import com.lagradost.cloudstream3.USER_AGENT
 import okhttp3.Interceptor
+import okhttp3.Request
 
 /**
  * When used as Interceptor additionalUrls cannot be returned, use WebViewResolver(...).resolveUsingWebView(...)
@@ -24,5 +25,38 @@ expect class WebViewResolver(
 ) : Interceptor {
     companion object {
         val DEFAULT_TIMEOUT: Long
+        var webViewUserAgent: String?
     }
+
+    /**
+     * @param requestCallBack asynchronously return matched requests by either interceptUrl or additionalUrls. If true, destroy WebView.
+     * @return the final request (by interceptUrl) and all the collected urls (by additionalUrls).
+     * */
+    suspend fun resolveUsingWebView(
+        url: String,
+        referer: String? = null,
+        method: String = "GET",
+        requestCallBack: (Request) -> Boolean = { false },
+    ) : Pair<Request?, List<Request>>
+
+    /**
+     * @param requestCallBack asynchronously return matched requests by either interceptUrl or additionalUrls. If true, destroy WebView.
+     * @return the final request (by interceptUrl) and all the collected urls (by additionalUrls).
+     * */
+    suspend fun resolveUsingWebView(
+        url: String,
+        referer: String? = null,
+        headers: Map<String, String> = emptyMap(),
+        method: String = "GET",
+        requestCallBack: (Request) -> Boolean = { false },
+    ) : Pair<Request?, List<Request>>
+
+    /**
+     * @param requestCallBack asynchronously return matched requests by either interceptUrl or additionalUrls. If true, destroy WebView.
+     * @return the final request (by interceptUrl) and all the collected urls (by additionalUrls).
+     * */
+    suspend fun resolveUsingWebView(
+        request: Request,
+        requestCallBack: (Request) -> Boolean = { false }
+    ): Pair<Request?, List<Request>>
 }
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/plugins/BasePlugin.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/plugins/BasePlugin.kt
index c7c0bb82f0e..61f87b8bab9 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/plugins/BasePlugin.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/plugins/BasePlugin.kt
@@ -31,7 +31,9 @@ abstract class BasePlugin {
     fun registerExtractorAPI(element: ExtractorApi) {
         Log.i(PLUGIN_TAG, "Adding ${element.name} (${element.mainUrl}) ExtractorApi")
         element.sourcePlugin = this.filename
-        extractorApis.add(element)
+        synchronized(extractorApis) {
+            extractorApis.add(element)
+        }
     }
 
     /**
@@ -51,7 +53,8 @@ abstract class BasePlugin {
     /** Full file path to the plugin. */
     @Deprecated(
         "Renamed to `filename` to follow conventions",
-        replaceWith = ReplaceWith("filename")
+        replaceWith = ReplaceWith("filename"),
+        level = DeprecationLevel.ERROR
     )
     var __filename: String?
         get() = filename
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/syncproviders/SyncAPI.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/syncproviders/SyncAPI.kt
index 676ac6fef6c..7ec9905b55f 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/syncproviders/SyncAPI.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/syncproviders/SyncAPI.kt
@@ -3,6 +3,7 @@ package com.lagradost.cloudstream3.syncproviders
 enum class SyncIdName {
     Anilist,
     MyAnimeList,
+    Kitsu,
     Trakt,
     Imdb,
     Simkl,
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/AppDebug.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/AppDebug.kt
new file mode 100644
index 00000000000..e07f32c0a4a
--- /dev/null
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/AppDebug.kt
@@ -0,0 +1,9 @@
+package com.lagradost.cloudstream3.utils
+
+import com.lagradost.cloudstream3.InternalAPI
+
+@InternalAPI
+object AppDebug {
+    @Volatile
+    var isDebug: Boolean = false
+}
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/Coroutines.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/Coroutines.kt
index f87ddc6ab09..c525a1f36b0 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/Coroutines.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/Coroutines.kt
@@ -1,28 +1,34 @@
 package com.lagradost.cloudstream3.utils
 
+import androidx.annotation.AnyThread
+import androidx.annotation.MainThread
+import androidx.annotation.WorkerThread
 import com.lagradost.cloudstream3.mvvm.launchSafe
 import com.lagradost.cloudstream3.mvvm.logError
 import kotlinx.coroutines.*
 import java.util.Collections.synchronizedList
 
-expect fun runOnMainThreadNative(work: (() -> Unit))
+@AnyThread
+expect fun runOnMainThreadNative(@MainThread work: (() -> Unit))
 object Coroutines {
-    fun <T> T.main(work: suspend ((T) -> Unit)): Job {
+    @AnyThread
+    fun <T> T.main(@MainThread work: suspend ((T) -> Unit)): Job {
         val value = this
         return CoroutineScope(Dispatchers.Main).launchSafe {
             work(value)
         }
     }
 
-    fun <T> T.ioSafe(work: suspend (CoroutineScope.(T) -> Unit)): Job {
+    @AnyThread
+    fun <T> T.ioSafe(@WorkerThread work: suspend (CoroutineScope.(T) -> Unit)): Job {
         val value = this
-
         return CoroutineScope(Dispatchers.IO).launchSafe {
             work(value)
         }
     }
 
-    suspend fun <T, V> V.ioWorkSafe(work: suspend (CoroutineScope.(V) -> T)): T? {
+    @AnyThread
+    suspend fun <T, V> V.ioWorkSafe(@WorkerThread work: suspend (CoroutineScope.(V) -> T)): T? {
         val value = this
         return withContext(Dispatchers.IO) {
             try {
@@ -34,21 +40,24 @@ object Coroutines {
         }
     }
 
-    suspend fun <T, V> V.ioWork(work: suspend (CoroutineScope.(V) -> T)): T {
+    @AnyThread
+    suspend fun <T, V> V.ioWork(@WorkerThread work: suspend (CoroutineScope.(V) -> T)): T {
         val value = this
         return withContext(Dispatchers.IO) {
             work(value)
         }
     }
 
-    suspend fun <T, V> V.mainWork(work: suspend (CoroutineScope.(V) -> T)): T {
+    @AnyThread
+    suspend fun <T, V> V.mainWork(@MainThread work: suspend (CoroutineScope.(V) -> T)): T {
         val value = this
         return withContext(Dispatchers.Main) {
             work(value)
         }
     }
 
-    fun runOnMainThread(work: (() -> Unit)) {
+    @AnyThread
+    fun runOnMainThread(@MainThread work: (() -> Unit)) {
         runOnMainThreadNative(work)
     }
 
@@ -56,8 +65,8 @@ object Coroutines {
      * Safe to add and remove how you want
      * If you want to iterate over the list then you need to do:
      * synchronized(allProviders) { code here }
-     **/
+     */
     fun <T> threadSafeListOf(vararg items: T): MutableList<T> {
         return synchronizedList(items.toMutableList())
     }
-}
\ No newline at end of file
+}
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 2ff3cf0028b..ab80cf2cade 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/ExtractorApi.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/ExtractorApi.kt
@@ -1,35 +1,30 @@
 package com.lagradost.cloudstream3.utils
 
 import com.fasterxml.jackson.annotation.JsonIgnore
+import com.lagradost.cloudstream3.AudioFile
 import com.lagradost.cloudstream3.IDownloadableMinimum
 import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.USER_AGENT
 import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.extractors.AStreamHub
 import com.lagradost.cloudstream3.extractors.Acefile
 import com.lagradost.cloudstream3.extractors.Ahvsh
 import com.lagradost.cloudstream3.extractors.Aico
-import com.lagradost.cloudstream3.extractors.AnimesagaStream
-import com.lagradost.cloudstream3.extractors.Anplay
-import com.lagradost.cloudstream3.extractors.AsianLoad
 import com.lagradost.cloudstream3.extractors.Asnwish
+import com.lagradost.cloudstream3.extractors.Auvexiug
 import com.lagradost.cloudstream3.extractors.Awish
-import com.lagradost.cloudstream3.extractors.Beastx
-import com.lagradost.cloudstream3.extractors.Bestx
 import com.lagradost.cloudstream3.extractors.BgwpCC
 import com.lagradost.cloudstream3.extractors.BigwarpArt
 import com.lagradost.cloudstream3.extractors.BigwarpIO
 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.ByseSX
+import com.lagradost.cloudstream3.extractors.Bysezejataos
+import com.lagradost.cloudstream3.extractors.ByseBuho
+import com.lagradost.cloudstream3.extractors.ByseVepoin
+import com.lagradost.cloudstream3.extractors.ByseQekaho
+import com.lagradost.cloudstream3.extractors.Cavanhabg
 import com.lagradost.cloudstream3.extractors.Cda
 import com.lagradost.cloudstream3.extractors.Cdnplayer
 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.CloudMailRu
 import com.lagradost.cloudstream3.extractors.ContentX
 import com.lagradost.cloudstream3.extractors.CsstOnline
@@ -56,14 +51,16 @@ 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.Doodspro
+import com.lagradost.cloudstream3.extractors.Dsvplay
 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.DsstOnline
+import com.lagradost.cloudstream3.extractors.Dumbalag
 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
@@ -77,8 +74,9 @@ 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.FilemoonV2
 import com.lagradost.cloudstream3.extractors.Filesim
+import com.lagradost.cloudstream3.extractors.Multimoviesshg
 import com.lagradost.cloudstream3.extractors.FlaswishCom
 import com.lagradost.cloudstream3.extractors.FourCX
 import com.lagradost.cloudstream3.extractors.FourPichive
@@ -86,7 +84,7 @@ import com.lagradost.cloudstream3.extractors.FourPlayRu
 import com.lagradost.cloudstream3.extractors.Fplayer
 import com.lagradost.cloudstream3.extractors.FsstOnline
 import com.lagradost.cloudstream3.extractors.GDMirrorbot
-import com.lagradost.cloudstream3.extractors.GMPlayer
+import com.lagradost.cloudstream3.extractors.GUpload
 import com.lagradost.cloudstream3.extractors.GamoVideo
 import com.lagradost.cloudstream3.extractors.Gdriveplayer
 import com.lagradost.cloudstream3.extractors.Gdriveplayerapi
@@ -101,20 +99,24 @@ import com.lagradost.cloudstream3.extractors.Gdriveplayerus
 import com.lagradost.cloudstream3.extractors.Geodailymotion
 import com.lagradost.cloudstream3.extractors.Gofile
 import com.lagradost.cloudstream3.extractors.GoodstreamExtractor
-import com.lagradost.cloudstream3.extractors.GuardareStream
 import com.lagradost.cloudstream3.extractors.Guccihide
+import com.lagradost.cloudstream3.extractors.Guxhag
 import com.lagradost.cloudstream3.extractors.HDMomPlayer
 import com.lagradost.cloudstream3.extractors.HDPlayerSystem
 import com.lagradost.cloudstream3.extractors.HDStreamAble
+import com.lagradost.cloudstream3.extractors.Habetar
+import com.lagradost.cloudstream3.extractors.Haxloppd
+import com.lagradost.cloudstream3.extractors.HglinkTo
+import com.lagradost.cloudstream3.extractors.HgplayCDN
 import com.lagradost.cloudstream3.extractors.Hotlinger
+import com.lagradost.cloudstream3.extractors.HubCloud
 import com.lagradost.cloudstream3.extractors.Hxfile
+import com.lagradost.cloudstream3.extractors.HlsWish
 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
@@ -124,33 +126,33 @@ import com.lagradost.cloudstream3.extractors.Linkbox
 import com.lagradost.cloudstream3.extractors.LuluStream
 import com.lagradost.cloudstream3.extractors.Lulustream1
 import com.lagradost.cloudstream3.extractors.Lulustream2
+import com.lagradost.cloudstream3.extractors.Luluvdoo
 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
+import com.lagradost.cloudstream3.extractors.MixDropPs
+import com.lagradost.cloudstream3.extractors.Mdy
+import com.lagradost.cloudstream3.extractors.MixDropSi
+import com.lagradost.cloudstream3.extractors.MxDropTo
 import com.lagradost.cloudstream3.extractors.Movhide
 import com.lagradost.cloudstream3.extractors.Moviehab
 import com.lagradost.cloudstream3.extractors.MoviehabNet
-import com.lagradost.cloudstream3.extractors.Moviesapi
 import com.lagradost.cloudstream3.extractors.Moviesm4u
 import com.lagradost.cloudstream3.extractors.Mp4Upload
 import com.lagradost.cloudstream3.extractors.Multimovies
 import com.lagradost.cloudstream3.extractors.Mvidoo
+import com.lagradost.cloudstream3.extractors.MyVidPlay
 import com.lagradost.cloudstream3.extractors.Mwish
-import com.lagradost.cloudstream3.extractors.MwvnVizcloudInfo
-import com.lagradost.cloudstream3.extractors.MyCloud
 import com.lagradost.cloudstream3.extractors.NathanFromSubject
 import com.lagradost.cloudstream3.extractors.Nekostream
 import com.lagradost.cloudstream3.extractors.Nekowish
@@ -159,17 +161,19 @@ import com.lagradost.cloudstream3.extractors.Neonime8n
 import com.lagradost.cloudstream3.extractors.Obeywish
 import com.lagradost.cloudstream3.extractors.Odnoklassniki
 import com.lagradost.cloudstream3.extractors.OkRuHTTP
+import com.lagradost.cloudstream3.extractors.OkRuHTTPMobile
 import com.lagradost.cloudstream3.extractors.OkRuSSL
-import com.lagradost.cloudstream3.extractors.Okrulink
+import com.lagradost.cloudstream3.extractors.OkRuSSLMobile
 import com.lagradost.cloudstream3.extractors.PeaceMakerst
 import com.lagradost.cloudstream3.extractors.Peytonepre
 import com.lagradost.cloudstream3.extractors.Pichive
 import com.lagradost.cloudstream3.extractors.PixelDrain
+import com.lagradost.cloudstream3.extractors.PixelDrainDev
 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.Playmogo
 import com.lagradost.cloudstream3.extractors.Rabbitstream
 import com.lagradost.cloudstream3.extractors.RapidVid
 import com.lagradost.cloudstream3.extractors.Rasacintaku
@@ -193,8 +197,9 @@ import com.lagradost.cloudstream3.extractors.SibNet
 import com.lagradost.cloudstream3.extractors.Simpulumlamerop
 import com.lagradost.cloudstream3.extractors.Smoothpre
 import com.lagradost.cloudstream3.extractors.Sobreatsesuyp
-import com.lagradost.cloudstream3.extractors.Solidfiles
 import com.lagradost.cloudstream3.extractors.Ssbstream
+import com.lagradost.cloudstream3.extractors.StreamEmbed
+import com.lagradost.cloudstream3.extractors.StreamHLS
 import com.lagradost.cloudstream3.extractors.StreamM4u
 import com.lagradost.cloudstream3.extractors.StreamSB
 import com.lagradost.cloudstream3.extractors.StreamSB1
@@ -212,14 +217,17 @@ import com.lagradost.cloudstream3.extractors.StreamSilk
 import com.lagradost.cloudstream3.extractors.StreamTape
 import com.lagradost.cloudstream3.extractors.StreamTapeNet
 import com.lagradost.cloudstream3.extractors.StreamTapeXyz
+import com.lagradost.cloudstream3.extractors.Watchadsontape
 import com.lagradost.cloudstream3.extractors.StreamWishExtractor
 import com.lagradost.cloudstream3.extractors.StreamhideCom
 import com.lagradost.cloudstream3.extractors.StreamhideTo
 import com.lagradost.cloudstream3.extractors.Streamhub2
+import com.lagradost.cloudstream3.extractors.Streamix
 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.Streamup
 import com.lagradost.cloudstream3.extractors.Streamwish2
 import com.lagradost.cloudstream3.extractors.Strwish
 import com.lagradost.cloudstream3.extractors.Strwish2
@@ -229,21 +237,24 @@ 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.Techinmind
 import com.lagradost.cloudstream3.extractors.Tubeless
+import com.lagradost.cloudstream3.extractors.Uasopt
+import com.lagradost.cloudstream3.extractors.Up4FunTop
+import com.lagradost.cloudstream3.extractors.Up4Stream
 import com.lagradost.cloudstream3.extractors.Upstream
 import com.lagradost.cloudstream3.extractors.UpstreamExtractor
 import com.lagradost.cloudstream3.extractors.Uqload
 import com.lagradost.cloudstream3.extractors.Uqload1
 import com.lagradost.cloudstream3.extractors.Uqload2
+import com.lagradost.cloudstream3.extractors.Uqloadcx
+import com.lagradost.cloudstream3.extractors.Uqloadbz
 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.Videa
 import com.lagradost.cloudstream3.extractors.Vicloud
 import com.lagradost.cloudstream3.extractors.VidHidePro
 import com.lagradost.cloudstream3.extractors.VidHidePro1
@@ -252,49 +263,38 @@ 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.VidHideHub
+import com.lagradost.cloudstream3.extractors.Ryderjet
 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.VidStack
 import com.lagradost.cloudstream3.extractors.VideoSeyred
-import com.lagradost.cloudstream3.extractors.VideoVard
-import com.lagradost.cloudstream3.extractors.VideovardSX
+import com.lagradost.cloudstream3.extractors.Videzz
 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
+import com.lagradost.cloudstream3.extractors.Vidmolyto
+import com.lagradost.cloudstream3.extractors.Vidmolybiz
 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.Vidoza
 import com.lagradost.cloudstream3.extractors.VinovoSi
 import com.lagradost.cloudstream3.extractors.VinovoTo
-import com.lagradost.cloudstream3.extractors.Vizcloud
-import com.lagradost.cloudstream3.extractors.Vizcloud2
-import com.lagradost.cloudstream3.extractors.VizcloudCloud
-import com.lagradost.cloudstream3.extractors.VizcloudDigital
-import com.lagradost.cloudstream3.extractors.VizcloudInfo
-import com.lagradost.cloudstream3.extractors.VizcloudLive
-import com.lagradost.cloudstream3.extractors.VizcloudOnline
-import com.lagradost.cloudstream3.extractors.VizcloudSite
-import com.lagradost.cloudstream3.extractors.VizcloudXyz
+import com.lagradost.cloudstream3.extractors.VidNest
+import com.lagradost.cloudstream3.extractors.Vidara
+import com.lagradost.cloudstream3.extractors.Vide0Net
+import com.lagradost.cloudstream3.extractors.Vidsonic
+import com.lagradost.cloudstream3.extractors.VkExtractor
 import com.lagradost.cloudstream3.extractors.Voe
 import com.lagradost.cloudstream3.extractors.Voe1
+import com.lagradost.cloudstream3.extractors.Voe2
 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.Xenolyzb
 import com.lagradost.cloudstream3.extractors.Yipsu
 import com.lagradost.cloudstream3.extractors.YourUpload
 import com.lagradost.cloudstream3.extractors.YoutubeExtractor
@@ -302,7 +302,7 @@ import com.lagradost.cloudstream3.extractors.YoutubeMobileExtractor
 import com.lagradost.cloudstream3.extractors.YoutubeNoCookieExtractor
 import com.lagradost.cloudstream3.extractors.YoutubeShortLinkExtractor
 import com.lagradost.cloudstream3.extractors.Yufiles
-import com.lagradost.cloudstream3.extractors.Zorofile
+import com.lagradost.cloudstream3.extractors.Yuguaab
 import com.lagradost.cloudstream3.extractors.Zplayer
 import com.lagradost.cloudstream3.extractors.ZplayerV2
 import com.lagradost.cloudstream3.extractors.Ztreamhub
@@ -337,6 +337,7 @@ fun Long.toUs(): Long {
  * If your site has an unorthodox m3u8-like system where there are multiple smaller videos concatenated
  * use this.
  * */
+@Suppress("DEPRECATION")
 data class ExtractorLinkPlayList(
     override val source: String,
     override val name: String,
@@ -347,6 +348,7 @@ data class ExtractorLinkPlayList(
     /** Used for getExtractorVerifierJob() */
     override var extractorData: String? = null,
     override var type: ExtractorLinkType,
+    override var audioTracks: List<AudioFile> = emptyList(),
 ) : ExtractorLink(
     source = source,
     name = name,
@@ -355,7 +357,8 @@ data class ExtractorLinkPlayList(
     quality = quality,
     headers = headers,
     extractorData = extractorData,
-    type = type
+    type = type,
+    audioTracks = audioTracks
 ) {
     constructor(
         source: String,
@@ -509,8 +512,9 @@ suspend fun newDrmExtractorLink(
  * @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.
+ * @see newDrmExtractorLink
  * */
-@Suppress("DEPRECATION_ERROR")
+@Suppress("DEPRECATION")
 open class DrmExtractorLink private constructor(
     override val source: String,
     override val name: String,
@@ -527,8 +531,9 @@ open class DrmExtractorLink private constructor(
     open var kty: String? = null,
     open var keyRequestParameters: HashMap<String, String>,
     open var licenseUrl: String? = null,
+    override var audioTracks: List<AudioFile> = emptyList(),
 ) : ExtractorLink(
-    source, name, url, referer, quality, type, headers, extractorData
+    source, name, url, referer, quality, headers, extractorData, type, audioTracks
 ) {
     @Deprecated("Use newDrmExtractorLink", level = DeprecationLevel.ERROR)
     constructor(
@@ -610,8 +615,12 @@ open class DrmExtractorLink private constructor(
  * @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)
+ * @property audioTracks List of separate audio tracks that can be used with this video
+ * @see newExtractorLink
  * */
-open class ExtractorLink constructor(
+open class ExtractorLink
+@Deprecated("Use newExtractorLink", level = DeprecationLevel.WARNING)
+constructor(
     open val source: String,
     open val name: String,
     override val url: String,
@@ -621,6 +630,8 @@ open class ExtractorLink constructor(
     /** Used for getExtractorVerifierJob() */
     open var extractorData: String? = null,
     open var type: ExtractorLinkType,
+    /** List of separate audio tracks that can be merged with this video */
+    open var audioTracks: List<AudioFile> = emptyList(),
 ) : IDownloadableMinimum {
     val isM3u8: Boolean get() = type == ExtractorLinkType.M3U8
     val isDash: Boolean get() = type == ExtractorLinkType.DASH
@@ -655,6 +666,7 @@ open class ExtractorLink constructor(
         return headers
     }
 
+    @Suppress("DEPRECATION")
     @Deprecated("Use newExtractorLink", level = DeprecationLevel.ERROR)
     constructor(
         source: String,
@@ -678,6 +690,7 @@ open class ExtractorLink constructor(
         type = type ?: inferTypeFromUrl(url)
     )
 
+    @Suppress("DEPRECATION")
     @Deprecated("Use newExtractorLink", level = DeprecationLevel.ERROR)
     constructor(
         source: String,
@@ -719,6 +732,7 @@ open class ExtractorLink constructor(
         extractorData: String? = null
     ) : this(source, name, url, referer, quality, isM3u8, headers, extractorData, false)
 
+    @Suppress("DEPRECATION")
     @Deprecated("Use newExtractorLink", level = DeprecationLevel.ERROR)
     constructor(
         source: String,
@@ -831,6 +845,7 @@ suspend fun loadExtractor(
     )
 }
 
+
 /**
  * Tries to load the appropriate extractor based on link, returns true if any extractor is loaded.
  * */
@@ -890,35 +905,24 @@ suspend fun loadExtractor(
 
 val extractorApis: MutableList<ExtractorApi> = arrayListOf(
     //AllProvider(),
-    WcoStream(),
-    Vidstreamz(),
-    Vizcloud(),
-    Vizcloud2(),
-    VizcloudOnline(),
-    VizcloudXyz(),
-    VizcloudLive(),
-    VizcloudInfo(),
-    MwvnVizcloudInfo(),
-    VizcloudDigital(),
-    VizcloudCloud(),
-    VizcloudSite(),
-    VideoVard(),
-    VideovardSX(),
     Mp4Upload(),
     StreamTape(),
     StreamTapeNet(),
     ShaveTape(),
     StreamTapeXyz(),
+    Watchadsontape(),
 
     //mixdrop extractors
     MixDropBz(),
     MixDropCh(),
     MixDropTo(),
     MixDropAg(),
-
     MixDrop(),
+    MixDropPs(),
+    Mdy(),
+    MxDropTo(),
+    MixDropSi(),
 
-    Mcloud(),
     XStreamCdn(),
 
     StreamSB(),
@@ -951,7 +955,7 @@ val extractorApis: MutableList<ExtractorApi> = arrayListOf(
     Lvturbo(),
 
     Fastream(),
-
+    Videa(),
     FEmbed(),
     FeHD(),
     Fplayer(),
@@ -966,6 +970,8 @@ val extractorApis: MutableList<ExtractorApi> = arrayListOf(
     Uqload(),
     Uqload1(),
     Uqload2(),
+    Uqloadcx(),
+    Uqloadbz(),
     Evoload(),
     Evoload1(),
     UpstreamExtractor(),
@@ -990,14 +996,13 @@ val extractorApis: MutableList<ExtractorApi> = arrayListOf(
     VidMoxy(),
     Sobreatsesuyp(),
     PixelDrain(),
+    PixelDrainDev(),
     MailRu(),
 
-    Tomatomatela(),
-    TomatomatelalClub(),
-    Cinestart(),
     OkRuSSL(),
+    OkRuSSLMobile(),
     OkRuHTTP(),
-    Okrulink(),
+    OkRuHTTPMobile(),
     Sendvid(),
 
     // dood extractors
@@ -1015,11 +1020,10 @@ val extractorApis: MutableList<ExtractorApi> = arrayListOf(
     DoodWatchExtractor(),
     DoodWfExtractor(),
     DoodYtExtractor(),
-
-    AsianLoad(),
+    Doodspro(),
+    Dsvplay(),
 
     // GenericM3U8(),
-    Jawcloud(),
     Zplayer(),
     ZplayerV2(),
     Upstream(),
@@ -1028,9 +1032,6 @@ val extractorApis: MutableList<ExtractorApi> = arrayListOf(
     Tantifilm(),
     Userload(),
     Supervideo(),
-    GuardareStream(),
-    CineGrabber(),
-    Vanfem(),
 
     // StreamSB.kt works
     //  SBPlay(),
@@ -1039,11 +1040,7 @@ val extractorApis: MutableList<ExtractorApi> = arrayListOf(
 
     PlayerVoxzer(),
 
-    BullStream(),
-    GMPlayer(),
-
     Blogger(),
-    Solidfiles(),
     YourUpload(),
 
     Hxfile(),
@@ -1060,10 +1057,7 @@ val extractorApis: MutableList<ExtractorApi> = arrayListOf(
     DesuOdvip(),
     DesuDrive(),
 
-    Chillx(),
-    Moviesapi(),
-    Watchx(),
-    Bestx(),
+
     Keephealth(),
     Sbnet(),
     Sbasian(),
@@ -1083,28 +1077,34 @@ val extractorApis: MutableList<ExtractorApi> = arrayListOf(
     FileMoonIn(),
     Moviesm4u(),
     Filesim(),
+    Multimoviesshg(),
     Ahvsh(),
     Guccihide(),
     FileMoon(),
     FileMoonSx(),
+    FilemoonV2(),
 
     Vido(),
     Linkbox(),
     Acefile(),
-    Minoplres(), // formerly SpeedoStream
-    Zorofile(),
     Embedgram(),
     Mvidoo(),
     Streamplay(),
     Vidmoly(),
     Vidmolyme(),
+    Vidmolyto(),
+    Vidmolybiz(),
     Voe(),
     Voe1(),
+    Voe2(),
     Tubeless(),
     Moviehab(),
     MoviehabNet(),
     Jeniusplay(),
     StreamoUpload(),
+    Streamup(),
+    Streamix(),
+    Vidara(),
 
     GamoVideo(),
     Gdriveplayerapi(),
@@ -1127,19 +1127,10 @@ val extractorApis: MutableList<ExtractorApi> = arrayListOf(
     YoutubeMobileExtractor(),
     YoutubeNoCookieExtractor(),
     Streamlare(),
-    VidSrcExtractor(),
-    VidSrcExtractor2(),
-    VidSrcTo(),
     PlayLtXyz(),
-    AStreamHub(),
-    Vidplay(),
-    VidplayOnline(),
-    MyCloud(),
-    MegaF(),
 
     Cda(),
     Dailymotion(),
-    ByteShare(),
     Ztreamhub(),
     Rabbitstream(),
     Dokicloud(),
@@ -1152,14 +1143,35 @@ val extractorApis: MutableList<ExtractorApi> = arrayListOf(
     VidHidePro4(),
     VidHidePro5(),
     VidHidePro6(),
+    VidHideHub(),
+    Ryderjet(),
+    VidNest(),
     Dhtpre(),
+
+    // CineMM Redirects
     Dhcplay(),
+    HglinkTo(),
+
+    // CineMM mirrors
+    HgplayCDN(),
+    Habetar(),
+    Yuguaab(),
+    Guxhag(),
+    Auvexiug(),
+    Xenolyzb(),
+    Haxloppd(),
+    Cavanhabg(),
+    Dumbalag(),
+    Uasopt(),
+
     Smoothpre(),
     Peytonepre(),
     LuluStream(),
     Lulustream1(),
     Lulustream2(),
+    Luluvdoo(),
     StreamWishExtractor(),
+    StreamHLS(),
     BigwarpIO(),
     BigwarpArt(),
     BgwpCC(),
@@ -1168,13 +1180,9 @@ val extractorApis: MutableList<ExtractorApi> = arrayListOf(
     FlaswishCom(),
     SfastwishCom(),
     Playerwish(),
+    StreamEmbed(),
     EmturbovidExtractor(),
     Vtbe(),
-    EPlayExtractor(),
-    Vidguardto(),
-    Vidguardto1(),
-    Vidguardto2(),
-    Vidguardto3(),
     SecvideoOnline(),
     FsstOnline(),
     CsstOnline(),
@@ -1205,25 +1213,33 @@ val extractorApis: MutableList<ExtractorApi> = arrayListOf(
     Nekostream(),
     Swdyu(),
     Wishonly(),
-    Beastx(),
-    Playerx(),
-    AnimesagaStream(),
-    Anplay(),
-    Kinogeru(),
-    Vidxstream(),
-    Boltx(),
-    Vectorx(),
-    Boosterx(),
     Ds2play(),
     Ds2video(),
-    Filegram(),
+    Vidsonic(),
     InternetArchive(),
     VidStack(),
     GDMirrorbot(),
+    Techinmind(),
     Server1uns(),
     VinovoSi(),
     VinovoTo(),
+    Vidoza(),
+    Videzz(),
     CloudMailRu(),
+    HubCloud(),
+    VkExtractor(),
+    Bysezejataos(),
+    ByseSX(),
+    ByseVepoin(),
+    ByseBuho(),
+    MyVidPlay(),
+    Playmogo(),
+    Vide0Net(),
+    Up4Stream(),
+    Up4FunTop(),
+    GUpload(),
+    HlsWish(),
+    ByseQekaho(),
 )
 
 
@@ -1252,7 +1268,7 @@ suspend fun getPostForm(requestUrl: String, html: String): String? {
     var hash: String? = null
 
     for (input in inputs) {
-        val value = input.attr("value") ?: continue
+        val value = input.attr("value")
         when (input.attr("name")) {
             "op" -> op = value
             "id" -> id = value
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/HlsPlaylistParser.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/HlsPlaylistParser.kt
index ee90eae52a4..01e5bb86295 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/HlsPlaylistParser.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/HlsPlaylistParser.kt
@@ -222,7 +222,7 @@ object HlsPlaylistParser {
             if (codecs.isNullOrEmpty()) {
                 return arrayOf()
             }
-            return split(codecs.trim { it <= ' ' }, "(\\s*,\\s*)")
+            return split(codecs.trim(), "(\\s*,\\s*)")
         }
 
         fun getCodecsOfType(
@@ -788,12 +788,6 @@ object HlsPlaylistParser {
         const val APPLICATION_MP4CEA608: String = "$BASE_TYPE_APPLICATION/x-mp4-cea-608"
 
 
-        @Deprecated(
-            """RawCC is a Google-internal subtitle format that isn't supported by this version of
-        Media3. There is no replacement for this value."""
-        )
-        const val APPLICATION_RAWCC: String = "$BASE_TYPE_APPLICATION/x-rawcc"
-
         const val APPLICATION_VOBSUB: String = "$BASE_TYPE_APPLICATION/vobsub"
         const val APPLICATION_PGS: String = "$BASE_TYPE_APPLICATION/pgs"
         const val APPLICATION_SCTE35: String = "$BASE_TYPE_APPLICATION/x-scte35"
@@ -934,7 +928,7 @@ object HlsPlaylistParser {
 
         fun getMediaMimeType(codecOrNull: String?): String? {
             var codec = codecOrNull ?: return null
-            codec = codec.trim { it <= ' ' }.lowercase()
+            codec = codec.trim().lowercase()
             if (codec.startsWith("avc1") || codec.startsWith("avc3")) {
                 return MimeTypes.VIDEO_H264
             } else if (codec.startsWith("hev1") || codec.startsWith("hvc1")) {
@@ -1025,7 +1019,6 @@ object HlsPlaylistParser {
                 || APPLICATION_TTML == mimeType
                 || APPLICATION_TX3G == mimeType
                 || APPLICATION_MP4VTT == mimeType
-                || APPLICATION_RAWCC == mimeType
                 || APPLICATION_VOBSUB == mimeType
                 || APPLICATION_PGS == mimeType
                 || APPLICATION_DVBSUBS == mimeType;
@@ -1247,7 +1240,7 @@ object HlsPlaylistParser {
         if (concatenatedCharacteristics.isNullOrEmpty()) {
             return 0
         }
-        val characteristics = Util.split(concatenatedCharacteristics!!, ",")
+        val characteristics = Util.split(concatenatedCharacteristics, ",")
         //@RoleFlags
         var roleFlags = 0
         if (characteristics.contains("public.accessibility.describes-video")) {
@@ -1450,7 +1443,16 @@ object HlsPlaylistParser {
          */
         //val labels: List<Label> = emptyList(),
 
-        /** The language as an IETF BCP 47 conformant tag, or null if unknown or not applicable. */
+        /**
+         * The language as an IETF BCP 47 conformant tag, or null if unknown or not applicable.
+         * Check [com.lagradost.cloudstream3.utils.SubtitleHelper].
+         *
+         * See locales on:
+         * https://github.com/unicode-org/cldr-json/blob/main/cldr-json/cldr-core/availableLocales.json
+         * https://www.iana.org/assignments/language-subtag-registry/language-subtag-registry
+         * https://android.googlesource.com/platform/frameworks/base/+/android-16.0.0_r2/core/res/res/values/locale_config.xml
+         * https://iso639-3.sil.org/code_tables/639/data/all
+        */
         val language: String? = null,
 
         /** Track selection flags. */
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 dd595dffaa7..1ec442d7bcc 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/JsHunter.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/JsHunter.kt
@@ -34,8 +34,8 @@ class JsHunter(private val hunterJS: String) {
                 )
             val searchResults: Matcher = p.matcher(hunterJS)
             if (searchResults.find() && searchResults.groupCount() == 4) {
-                val h = searchResults.group(1)!!.toString()
-                val n = searchResults.group(2)!!.toString()
+                val h = searchResults.group(1)!!
+                val n = searchResults.group(2)!!
                 val t = searchResults.group(3)!!.toInt()
                 val e = searchResults.group(4)!!.toInt()
                 return hunter(h, n, t, e)
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 a852bdc0364..23226418b48 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/M3u8Helper.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/M3u8Helper.kt
@@ -233,7 +233,9 @@ object M3u8Helper2 {
             val ts = allTsLinks[index]
 
             val tsResponse = app.get(ts.url, headers = headers, verify = false)
-            val tsData = tsResponse.body.bytes()
+            val body = tsResponse.body
+            val tsData = body.bytes()
+            body.close()
             if (tsData.isEmpty()) throw ErrorLoadingException("no data")
 
             return if (isEncrypted) {
@@ -329,7 +331,9 @@ object M3u8Helper2 {
             encryptionIv = match[3].toByteArray()
             val encryptionKeyResponse =
                 app.get(encryptionUri, headers = playlistStream.headers, verify = false)
-            encryptionData = encryptionKeyResponse.body.bytes()
+            val body = encryptionKeyResponse.body
+            encryptionData = body.bytes()
+            body.close()
         } else {
             encryptionState = false
         }
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/SubtitleHelper.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/SubtitleHelper.kt
index c65b2b14b17..8d5479cc0ab 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/SubtitleHelper.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/SubtitleHelper.kt
@@ -1,519 +1,734 @@
-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", ""),
-    )
-}
+package com.lagradost.cloudstream3.utils
+
+import me.xdrop.fuzzywuzzy.FuzzySearch
+import java.util.Locale
+
+// If you find a way to use SettingsGeneral getCurrentLocale()
+// instead of this function do it.
+fun getCurrentLocale(): String {
+    return Locale.getDefault().toLanguageTag()
+}
+
+@Suppress(
+    "unused",
+    "MemberVisibilityCanBePrivate"
+)
+object SubtitleHelper {
+    @Deprecated(
+        "Default language code changed to IETF BCP 47 tag",
+        replaceWith = ReplaceWith("LanguageMetadata(languageName, nativeName, ISO_639_1.ifBlank { ISO_639_2_B }), ISO_639_1, ISO_639_2_B, ISO_639_3, ISO_639_1"),
+        level = DeprecationLevel.WARNING
+    )
+    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,
+    )
+
+    /**
+     * Represents one language with english name, native name and codes.
+     * IETF BCP 47 conformant tag shall be used as the first choice for language code!
+     *
+     * See locales on:
+     * https://github.com/unicode-org/cldr-json/blob/main/cldr-json/cldr-core/availableLocales.json
+     * https://www.iana.org/assignments/language-subtag-registry/language-subtag-registry
+     * https://android.googlesource.com/platform/frameworks/base/+/android-16.0.0_r2/core/res/res/values/locale_config.xml
+     * https://iso639-3.sil.org/code_tables/639/data/all
+     */
+    data class LanguageMetadata(
+        val languageName: String,
+        val nativeName: String,
+        val IETF_tag: String,       // Combine ISO 639-1, 639-3 and ISO 3166-1 (or numeric UN M49 / CLDR) for country / region
+        val ISO_639_1: String,
+        val ISO_639_2_B: String,    // ISO 639-2/T missing as it's a subset of ISO 639-3
+        val ISO_639_3: String,      // ISO 639-6 missing as it's intended to differentiate specific dialects and variants
+        val openSubtitles: String, // inconsistent codes that do not conform ISO 639
+    ) {
+        fun localizedName(localizedTo: String? = null): String {
+            // Use system locale to localize language name
+            val localeOfLangCode = Locale.forLanguageTag(this.IETF_tag)
+            val localeOfLocalizeTo = Locale.forLanguageTag(localizedTo ?: getCurrentLocale())
+            val sysLocalizedName = localeOfLangCode.getDisplayName(localeOfLocalizeTo)
+
+            val langCodeWithCountry = "${localeOfLangCode.language} (" // ${localeOfLangCode.country})"
+            val failedToLocalize =
+                sysLocalizedName.equals(this.IETF_tag, ignoreCase = true) ||
+                sysLocalizedName.contains(langCodeWithCountry, ignoreCase = true)
+
+            return if (failedToLocalize)
+                // fallback to native language name
+                this.nativeName
+            else
+                sysLocalizedName
+        }
+
+        fun nameNextToFlagEmoji(localizedTo: String? = null): String {
+            // fallback to [A][A] -> [?] question mak flag
+            val flag = getFlagFromIso(this.IETF_tag) ?: "\ud83c\udde6\ud83c\udde6"
+
+            return "$flag\u00a0${localizedName(localizedTo)}" // \u00a0 non-breaking space
+        }
+    }
+
+    /**
+     * Language name (english or native) -> [LanguageMetadata]
+     * @param languageName language name or language tag
+     * @param halfMatch match with `contains()` instead of `equals()`. Also uses fuzzy matching to get approximate matches.
+     */
+    private fun getLanguageDataFromName(
+        languageName: String?,
+        halfMatch: Boolean? = false
+    ): LanguageMetadata? {
+        if (languageName.isNullOrBlank() || languageName.length < 2) return null
+        // Workaround to avoid junk like "English (original audio)" or "Spanish 123"
+        // or "اَلْعَرَبِيَّةُ (Original Audio) 1" or "English (hindi sub)"…
+        // Will still keep "-" to be compatible with language tags such as pr-bt
+        val garbage = Regex(
+            "\\([^)]*(?:dub|sub|original|audio|code)[^)]*\\)|" + // junk words in parenthesis
+                    "[\\u064B-\\u065B]|" + // arabic diacritics
+                    "\\d|" +  // numbers
+                    "[^\\p{L}\\p{Mn}\\p{Mc}\\p{Me} ()-]" // non-letter (from any language)
+        )
+
+
+        val lowLangName = languageName.lowercase().replace(garbage, "").trim()
+
+        val index = indexMapLanguageName[lowLangName]
+            ?: indexMapNativeName[lowLangName]
+            ?: indexMapIETF_tag[lowLangName]
+            ?: -1
+
+        val langMetadata = languages.getOrNull(index)
+
+        if (langMetadata != null) {
+            return langMetadata
+        } else if (halfMatch == true) {
+            // Go for partial matches but only use the best match
+            var closestMatch: Pair<LanguageMetadata?, Int> = null to 0
+
+            for (lang in languages) {
+                val score = maxOf(
+                    FuzzySearch.ratio(lowLangName, lang.languageName.lowercase()),
+                    FuzzySearch.ratio(
+                        lowLangName, lang.nativeName.lowercase()
+                    )
+                )
+
+                // Usually the languageName or nativeName is a substring of the entered name, for example in "English Subtitle"
+                if (lowLangName.contains(lang.languageName, ignoreCase = true) ||
+                    lowLangName.contains(lang.nativeName, ignoreCase = true) ||
+                    // Arbitrary cutoff at 80.
+                    score > 80
+                ) {
+                    // First detected language gets priority in equal scores.
+                    if (score > closestMatch.second) {
+                        closestMatch = lang to score
+                    }
+                }
+            }
+
+            return closestMatch.first
+        }
+
+        return null
+    }
+
+    @Deprecated(
+        "Default language code changed to IETF BCP 47 tag",
+        replaceWith = ReplaceWith("fromLanguageToTagIETF(input, looseCheck)"),
+        level = DeprecationLevel.WARNING
+    )
+    /**
+     * Language name (english or native) -> ISO_639_1
+     * @param input language name
+     * @param looseCheck match with `contains()` instead of `equals()`
+    */
+    fun fromLanguageToTwoLetters(input: String, looseCheck: Boolean): String? {
+        return getLanguageDataFromName(input, looseCheck)?.ISO_639_1
+    }
+
+    @Deprecated(
+        "Default language code changed to IETF BCP 47 tag",
+        replaceWith = ReplaceWith("fromLanguageToTagIETF(input)"),
+        level = DeprecationLevel.WARNING
+    )
+    /**
+     * Language name (english or native) -> ISO_639_3
+    */
+    fun fromLanguageToThreeLetters(input: String): String? {
+        return getLanguageDataFromName(input)?.ISO_639_3
+    }
+
+    /**
+     * Language name -> IETF_tag
+     * @param languageName language name
+     * @param halfMatch match with `contains()` instead of `equals()`
+    */
+    fun fromLanguageToTagIETF(languageName: String?, halfMatch: Boolean? = false): String? {
+        return getLanguageDataFromName(languageName, halfMatch)?.IETF_tag
+    }
+
+    /**
+     * Language code -> [LanguageMetadata]
+     * @param languageCode IETF BCP 47, ISO 639-1, ISO 639-2B/T, ISO 639-3, OpenSubtitles
+     * @return [LanguageMetadata] or `null`
+    */
+    private fun getLanguageDataFromCode(languageCode: String?): LanguageMetadata?  {
+        if (languageCode.isNullOrBlank() || languageCode.length < 2) return null
+
+        val lowLangCode = languageCode.lowercase().trim()
+        val index =
+            indexMapIETF_tag[lowLangCode] ?:
+            indexMapISO_639_1[lowLangCode] ?:
+            indexMapISO_639_3[lowLangCode] ?:
+            indexMapISO_639_2_B[lowLangCode] ?:
+            indexMapOpenSubtitles[lowLangCode] ?: -1
+
+        return languages.getOrNull(index)
+    }
+
+    @Deprecated(
+        "Default language code changed to IETF BCP 47 tag",
+        replaceWith = ReplaceWith("fromTagToEnglishLanguageName(input)"),
+        level = DeprecationLevel.WARNING
+    )
+    /**
+     * Language code -> language english name
+    */
+    fun fromTwoLettersToLanguage(input: String): String? {
+        return getLanguageDataFromCode(input)?.languageName
+    }
+
+    @Deprecated(
+        "Default language code changed to IETF BCP 47 tag",
+        replaceWith = ReplaceWith("fromTagToEnglishLanguageName(input)"),
+        level = DeprecationLevel.WARNING
+    )
+    /**
+     * Language code -> language english name
+    */
+    fun fromThreeLettersToLanguage(input: String): String? {
+        return getLanguageDataFromCode(input)?.languageName
+    }
+
+    /**
+     * Language code -> language name (if not found, fallback to native language name)
+     * @param languageCode IETF BCP 47, ISO 639-1, ISO 639-2B/T, ISO 639-3, OpenSubtitles
+     * @param localizedTo IETF BCP 47 tag to localize the language name to. Default: app current language
+    */
+    fun fromTagToLanguageName(languageCode: String?, localizedTo: String? = null): String? {
+        return getLanguageDataFromCode(languageCode)?.localizedName(localizedTo)
+    }
+
+    /**
+     * Language code -> language english name
+     * @param languageCode IETF BCP 47, ISO 639-1, ISO 639-2B/T, ISO 639-3, OpenSubtitles
+    */
+    fun fromTagToEnglishLanguageName(languageCode: String?): String? {
+        return getLanguageDataFromCode(languageCode)?.languageName
+    }
+
+    /**
+     * Language code -> openSubtitles inconsistent language tag
+     * @param languageCode IETF BCP 47, ISO 639-1, ISO 639-2B/T, ISO 639-3, OpenSubtitles
+    */
+    fun fromCodeToOpenSubtitlesTag(languageCode: String?): String? {
+        return getLanguageDataFromCode(languageCode)?.openSubtitles
+    }
+
+    /** openSubtitles -> IETF_tag */
+    fun fromCodeToLangTagIETF(languageCode: String?): String? {
+        return getLanguageDataFromCode(languageCode)?.IETF_tag
+    }
+
+    /**
+     * Check for a well formed IETF BCP 47 conformant language tag
+     *
+     * See locales on:
+     * https://github.com/unicode-org/cldr-json/blob/main/cldr-json/cldr-core/availableLocales.json
+     * https://www.iana.org/assignments/language-subtag-registry/language-subtag-registry
+     * https://android.googlesource.com/platform/frameworks/base/+/android-16.0.0_r2/core/res/res/values/locale_config.xml
+    */
+    fun isWellFormedTagIETF(langTagIETF: String?): Boolean {
+        if (langTagIETF.isNullOrBlank() || langTagIETF.length < 2) return false
+
+        // Written by Addison Phillips, <Addison at amazon.com>
+        // https://www.langtag.net/philips-regexp.html
+        val langTagRegex = """
+            +(^[xX](\x2d\p{Alnum}{1,8})*$)
+            +|(((^\p{Alpha}{2,8}(?=\x2d|$)){1}
+            +((\x2d\p{Alpha}{3})(?=\x2d|$)){0,3}
+            +(\x2d\p{Alpha}{4}(?=\x2d|$))?
+            +(\x2d(\p{Alpha}{2}|\d{3})(?=\x2d|$))?
+            +(\x2d(\d\p{Alnum}{3}|\p{Alnum}{5,8})(?=\x2d|$))*)
+            +((\x2d([a-wyzA-WYZ](?=\x2d))(\x2d(\p{Alnum}{2,8})+)*))*
+            +(\x2d[xX](\x2d\p{Alnum}{1,8})*)?)$
+            """.trimMargin("+").toRegex()
+        return langTagIETF.matches(langTagRegex)
+    }
+
+    /**
+     * Try to get a flag emoji form a language code
+     * or two letters country code (ISO 3166-1-alfa-2)
+    */
+    fun getFlagFromIso(inp: String?): String? {
+        if (inp.isNullOrBlank() || inp.length < 2) return null
+
+        // 2 times a symbol between regional indicator "[A]" and "[Z]"
+        val unicodeFlagRegex = Regex("[\uD83C\uDDE6-\uD83C\uDDFF]{2}")
+        // language tags (en-US, es-419, pt-BR, zh-hant-TW) that includes country
+        val countryRegex = Regex("[-_](\\p{Alnum}{2,3})$", RegexOption.IGNORE_CASE)
+
+        val country = countryRegex.find(inp)?.groupValues?.get(1)
+
+        val flagEmoji =
+            getFlagFromCountry2Letters(lang2country[inp.lowercase()]) ?:
+            getFlagFromCountry2Letters(country?.uppercase()) ?:
+            getFlagFromCountry2Letters(inp.uppercase()) ?:
+            getFlagFromCountry2Letters(lang2country[country?.lowercase()]) ?: ""
+
+        if (inp.equals("qt", ignoreCase = true))
+            return "\uD83E\uDD8D" // "mmmm... monke" -> gorilla [🦍]
+        if (flagEmoji.matches(unicodeFlagRegex))
+            return flagEmoji
+        return null
+    }
+
+    /**
+     * Get a flag emoji next to the language name
+     * @param languageCode IETF BCP 47, ISO 639-1, ISO 639-2B/T, ISO 639-3, OpenSubtitles
+     * @param localizedTo IETF BCP 47 tag to localize the language name to. Default: app current language
+    */
+    fun getNameNextToFlagEmoji(languageCode: String?, localizedTo: String? = null): String? {
+        return getLanguageDataFromCode(languageCode)?.nameNextToFlagEmoji(localizedTo)
+    }
+
+    // 2 letters country code (ISO 3166-1-alfa-2) -> flag emoji
+    private fun getFlagFromCountry2Letters(countryLetters: String?): String? {
+        if (countryLetters.isNullOrBlank() || countryLetters.length != 2) return null
+
+        val asciiOffset = 0x41    // uppercase "A"
+        val flagOffset = 0x1F1E6  // regional indicator "[A]"
+        val offset = flagOffset - asciiOffset
+
+        val firstChar: Int = Character.codePointAt(countryLetters, 0) + offset
+        val secondChar: Int = Character.codePointAt(countryLetters, 1) + offset
+
+        return String(Character.toChars(firstChar)) + String(Character.toChars(secondChar))
+    }
+
+    // when (langTag = country) or (langTag contains country)
+    // as in:
+    //   "es" to "ES"
+    //   "pt" to "PT"
+    //   "fr" to "FR"
+    //   "en-US" to "US"
+    //   "pt-BR" to "BR"
+    //   "zh-hant-TW" to "TW"
+    // add to this list is useless as getFlagFromIso() already
+    // handles it.
+    // Adding here is still an option to overwrite a flag like in:
+    //   "am" to "ET" => Ethiopia flag for Amharic instead of Armenia flag
+    // For country / region see
+    // https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2
+    // https://en.wikipedia.org/wiki/UN_M49
+    private val lang2country = mapOf(
+        "419" to "ES", // (?_?) Latin America Spanish -> ES or a L.A. country?
+        "aa" to "ET",
+        "af" to "ZA",
+        "agq" to "CM",
+        "ajp" to "SY",
+        "ak" to "GH",
+        "am" to "ET",
+        "an" to "ES",
+        "apc" to "SY",
+        "ar" to "AE",
+        "arg" to "ES",
+        "ars" to "SA",
+        "as" to "IN",
+        "asa" to "TZ",
+        "av" to "RU", // (?_?) Avaric -> RU
+        "ay" to "BO", // (?_?) Aymara -> BO
+        "azb" to "AZ",
+        "bas" to "CM",
+        "be" to "BY",
+        "bem" to "ZM",
+        "bez" to "IT",
+        "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",
+        "ckb" to "IQ", // (?_?) Central Kurdish -> IQ or IR
+        "cnr" to "ME",
+        "cs" to "CZ",
+        "cy" to "GB",
+        "da" to "DK",
+        "dav" to "KE",
+        "dje" to "NE",
+        "dua" to "CM",
+        "dyo" to "SN",
+        "dz" to "BT",
+        "ea" to "ES",
+        "ebu" to "KE",
+        "ee" to "GH",
+        "el" to "GR",
+        "en" to "GB",
+        "et" to "EE",
+        "eu" to "ES",
+        "ewo" to "CM",
+        "ex" to "ES",
+        "ext" to "ES",
+        "fa" to "IR",
+        "ff" to "CN",
+        "fil" to "PH",
+        "fj" to "FJ",
+        "ga" to "IE",
+        "gd" to "GB",
+        "gl" to "ES",
+        "gn" to "PY", // (?_?) Guarani -> PY
+        "gsw" to "CH",
+        "gu" to "IN",
+        "guz" to "KE",
+        "gv" to "GB",
+        "ha" to "NG",
+        "haw" to "US",
+        "he" to "IL",
+        "hi" to "IN",
+        "hy" to "AM",
+        "ig" to "NG",
+        "ii" to "CN",
+        "in" to "ID", // "in" deprecate, use "id" instead. Keeping for exiting subtitles
+        "ita" to "IT",
+        "iw" to "IL", // "iw" deprecate, use "he" instead. Keeping for exiting subtitles
+        "ja" to "JP",
+        "jmc" to "TZ",
+        "jv" to "ID",
+        "jvn" to "ID",
+        "ka" to "GE",
+        "kab" to "DZ",
+        "kam" to "KE",
+        "kde" to "TZ",
+        "kea" to "CV",
+        "kg" to "CD", // (?_?) Kongo -> CD or CG or AO
+        "khq" to "ML",
+        "ki" to "KE",
+        "kk" to "KZ",
+        "kl" to "GL",
+        "kln" to "KE",
+        "km" to "KH",
+        "kn" to "IN",
+        "ko" to "KR",
+        "kok" to "IN",
+        "kr" to "TD", // (?_?) Kanuri -> TD or NE
+        "ks" to "IN", // (?_?) Kashmiri -> IN or PK
+        "ksb" to "TZ",
+        "ksf" to "CM",
+        "ku" to "IQ",
+        "kw" to "GB",
+        "ky" to "KG",
+        "la" to "IT",
+        "lag" to "TZ",
+        "lat" to "IT",
+        "lat" to "LV",
+        "lb" to "LU",
+        "lg" to "UG",
+        "ln" to "CG",
+        "lo" to "LA",
+        "ltz" to "LU",
+        "lu" to "CD",
+        "luo" to "KE",
+        "luy" to "KE",
+        "ma" to "IN",
+        "mas" to "TZ",
+        "mer" to "KE",
+        "mfe" to "MU",
+        "mgh" to "MZ",
+        "ml" to "IN",
+        "mni" to "IN",
+        "mr" to "IN",
+        "ms" to "MY",
+        "mua" to "CM",
+        "my" to "MM",
+        "naq" to "NA",
+        "nb" to "NO",
+        "nd" to "ZW",
+        "ne" to "NP",
+        "nmg" to "CM",
+        "nn" to "NO",
+        "nr" to "ZA", // (?_?) Southern Ndebele -> ZA or ZW
+        "nus" to "SD",
+        "nv" to "US",
+        "ny" to "MW", // (?_?) Nyanja -> MW
+        "nyn" to "UG",
+        "oc" to "ES",
+        "oci" to "ES",
+        "om" to "ET",
+        "or" to "IN",
+        "pa" to "IN",
+        "pa" to "PK",
+        "pan" to "IN",
+        "pb" to "BR",
+        "pm" to "MZ",
+        "por" to "PT",
+        "pr" to "AF",
+        "prs" to "AF",
+        "ps" to "AF",
+        "qu" to "PE", // (?_?) Quechua -> PE or EC or BO or CO or CL or AR
+        "que" to "PE", // (?_?) Quechua -> PE or EC or BO or CO or CL or AR
+        "rm" to "CH",
+        "rn" to "BI",
+        "rof" to "TZ",
+        "rwk" to "TZ",
+        "sa" to "IN",
+        "san" to "IN",
+        "saq" to "KE",
+        "sat" to "IN",
+        "sbp" to "TZ",
+        "sd" to "PK", // (?_?) Sindhi -> PK or IN
+        "sdn" to "PK", // (?_?) Sindhi -> PK or IN
+        "se" to "NO",
+        "seh" to "MZ",
+        "ses" to "ML",
+        "sg" to "CF",
+        "shi" to "MA",
+        "si" to "LK",
+        "sl" to "SI",
+        "sm" to "WS",
+        "smo" to "WS",
+        "sn" to "ZW",
+        "sp" to "ES",
+        "sq" to "AL",
+        "sr" to "RS",
+        "st" to "LS", // (?_?) Southern Sotho -> LS or ZA
+        "su" to "ID",
+        "sv" to "SE",
+        "sw" to "TZ",
+        "swc" to "CD",
+        "ta" to "IN",
+        "tat" to "RU",
+        "tdt" to "TL",
+        "te" to "IN",
+        "teo" to "UG",
+        "tg" to "TJ",
+        "tgk" to "TJ",
+        "ti" to "ET",
+        "tk" to "TM",
+        "tl" to "PH",
+        "tm-td" to "TL", // (?_?) Tetun -> TL
+        "tn" to "ZA", // (?_?) Tswana -> ZA or BW
+        "ts" to "ZA",
+        "tso" to "ZA",
+        "tt" to "RU",
+        "tuk" to "TM",
+        "twq" to "NE",
+        "tzm" to "MA",
+        "uk" to "UA",
+        "ur" to "PK",
+        "vai" to "LR",
+        "vi" to "VN",
+        "vun" to "TZ",
+        "wo" to "SN",
+        "xh" to "ZA",
+        "xho" to "ZA",
+        "xog" to "UG",
+        "yav" to "CM",
+        "yo" to "NG",
+        "yue" to "CN",
+        "za" to "CN",
+        "zh-hans" to "CN", // (?_?) Chinese (simplified) -> CN ?
+        "zh-hant" to "TW", // (?_?) Chinese (traditional) -> CN or TW or other ?
+        "zh" to "CN",
+        "zha" to "CN",
+        "zu" to "ZA",
+    )
+
+    @Suppress("SpellCheckingInspection")
+    val languages = listOf(
+        // languageName, nativeName, IETF_tag, ISO_639_1, ISO_639_2_B, ISO_639_3, openSubtitles
+        LanguageMetadata("Afar","Afaraf","aa","aa","aar","aar",""),
+        LanguageMetadata("Afrikaans","Afrikaans","af","af","afr","afr","af"),
+        LanguageMetadata("Akan","Akan","ak","ak","aka","aka",""),
+        LanguageMetadata("Albanian","Shqip","sq","sq","","sqi","sq"),
+        LanguageMetadata("Amharic","አማርኛ","am","am","amh","amh","am"),
+        LanguageMetadata("Arabic","العربية","ar","ar","ara","ara","ar"),
+        LanguageMetadata("Arabic (Levantine)","عربي شامي","apc","","ajp","apc","ar"), // "ajp" is deprecated, keeping for compatibility
+        LanguageMetadata("Arabic (Najdi)","عربي شامي","ars","","","ars","ar"),
+        LanguageMetadata("Aragonese","aragonés","an","an","arg","arg","an"),
+        LanguageMetadata("Armenian","Հայերեն","hy","hy","","hye","hy"),
+        LanguageMetadata("Assamese","অসমীয়া","as","as","asm","asm","as"),
+        LanguageMetadata("Avaric","авар мацӀ, магӀарул мацӀ","av","av","ava","ava",""),
+        LanguageMetadata("Aymara","aymar aru","ay","ay","aym","aym",""),
+        LanguageMetadata("Azerbaijani","Azərbaycan","az","az","aze","aze","az-az"),
+        LanguageMetadata("Azerbaijani (South)","Azərbaycan (Cənubi)","azb","","","azb","az-zb"),
+        LanguageMetadata("Bambara","bamanankan","bm","bm","bam","bam",""),
+        LanguageMetadata("Basque","euskara, euskera","eu","eu","","eus","eu"),
+        LanguageMetadata("Belarusian","беларуская мова","be","be","bel","bel","be"),
+        LanguageMetadata("Bengali","বাংলা","bn","bn","ben","ben","bn"),
+        LanguageMetadata("Bosnian","bosanski jezik","bs","bs","bos","bos","bs"),
+        LanguageMetadata("Breton","brezhoneg","br","br","bre","bre","br"),
+        LanguageMetadata("Bulgarian","български език","bg","bg","bul","bul","bg"),
+        LanguageMetadata("Burmese","ဗမာစာ","my","my","","mya","my"),
+        LanguageMetadata("Catalan","català","ca","ca","cat","cat","ca"),
+        LanguageMetadata("Chichewa","chiCheŵa, chinyanja","ny","ny","nya","nya",""),
+        LanguageMetadata("Chinese","中文, 汉语, 漢語","zh","zh","chi","zho","ze"),
+        LanguageMetadata("Chinese (Cantonese)","廣東話, 广东话","yue","","","yue","zh-ca"),
+        LanguageMetadata("Chinese (simplified)","汉语","zh-hans","","","","zh-cn"),
+        LanguageMetadata("Chinese (Taiwan)","正體中文(臺灣)","zh-hant-tw","","","","zh-tw"),
+        LanguageMetadata("Chinese (traditional)","漢語","zh-hant","","","","zh-tw"),
+        LanguageMetadata("Croatian","hrvatski jezik","hr","hr","hrv","hrv","hr"),
+        LanguageMetadata("Czech","čeština, český jazyk","cs","cs","","ces","cs"),
+        LanguageMetadata("Danish","dansk","da","da","dan","dan","da"),
+        LanguageMetadata("Dari","دری","prs","","","prs","pr"),
+        LanguageMetadata("Dutch","Nederlands, Vlaams","nl","nl","","nld","nl"),
+        LanguageMetadata("Dzongkha","རྫོང་ཁ","dz","dz","dzo","dzo",""),
+        LanguageMetadata("English","English","en","en","eng","eng","en"),
+        LanguageMetadata("Esperanto","Esperanto","eo","eo","epo","epo","eo"),
+        LanguageMetadata("Estonian","eesti, eesti keel","et","et","est","est","et"),
+        LanguageMetadata("Ewe","Eʋegbe","ee","ee","ewe","ewe",""),
+        LanguageMetadata("Extremaduran","Estremeñu","ext","","","ext","ex"),
+        LanguageMetadata("Faroese","føroyskt","fo","fo","fao","fao",""),
+        LanguageMetadata("Fijian","vosa Vakaviti","fj","fj","fij","fij",""),
+        LanguageMetadata("Filipino","Wikang Filipino","fil","","fil","fil",""),
+        LanguageMetadata("Finnish","suomi, suomen kieli","fi","fi","fin","fin","fi"),
+        LanguageMetadata("French","Français","fr","fr","","fra","fr"),
+        LanguageMetadata("Fula","Fulfulde, Pulaar, Pular","ff","ff","ful","ful",""),
+        LanguageMetadata("Galician","Galego","gl","gl","glg","glg","gl"),
+        LanguageMetadata("Ganda","Luganda","lg","lg","lug","lug",""),
+        LanguageMetadata("Georgian","ქართული","ka","ka","","kat","ka"),
+        LanguageMetadata("German","Deutsch","de","de","","deu","de"),
+        LanguageMetadata("Greek","ελληνικά","el","el","","ell","el"),
+        LanguageMetadata("Guarani","Avañe'ẽ","gn","gn","grn","gug",""),
+        LanguageMetadata("Gujarati","ગુજરાતી","gu","gu","guj","guj",""),
+        LanguageMetadata("Haitian","Kreyòl ayisyen","ht","ht","hat","hat",""),
+        LanguageMetadata("Hausa","(Hausa) هَوُسَ","ha","ha","hau","hau",""),
+        LanguageMetadata("Hebrew","עברית","he","iw","heb","heb","he"), // "iw" is deprecated, keeping for compatibility
+        LanguageMetadata("Hindi","हिन्दी, हिंदी","hi","hi","hin","hin","hi"),
+        LanguageMetadata("Hungarian","Magyar","hu","hu","hun","hun","hu"),
+        LanguageMetadata("Icelandic","Íslenska","is","is","","isl","is"),
+        LanguageMetadata("Ido","Ido","io","io","ido","ido",""),
+        LanguageMetadata("Igbo","Asụsụ Igbo","ig","ig","ibo","ibo","ig"),
+        LanguageMetadata("Indonesian","Bahasa Indonesia","id","in","ind","ind","id"), // "in" is deprecated, keeping for compatibility
+        LanguageMetadata("Interlingua","Interlingua","ia","ia","ina","ina","ia"),
+        LanguageMetadata("Interlingue","Interlingue (originally Occidental)","ie","ie","ile","ile",""),
+        LanguageMetadata("Irish","Gaeilge","ga","ga","gle","gle","ga"),
+        LanguageMetadata("Italian","italiano","it","it","ita","ita","it"),
+        LanguageMetadata("Japanese","日本語 (にほんご)","ja","ja","jpn","jpn","ja"),
+        LanguageMetadata("Javanese","ꦧꦱꦗꦮ","jv","jv","jav","jvn",""),
+        LanguageMetadata("Kalaallisut","kalaallisut, kalaallit oqaasii","kl","kl","kal","kal",""),
+        LanguageMetadata("Kannada","ಕನ್ನಡ","kn","kn","kan","kan","kn"),
+        LanguageMetadata("Kanuri","Kanuri","kr","kr","kau","kau",""),
+        LanguageMetadata("Kashmiri","कश्मीरी, كشميري‎","ks","ks","kas","kas",""),
+        LanguageMetadata("Kazakh","қазақ тілі","kk","kk","kaz","kaz","kk"),
+        LanguageMetadata("Khmer","ខ្មែរ, ខេមរភាសា, ភាសាខ្មែរ","km","km","khm","khm","km"),
+        LanguageMetadata("Kikuyu","Gĩkũyũ","ki","ki","kik","kik",""),
+        LanguageMetadata("Kinyarwanda","Ikinyarwanda","rw","rw","kin","kin",""),
+        LanguageMetadata("Kirundi","Ikirundi","rn","rn","run","run",""),
+        LanguageMetadata("Kongo","Kikongo","kg","kg","kon","kon",""),
+        LanguageMetadata("Korean","한국어, 조선어","ko","ko","kor","kor","ko"),
+        LanguageMetadata("Kurdish","Kurdî, كوردی‎","ku","ku","kur","kur","ku"),
+        LanguageMetadata("Kyrgyz","Кыргызча, Кыргыз тили","ky","ky","kir","kir",""),
+        LanguageMetadata("Lao","ພາສາລາວ","lo","lo","lao","lao",""),
+        LanguageMetadata("Latin","Latine","la","la","lat","lat",""),
+        LanguageMetadata("Latvian","latviešu valoda","lv","lv","lav","lav","lv"),
+        LanguageMetadata("Lingala","Lingála","ln","ln","lin","lin",""),
+        LanguageMetadata("Lithuanian","lietuvių kalba","lt","lt","lit","lit","lt"),
+        LanguageMetadata("Luba-Katanga","Tshiluba","lu","lu","lub","lub",""),
+        LanguageMetadata("Luxembourgish","Lëtzebuergesch","lb","lb","ltz","ltz","lb"),
+        LanguageMetadata("Macedonian","македонски","mk","mk","","mkd","mk"),
+        LanguageMetadata("Malagasy","fiteny malagasy","mg","mg","mlg","mlg",""),
+        LanguageMetadata("Malay","Bahasa Melayu, بهاس ملايو‎","ms","ms","","msa","ms"),
+        LanguageMetadata("Malayalam","മലയാളം","ml","ml","mal","mal","ml"),
+        LanguageMetadata("Maltese","Malti","mt","mt","mlt","mlt",""),
+        LanguageMetadata("Manx","Gaelg, Gailck","gv","gv","glv","glv",""),
+        LanguageMetadata("Marathi","मराठी","mr","mr","mar","mar","mr"),
+        LanguageMetadata("Marshallese","Kajin M̧ajeļ","mh","mh","mah","mah",""),
+        LanguageMetadata("Meitei","ꯃꯅꯤꯄꯨꯔꯤ, মণিপুরী","mni","","mni","mni","ma"),
+        LanguageMetadata("Mexican Spanish", "Español mexicano", "es-MX", "mx","","",""), // iso639_1 is not mx but, some extension use it as such
+        LanguageMetadata("Mongolian","Монгол хэл","mn","mn","mon","mon","mn"),
+        LanguageMetadata("Montenegrin","crnogorski, црногорски","cnr","","cnr","cnr","me"),
+        LanguageMetadata("Navajo","Diné bizaad","nv","nv","nav","nav","nv"),
+        LanguageMetadata("Nepali","नेपाली","ne","ne","nep","nep","ne"),
+        LanguageMetadata("Northern Ndebele","isiNdebele","nd","nd","nde","nde",""),
+        LanguageMetadata("Northern Sami","Davvisámegiella","se","se","sme","sme","se"),
+        LanguageMetadata("Norwegian","Norsk","no","no","nor","nor","no"),
+        LanguageMetadata("Norwegian Bokmål","Norsk bokmål","nb","nb","nob","nob",""),
+        LanguageMetadata("Norwegian Nynorsk","Norsk nynorsk","nn","nn","nno","nno",""),
+        LanguageMetadata("Nuosu","ꆈꌠ꒿ Nuosuhxop","ii","ii","iii","iii",""),
+        LanguageMetadata("Occitan","occitan, lenga d'òc","oc","oc","oci","oci","oc"),
+        LanguageMetadata("Oriya","ଓଡ଼ିଆ","or","or","ori","ori","or"),
+        LanguageMetadata("Oromo","Afaan Oromoo","om","om","orm","orm",""),
+        LanguageMetadata("Panjabi","ਪੰਜਾਬੀ, پنجابی‎","pa","pa","pan","pan",""),
+        LanguageMetadata("Pashto","پښتو","ps","ps","pus","pus","ps"),
+        LanguageMetadata("Persian (Farsi)","فارسی","fa","fa","","fas","fa"),
+        LanguageMetadata("Polish","Polski, polszczyzna","pl","pl","pol","pol","pl"),
+        LanguageMetadata("Portuguese","Português","pt","pt","por","por","pt-pt"),
+        LanguageMetadata("Portuguese (Brazil)","Português (Brasil)","pt-br","","","","pt-br"),
+        LanguageMetadata("Portuguese (Mozambique)","Português (Moçambique)","pt-mz","","","","pm"),
+        LanguageMetadata("Quechua","Runa Simi, Kichwa","qu","qu","que","que",""),
+        LanguageMetadata("Romanian","Română","ro","ro","","ron","ro"),
+        LanguageMetadata("Romansh","rumantsch grischun","rm","rm","roh","roh",""),
+        LanguageMetadata("Russian","Русский","ru","ru","rus","rus","ru"),
+        LanguageMetadata("Samoan","gagana fa'a Samoa","sm","sm","smo","smo",""),
+        LanguageMetadata("Sango","yângâ tî sängö","sg","sg","sag","sag",""),
+        LanguageMetadata("Sanskrit","संस्कृतम्","sa","sa","san","san",""),
+        LanguageMetadata("Santali","ᱥᱟᱱᱛᱟᱲᱤ","sat","","","sat","sx"),
+        LanguageMetadata("Scottish Gaelic","Gàidhlig","gd","gd","gla","gla","gd"),
+        LanguageMetadata("Serbian","српски језик","sr","sr","srp","srp","sr"),
+        LanguageMetadata("Shona","chiShona","sn","sn","sna","sna",""),
+        LanguageMetadata("Sindhi","सिन्धी, سنڌي، سندھی‎","sd","sd","snd","snd","sd"),
+        LanguageMetadata("Sinhala","සිංහල","si","si","sin","sin","si"),
+        LanguageMetadata("Slovak","slovenčina, slovenský jazyk","sk","sk","","slk","sk"),
+        LanguageMetadata("Slovenian","slovenski jezik, slovenščina","sl","sl","slv","slv","sl"),
+        LanguageMetadata("Somali","Soomaaliga, af Soomaali","so","so","som","som","so"),
+        LanguageMetadata("Sotho","Sesotho","st","st","sot","sot",""),
+        LanguageMetadata("Southern Ndebele","isiNdebele","nr","nr","nbl","nbl",""),
+        LanguageMetadata("Spanish","Español","es","es","spa","spa","es"),
+        LanguageMetadata("Spanish (Europe)","Español (Europa)","es-es","","","","sp"),
+        LanguageMetadata("Spanish (Latin America)","Español (Latinoamérica)","es-419","","","","ea"),
+        LanguageMetadata("Sundanese","Basa Sunda","su","su","sun","sun",""),
+        LanguageMetadata("Swahili","Kiswahili","sw","sw","swa","swa","sw"),
+        LanguageMetadata("Swedish","Svenska","sv","sv","swe","swe","sv"),
+        LanguageMetadata("Tagalog","Wikang Tagalog, ᜆᜄᜎᜓᜄ᜔","tl","tl","","tlg","tl"),
+        LanguageMetadata("Tajik","тоҷикӣ, toçikī, تاجیکی‎","tg","tg","tgk","tgk",""),
+        LanguageMetadata("Tamil","தமிழ்","ta","ta","tam","tam","ta"),
+        LanguageMetadata("Tatar","татар теле, tatar tele","tt","tt","tat","tat","tt"),
+        LanguageMetadata("Telugu","తెలుగు","te","te","tel","tel","te"),
+        LanguageMetadata("Tetum","Tetun","tdt","","","tdt","tm-td"),
+        LanguageMetadata("Thai","ไทย","th","th","tha","tha","th"),
+        LanguageMetadata("Tibetan Standard","བོད་ཡིག","bo","bo","","bod",""),
+        LanguageMetadata("Tigrinya","ትግርኛ","ti","ti","tir","tir",""),
+        LanguageMetadata("Toki Pona","toki pona","tok","","","tok","tp"),
+        LanguageMetadata("Tonga","faka Tonga","to","to","ton","ton",""),
+        LanguageMetadata("Tsonga","Xitsonga","ts","ts","tso","tso",""),
+        LanguageMetadata("Tswana","Setswana","tn","tn","tsn","tsn",""),
+        LanguageMetadata("Turkish","Türkçe","tr","tr","tur","tur","tr"),
+        LanguageMetadata("Turkmen","Türkmen, Түркмен","tk","tk","tuk","tuk","tk"),
+        LanguageMetadata("Ukrainian","Українська","uk","uk","ukr","ukr","uk"),
+        LanguageMetadata("Urdu","اردو","ur","ur","urd","urd","ur"),
+        LanguageMetadata("Uzbek","Oʻzbek, Ўзбек, أۇزبېك‎","uz","uz","uzb","uzb","uz"),
+        LanguageMetadata("Vietnamese","Tiếng Việt","vi","vi","vie","vie","vi"),
+        LanguageMetadata("Welsh","Cymraeg","cy","cy","","cym","cy"),
+        LanguageMetadata("Wolof","Wollof","wo","wo","wol","wol",""),
+        LanguageMetadata("Xhosa","isiXhosa","xh","xh","xho","xho",""),
+        LanguageMetadata("Yoruba","Yorùbá","yo","yo","yor","yor",""),
+        LanguageMetadata("Zhuang","Saɯ cueŋƅ, Saw cuengh","za","za","zha","zha",""),
+        LanguageMetadata("Zulu","isiZulu","zu","zu","zul","zul",""),
+    )
+
+    val indexMapLanguageName = languages.withIndex().associate { (i, lang) -> lang.languageName.lowercase() to i}
+    val indexMapNativeName = languages.withIndex().associate { (i, lang) -> lang.nativeName.lowercase() to i}
+    val indexMapIETF_tag = languages.withIndex().associate { (i, lang) -> lang.IETF_tag.lowercase() to i}
+    val indexMapISO_639_1 = languages.withIndex().associate { (i, lang) -> lang.ISO_639_1.lowercase() to i}
+    val indexMapISO_639_2_B = languages.withIndex().associate { (i, lang) -> lang.ISO_639_2_B.lowercase() to i}
+    val indexMapISO_639_3 = languages.withIndex().associate { (i, lang) -> lang.ISO_639_3.lowercase() to i}
+    val indexMapOpenSubtitles = languages.withIndex().associate { (i, lang) -> lang.openSubtitles.lowercase() to i}
+}
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 1a9867f5023..206b0f29fe1 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/UnshortenUrl.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/UnshortenUrl.kt
@@ -51,16 +51,18 @@ object ShortLink {
     suspend fun unshorten(uri: String, type: String? = null): String {
         var currentUrl = uri
 
-        while (true) {
-            val oldurl = currentUrl
+        val visitedUrls = mutableSetOf<String>()
+        var count = 10
+        while (!visitedUrls.contains(currentUrl) && count > 0) {
+            visitedUrls += currentUrl
+            count -= 1
+
             val domain =
-                URI(currentUrl.trim()).host ?: throw IllegalArgumentException("No domain found in URI!")
+                URI(currentUrl.trim()).host
+                    ?: throw IllegalArgumentException("No domain found in URI!")
             currentUrl = shortList.firstOrNull {
                 it.regex.find(domain) != null || type == it.type
             }?.function?.let { it(currentUrl) } ?: break
-            if (oldurl == currentUrl) {
-                break
-            }
         }
         return currentUrl.trim()
     }
@@ -112,8 +114,10 @@ object ShortLink {
             uri.contains("delta") -> uri = uri.replace("/delta/", "/adelta/")
             (uri.contains("/ga/") || uri.contains("/ga2/")) -> uri =
                 base64Decode(uri.split('/').last()).trim()
+
             uri.contains("/speedx/") -> uri =
                 uri.replace("http://linkup.pro/speedx", "http://speedvideo.net")
+
             else -> {
                 r = app.get(uri, allowRedirects = true)
                 uri = r.url
@@ -187,8 +191,9 @@ object ShortLink {
     fun unshortenDavisonbarker(uri: String): String {
         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
+        return doc.selectFirst("iframe")?.attr("src")?.trim() ?: uri
     }
 }
\ No newline at end of file
diff --git a/library/src/jvmMain/kotlin/com/lagradost/cloudstream3/network/WebViewResolver.jvm.kt b/library/src/jvmMain/kotlin/com/lagradost/cloudstream3/network/WebViewResolver.jvm.kt
index 6b99ef3b503..39e0d51f95e 100644
--- a/library/src/jvmMain/kotlin/com/lagradost/cloudstream3/network/WebViewResolver.jvm.kt
+++ b/library/src/jvmMain/kotlin/com/lagradost/cloudstream3/network/WebViewResolver.jvm.kt
@@ -1,6 +1,10 @@
 package com.lagradost.cloudstream3.network
 
+import com.lagradost.cloudstream3.mvvm.debugException
+import com.lagradost.cloudstream3.mvvm.logError
+import com.lagradost.nicehttp.requestCreator
 import okhttp3.Interceptor
+import okhttp3.Request
 import okhttp3.Response
 
 /**
@@ -31,5 +35,40 @@ actual class WebViewResolver actual constructor(
 
     actual companion object {
         actual val DEFAULT_TIMEOUT = 60_000L
+        actual var webViewUserAgent: String? = null
+    }
+
+    actual suspend fun resolveUsingWebView(
+        url: String,
+        referer: String?,
+        method: String,
+        requestCallBack: (Request) -> Boolean,
+    ): Pair<Request?, List<Request>> =
+        resolveUsingWebView(url, referer, emptyMap(), method, requestCallBack)
+
+    actual suspend fun resolveUsingWebView(
+        url: String,
+        referer: String?,
+        headers: Map<String, String>,
+        method: String,
+        requestCallBack: (Request) -> Boolean
+    ): Pair<Request?, List<Request>> {
+        return try {
+            resolveUsingWebView(
+                requestCreator(method, url, referer = referer, headers = headers), requestCallBack
+            )
+        } catch (e: java.lang.IllegalArgumentException) {
+            logError(e)
+            debugException { "ILLEGAL URL IN resolveUsingWebView!" }
+            return null to emptyList()
+        }
+    }
+
+    actual suspend fun resolveUsingWebView(
+        request: Request,
+        requestCallBack: (Request) -> Boolean
+    ): Pair<Request?, List<Request>> {
+        TODO("Not yet implemented")
     }
 }
+
diff --git a/library/src/jvmMain/kotlin/com/lagradost/cloudstream3/utils/Coroutines.jvm.kt b/library/src/jvmMain/kotlin/com/lagradost/cloudstream3/utils/Coroutines.jvm.kt
index 0a9667cbc16..8fc9a8b0f01 100644
--- a/library/src/jvmMain/kotlin/com/lagradost/cloudstream3/utils/Coroutines.jvm.kt
+++ b/library/src/jvmMain/kotlin/com/lagradost/cloudstream3/utils/Coroutines.jvm.kt
@@ -1,5 +1,9 @@
 package com.lagradost.cloudstream3.utils
 
-actual fun runOnMainThreadNative(work: () -> Unit) {
+import androidx.annotation.AnyThread
+import androidx.annotation.MainThread
+
+@AnyThread
+actual fun runOnMainThreadNative(@MainThread work: () -> Unit) {
     work.invoke()
-}
\ No newline at end of file
+}
diff --git a/settings.gradle.kts b/settings.gradle.kts
index bd26f9f3499..73bf5a1958b 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,5 +1,21 @@
-rootProject.name = "CloudStream"
+// https://developer.android.com/build#settings-file
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+        google()
+        mavenCentral()
+    }
+}
+
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        google()
+        mavenCentral()
+        mavenLocal()
+        maven("https://jitpack.io")
+    }
+}
 
-include(":app")
-include(":library")
-include(":docs")
\ No newline at end of file
+rootProject.name = "CloudStream"
+include(":app", ":library", ":docs")